Changeset 1095 for rfc2629xslt/rfc2629toXHTML.xslt

Timestamp:

Dec 1, 2010, 4:07:53 AM (9 years ago)

Author:

julian.reschke@…

Message:

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

File:

• rfc2629xslt/rfc2629toXHTML.xslt (modified) (8 diffs)

rfc2629xslt/rfc2629toXHTML.xslt

@@ -337 +337 @@
       <xsl:call-template name="error">
         <xsl:with-param name="msg" select="concat('Unsupported value for /rfc/@submissionType: ', /rfc/@submissionType)"/>
+        <xsl:with-param name="inline" select="'no'"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
+  
+  <!-- sanity check on @consensus -->
+  <xsl:if test="/rfc/@consensus and (/rfc/@submissionType='IAB' or /rfc/@submissionType='independent')">
+    <xsl:call-template name="warning">
+      <xsl:with-param name="msg" select="concat('/rfc/@consensus meaningless with a /rfc/@submissionType value of ', /rfc/@submissionType)"/>
+      <xsl:with-param name="inline" select="'no'"/>
+    </xsl:call-template>
+  </xsl:if>
+</xsl:variable>
+
+<xsl:variable name="consensus">
+  <xsl:choose>
+    <xsl:when test="/rfc/@consensus='yes' or not(/rfc/@consensus)">yes</xsl:when>
+    <xsl:when test="/rfc/@consensus='no'">no</xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="concat('(UNSUPPORTED VALUE FOR CONSENSUS: ',/rfc/@consensus,')')"/>
+      <xsl:call-template name="error">
+        <xsl:with-param name="msg" select="concat('Unsupported value for /rfc/@consensus: ', /rfc/@consensus)"/>
         <xsl:with-param name="inline" select="'no'"/>
       </xsl:call-template>
@@ -3282 +3304 @@
   margin-left: 0em;
 }
-<xsl:if test="$has-index">ul.ind {
+<xsl:if test="$has-index">ul.ind, ul.ind ul {
   list-style: none;
   margin-left: 1.5em;
@@ -4168 +4190 @@
           (IETF).
           <xsl:choose>
-            <xsl:when test="not(/rfc/@consensus) or /rfc/@consensus='yes'">
+            <xsl:when test="$consensus='yes'">
               It represents the consensus of the IETF community.  It has
               received public review and has been approved for publication by
@@ -4176 +4198 @@
               It has been approved for publication by the Internet Engineering
               Steering Group (IESG).
+              <!-- sanity check of $consensus -->
+              <xsl:if test="/rfc/@category='std' or /rfc/@category='bcp'">
+                <xsl:call-template name="error">
+                  <xsl:with-param name="msg" select="'IETF BCPs and Standards Track documents require IETF consensus, check values of @category and @consensus!'"/>
+                  <xsl:with-param name="inline" select="'no'"/>
+                </xsl:call-template>
+              </xsl:if>
             </xsl:otherwise>
           </xsl:choose>
@@ -4190 +4219 @@
           deployment.
           <xsl:choose>
-            <xsl:when test="(not(/rfc/@consensus) or /rfc/@consensus='yes') and /rfc/front/workgroup!=''">
+            <xsl:when test="$consensus='yes' and /rfc/front/workgroup!=''">
               This RFC represents the consensus of the
               <xsl:value-of select="/rfc/front/workgroup"/> Research Group of the Internet
               Research Task Force (IRTF).
             </xsl:when>
-            <xsl:when test="/rfc/@consensus='no' and /rfc/front/workgroup!=''">
+            <xsl:when test="$consensus='no' and /rfc/front/workgroup!=''">
               This RFC represents the individual opinion(s) of one or more
               members of the <xsl:value-of select="/rfc/front/workgroup"/> Research Group of the
@@ -6025 +6054 @@
     <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.531 $',':')">
-      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.531 $', 'Revision: '),'$','')),', ')"/>
+    <xsl:if test="contains('$Revision: 1.536 $',':')">
+      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.536 $', 'Revision: '),'$','')),', ')"/>
     </xsl:if>
-    <xsl:if test="contains('$Date: 2010-10-31 21:50:52 $',':')">
-      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2010-10-31 21:50:52 $', 'Date: '),'$','')),', ')"/>
+    <xsl:if test="contains('$Date: 2010-11-29 12:56:12 $',':')">
+      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2010-11-29 12:56:12 $', 'Date: '),'$','')),', ')"/>
     </xsl:if>
     <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))"/>
@@ -6528 +6557 @@
       <xsl:text> (at line </xsl:text>
       <xsl:value-of select="saxon-old:line-number()"/>
+      <xsl:if test="function-available('saxon-old:systemId')">
+        <xsl:variable name="rootsys">
+          <xsl:for-each select="/*">
+            <xsl:value-of select="saxon-old:systemId()"/>
+          </xsl:for-each>
+        </xsl:variable>
+        <xsl:if test="$rootsys != saxon-old:systemId()">
+          <xsl:text> of </xsl:text>
+          <xsl:value-of select="saxon-old:systemId()"/>
+        </xsl:if>
+      </xsl:if>
       <xsl:text>)</xsl:text>
     </xsl:if>
@@ -6535 +6575 @@
       <xsl:text> (at line </xsl:text>
       <xsl:value-of select="saxon:line-number()"/>
+      <xsl:if test="function-available('saxon:systemId')">
+        <xsl:variable name="rootsys">
+          <xsl:for-each select="/*">
+            <xsl:value-of select="saxon:systemId()"/>
+          </xsl:for-each>
+        </xsl:variable>
+        <xsl:if test="$rootsys != saxon:systemId()">
+          <xsl:text> of </xsl:text>
+          <xsl:value-of select="saxon:systemId()"/>
+        </xsl:if>
+      </xsl:if>
       <xsl:text>)</xsl:text>
     </xsl:if>