From: Bob Stayton <bobs@sagehill.net>
Date: Tue, 7 Jan 2014 22:31:09 +0000 (+0000)
Subject: Add support for $show.bookmarks param to turn bookmarks on or
X-Git-Tag: release/1.79.1~6^2~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89cd7dce276fd6c7c7a58e349df5c40087d95d75;p=docbook-dsssl

Add support for $show.bookmarks param to turn bookmarks on or
off.
---

diff --git a/xsl/fo/autotoc.xsl b/xsl/fo/autotoc.xsl
index 97fc0acfd..07383c74d 100644
--- a/xsl/fo/autotoc.xsl
+++ b/xsl/fo/autotoc.xsl
@@ -35,7 +35,9 @@
   <xsl:if test="$nodes">
     <fo:block id="toc...{$id}"
               xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$axf.extensions != 0 and $xsl1.1.bookmarks = 0">
+      <xsl:if test="$axf.extensions != 0 and 
+                    $xsl1.1.bookmarks = 0 and 
+                    $show.bookmarks != 0">
         <xsl:attribute name="axf:outline-level">1</xsl:attribute>
         <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
         <xsl:attribute name="axf:outline-title">
@@ -77,7 +79,9 @@
   <xsl:if test="$nodes">
     <fo:block id="toc...{$cid}"
               xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$axf.extensions != 0 and $xsl1.1.bookmarks = 0">
+      <xsl:if test="$axf.extensions != 0 and 
+                    $xsl1.1.bookmarks = 0 and 
+                    $show.bookmarks != 0">
         <xsl:attribute name="axf:outline-level">1</xsl:attribute>
         <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
         <xsl:attribute name="axf:outline-title">
diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index 10d132238..6515afeeb 100644
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -71,7 +71,9 @@
         <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
       </xsl:call-template>
     </xsl:attribute>
-    <xsl:if test="$axf.extensions != 0 and $xsl1.1.bookmarks = 0">
+    <xsl:if test="$axf.extensions != 0 and 
+                  $xsl1.1.bookmarks = 0 and 
+                  $show.bookmarks != 0">
       <xsl:attribute name="axf:outline-level">
         <xsl:value-of select="count($node/ancestor::*)"/>
       </xsl:attribute>
@@ -703,7 +705,9 @@
   </xsl:variable>
 
   <fo:block id='{$id}'>
-    <xsl:if test="$axf.extensions != 0 and $xsl1.1.bookmarks = 0">
+    <xsl:if test="$axf.extensions != 0 and 
+                  $xsl1.1.bookmarks = 0 and 
+                  $show.bookmarks != 0">
       <xsl:attribute name="axf:outline-level">
         <xsl:value-of select="count(ancestor::*)+2"/>
       </xsl:attribute>
diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index 9c479c3b7..d5b75b15c 100644
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -31,7 +31,9 @@
 
   <fo:block keep-with-next.within-column="always"
             hyphenate="false">
-    <xsl:if test="$axf.extensions != 0 and $xsl1.1.bookmarks = 0">
+    <xsl:if test="$axf.extensions != 0 and 
+                  $xsl1.1.bookmarks = 0 and 
+                  $show.bookmarks != 0">
       <xsl:attribute name="axf:outline-level">
         <xsl:choose>
           <xsl:when test="count($node/ancestor::*) > 0">
diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index d5c465103..980378639 100644
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -284,8 +284,11 @@
 <xsl:template name="generate.bookmarks">
   <xsl:variable name="document.element" select="self::*"/>
   <xsl:choose>
-    <!-- use standard bookmark elements? -->
+    <xsl:when test="$show.bookmarks = 0">
+      <!-- omit bookmarks  -->
+    </xsl:when>
     <xsl:when test="$xsl1.1.bookmarks != 0">
+      <!-- use standard bookmark elements -->
       <xsl:variable name="bookmarks">
         <xsl:apply-templates select="$document.element" 
                              mode="bookmark"/>
diff --git a/xsl/fo/param.ent b/xsl/fo/param.ent
index fa2311156..bf1536fff 100644
--- a/xsl/fo/param.ent
+++ b/xsl/fo/param.ent
@@ -364,3 +364,4 @@
 <!ENTITY force.blank.pages SYSTEM "../params/force.blank.pages.xml">
 <!ENTITY mark.optional.procedure.steps SYSTEM "../params/mark.optional.procedure.steps.xml">
 <!ENTITY xsl1.1.bookmarks SYSTEM "../params/xsl1.1.bookmarks.xml">
+<!ENTITY show.bookmarks SYSTEM "../params/show.bookmarks.xml">
diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index d114f34f5..5f1b1a866 100644
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -281,6 +281,7 @@ generate.section.toc.level;
 &section.container.element;
 &monospace.verbatim.font.width;
 &exsl.node.set.available;
+&show.bookmarks;
 &bookmarks.collapse;
 &xsl1.1.bookmarks;
 &generate.consistent.ids;
@@ -934,6 +935,7 @@ around all these parameters.</para>
 <src:fragref linkend="para.properties.frag"/>
 <src:fragref linkend="mark.optional.procedure.steps.frag"/>
 <src:fragref linkend="xsl1.1.bookmarks.frag"/>
+<src:fragref linkend="show.bookmarks.frag"/>
 
 </xsl:stylesheet>
 </src:fragment>
diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index f969d681c..d8ccb1102 100644
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -637,7 +637,9 @@
       </xsl:choose>
     </xsl:variable>
 
-    <xsl:if test="$axf.extensions != 0 and $xsl1.1.bookmarks = 0">
+    <xsl:if test="$axf.extensions != 0 and 
+                  $xsl1.1.bookmarks = 0 and 
+                  $show.bookmarks != 0">
       <xsl:attribute name="axf:outline-level">
         <xsl:value-of select="count(ancestor::*)-1 + $offset"/>
       </xsl:attribute>
diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 6b242067d..f097a11d0 100644
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -294,7 +294,9 @@
       </xsl:apply-templates>
     </xsl:variable>
 
-    <xsl:if test="$axf.extensions != 0 and $xsl1.1.bookmarks = 0">
+    <xsl:if test="$axf.extensions != 0 and 
+                  $xsl1.1.bookmarks = 0 and 
+                  $show.bookmarks != 0">
       <xsl:attribute name="axf:outline-level">
         <xsl:value-of select="count(ancestor::*)-1"/>
       </xsl:attribute>