Changeset 447 for rfc2629xslt/rfc2629toXHTML.xslt

Timestamp:

23/02/09 12:14:49 (12 years ago)

Author:

julian.reschke@…

Message:

Update to latest version of rfc2629.xslt and experimental version of xml2rfc.tcl.

File:

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

rfc2629xslt/rfc2629toXHTML.xslt

@@ -3330 +3330 @@
   
           <!-- as of Nov 2008 -->
-          <xsl:when test="/rfc/@ipr = 'trust200811'">
+          <xsl:when test="/rfc/@ipr = 'trust200811'                           or /rfc/@ipr = 'noModificationTrust200811'                           or  /rfc/@ipr = 'noDerivativesTrust200811'">
             This Internet-Draft is submitted to IETF pursuant to, and in full
             conformance with, the provisions of BCP 78 and BCP 79.
           </xsl:when>
-          <xsl:when test="/rfc/@ipr = 'noModificationTrust200811'">
-            This Internet-Draft is submitted to IETF pursuant to, and in full
-            conformance with, the provisions of BCP 78 and BCP 79.
-            This document may not be modified, and derivative works of it may
-            not be created, except to format it for publication as an RFC and
-            to translate it into languages other than English.
-          </xsl:when>
-          <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200811'">
-            This Internet-Draft is submitted to IETF pursuant to, and in full
-            conformance with, the provisions of BCP 78 and BCP 79.
-            This document may not be modified, and derivative works of it may
-            not be created, and it may not be published except as an Internet-Draft.
-          </xsl:when>
   
           <!-- as of Feb 2009 -->
-          <xsl:when test="/rfc/@ipr = 'trust200902'">
+          <xsl:when test="/rfc/@ipr = 'trust200902'                           or /rfc/@ipr = 'noModificationTrust200902'                           or /rfc/@ipr = 'noDerivativesTrust200902'                           or /rfc/@ipr = 'pre5378Trust200902'">
             This Internet-Draft is submitted to IETF pursuant to, and in full
             conformance with, the provisions of BCP 78 and BCP 79.
           </xsl:when>
           <xsl:when test="/rfc/@ipr = 'noModificationTrust200902'">
-            This Internet-Draft is submitted to IETF pursuant to, and in full
-            conformance with, the provisions of BCP 78 and BCP 79.
             This document may not be modified, and derivative works of it may
             not be created, except to format it for publication as an RFC or
@@ -3361 +3346 @@
           </xsl:when>
           <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200902'">
-            This Internet-Draft is submitted to IETF pursuant to, and in full
-            conformance with, the provisions of BCP 78 and BCP 79.
             This document may not be modified, and derivative works of it may
             not be created, and it may not be published except as an Internet-Draft.
           </xsl:when>
           <xsl:when test="/rfc/@ipr = 'pre5378Trust200902'">
-            This Internet-Draft is submitted to IETF pursuant to, and in full
-            conformance with, the provisions of BCP 78 and BCP 79.
             This document may contain material from IETF Documents or IETF Contributions published or
             made publicly available before November 10, 2008. The person(s) controlling the copyright in
@@ -3382 +3363 @@
             CONFORMANCE UNDEFINED.
           </xsl:otherwise>
+        </xsl:choose>
+        
+        <!-- restrictions -->
+        <xsl:choose>
+          <xsl:when test="/rfc/@ipr = 'noModificationTrust200811'">
+            This document may not be modified, and derivative works of it may
+            not be created, except to format it for publication as an RFC and
+            to translate it into languages other than English.
+          </xsl:when>
+          <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200811'">
+            This document may not be modified, and derivative works of it may
+            not be created, and it may not be published except as an Internet-Draft.
+          </xsl:when>
+
+          <xsl:when test="/rfc/@ipr = 'noModificationTrust200902'">
+            This document may not be modified, and derivative works of it may
+            not be created, except to format it for publication as an RFC or
+            to translate it into languages other than English.
+          </xsl:when>
+          <xsl:when test="/rfc/@ipr = 'noDerivativesTrust200902'">
+            This document may not be modified, and derivative works of it may
+            not be created, and it may not be published except as an Internet-Draft.
+          </xsl:when>
+
+          <xsl:otherwise/>
         </xsl:choose>
       </t>
@@ -3484 +3490 @@
         
         <!-- special case: RFC5378 escape applies to RFCs as well -->
-        <xsl:if test="/rfc/@ipr = 'pre5378Trust200902' and /rfc/@number">
+        <xsl:if test="/rfc/@ipr = 'pre5378Trust200902'">
           <t>
             This document may contain material from IETF Documents or IETF Contributions published or
@@ -5078 +5084 @@
     <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.421 $',':')">
-      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.421 $', 'Revision: '),'$','')),', ')"/>
+    <xsl:if test="contains('$Revision: 1.422 $',':')">
+      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.422 $', 'Revision: '),'$','')),', ')"/>
     </xsl:if>
-    <xsl:if test="contains('$Date: 2009-02-20 13:12:03 $',':')">
-      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-02-20 13:12:03 $', 'Date: '),'$','')),', ')"/>
+    <xsl:if test="contains('$Date: 2009-02-22 22:47:18 $',':')">
+      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-02-22 22:47:18 $', 'Date: '),'$','')),', ')"/>
     </xsl:if>
     <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))"/>