From: Bob Stayton <bobs@sagehill.net>
Date: Tue, 3 Sep 2013 16:26:58 +0000 (+0000)
Subject: Add missing template for tocdiv/title elements to fix bug #1310.
X-Git-Tag: release/1.79.1~6^2~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48cb712e034423fd129b0443387c65b6cd4a51db;p=docbook-dsssl

Add missing template for tocdiv/title elements to fix bug #1310.
---

diff --git a/xsl/fo/toc.xsl b/xsl/fo/toc.xsl
index 4095c636c..8ca82330e 100644
--- a/xsl/fo/toc.xsl
+++ b/xsl/fo/toc.xsl
@@ -167,9 +167,11 @@
 </xsl:template>
 
 <xsl:template match="tocentry|lotentry|tocdiv|tocfront|tocback">
-  <fo:block text-align-last="justify"
-            end-indent="2pc"
+  <fo:block end-indent="2pc"
             last-line-end-indent="-2pc">
+    <xsl:if test="@linkend or @pagenum">
+      <xsl:attribute name="text-align-last">justify</xsl:attribute>
+    </xsl:if>
     <fo:inline keep-with-next.within-line="always">
       <xsl:choose>
         <xsl:when test="@linkend">
@@ -223,19 +225,19 @@
   </fo:block>
 </xsl:template>
 
-<xsl:template match="toc/title">
+<xsl:template match="toc/title | tocdiv/title">
   <fo:block font-weight="bold">
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
 
-<xsl:template match="toc/subtitle">
+<xsl:template match="toc/subtitle | tocdiv/subtitle">
   <fo:block font-weight="bold">
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
 
-<xsl:template match="toc/titleabbrev">
+<xsl:template match="toc/titleabbrev |tocdiv/titleabbrev">
 </xsl:template>
 
 <!-- ==================================================================== -->
diff --git a/xsl/html/toc.xsl b/xsl/html/toc.xsl
index 41d9733c4..332ec82a2 100644
--- a/xsl/html/toc.xsl
+++ b/xsl/html/toc.xsl
@@ -245,21 +245,21 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="toc/title">
+<xsl:template match="toc/title | tocdiv/title">
   <div>
     <xsl:apply-templates select="." mode="common.html.attributes"/>
     <xsl:apply-templates/>
   </div>
 </xsl:template>
 
-<xsl:template match="toc/subtitle">
+<xsl:template match="toc/subtitle | tocdiv/subtitle">
   <div>
     <xsl:apply-templates select="." mode="common.html.attributes"/>
     <xsl:apply-templates/>
   </div>
 </xsl:template>
 
-<xsl:template match="toc/titleabbrev">
+<xsl:template match="toc/titleabbrev | tocdiv/titleabbrev">
 </xsl:template>
 
 <!-- ==================================================================== -->