Fixed exporting PDF bookmarks with missing TOC levels

pageseeder · Feb 28, 2020 · e1c27e8 · e1c27e8
1 parent 89f454b
commit e1c27e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pso-pdf-core/src/main/resources/org/pageseeder/pdf/xslt/export.xsl b/pso-pdf-core/src/main/resources/org/pageseeder/pdf/xslt/export.xsl
@@ -94,9 +94,9 @@
       </fo:layout-master-set>
 
       <!-- create PDF bookmarks -->
-      <xsl:if test="//toc[1]/toc-tree/toc-part[@idref]">
+      <xsl:if test="//toc[1]/toc-tree//toc-part[@idref]">
         <fo:bookmark-tree>
-          <xsl:apply-templates select="//toc[1]/toc-tree/toc-part[@idref]" mode="bookmark" />
+          <xsl:apply-templates select="//toc[1]/toc-tree/toc-part" mode="bookmark" />
         </fo:bookmark-tree>
       </xsl:if>
 

diff --git a/pso-pdf-core/src/main/resources/org/pageseeder/pdf/xslt/psml-to-fo.xsl b/pso-pdf-core/src/main/resources/org/pageseeder/pdf/xslt/psml-to-fo.xsl
@@ -1104,10 +1104,15 @@
         <xsl:if test="@prefix != ''"><xsl:text> </xsl:text></xsl:if>
         <xsl:value-of select="@title"/>
       </fo:bookmark-title>
-      <xsl:apply-templates select="toc-part[@idref]" mode="bookmark"/>
+      <xsl:apply-templates select="toc-part" mode="bookmark"/>
     </fo:bookmark>
   </xsl:template>
-
+
+  <!-- In case there are missing levels -->
+  <xsl:template match="toc-part[not(@idref)]" mode="bookmark">
+    <xsl:apply-templates select="toc-part" mode="bookmark"/>
+  </xsl:template>
+
 	<!-- Ignore metadata elements in PageSeeder document -->
 	<xsl:template match="documentinfo | fragmentinfo | locator | metadata"/>
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.4.8
+0.4.9