Fix booklist merging in PDF #1197

For booklist children with a topic reference, don't create a place holder, but rather process the topic instead.
dita-ot · Dec 23, 2012 · ffaab35 · ffaab35
1 parent 8b81105
commit ffaab35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/doc/readme/changes/rel1.7.xml b/src/main/doc/readme/changes/rel1.7.xml
@@ -180,6 +180,7 @@
           <li>#1409 Stylesheet imported multiple times in the hierarchy (reloaded) (release candidate)</li>
           <li>#1413 Mapref resolution cascades role (release candidate)</li>
           <li>#1416 german translation (release candidate)</li>
+          <li>#1197 Handling of @href on a &lt;glossarylist> (final release)</li>
           <li>#1362 href attribute in appendices element breaks PDF conversion (final release)</li>
           <li>#1418 PDF2 transtype breaks when bookmap has parts (final release)</li>
         </ul>

diff --git a/src/main/plugins/org.dita.pdf2/xsl/common/topicmergeImpl.xsl b/src/main/plugins/org.dita.pdf2/xsl/common/topicmergeImpl.xsl
@@ -126,25 +126,25 @@ See the accompanying license.txt file for applicable licenses.
         </ot-placeholder:toc>
     </xsl:template>
 
-    <xsl:template match="*[contains(@class,' bookmap/indexlist ')]" priority="2" mode="build-tree">
+    <xsl:template match="*[contains(@class,' bookmap/indexlist ')][not(@href)]" priority="2" mode="build-tree">
         <ot-placeholder:indexlist id="{generate-id()}">
             <xsl:apply-templates mode="build-tree"/>
         </ot-placeholder:indexlist>
     </xsl:template>
 
-    <xsl:template match="*[contains(@class,' bookmap/glossarylist ')]" priority="2" mode="build-tree">
+    <xsl:template match="*[contains(@class,' bookmap/glossarylist ')][not(@href)]" priority="2" mode="build-tree">
         <ot-placeholder:glossarylist id="{generate-id()}">
             <xsl:apply-templates mode="build-tree"/>
         </ot-placeholder:glossarylist>
     </xsl:template>
 
-    <xsl:template match="*[contains(@class,' bookmap/tablelist ')]" priority="2" mode="build-tree">
+    <xsl:template match="*[contains(@class,' bookmap/tablelist ')][not(@href)]" priority="2" mode="build-tree">
         <ot-placeholder:tablelist id="{generate-id()}">
             <xsl:apply-templates mode="build-tree"/>
         </ot-placeholder:tablelist>
     </xsl:template>
 
-    <xsl:template match="*[contains(@class,' bookmap/figurelist ')]" priority="2" mode="build-tree">
+    <xsl:template match="*[contains(@class,' bookmap/figurelist ')][not(@href)]" priority="2" mode="build-tree">
         <ot-placeholder:figurelist id="{generate-id()}">
             <xsl:apply-templates mode="build-tree"/>
         </ot-placeholder:figurelist>