Date: Wed, 15 Aug 2012 21:50:44 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r39383 - in projects/sgml2xml: de_DE.ISO8859-1/share/sgml en_US.ISO8859-1/htdocs/gnome en_US.ISO8859-1/htdocs/java en_US.ISO8859-1/htdocs/news/status en_US.ISO8859-1/htdocs/releases/6.0... Message-ID: <201208152150.q7FLoiFd016871@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Wed Aug 15 21:50:43 2012 New Revision: 39383 URL: http://svn.freebsd.org/changeset/doc/39383 Log: - Properly copy XHTML fragments by adding namespace - Allow disabling last modified date by setting the date variable to empty text - Only disable last modified date in old news, press, events pages since it makes sense for recent entries Approved by: doceng (implicit) Modified: projects/sgml2xml/de_DE.ISO8859-1/share/sgml/libcommon.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/libcommon.xsl projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.events.xsl projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.events.xsl projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldpress.xsl projects/sgml2xml/ru_RU.KOI8-R/share/sgml/templates.events.xsl projects/sgml2xml/share/sgml/libcommon.xsl projects/sgml2xml/share/sgml/templates.entries.xsl projects/sgml2xml/share/sgml/templates.oldnewsflash.xsl projects/sgml2xml/share/sgml/templates.oldpress.xsl projects/sgml2xml/share/sgml/templates.pastevents.xsl projects/sgml2xml/share/sgml/xhtml.xsl Modified: projects/sgml2xml/de_DE.ISO8859-1/share/sgml/libcommon.xsl ============================================================================== --- projects/sgml2xml/de_DE.ISO8859-1/share/sgml/libcommon.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/de_DE.ISO8859-1/share/sgml/libcommon.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -6,7 +6,10 @@ basiert auf: r38826 --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml">; + <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>; <xsl:template name="html-news-list-newsflash-preface"> Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/index.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -9,6 +9,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf1="http://my.netscape.com/rdf/simple/0.9/" + xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="rdf rdf1" version="1.0"> <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; @@ -49,7 +50,7 @@ <xsl:value-of select="title"/><br/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="p"/><br/> + <xsl:apply-templates select="p" mode="copy.html"/><br/> </xsl:otherwise> </xsl:choose> </a></li> Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/gnome/newsflash.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -86,7 +86,7 @@ <xsl:text> </xsl:text> <xsl:value-of select="ancestor::month/name"/>, <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text> - <xsl:copy-of select="p"/> + <xsl:apply-templates select="p" mode="copy.html"/> </p> </li> Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/java/newsflash.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -83,9 +83,8 @@ <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text> <xsl:value-of select="title"/> </p> - <xsl:copy-of select="p"/> + + <xsl:apply-templates select="p" mode="copy.html"/> </li> </xsl:template> - - <xsl:template match="date"/> <!-- Deliberately left blank --> </xsl:stylesheet> Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/news/status/report.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -76,7 +76,7 @@ <xsl:template match="section"> <h1><xsl:value-of select="title"/></h1> - <xsl:copy-of select="p"/> + <xsl:apply-templates select="p" mode="copy.html"/> </xsl:template> <!-- A project creates a header, and then process the three components of @@ -129,14 +129,14 @@ <!-- Body is a doddle. Since it contains HTML we just copy in all the child elements. --> <xsl:template match="body"> - <xsl:copy-of select="child::node()"/> + <xsl:apply-templates select="child::node()" mode="copy.html"/> </xsl:template> <xsl:template match="help"> <h3>Open tasks:</h3> <ol> <xsl:for-each select="task"> - <li><xsl:copy-of select="child::node()"/></li> + <li><xsl:apply-templates select="child::node()" mode="copy.html"/></li> </xsl:for-each> </ol> </xsl:template> Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.0R/stress.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -2,8 +2,8 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" -xmlns:cvs="http://www.FreeBSD.org/XML/CVS" -exclude-result-prefixes="rdf cvs" +xmlns="http://www.w3.org/1999/xhtml" +exclude-result-prefixes="rdf" version="1.0"> <xsl:output Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.1R/stress.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -2,8 +2,8 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" -xmlns:cvs="http://www.FreeBSD.org/XML/CVS" -exclude-result-prefixes="rdf cvs" +xmlns="http://www.w3.org/1999/xhtml" +exclude-result-prefixes="rdf" version="1.0"> <xsl:output Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/6.2R/stress.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -2,8 +2,8 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" -xmlns:cvs="http://www.FreeBSD.org/XML/CVS" -exclude-result-prefixes="rdf cvs" +xmlns="http://www.w3.org/1999/xhtml" +exclude-result-prefixes="rdf" version="1.0"> <xsl:output Modified: projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl ============================================================================== --- projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/en_US.ISO8859-1/htdocs/releases/7.0R/stress.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -2,8 +2,8 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" -xmlns:cvs="http://www.FreeBSD.org/XML/CVS" -exclude-result-prefixes="rdf cvs" +xmlns="http://www.w3.org/1999/xhtml" +exclude-result-prefixes="rdf" version="1.0"> <xsl:output Modified: projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/libcommon.xsl ============================================================================== --- projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/libcommon.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/fr_FR.ISO8859-1/share/sgml/libcommon.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -3,7 +3,10 @@ "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">; <!-- $FreeBSD$ --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml">; + <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>; <xsl:template name="html-news-list-newsflash-preface"> Modified: projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.events.xsl ============================================================================== --- projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.events.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.events.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -261,7 +261,7 @@ <xsl:with-param name="enddate" select="enddate" /> </xsl:call-template> </em><br/> - <xsl:copy-of select="description/child::node()"/> + <xsl:apply-templates select="description/child::node()" mode="copy.html"/> </p> <xsl:if test="link"> <p><xsl:apply-templates select="link"/></p> Modified: projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl ============================================================================== --- projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldnewsflash.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -19,6 +19,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:variable name="title">&title;</xsl:variable> <xsl:variable name="year"> @@ -26,7 +29,7 @@ </xsl:variable> <xsl:template match="p"> - <xsl:copy-of select="." /> + <xsl:apply-templates select="." mode="copy.html"/> </xsl:template> <xsl:template name="process.sidewrap"> @@ -98,7 +101,7 @@ <xsl:value-of select="ancestor::day/name"/>:</b><xsl:text> </xsl:text> <xsl:for-each select="p"> <xsl:if test="position() > 1"><br /><br /></xsl:if> - <xsl:copy-of select="child::node()" /> + <xsl:apply-templates select="child::node()" mode="copy.html"/> </xsl:for-each> </p> Modified: projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl ============================================================================== --- projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.oldpress.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -19,6 +19,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:variable name="title">&title;</xsl:variable> <xsl:variable name="year"> @@ -82,7 +85,7 @@ <a href="{$site-url}"><xsl:value-of select="site-name"/></a>, <xsl:value-of select="author"/><br/> - <xsl:copy-of select="p/child::node()"/> + <xsl:apply-templates select="p/child::node()" mode="copy.html"/> </p> </li> </xsl:template> Modified: projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl ============================================================================== --- projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/hu_HU.ISO8859-2/share/sgml/templates.pastevents.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -48,6 +48,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:param name="pastyears">2008 2007 2006 2005 2004 2003</xsl:param> <xsl:key name="event-by-month" match="event" @@ -217,7 +220,7 @@ <xsl:with-param name="enddate" select="enddate" /> </xsl:call-template> </em><br/> - <xsl:copy-of select="description/child::node()"/> + <xsl:apply-templates select="description/child::node()" mode="copy.html"/> </p> <xsl:if test="link"> <p><xsl:apply-templates select="link"/></p> Modified: projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.events.xsl ============================================================================== --- projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.events.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.events.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -255,7 +255,7 @@ <xsl:with-param name="enddate" select="enddate" /> </xsl:call-template> </em><br/> - <xsl:copy-of select="description/child::node()"/> + <xsl:apply-templates select="description/child::node()" mode="copy.html"/> </p> <xsl:if test="link"> <p><xsl:apply-templates select="link"/></p> Modified: projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl ============================================================================== --- projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldnewsflash.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -15,6 +15,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:variable name="title">&title;</xsl:variable> <xsl:variable name="year"> @@ -22,7 +25,7 @@ </xsl:variable> <xsl:template match="p"> - <xsl:copy-of select="." /> + <xsl:apply-templates select="." mode="copy.html"/> </xsl:template> <xsl:template name="process.sidewrap"> @@ -95,13 +98,10 @@ <xsl:text> Æü</xsl:text>:</b><xsl:text> </xsl:text> <xsl:for-each select="p"> <xsl:if test="position() > 1"><br /><br /></xsl:if> - <xsl:copy-of select="child::node()" /> + <xsl:apply-templates select="child::node()" mode="copy.html"/> </xsl:for-each> </p> </li> </xsl:template> - - <xsl:template match="date"/> <!-- Deliberately left blank --> - </xsl:stylesheet> Modified: projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldpress.xsl ============================================================================== --- projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldpress.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/ja_JP.eucJP/share/sgml/templates.oldpress.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -15,6 +15,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:variable name="title">&title;</xsl:variable> <xsl:variable name="year"> @@ -82,7 +85,7 @@ <a href="{$site-url}"><xsl:value-of select="site-name"/></a>, <xsl:value-of select="author"/><br/> - <xsl:copy-of select="p/child::node()"/> + <xsl:apply-templates select="p/child::node()" mode="copy.html"/> </p> </li> </xsl:template> Modified: projects/sgml2xml/ru_RU.KOI8-R/share/sgml/templates.events.xsl ============================================================================== --- projects/sgml2xml/ru_RU.KOI8-R/share/sgml/templates.events.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/ru_RU.KOI8-R/share/sgml/templates.events.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -261,7 +261,7 @@ <xsl:with-param name="enddate" select="enddate" /> </xsl:call-template> </em><br/> - <xsl:copy-of select="description/child::node()"/> + <xsl:apply-templates select="description/child::node()" mode="copy.html"/> </p> <xsl:if test="link"> <p><xsl:apply-templates select="link"/></p> Modified: projects/sgml2xml/share/sgml/libcommon.xsl ============================================================================== --- projects/sgml2xml/share/sgml/libcommon.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/share/sgml/libcommon.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -15,7 +15,7 @@ <xsl:import href="./transtable-common.xsl" /> <xsl:variable name="svnKeyword"> - <xsl:value-of select="//cvs:keyword[1]"/> + <xsl:value-of select="normalize-space(//cvs:keyword[1])"/> </xsl:variable> <xsl:variable name="date"> @@ -37,6 +37,16 @@ <xsl:variable name="curdate.day" select="date:day-in-month()"/> <!-- + Used to copy HTML chunks to the output. + --> + <xsl:template match="*" mode="copy.html"> + <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml">; + <xsl:copy-of select="attribute::*"/> + <xsl:apply-templates select="child::node()" mode="copy.html"/> + </xsl:element> + </xsl:template> + + <!-- template name used in html-usergroups-map templates.usergroups.xsl @@ -203,15 +213,15 @@ [count(.|key('html-usergroups-id-key', string($id))) = count(key('html-usergroups-id-key', string($id)))] "> - <xsl:copy-of select=" + <xsl:apply-templates select=" key('html-usergroups-regions-key', string($continent)) [count(.|key('html-usergroups-id-key', string($id))) = count(key('html-usergroups-id-key', string($id)))]/description/node() - " /> + " mode="copy.html"/> </xsl:when> <xsl:otherwise> <xsl:for-each select="document($usergroups.xml)"> - <xsl:copy-of select="key('html-usergroups-id-key', string($id))/description/node()" /> + <xsl:apply-templates select="key('html-usergroups-id-key', string($id))/description/node()" mode="copy.html"/> </xsl:for-each> </xsl:otherwise> </xsl:choose> @@ -576,7 +586,7 @@ <xsl:text> </xsl:text> <xsl:for-each select="p"> <xsl:if test="position() > 1"><br /><br /></xsl:if> - <xsl:copy-of select="child::node()" /> + <xsl:apply-templates select="child::node()" mode="copy.html"/> </xsl:for-each> </p> </li> @@ -612,7 +622,7 @@ <xsl:text> </xsl:text> <xsl:for-each select="p"> <xsl:if test="position() > 1"><br /><br /></xsl:if> - <xsl:copy-of select="child::node()" /> + <xsl:apply-templates select="child::node()" mode="copy.html"/> </xsl:for-each> </p> </li> @@ -673,7 +683,7 @@ <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/> <a href="{$site-url}"><xsl:value-of select="site-name"/></a>, <xsl:value-of select="author"/><br/> - <xsl:copy-of select="p/child::node()"/> + <xsl:apply-templates select="p/child::node()" mode="copy.html"/> </p> </li> </xsl:for-each> @@ -694,7 +704,7 @@ <a href="{$url}"><b><xsl:value-of select="name"/></b></a><br/> <a href="{$site-url}"><xsl:value-of select="site-name"/></a>, <xsl:value-of select="author"/><br/> - <xsl:copy-of select="p/child::node()"/> + <xsl:apply-templates select="p/child::node()" mode="copy.html"/> </p> </li> </xsl:for-each> Modified: projects/sgml2xml/share/sgml/templates.entries.xsl ============================================================================== --- projects/sgml2xml/share/sgml/templates.entries.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/share/sgml/templates.entries.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -105,7 +105,7 @@ <xsl:value-of select="name"/> </xsl:element></dt> - <dd><xsl:copy-of select="description/child::node()" /></dd> + <dd><xsl:apply-templates select="description/child::node()" mode="copy.html"/></dd> </xsl:for-each> </dl> </xsl:otherwise> Modified: projects/sgml2xml/share/sgml/templates.oldnewsflash.xsl ============================================================================== --- projects/sgml2xml/share/sgml/templates.oldnewsflash.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/share/sgml/templates.oldnewsflash.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -13,6 +13,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:variable name="year"> <xsl:value-of select="descendant::year/name"/> </xsl:variable> @@ -104,7 +107,7 @@ <xsl:value-of select="ancestor::year/name"/>:</b><xsl:text> </xsl:text> <xsl:for-each select="p"> <xsl:if test="position() > 1"><br /><br /></xsl:if> - <xsl:copy-of select="child::node()" /> + <xsl:apply-templates select="child::node()" mode="copy.html"/> </xsl:for-each> </p> Modified: projects/sgml2xml/share/sgml/templates.oldpress.xsl ============================================================================== --- projects/sgml2xml/share/sgml/templates.oldpress.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/share/sgml/templates.oldpress.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -13,6 +13,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:variable name="title">&title;</xsl:variable> <xsl:variable name="year"> @@ -78,7 +81,7 @@ <a href="{$site-url}"><xsl:value-of select="site-name"/></a>, <xsl:value-of select="author"/><br/> - <xsl:copy-of select="p/child::node()"/> + <xsl:apply-templates select="p/child::node()" mode="copy.html"/> </p> </li> </xsl:template> Modified: projects/sgml2xml/share/sgml/templates.pastevents.xsl ============================================================================== --- projects/sgml2xml/share/sgml/templates.pastevents.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/share/sgml/templates.pastevents.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -42,6 +42,9 @@ <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>; <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/xhtml.xsl"/>; + <!-- Do not add last modified date for old news/press --> + <xsl:variable name="date"/> + <xsl:param name="pastyears">2003 2004 2005 2006</xsl:param> <xsl:key name="event-by-month" match="event" @@ -214,7 +217,7 @@ <xsl:with-param name="enddate" select="enddate" /> </xsl:call-template> </em><br/> - <xsl:copy-of select="description/child::node()"/> + <xsl:apply-templates select="description/child::node()" mode="copy.html"/> </p> <xsl:if test="link"> <p><xsl:apply-templates select="link"/></p> Modified: projects/sgml2xml/share/sgml/xhtml.xsl ============================================================================== --- projects/sgml2xml/share/sgml/xhtml.xsl Wed Aug 15 06:22:55 2012 (r39382) +++ projects/sgml2xml/share/sgml/xhtml.xsl Wed Aug 15 21:50:43 2012 (r39383) @@ -17,7 +17,7 @@ <xsl:variable name="rsstitle" select="''"/> <xsl:variable name="svnKeyword"> - <xsl:value-of select="//cvs:keyword[1]"/> + <xsl:value-of select="normalize-space(//cvs:keyword[1])"/> </xsl:variable> <xsl:variable name="date"> @@ -170,6 +170,8 @@ parameters. Changing them will result i <xsl:template name="process.footer"> ©right;<br/> - &lastmod; <xsl:value-of select="$date"/> + <xsl:if test="$date != ''"> + &lastmod; <xsl:value-of select="$date"/> + </xsl:if> </xsl:template> </xsl:stylesheet>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208152150.q7FLoiFd016871>