Changeset 1652 for rfc2629xslt/rfc2629.xslt

Timestamp:

05/04/12 11:39:00 (9 years ago)

Author:

julian.reschke@…

Message:

bump up document dates, update to latest version of rfc2629.xslt

File:

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

rfc2629xslt/rfc2629.xslt

@@ -760 +760 @@
     </xsl:when>
     <xsl:when test="not(contains($content,'&#10;'))">
-      <xsl:if test="string-length($content) > 69 + $indent">
+      <xsl:if test="string-length($content) > 69 + number($indent)">
         <xsl:call-template name="warning">
           <xsl:with-param name="msg">artwork line too long: '<xsl:value-of select="$content"/>' (<xsl:value-of select="string-length($content)"/> characters)</xsl:with-param>
@@ -2947 +2947 @@
   <xsl:param name="in-prose"/>
   <xsl:choose>
-    <xsl:when test="$xml2rfc-ext-pub-day >= 1">
+    <xsl:when test="number($xml2rfc-ext-pub-day) >= 1">
       <xsl:if test="$in-prose">
         <xsl:text>on </xsl:text>
@@ -4025 +4025 @@
   <!-- generate navigation links to index subsections -->
   <p class="noprint">
-    <xsl:variable name="irefs" select="//iref[generate-id(.) = generate-id(key('index-first-letter',translate(substring(@item,1,1),$lcase,$ucase)))]"/>
-    <xsl:variable name="xrefs" select="//reference[not(starts-with(@anchor,'deleted-'))][generate-id(.) = generate-id(key('index-first-letter',translate(substring(@anchor,1,1),$lcase,$ucase)))]"/>
+    <xsl:variable name="irefs" select="//iref[generate-id(.) = generate-id(key('index-first-letter',translate(substring(@item,1,1),$lcase,$ucase))[1])]"/>
+    <xsl:variable name="xrefs" select="//reference[not(starts-with(@anchor,'deleted-'))][generate-id(.) = generate-id(key('index-first-letter',translate(substring(@anchor,1,1),$lcase,$ucase))[1])]"/>
   
     <xsl:for-each select="$irefs | $xrefs">
@@ -4054 +4054 @@
   <div class="print2col">
   <ul class="ind">
-    <xsl:variable name="irefs2" select="//iref[generate-id(.) = generate-id(key('index-first-letter',translate(substring(@item,1,1),$lcase,$ucase)))]"/>
-    <xsl:variable name="xrefs2" select="//reference[not(starts-with(@anchor,'deleted-'))][generate-id(.) = generate-id(key('index-first-letter',translate(substring(@anchor,1,1),$lcase,$ucase)))]"/>
+    <xsl:variable name="irefs2" select="//iref[generate-id(.) = generate-id(key('index-first-letter',translate(substring(@item,1,1),$lcase,$ucase))[1])]"/>
+    <xsl:variable name="xrefs2" select="//reference[not(starts-with(@anchor,'deleted-'))][generate-id(.) = generate-id(key('index-first-letter',translate(substring(@anchor,1,1),$lcase,$ucase))[1])]"/>
   
     <xsl:for-each select="$irefs2 | $xrefs2">
@@ -4105 +4105 @@
                               <xsl:sort select="substring-before(concat(@x:sec,'.'),'.')" data-type="number"/>
                               <xsl:sort select="substring(@x:sec,2+string-length(substring-before(@x:sec,'.')))" data-type="number"/>
-                              <xsl:if test="generate-id(.) = generate-id(key('index-xref-by-sec',concat(@target,'..',@x:sec)))">
+                              <xsl:if test="generate-id(.) = generate-id(key('index-xref-by-sec',concat(@target,'..',@x:sec))[1])">
                                 <li>
                                   <em>
@@ -4135 +4135 @@
                               <xsl:for-each select="$rs3">
                                 <xsl:sort select="count($doc//*[@anchor and following::*/@anchor=substring-after(current()/@x:rel,'#')])" order="ascending" data-type="number"/>
-                                <xsl:if test="generate-id(.) = generate-id(key('index-xref-by-anchor',concat(@target,'..',@x:rel)))">
+                                <xsl:if test="generate-id(.) = generate-id(key('index-xref-by-anchor',concat(@target,'..',@x:rel))[1])">
                                   <li>
                                     <em>
@@ -4168 +4168 @@
                   <xsl:otherwise>
                     <!-- regular iref -->
-                    <xsl:if test="generate-id(.) = generate-id(key('index-item',concat(@item,@anchor)))">
+                    <xsl:if test="generate-id(.) = generate-id(key('index-item',concat(@item,@anchor))[1])">
                       <xsl:variable name="item" select="@item"/>
                       <xsl:variable name="in-artwork" select="key('index-item',$item)[@primary='true' and ancestor::artwork]"/>
@@ -5177 +5177 @@
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="number($name)=$name">
+    <xsl:when test="string(number($name))=$name">
       <a href="{concat($rfcUrlPrefix,$name,$rfcUrlPostfix)}"><xsl:value-of select="$name"/></a>
       <xsl:call-template name="check-front-matter-ref">
@@ -6533 +6533 @@
     <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.570 $',':')">
-      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.570 $', 'Revision: '),'$','')),', ')" />
+    <xsl:if test="contains('$Revision: 1.572 $',':')">
+      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.572 $', 'Revision: '),'$','')),', ')" />
     </xsl:if>
-    <xsl:if test="contains('$Date: 2012-02-13 19:17:35 $',':')">
-      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2012-02-13 19:17:35 $', 'Date: '),'$','')),', ')" />
+    <xsl:if test="contains('$Date: 2012-03-19 14:26:22 $',':')">
+      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2012-03-19 14:26:22 $', 'Date: '),'$','')),', ')" />
     </xsl:if>
     <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))" />