Tweaks to optimize the docbook to html conversion.

[SVN r61937]
This commit is contained in:
Steven Watanabe 2010-05-12 22:30:59 +00:00
parent ee1d651df1
commit d59a9b8578
6 changed files with 42 additions and 22 deletions

View File

@ -10,7 +10,9 @@
version="1.0"> version="1.0">
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/admon.xsl"/> <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/admon.xsl"/>
<xsl:import href="relative-href.xsl"/>
<!-- Already included in the main style sheet -->
<!-- <xsl:import href="relative-href.xsl"/> -->
<xsl:template name="admon.graphic"> <xsl:template name="admon.graphic">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>

View File

@ -10,7 +10,9 @@
version="1.0"> version="1.0">
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/callout.xsl"/> <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/callout.xsl"/>
<xsl:import href="relative-href.xsl"/>
<!-- Already included in the main style sheet -->
<!-- <xsl:import href="relative-href.xsl"/> -->
<xsl:template name="callout-bug"> <xsl:template name="callout-bug">
<xsl:param name="conum" select='1'/> <xsl:param name="conum" select='1'/>

View File

@ -10,10 +10,14 @@
version="1.0"> version="1.0">
<!-- Import the HTML chunking stylesheet --> <!-- Import the HTML chunking stylesheet -->
<!-- Watch out that we don't override chunk.xsl -->
<!--
<xsl:import <xsl:import
href="http://docbook.sourceforge.net/release/xsl/current/html/chunk-common.xsl"/> href="http://docbook.sourceforge.net/release/xsl/current/html/chunk-common.xsl"/> -->
<xsl:import href="relative-href.xsl"/> <!-- Already included in the main stylesheet -->
<!-- <xsl:import href="relative-href.xsl"/> -->
<!-- ==================================================================== --> <!-- ==================================================================== -->

View File

@ -16,14 +16,23 @@
<xsl:import <xsl:import
href="http://docbook.sourceforge.net/release/xsl/current/html/math.xsl"/> href="http://docbook.sourceforge.net/release/xsl/current/html/math.xsl"/>
<xsl:import href="chunk-common.xsl"/> <!-- Bring in the fast chunking overrides. There's nothing
<xsl:import href="docbook-layout.xsl"/> that we need to override, so include instead of importing it. -->
<xsl:import href="navbar.xsl"/> <xsl:include
<xsl:import href="admon.xsl"/> href="http://docbook.sourceforge.net/release/xsl/current/html/chunkfast.xsl"/>
<xsl:import href="xref.xsl"/>
<xsl:import href="relative-href.xsl"/> <!-- We have to make sure that our templates override all
<xsl:import href="callout.xsl"/> docbook templates. Therefore, we include our own templates
instead of importing them. In order for this to work,
the stylesheets included here cannot also include each other -->
<xsl:include href="chunk-common.xsl"/>
<xsl:include href="docbook-layout.xsl"/>
<xsl:include href="navbar.xsl"/>
<xsl:include href="admon.xsl"/>
<xsl:include href="xref.xsl"/>
<xsl:include href="relative-href.xsl"/>
<xsl:include href="callout.xsl"/>
<xsl:param name="html.stylesheet"> <xsl:param name="html.stylesheet">
<xsl:choose> <xsl:choose>
<xsl:when test = "$boost.defaults = 'Boost'"> <xsl:when test = "$boost.defaults = 'Boost'">
@ -280,6 +289,8 @@ set toc,title
</div> </div>
</xsl:template> </xsl:template>
<xsl:template name="generate.html.title"/>
<!-- ============================================================ --> <!-- ============================================================ -->
<xsl:template name="output.html.stylesheets"> <xsl:template name="output.html.stylesheets">

View File

@ -9,8 +9,9 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0"> version="1.0">
<xsl:import href="relative-href.xsl"/> <!-- Already included in the main style sheet -->
<!-- <xsl:import href="relative-href.xsl"/> -->
<!-- <!--
boost.defaults: boost.defaults:
*custom - only use explicitly set parameters *custom - only use explicitly set parameters
@ -369,7 +370,7 @@
</xsl:call-template> </xsl:call-template>
</a></xsl:if> </a></xsl:if>
<!-- home --> <!-- home -->
<xsl:if test = "$home != . or $nav.context = 'toc'"> <xsl:if test = "generate-id($home) != generate-id(.) or $nav.context = 'toc'">
<a accesskey = "h"> <a accesskey = "h">
<xsl:attribute name = "href"><xsl:call-template name = "href.target"> <xsl:attribute name = "href"><xsl:call-template name = "href.target">
<xsl:with-param name = "object" select = "$home"/> <xsl:with-param name = "object" select = "$home"/>

View File

@ -16,13 +16,13 @@
<xsl:import <xsl:import
href="http://docbook.sourceforge.net/release/xsl/current/xhtml/math.xsl"/> href="http://docbook.sourceforge.net/release/xsl/current/xhtml/math.xsl"/>
<xsl:import href="chunk-common.xsl"/> <xsl:include href="chunk-common.xsl"/>
<xsl:import href="docbook-layout.xsl"/> <xsl:include href="docbook-layout.xsl"/>
<xsl:import href="navbar.xsl"/> <xsl:include href="navbar.xsl"/>
<xsl:import href="admon.xsl"/> <xsl:include href="admon.xsl"/>
<xsl:import href="xref.xsl"/> <xsl:include href="xref.xsl"/>
<xsl:import href="relative-href.xsl"/> <xsl:include href="relative-href.xsl"/>
<xsl:import href="callout.xsl"/> <xsl:include href="callout.xsl"/>
<xsl:param name="html.stylesheet"> <xsl:param name="html.stylesheet">
<xsl:choose> <xsl:choose>