From 828901ae1db6b04ef4de96de89942e68e584eff3 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Mon, 23 Apr 2007 11:53:57 +0000
Subject: [PATCH]

---
 src/docbkx/resources/xsl/fopdf.xsl      | 56 +------------------------
 src/docbkx/resources/xsl/html_chunk.xsl |  2 +-
 2 files changed, 3 insertions(+), 55 deletions(-)

diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl
index 9fa06af0..4445a3d9 100644
--- a/src/docbkx/resources/xsl/fopdf.xsl
+++ b/src/docbkx/resources/xsl/fopdf.xsl
@@ -100,7 +100,7 @@
         <xsl:param name="gentext-key" select="''"/>
         <xsl:variable name="Version">
             <xsl:if test="//releaseinfo">
-                <xsl:text>Spring Web Services (</xsl:text>
+                <xsl:text>Spring-WS (</xsl:text>
                 <xsl:value-of select="//releaseinfo"/>
                 <xsl:text>)</xsl:text>
             </xsl:if>
@@ -139,59 +139,7 @@
         </xsl:choose>
     </xsl:template>
 
-    <!--###################################################
-                  Custom Toc Line
-   ################################################### -->
-
-    <!-- The default DocBook XSL TOC printing is seriously broken... -->
-    <xsl:template name="toc.line">
-        <xsl:variable name="id">
-            <xsl:call-template name="object.id"/>
-        </xsl:variable>
-
-        <xsl:variable name="label">
-            <xsl:apply-templates select="." mode="label.markup"/>
-        </xsl:variable>
-
-        <!-- justify-end removed from block attributes (space problem in title.markup) -->
-        <fo:block end-indent="{$toc.indent.width}pt"
-                  last-line-end-indent="-{$toc.indent.width}pt"
-                  white-space-treatment="preserve"
-                  text-align="left"
-                  white-space-collapse="false">
-            <fo:inline keep-with-next.within-line="always">
-                <!-- print Chapters in bold style -->
-                <xsl:choose>
-                    <xsl:when test="local-name(.) = 'chapter'">
-                        <xsl:attribute name="font-weight">bold</xsl:attribute>
-                    </xsl:when>
-                </xsl:choose>
-                <fo:basic-link internal-destination="{$id}">
-                    <xsl:if test="$label != ''">
-                        <xsl:copy-of select="$label"/>
-                        <fo:inline white-space-treatment="preserve"
-                                   white-space-collapse="false">
-                            <xsl:value-of select="$autotoc.label.separator"/>
-                        </fo:inline>
-                    </xsl:if>
-                    <xsl:apply-templates select="." mode="title.markup"/>
-                </fo:basic-link>
-            </fo:inline>
-            <fo:inline keep-together.within-line="always">
-                <xsl:text> </xsl:text>
-                <fo:leader leader-pattern="dots"
-                           leader-pattern-width="3pt"
-                           leader-alignment="reference-area"
-                           keep-with-next.within-line="always"/>
-                <xsl:text> </xsl:text>
-                <fo:basic-link internal-destination="{$id}">
-                    <fo:page-number-citation ref-id="{$id}"/>
-                </fo:basic-link>
-            </fo:inline>
-        </fo:block>
-    </xsl:template>
-
-    <!--###################################################
+   <!--###################################################
                      Extensions
    ################################################### -->
 
diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl
index cfd07354..20a4f719 100644
--- a/src/docbkx/resources/xsl/html_chunk.xsl
+++ b/src/docbkx/resources/xsl/html_chunk.xsl
@@ -12,7 +12,6 @@
     ################################################### -->
     <xsl:param name="chunk.section.depth">'5'</xsl:param>
     <xsl:param name="use.id.as.filename">'1'</xsl:param>
-    <xsl:param name="html.stylesheet">html.css</xsl:param>
     <!-- These extensions are required for table printing and other stuff -->
     <xsl:param name="use.extensions">1</xsl:param>
     <xsl:param name="tablecolumns.extension">0</xsl:param>
@@ -38,6 +37,7 @@
                          Callouts
     ################################################### -->
     <!-- Place callout marks at this column in annotated areas -->
+    <xsl:param name="callout.graphics">1</xsl:param>
     <xsl:param name="callout.defaultcolumn">90</xsl:param>
     <!--###################################################
                           Misc