Moved the end-indent properties from toc.line to the

toc.line.properties attribute-set.

diff --git a/xsl/fo/autotoc.xsl b/xsl/fo/autotoc.xsl
index f58b6904ececf9530308b301080cf79a0aaf6c9e..e2bae9b1f3abaf20bec0ae7d321cbf06752ea81e 100644 (file)
--- a/xsl/fo/autotoc.xsl
+++ b/xsl/fo/autotoc.xsl
@@ -192,9 +192,7 @@
     <xsl:apply-templates select="." mode="label.markup"/>
   </xsl:variable>
 
-  <fo:block xsl:use-attribute-sets="toc.line.properties"
-            end-indent="{$toc.indent.width}pt"
-            last-line-end-indent="-{$toc.indent.width}pt">
+  <fo:block xsl:use-attribute-sets="toc.line.properties">
     <fo:inline keep-with-next.within-line="always">
       <fo:basic-link internal-destination="{$id}">
         <xsl:if test="$label != ''">

diff --git a/xsl/params/toc.line.properties.xml b/xsl/params/toc.line.properties.xml
index 0a8a61a9f7a55e3eaea23dca549f04fd26d58bc5..80de52917cb88ca6987c7e76ca6b6497e86ee86f 100644 (file)
--- a/xsl/params/toc.line.properties.xml
+++ b/xsl/params/toc.line.properties.xml
@@ -15,6 +15,10 @@
 <xsl:attribute-set name="toc.line.properties">
   <xsl:attribute name="text-align-last">justify</xsl:attribute>
   <xsl:attribute name="text-align">start</xsl:attribute>
+  <xsl:attribute name="end-indent"><xsl:value-of
+                select="concat($toc.indent.width, 'pt')"/></xsl:attribute>
+  <xsl:attribute name="last-line-end-indent"><xsl:value-of
+                select="concat('-', $toc.indent.width, 'pt')"/></xsl:attribute>
 </xsl:attribute-set>
 </src:fragment>
 </refsynopsisdiv>