From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 1 Dec 2001 19:43:57 +0000 (+0000)
Subject: Make sure bookmarks are never empty
X-Git-Tag: release/1.79.1~6^2~6075
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eedb29631d84d0f36c99e2bd18b516960bc6148;p=docbook-dsssl

Make sure bookmarks are never empty
---

diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index 91ce4d22b..1052226ad 100644
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -135,9 +135,14 @@
               <xsl:apply-templates select="key('id',$rootid)" mode="outline"/>
             </xsl:if>
             <xsl:if test="$xep.extensions != 0">
-              <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
+              <xsl:variable name="bookmarks">
                 <xsl:apply-templates select="key('id',$rootid)" mode="xep.outline"/>
-              </rx:outline>
+              </xsl:variable>
+              <xsl:if test="string($bookmarks) != ''">
+                <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
+                  <xsl:copy-of select="$bookmarks"/>
+                </rx:outline>
+              </xsl:if>
             </xsl:if>
             <xsl:apply-templates select="key('id',$rootid)"/>
           </xsl:otherwise>
@@ -148,9 +153,14 @@
           <xsl:apply-templates mode="outline"/>
         </xsl:if>
         <xsl:if test="$xep.extensions != 0">
-          <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
+          <xsl:variable name="bookmarks">
             <xsl:apply-templates mode="xep.outline"/>
-          </rx:outline>
+          </xsl:variable>
+          <xsl:if test="string($bookmarks) != ''">
+            <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
+              <xsl:copy-of select="$bookmarks"/>
+            </rx:outline>
+          </xsl:if>
         </xsl:if>
         <xsl:apply-templates/>
       </xsl:otherwise>
diff --git a/xsl/fo/xep.xsl b/xsl/fo/xep.xsl
index dace8f8a8..046358de1 100644
--- a/xsl/fo/xep.xsl
+++ b/xsl/fo/xep.xsl
@@ -55,6 +55,7 @@
 <!-- ********************************************************************
      Pdf bookmarks
      ******************************************************************** -->
+
 <xsl:template match="*" mode="xep.outline">
   <xsl:apply-templates select="*" mode="xep.outline"/>
 </xsl:template>
@@ -69,10 +70,6 @@
   </xsl:variable>
   <xsl:variable name="bookmark-label">
     <xsl:apply-templates select="." mode="object.title.markup"/>
-<!--
-    <xsl:apply-templates select="." mode="label.markup"/>
-    <xsl:apply-templates select="." mode="title.markup"/>
--->
   </xsl:variable>
 
   <xsl:choose>