From a867b55b748fed7a096c146d1e381e328b136113 Mon Sep 17 00:00:00 2001
From: bobstayton <bobs@sagehill.net>
Date: Wed, 27 Jun 2018 22:13:26 -0700
Subject: [PATCH] fix issue #46 inconsistent element selection for bookmarks

---
 xsl/fo/docbook.xsl | 32 +++++++++++++++++++++++++++-----
 xsl/fo/fop.xsl     | 31 +++++++++++++++++++++++++++----
 xsl/fo/fop1.xsl    | 33 +++++++++++++++++++++++++++------
 xsl/fo/xep.xsl     | 32 +++++++++++++++++++++++++++-----
 4 files changed, 108 insertions(+), 20 deletions(-)

diff --git a/xsl/fo/docbook.xsl b/xsl/fo/docbook.xsl
index 5d4058159..4b6019b72 100644
--- a/xsl/fo/docbook.xsl
+++ b/xsl/fo/docbook.xsl
@@ -358,11 +358,33 @@
   <xsl:apply-templates select="*" mode="bookmark"/>
 </xsl:template>
 
-<xsl:template match="d:set|d:book|d:part|d:reference|
-                     d:preface|d:chapter|d:appendix|d:article|d:topic
-                     |d:glossary|d:bibliography|d:index|d:setindex
-                     |d:refentry
-                     |d:sect1|d:sect2|d:sect3|d:sect4|d:sect5|d:section"
+<!-- to turn off any of these, add to your customization layer
+     an empty template matching on that element and in this mode -->
+<xsl:template match="d:appendix |
+                     d:article |
+                     d:bibliography |
+                     d:book |
+                     d:chapter |
+                     d:glossary |
+                     d:index |
+                     d:part |
+                     d:preface |
+                     d:refentry |
+                     d:reference |
+                     d:refsect1 |
+                     d:refsect2 |
+                     d:refsect3 |
+                     d:refsection |
+                     d:refsynopsisdiv |
+                     d:sect1 |
+                     d:sect2 |
+                     d:sect3 |
+                     d:sect4 |
+                     d:sect5 |
+                     d:section |
+                     d:set |
+                     d:setindex |
+                     d:topic"
               mode="bookmark">
 
   <xsl:variable name="id">
diff --git a/xsl/fo/fop.xsl b/xsl/fo/fop.xsl
index 44fb4b98a..3125e4796 100644
--- a/xsl/fo/fop.xsl
+++ b/xsl/fo/fop.xsl
@@ -32,10 +32,33 @@ translates characters with code>255 back to ASCII.
   <xsl:apply-templates select="*" mode="fop.outline"/>
 </xsl:template>
 
-<xsl:template match="d:set|d:book|d:part|d:reference|d:preface|d:chapter|d:appendix|d:article
-                     |d:glossary|d:bibliography|d:index|d:setindex
-                     |d:refentry
-                     |d:sect1|d:sect2|d:sect3|d:sect4|d:sect5|d:section"
+<!-- to turn off any of these, add to your customization layer
+     an empty template matching on that element and in this mode -->
+<xsl:template match="d:appendix |
+                     d:article |
+                     d:bibliography |
+                     d:book |
+                     d:chapter |
+                     d:glossary |
+                     d:index |
+                     d:part |
+                     d:preface |
+                     d:refentry |
+                     d:reference |
+                     d:refsect1 |
+                     d:refsect2 |
+                     d:refsect3 |
+                     d:refsection |
+                     d:refsynopsisdiv |
+                     d:sect1 |
+                     d:sect2 |
+                     d:sect3 |
+                     d:sect4 |
+                     d:sect5 |
+                     d:section |
+                     d:set |
+                     d:setindex |
+                     d:topic"
               mode="fop.outline">
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
diff --git a/xsl/fo/fop1.xsl b/xsl/fo/fop1.xsl
index 1544f9f81..4ce5aeece 100644
--- a/xsl/fo/fop1.xsl
+++ b/xsl/fo/fop1.xsl
@@ -21,12 +21,33 @@
   <xsl:apply-templates select="*" mode="fop1.outline"/>
 </xsl:template>
 
-<xsl:template match="d:set|d:book|d:part|d:reference|
-                     d:preface|d:chapter|d:appendix|d:article|d:topic
-                     |d:glossary|d:bibliography|d:index|d:setindex
-                     |d:refentry|d:refsynopsisdiv
-                     |d:refsect1|d:refsect2|d:refsect3|d:refsection
-                     |d:sect1|d:sect2|d:sect3|d:sect4|d:sect5|d:section"
+<!-- to turn off any of these, add to your customization layer
+     an empty template matching on that element and in this mode -->
+<xsl:template match="d:appendix |
+                     d:article |
+                     d:bibliography |
+                     d:book |
+                     d:chapter |
+                     d:glossary |
+                     d:index |
+                     d:part |
+                     d:preface |
+                     d:refentry |
+                     d:reference |
+                     d:refsect1 |
+                     d:refsect2 |
+                     d:refsect3 |
+                     d:refsection |
+                     d:refsynopsisdiv |
+                     d:sect1 |
+                     d:sect2 |
+                     d:sect3 |
+                     d:sect4 |
+                     d:sect5 |
+                     d:section |
+                     d:set |
+                     d:setindex |
+                     d:topic"
               mode="fop1.outline">
 
   <xsl:variable name="id">
diff --git a/xsl/fo/xep.xsl b/xsl/fo/xep.xsl
index 960f45aa1..15fad6ae4 100644
--- a/xsl/fo/xep.xsl
+++ b/xsl/fo/xep.xsl
@@ -111,11 +111,33 @@
   <xsl:apply-templates select="*" mode="xep.outline"/>
 </xsl:template>
 
-<xsl:template match="d:set|d:book|d:part|d:reference|d:preface|d:chapter|d:appendix|d:article
-                     |d:glossary|d:bibliography|d:index|d:setindex|d:topic
-                     |d:refentry|d:refsynopsisdiv
-                     |d:refsect1|d:refsect2|d:refsect3|d:refsection
-                     |d:sect1|d:sect2|d:sect3|d:sect4|d:sect5|d:section"
+<!-- to turn off any of these, add to your customization layer
+     an empty template matching on that element and in this mode -->
+<xsl:template match="d:appendix |
+                     d:article |
+                     d:bibliography |
+                     d:book |
+                     d:chapter |
+                     d:glossary |
+                     d:index |
+                     d:part |
+                     d:preface |
+                     d:refentry |
+                     d:reference |
+                     d:refsect1 |
+                     d:refsect2 |
+                     d:refsect3 |
+                     d:refsection |
+                     d:refsynopsisdiv |
+                     d:sect1 |
+                     d:sect2 |
+                     d:sect3 |
+                     d:sect4 |
+                     d:sect5 |
+                     d:section |
+                     d:set |
+                     d:setindex |
+                     d:topic"
               mode="xep.outline">
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
-- 
2.40.0