[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/html/data/standardMacros metaTags,1.1.1.1,1.2

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/html/data/standardMacros
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23740

Modified Files:
	metaTags 
Log Message:
towards XHTML complicance

Index: metaTags
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/html/data/standardMacros/metaTags,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** metaTags	26 Mar 2005 19:43:03 -0000	1.1.1.1
--- metaTags	5 Jan 2006 06:12:53 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.html.data.standardMacros.metaTags
  
! on metaTags (pageTable = nil) {
	ÇAdd meta tags to the page header.
		ÇTuesday, January 27, 1998 at 12:53:14 AM by PBS
	
	local (htmlText = "", i);
	
	on add (s) {
		htmlText = htmlText + s};
	
	if pageTable == nil {
		pageTable = html.getPageTableAddress ()};
	
	if defined (pageTable^.meta) {
		add ("\r" + pageTable^.meta)};
	
	ÇGeneral meta tags framework.
		ÇFrom Jim Correia and Jeb Bateman.
	for i = 1 to sizeof (pageTable^) {
		local (adrSubItem = @pageTable^ [i]);
		local (itemName = string.lower (nameOf (adrSubItem^)));
		if not (itemName beginsWith "meta") {
			continue};
		if itemName == "meta" {
			continue};
		bundle { //add the meta directive
			local (type = "name", s);
			local (metaName = string.mid (itemName, 5, infinity));
			if (metaName beginsWith "equiv") {
				metaName = string.mid (metaName, 6, infinity);
				type = "http-equiv"};
			if typeOf (adrSubItem^) == scriptType {
				s = adrSubItem^ ()}
			else {
				s = string (adrSubItem^)};
			if typeOf (adrSubItem^) == outlineType {
				s = string.delete (s, sizeOf (s), 1)}; //pop off one trailing return character: PBS 6/3/99
			if s == "" {
				continue};
			add ("\r<meta "+ type +"=\""+ metaName +"\" content=\""+ s +"\">")}};
	
	Çadd our own meta tags -- Sat, Nov 30, 1996 at 6:26:59 AM by DW
		Çupdated Sun, Sep 28, 1997 at 4:06:28 PM by DW -- correct version number and platform
	if html.getPref ("includeMetaGenerator", pageTable) { //5.0
		local (gen = "Frontier " + Frontier.version () + " " + sys.os ());
		add ("\r<meta name=\"generator\" content=\"" + gen + "\">")};
	if html.getPref ("includeMetaCharset", pageTable) {
		local (charset = html.getPref ("charset", pageTable));
		add ("\r<meta http-equiv=\"content-type\" content=\"text/html; charset=" + charset + "\">")};
	
	htmlText = string.popLeading (htmlText, cr);
	return (htmlText)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.html.data.standardMacros.metaTags
  
! on metaTags (pageTable = nil) {
	ÇChanges
		Ç1/4/06; 3:22:24 PM by TAC
			Çdid some minor reformatting
			Çclose meta tag for xhtml compliance
		ÇTuesday, January 27, 1998 at 12:53:14 AM by PBS
			ÇAdd meta tags to the page header.
		ÇSun, Sep 28, 1997 at 4:06:28 PM by DW
			Çcorrect version number and platform
		ÇSat, Nov 30, 1996 at 6:26:59 AM by DW
			Çadd our own meta tags
	
	local (htmlText = "", i);
	
	on add (s) {
		htmlText = htmlText + s};
	
	if pageTable == nil {
		pageTable = html.getPageTableAddress ()};
	
	if defined (pageTable^.meta) {
		add ("\r" + pageTable^.meta)};
	
	bundle { // General meta tags framework.  From Jim Correia and Jeb Bateman.
		for i = 1 to sizeof (pageTable^) {
			local (adrSubItem = @pageTable^ [i]);
			local (itemName = string.lower (nameOf (adrSubItem^)));
			if not (itemName beginsWith "meta") {
				continue};
			if itemName == "meta" {
				continue};
			bundle { //add the meta directive
				local (type = "name", s);
				local (metaName = string.mid (itemName, 5, infinity));
				if (metaName beginsWith "equiv") {
					metaName = string.mid (metaName, 6, infinity);
					type = "http-equiv"};
				if typeOf (adrSubItem^) == scriptType {
					s = adrSubItem^ ()}
				else {
					s = string (adrSubItem^)};
				if typeOf (adrSubItem^) == outlineType {
					s = string.delete (s, sizeOf (s), 1)}; //pop off one trailing return character: PBS 6/3/99
				if s == "" {
					continue};
				add ("\r<meta "+ type +"=\""+ metaName +"\" content=\""+ s +"\" />")}}};
	
	bundle { // add our own meta tags
		if html.getPref ("includeMetaGenerator", pageTable) { //5.0
			local (gen = Frontier.getProgramName () + " " + Frontier.version () + " " + sys.os ());
			add ("\r<meta name=\"generator\" content=\"" + gen + "\" />")};
		
		if html.getPref ("includeMetaCharset", pageTable) {
			local (charset = html.getPref ("charset", pageTable));
			add ("\r<meta http-equiv=\"content-type\" content=\"text/html; charset=" + charset + "\" />")}};
	
	htmlText = string.popLeading (htmlText, cr);
	
	return (htmlText)}
\ No newline at end of file