Changeset 230 for rfc2629xslt/rfc2629.xslt

Timestamp:

08/03/08 09:17:34 (13 years ago)

Author:

julian.reschke@…

Message:

Update to xml2rfc 1.33 (only affects Makefiles), update to latest version of rfc2629.xslt, change Makefile to allow Saxon to keep line numbers from source files.

File:

• rfc2629xslt/rfc2629.xslt (modified) (6 diffs)

rfc2629xslt/rfc2629.xslt

@@ -38 +38 @@
                 xmlns:msxsl="urn:schemas-microsoft-com:xslt"
                 xmlns:myns="mailto:julian.reschke@greenbytes.de?subject=rcf2629.xslt"
-                xmlns:saxon="http://icl.com/saxon"
+                xmlns:saxon-old="http://icl.com/saxon"
+                xmlns:saxon="http://saxon.sf.net/"
                 xmlns:x="http://purl.org/net/xml2rfc/ext"
                 xmlns:xhtml="http://www.w3.org/1999/xhtml"
 
-                exclude-result-prefixes="date ed exslt msxsl myns saxon x xhtml"
+                exclude-result-prefixes="date ed exslt msxsl myns saxon saxon-old x xhtml"
                 >
 
@@ -339 +340 @@
         and /rfc/@number != 5065
         and /rfc/@number != 5094) or
-      ($xml2rfc-ext-pub-year > 2008) or
-      (not(/rfc/@number) and $xml2rfc-ext-pub-year > 2007 and $xml2rfc-ext-pub-month-numeric >= 9)
+      ($xml2rfc-ext-pub-year >= 2008) or
+      (not(/rfc/@number) and $xml2rfc-ext-pub-year >= 2007 and $xml2rfc-ext-pub-month-numeric >= 9)
     )
   )" />
@@ -1537 +1538 @@
 <xsl:template match="section|appendix">
 
+  <xsl:if test="self::appendix">
+    <xsl:call-template name="warning">
+      <xsl:with-param name="inline" select="'no'"/>
+      <xsl:with-param name="msg">The "appendix" element is deprecated, use "section" inside "back" instead.</xsl:with-param>
+    </xsl:call-template>
+  </xsl:if>
+
   <xsl:variable name="sectionNumber">
     <xsl:choose>
@@ -3821 +3829 @@
         <xsl:call-template name="warning">
           <xsl:with-param name="inline" select="'no'"/>
-          <xsl:with-param name="msg" select="concat('front matter mentions RFC',$rfcNo,' for which there is no reference element')"/>
+          <xsl:with-param name="msg" select="concat('front matter mentions RFC ',$rfcNo,' for which there is no reference element')"/>
         </xsl:call-template>
       </xsl:if>
@@ -4784 +4792 @@
     <xsl:text>http://greenbytes.de/tech/webdav/rfc2629.xslt, </xsl:text>
     <!-- when RCS keyword substitution in place, add version info -->
-    <xsl:if test="contains('$Revision: 1.362 $',':')">
-      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.362 $', 'Revision: '),'$','')),', ')" />
+    <xsl:if test="contains('$Revision: 1.365 $',':')">
+      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.365 $', 'Revision: '),'$','')),', ')" />
     </xsl:if>
-    <xsl:if test="contains('$Date: 2008-02-29 17:10:19 $',':')">
-      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2008-02-29 17:10:19 $', 'Date: '),'$','')),', ')" />
+    <xsl:if test="contains('$Date: 2008-03-07 07:17:25 $',':')">
+      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2008-03-07 07:17:25 $', 'Date: '),'$','')),', ')" />
     </xsl:if>
     <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))" />
@@ -4944 +4952 @@
 <!-- diag support -->
 <xsl:template name="lineno">
+  <xsl:if test="function-available('saxon-old:line-number')">
+    <xsl:if test="saxon-old:line-number() > 0">
+      <xsl:text> (at line </xsl:text>
+      <xsl:value-of select="saxon-old:line-number()"/>
+      <xsl:text>)</xsl:text>
+    </xsl:if>
+  </xsl:if>
   <xsl:if test="function-available('saxon:line-number')">
     <xsl:if test="saxon:line-number() > 0">