Changed section.level template to return number that matches

the section level (sect1 = 1, etc.), and adjusted templates
that use section.level accordingly to produce same output
as before.

diff --git a/xsl/fo/qandaset.xsl b/xsl/fo/qandaset.xsl
index d4ccb4a7f14303ba6c9d7783c6df4920e32ce46a..77b14971c4e3616a0f72e9306fda32aaf2c054a3 100644 (file)
--- a/xsl/fo/qandaset.xsl
+++ b/xsl/fo/qandaset.xsl
@@ -60,7 +60,7 @@
   </xsl:variable>
 
   <xsl:call-template name="section.heading">
-    <xsl:with-param name="level" select="$sectlvl"/>
+    <xsl:with-param name="level" select="$sectlvl + 1"/>
     <xsl:with-param name="title">
       <xsl:apply-templates/>
     </xsl:with-param>
@@ -108,7 +108,7 @@
 
   <xsl:call-template name="section.heading">
     <xsl:with-param name="level"
-                    select="$sectlvl + count(ancestor::qandadiv)"/>
+                    select="$sectlvl + 1 + count(ancestor::qandadiv)"/>
     <xsl:with-param name="title">
       <xsl:apply-templates/>
     </xsl:with-param>

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 02c09f58d64070030a261acac57223aed4be8238..f92173065cd7e5a145c720d27f8d76f37a202ebf 100644 (file)
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -337,7 +337,7 @@
 
     <xsl:if test="$passivetex.extensions != 0">
       <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 1}" 
+                      fotex-bookmark-level="{$level + 2}" 
                       fotex-bookmark-label="{$id}">
         <xsl:value-of select="$title"/>
       </fotex:bookmark>

diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 4420adcba5fa048857dab4d0933c23d13f001d03..49fdd24205d0ca338f327a9fe7fa1447553fa17a 100644 (file)
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -120,7 +120,7 @@
 
     <xsl:if test="$passivetex.extensions != 0">
       <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 1}" 
+                      fotex-bookmark-level="{$level + 2}" 
                       fotex-bookmark-label="{$id}">
         <xsl:value-of select="$title"/>
       </fotex:bookmark>