Changeset 448 for rfc2629xslt/rfc2629toXHTML.xslt

Timestamp:

24/02/09 21:31:57 (12 years ago)

Author:

julian.reschke@…

Message:

Update to xml2rfc 1.34pre3 and latest version of rfc2629.xslt

File:

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

rfc2629xslt/rfc2629toXHTML.xslt

@@ -2595 +2595 @@
   border-style: none none inset none;
   border-width: 1px;
-}</xsl:if>
+}
+caption {
+  caption-side: bottom;
+  font-weight: bold;
+  font-size: 9pt;
+  margin-top: .5em;
+}
+</xsl:if>
 table.header {
   width: 95%;
@@ -3386 +3393 @@
             not be created, and it may not be published except as an Internet-Draft.
           </xsl:when>
+          <xsl:when test="/rfc/@ipr = 'pre5378Trust200902'">
+            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
+            some of this material may not have granted the IETF Trust the right to allow modifications of such
+            material outside the IETF Standards Process. Without obtaining an adequate license from the
+            person(s) controlling the copyright in such materials, this document may not be modified outside
+            the IETF Standards Process, and derivative works of it may not be created outside the IETF
+            Standards Process, except to format it for publication as an RFC or to translate it into languages
+            other than English.
+          </xsl:when>
 
           <xsl:otherwise/>
@@ -3490 +3507 @@
         
         <!-- special case: RFC5378 escape applies to RFCs as well -->
-        <xsl:if test="/rfc/@ipr = 'pre5378Trust200902'">
+        <!-- <xsl:if test="/rfc/@ipr = 'pre5378Trust200902'">
           <t>
             This document may contain material from IETF Documents or IETF Contributions published or
@@ -3501 +3518 @@
             other than English.
           </t>
-        </xsl:if>
+        </xsl:if> -->
         
       </section>
@@ -4845 +4862 @@
       </xsl:choose>
     </xsl:variable>
+
     <table summary="{preamble}" class="{$style}" cellpadding="3" cellspacing="0">
+
+      <xsl:if test="(@title!='' or @anchor!='') and not(@suppress-title='true')">
+        <xsl:variable name="n"><xsl:number level="any" count="texttable[(@title!='' or @anchor!='') and not(@suppress-title='true')]"/></xsl:variable>
+        <caption>Table <xsl:value-of select="$n"/><xsl:if test="@title!=''">: <xsl:value-of select="@title"/></xsl:if></caption>
+      </xsl:if>
+
       <xsl:if test="ttcol!=''">
         <!-- skip header when all column titles are empty -->
@@ -4883 +4907 @@
     </table>
     <xsl:apply-templates select="postamble"/>
-
-    <xsl:if test="(@title!='' or @anchor!='') and not(@suppress-title='true')">
-      <xsl:variable name="n"><xsl:number level="any" count="texttable[(@title!='' or @anchor!='') and not(@suppress-title='true')]"/></xsl:variable>
-      <p class="figure">Table <xsl:value-of select="$n"/><xsl:if test="@title!=''">: <xsl:value-of select="@title"/></xsl:if></p>
-    </xsl:if>
   </div>
   
@@ -5084 +5103 @@
     <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.422 $',':')">
-      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.422 $', 'Revision: '),'$','')),', ')"/>
+    <xsl:if test="contains('$Revision: 1.424 $',':')">
+      <xsl:value-of select="concat('Revision ',normalize-space(translate(substring-after('$Revision: 1.424 $', 'Revision: '),'$','')),', ')"/>
     </xsl:if>
-    <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 test="contains('$Date: 2009-02-24 16:15:29 $',':')">
+      <xsl:value-of select="concat(normalize-space(translate(substring-after('$Date: 2009-02-24 16:15:29 $', 'Date: '),'$','')),', ')"/>
     </xsl:if>
     <xsl:value-of select="concat('XSLT vendor: ',system-property('xsl:vendor'),' ',system-property('xsl:vendor-url'))"/>