Changeset 446 for rfc2629xslt/rfc2629toFO.xslt

Timestamp:

Feb 20, 2009, 6:59:11 AM (11 years ago)

Author:

julian.reschke@…

Message:

Update to latest version of rfc2629.xslt, and add experimental version of xml2rfc.tcl (supporting the new IPR escape clause), use that clause in P1..P7 (but not for the method registrations).

File:

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

rfc2629xslt/rfc2629toFO.xslt

@@ -2 +2 @@
         XSLT transformation from RFC2629 XML format to XSL-FO
       
-    Copyright (c) 2006-2008, Julian Reschke (julian.reschke@greenbytes.de)
+    Copyright (c) 2006-2009, Julian Reschke (julian.reschke@greenbytes.de)
     All rights reserved.
 
@@ -346 +346 @@
   </xsl:if>
   
+  <xsl:apply-templates select="x:boilerplate"/>
         <xsl:apply-templates select="abstract" />
         <xsl:apply-templates select="note" />
@@ -751 +752 @@
       <xsl:choose>
         <xsl:when test="string-length($target) &gt; 0">
-          <fo:basic-link external-destination="url('{$target}')" xsl:use-attribute-sets="external-link"><xsl:value-of select="front/title" /></fo:basic-link>
+          <fo:basic-link external-destination="url('{$target}')" xsl:use-attribute-sets="external-link"><xsl:value-of select="normalize-space(front/title)" /></fo:basic-link>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="front/title" />
+          <xsl:value-of select="normalize-space(front/title)" />
         </xsl:otherwise>
       </xsl:choose>
@@ -940 +941 @@
 <xsl:template name="section-maker">
   <xsl:variable name="sectionNumber">
-    <xsl:if test="not(@myns:unnumbered)"><xsl:call-template name="get-section-number" /></xsl:if>
+    <xsl:choose>
+      <xsl:when test="@myns:unnumbered"></xsl:when>
+      <xsl:when test="ancestor::x:boilerplate"></xsl:when>
+      <xsl:otherwise><xsl:call-template name="get-section-number" /></xsl:otherwise>
+    </xsl:choose>
   </xsl:variable>
 
@@ -959 +964 @@
 </xsl:template>
 
-<xsl:template match="section[count(ancestor::section) = 0 and @myns:notoclink]">
+<xsl:template match="section[count(ancestor::section) = 0 and (@myns:notoclink or ancestor::x:boilerplate)]">
 
   <fo:block xsl:use-attribute-sets="h1">
@@ -970 +975 @@
 </xsl:template>
 
-<xsl:template match="section[count(ancestor::section) = 0 and not(@myns:notoclink)]">
+<xsl:template match="section[count(ancestor::section) = 0 and not(@myns:notoclink or ancestor::x:boilerplate)]">
 
   <fo:block xsl:use-attribute-sets="h1 newpage">
@@ -2498 +2503 @@
 </xsl:template>
 
+<!-- boilerplate -->
+<xsl:template match="x:boilerplate">
+  <xsl:apply-templates/>
+</xsl:template>
+
   <!-- experimental: format URI with zero-width spaces to ease line breaks -->