aboutsummaryrefslogtreecommitdiffstats
path: root/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml
diff options
context:
space:
mode:
Diffstat (limited to 'stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml')
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl10
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl11
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl2
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl134
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl4
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl14
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl12
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl4
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl10
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl62
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl5
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl6
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl1120
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl2
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl30
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl5
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl9
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl52
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl4
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl15
-rw-r--r--stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl2
21 files changed, 1237 insertions, 276 deletions
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl
index da3a19471..9a73ed628 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl
@@ -113,12 +113,12 @@
</xsl:attribute>
</xsl:if>
- <h3 class="title">
- <xsl:call-template name="anchor"/>
- <xsl:if test="$admon.textlabel != 0 or title or info/title">
+ <xsl:if test="$admon.textlabel != 0 or title or info/title">
+ <h3 class="title">
+ <xsl:call-template name="anchor"/>
<xsl:apply-templates select="." mode="object.title.markup"/>
- </xsl:if>
- </h3>
+ </h3>
+ </xsl:if>
<xsl:apply-templates/>
</div>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl
index 2614964f5..6b62d829d 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl
@@ -309,6 +309,7 @@
<xsl:attribute name="href">
<xsl:call-template name="href.target">
<xsl:with-param name="context" select="$toc-context"/>
+ <xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template>
</xsl:attribute>
@@ -482,7 +483,9 @@
<span class="refentrytitle">
<a>
<xsl:attribute name="href">
- <xsl:call-template name="href.target"/>
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="toc-context" select="$toc-context"/>
+ </xsl:call-template>
</xsl:attribute>
<xsl:copy-of select="$title"/>
</a>
@@ -505,6 +508,7 @@
<xsl:attribute name="href">
<xsl:call-template name="href.target">
<xsl:with-param name="object" select=".."/>
+ <xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template>
</xsl:attribute>
<xsl:apply-templates/>
@@ -532,6 +536,7 @@
<xsl:attribute name="href">
<xsl:call-template name="href.target">
<xsl:with-param name="object" select="$node"/>
+ <xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template>
</xsl:attribute>
<xsl:apply-templates select="$node" mode="titleabbrev.markup"/>
@@ -602,7 +607,9 @@
</xsl:if>
<a>
<xsl:attribute name="href">
- <xsl:call-template name="href.target"/>
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="toc-context" select="$toc-context"/>
+ </xsl:call-template>
</xsl:attribute>
<xsl:apply-templates select="." mode="titleabbrev.markup"/>
</a>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl
index 76e8858f6..fb6390eab 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl
@@ -64,7 +64,7 @@
</xsl:variable>
<xsl:variable name="dbhtml-filename">
- <xsl:call-template name="dbhtml-filename"/>
+ <xsl:call-template name="pi.dbhtml_filename"/>
</xsl:variable>
<xsl:variable name="filename">
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl
index cfd057fe4..f452b4414 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl
@@ -737,32 +737,98 @@
<xsl:template name="href.target">
<xsl:param name="context" select="."/>
<xsl:param name="object" select="."/>
-
+ <xsl:param name="toc-context" select="."/>
+ <!-- * If $toc-context contains some node other than the current node, -->
+ <!-- * it means we're processing a link in a TOC. In that case, to -->
+ <!-- * ensure the link will work correctly, we need to take a look at -->
+ <!-- * where the file containing the TOC will get written, and where -->
+ <!-- * the file that's being linked to will get written. -->
+ <xsl:variable name="toc-output-dir">
+ <xsl:if test="not($toc-context = .)">
+ <!-- * Get the $toc-context node and all its ancestors, look down -->
+ <!-- * through them to find the last/closest node to the -->
+ <!-- * toc-context node that has a "dbhtml dir" PI, and get the -->
+ <!-- * directory name from that. That's the name of the directory -->
+ <!-- * to which the current toc output file will get written. -->
+ <xsl:call-template name="dbhtml-dir">
+ <xsl:with-param name="context" select="$toc-context/ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:variable>
+ <xsl:variable name="linked-file-output-dir">
+ <xsl:if test="not($toc-context = .)">
+ <!-- * Get the current node and all its ancestors, look down -->
+ <!-- * through them to find the last/closest node to the current -->
+ <!-- * node that has a "dbhtml dir" PI, and get the directory name -->
+ <!-- * from that. That's the name of the directory to which the -->
+ <!-- * file that's being linked to will get written. -->
+ <xsl:call-template name="dbhtml-dir">
+ <xsl:with-param name="context" select="ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:variable>
<xsl:variable name="href.to.uri">
<xsl:call-template name="href.target.uri">
<xsl:with-param name="object" select="$object"/>
</xsl:call-template>
</xsl:variable>
-
<xsl:variable name="href.from.uri">
<xsl:call-template name="href.target.uri">
<xsl:with-param name="object" select="$context"/>
</xsl:call-template>
</xsl:variable>
-
- <!--
- <xsl:message>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message>
- <xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></xsl:message>
- -->
-
+ <!-- * <xsl:message>toc-context: <xsl:value-of select="local-name($toc-context)"/></xsl:message> -->
+ <!-- * <xsl:message>node: <xsl:value-of select="local-name(.)"/></xsl:message> -->
+ <!-- * <xsl:message>context: <xsl:value-of select="local-name($context)"/></xsl:message> -->
+ <!-- * <xsl:message>object: <xsl:value-of select="local-name($object)"/></xsl:message> -->
+ <!-- * <xsl:message>toc-output-dir: <xsl:value-of select="$toc-output-dir"/></xsl:message> -->
+ <!-- * <xsl:message>linked-file-output-dir: <xsl:value-of select="$linked-file-output-dir"/></xsl:message> -->
+ <!-- * <xsl:message>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message> -->
+ <!-- * <xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></xsl:message> -->
<xsl:variable name="href.to">
- <xsl:call-template name="trim.common.uri.paths">
- <xsl:with-param name="uriA" select="$href.to.uri"/>
- <xsl:with-param name="uriB" select="$href.from.uri"/>
- <xsl:with-param name="return" select="'A'"/>
- </xsl:call-template>
+ <xsl:choose>
+ <!-- * 2007-07-19, MikeSmith: Added the following conditional to -->
+ <!-- * deal with a problem case for links in TOCs. It checks to see -->
+ <!-- * if the output dir that a TOC will get written to is -->
+ <!-- * different from the output dir of the file being linked to. -->
+ <!-- * If it is different, we do not call trim.common.uri.paths. -->
+ <!-- * -->
+ <!-- * Reason why I added that conditional is: I ran into a bug for -->
+ <!-- * this case: -->
+ <!-- * -->
+ <!-- * 1. we are chunking into separate dirs -->
+ <!-- * -->
+ <!-- * 2. output for the TOC is written to current dir, but the file -->
+ <!-- * being linked to is written to some subdir "foo". -->
+ <!-- * -->
+ <!-- * For that case, links to that file in that TOC did not show -->
+ <!-- * the correct path - they omitted the "foo". -->
+ <!-- * -->
+ <!-- * The cause of that problem was that the trim.common.uri.paths -->
+ <!-- * template[1] was being called under all conditions. But it's -->
+ <!-- * apparent that we don't want to call trim.common.uri.paths in -->
+ <!-- * the case where a linked file is being written to a different -->
+ <!-- * directory than the TOC that contains the link, because doing -->
+ <!-- * so will cause a necessary (not redundant) directory-name -->
+ <!-- * part of the link to get inadvertently trimmed, resulting in -->
+ <!-- * a broken link to that file. Thus, added the conditional. -->
+ <!-- * -->
+ <!-- * [1] The purpose of the trim.common.uri.paths template is to -->
+ <!-- * prevent cases where, if we didn't call it, we end up with -->
+ <!-- * unnecessary, redundant directory names getting output; for -->
+ <!-- * example, "foo/foo/refname.html". -->
+ <xsl:when test="not($toc-output-dir = $linked-file-output-dir)">
+ <xsl:value-of select="$href.to.uri"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="trim.common.uri.paths">
+ <xsl:with-param name="uriA" select="$href.to.uri"/>
+ <xsl:with-param name="uriB" select="$href.from.uri"/>
+ <xsl:with-param name="return" select="'A'"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:variable>
-
<xsl:variable name="href.from">
<xsl:call-template name="trim.common.uri.paths">
<xsl:with-param name="uriA" select="$href.to.uri"/>
@@ -770,13 +836,11 @@
<xsl:with-param name="return" select="'B'"/>
</xsl:call-template>
</xsl:variable>
-
<xsl:variable name="depth">
<xsl:call-template name="count.uri.path.depth">
<xsl:with-param name="filename" select="$href.from"/>
</xsl:call-template>
</xsl:variable>
-
<xsl:variable name="href">
<xsl:call-template name="copy-string">
<xsl:with-param name="string" select="'../'"/>
@@ -784,7 +848,6 @@
</xsl:call-template>
<xsl:value-of select="$href.to"/>
</xsl:variable>
-
<!--
<xsl:message>
<xsl:text>In </xsl:text>
@@ -799,7 +862,6 @@
<xsl:value-of select="$href"/>
</xsl:message>
-->
-
<xsl:value-of select="$href"/>
</xsl:template>
@@ -1444,4 +1506,40 @@
</xsl:call-template>
</xsl:template>
+<!-- ==================================================================== -->
+
+<xsl:template name="dbhtml-dir">
+ <xsl:param name="context" select="."/>
+ <!-- directories are now inherited from previous levels -->
+ <xsl:variable name="ppath">
+ <xsl:if test="$context/parent::*">
+ <xsl:call-template name="dbhtml-dir">
+ <xsl:with-param name="context" select="$context/parent::*"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:variable>
+ <xsl:variable name="path">
+ <xsl:call-template name="pi.dbhtml_dir">
+ <xsl:with-param name="node" select="$context"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$path = ''">
+ <xsl:if test="$ppath != ''">
+ <xsl:value-of select="$ppath"/>
+ </xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="$ppath != ''">
+ <xsl:value-of select="$ppath"/>
+ <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'">
+ <xsl:text>/</xsl:text>
+ </xsl:if>
+ </xsl:if>
+ <xsl:value-of select="$path"/>
+ <xsl:text>/</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
</xsl:stylesheet>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl
index dbf4a04cd..e16c88ceb 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl
@@ -49,8 +49,8 @@
<xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/>
<xsl:variable name="filename">
- <xsl:call-template name="dbhtml-filename">
- <xsl:with-param name="pis" select="$chunk/processing-instruction('dbhtml')"/>
+ <xsl:call-template name="pi.dbhtml_filename">
+ <xsl:with-param name="node" select="$chunk"/>
</xsl:call-template>
</xsl:variable>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
index 66ce157e0..007f27f9c 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
@@ -37,11 +37,13 @@
<xsl:element name="h{$level+1}" namespace="http://www.w3.org/1999/xhtml">
<xsl:attribute name="class">title</xsl:attribute>
- <xsl:call-template name="anchor">
- <xsl:with-param name="node" select="$node"/>
- <xsl:with-param name="conditional" select="0"/>
- </xsl:call-template>
- <xsl:apply-templates select="$node" mode="object.title.markup">
+ <xsl:if test="$generate.id.attributes = 0">
+ <xsl:call-template name="anchor">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="conditional" select="0"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:apply-templates select="$node" mode="object.title.markup">
<xsl:with-param name="allow-anchors" select="1"/>
</xsl:apply-templates>
</xsl:element>
@@ -350,7 +352,7 @@
</div>
</xsl:template>
-<xsl:template match="article/title" mode="titlepage.mode" priority="2">
+<xsl:template match="article/title|article/articleinfo/title" mode="titlepage.mode" priority="2">
<xsl:call-template name="component.title">
<xsl:with-param name="node" select="ancestor::article[1]"/>
</xsl:call-template>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl
index c7dca21ca..b5af13ea2 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl
@@ -213,11 +213,13 @@
<h1>
<xsl:attribute name="class">title</xsl:attribute>
- <xsl:call-template name="anchor">
- <xsl:with-param name="node" select="$node"/>
- <xsl:with-param name="conditional" select="0"/>
- </xsl:call-template>
- <xsl:apply-templates select="$node" mode="object.title.markup">
+ <xsl:if test="$generate.id.attributes = 0">
+ <xsl:call-template name="anchor">
+ <xsl:with-param name="node" select="$node"/>
+ <xsl:with-param name="conditional" select="0"/>
+ </xsl:call-template>
+ </xsl:if>
+ <xsl:apply-templates select="$node" mode="object.title.markup">
<xsl:with-param name="allow-anchors" select="1"/>
</xsl:apply-templates>
</h1>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
index b1f57efeb..f906e34b9 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
@@ -103,7 +103,9 @@
<xsl:variable name="content">
<div class="{$class}">
<xsl:if test="$spacing.paras != 0"><p/></xsl:if>
- <xsl:call-template name="anchor"/>
+ <xsl:call-template name="anchor">
+ <xsl:with-param name="conditional" select="0"/>
+ </xsl:call-template>
<xsl:apply-templates/>
<!-- HACK: This doesn't belong inside formal.object; it
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
index 9d8da5fe1..4fa715323 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
@@ -221,9 +221,8 @@
</xsl:variable>
<xsl:variable name="img.src.path.pi">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'img.src.path'"/>
+ <xsl:call-template name="pi.dbhtml_img.src.path">
+ <xsl:with-param name="node" select=".."/>
</xsl:call-template>
</xsl:variable>
@@ -598,9 +597,8 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
</xsl:variable>
<xsl:variable name="bgcolor">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'background-color'"/>
+ <xsl:call-template name="pi.dbhtml_background-color">
+ <xsl:with-param name="node" select=".."/>
</xsl:call-template>
</xsl:variable>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl
index fb2127c55..dcb72e352 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl
@@ -196,10 +196,7 @@
<xsl:template match="variablelist">
<xsl:variable name="pi-presentation">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'list-presentation'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_list-presentation"/>
</xsl:variable>
<xsl:variable name="presentation">
@@ -217,24 +214,15 @@
</xsl:variable>
<xsl:variable name="list-width">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'list-width'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_list-width"/>
</xsl:variable>
<xsl:variable name="term-width">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'term-width'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_term-width"/>
</xsl:variable>
<xsl:variable name="table-summary">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'table-summary'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_table-summary"/>
</xsl:variable>
<div>
@@ -334,16 +322,14 @@
<xsl:template match="varlistentry" mode="varlist-table">
<xsl:variable name="presentation">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'term-presentation'"/>
+ <xsl:call-template name="pi.dbhtml_term-presentation">
+ <xsl:with-param name="node" select=".."/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="separator">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'term-separator'"/>
+ <xsl:call-template name="pi.dbhtml_term-separator">
+ <xsl:with-param name="node" select=".."/>
</xsl:call-template>
</xsl:variable>
<tr>
@@ -462,10 +448,10 @@
<xsl:variable name="localized-choice-separator">
<xsl:choose>
<xsl:when test="processing-instruction('dbchoice')">
- <xsl:call-template name="select.choice.separator"/>
+ <xsl:call-template name="select.choice.separator"/>
</xsl:when>
<xsl:otherwise>
- <!-- empty -->
+ <!-- empty -->
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -743,10 +729,7 @@
<xsl:template match="segmentedlist">
<xsl:variable name="presentation">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'list-presentation'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_list-presentation"/>
</xsl:variable>
<div>
@@ -814,17 +797,11 @@
<xsl:template match="segmentedlist" mode="seglist-table">
<xsl:variable name="table-summary">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'table-summary'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_table-summary"/>
</xsl:variable>
<xsl:variable name="list-width">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'list-width'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_list-width"/>
</xsl:variable>
<xsl:apply-templates select="title"/>
@@ -1052,4 +1029,17 @@
<!-- ==================================================================== -->
+<xsl:template name="orderedlist-starting-number">
+ <xsl:param name="list" select="."/>
+ <xsl:variable name="pi-start">
+ <xsl:call-template name="pi.dbhtml_start">
+ <xsl:with-param name="node" select="$list"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:call-template name="output-orderedlist-starting-number">
+ <xsl:with-param name="list" select="$list"/>
+ <xsl:with-param name="pi-start" select="$pi-start"/>
+ </xsl:call-template>
+</xsl:template>
+
</xsl:stylesheet>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl
index 1fbf10755..f9b55356d 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl
@@ -267,9 +267,8 @@
<xsl:template name="tex.math.output.delims">
<xsl:variable name="pi.delims">
- <xsl:call-template name="pi-attribute">
- <xsl:with-param name="pis" select=".//processing-instruction('dbtex')"/>
- <xsl:with-param name="attribute" select="'delims'"/>
+ <xsl:call-template name="pi.dbtex_delims">
+ <xsl:with-param name="node" select="descendant-or-self::*"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="result">
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
index e9017f240..ad241519c 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
@@ -2,7 +2,7 @@
<!--This file was created automatically by html2xhtml-->
<!--from the HTML stylesheets.-->
<!-- This file is generated from param.xweb -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns="http://docbook.org/ns/docbook" exclude-result-prefixes="src" version="1.0">
<!-- ********************************************************************
$Id$
@@ -65,7 +65,7 @@ div.annotation-close { position: absolute;
right: 2px;
}
</xsl:param>
-<xsl:param name="annotation.js" select="'http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js'"/>
+<xsl:param name="annotation.js" select="'http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js'"/>
<xsl:param name="annotation.graphic.open" select="'http://docbook.sourceforge.net/release/images/annot-open.png'"/>
<xsl:param name="annotation.graphic.close" select="'http://docbook.sourceforge.net/release/images/annot-close.png'"/>
<xsl:param name="annotation.support" select="0"/>
@@ -121,7 +121,7 @@ div.annotation-close { position: absolute;
<xsl:param name="ebnf.table.bgcolor" select="'#F5DCB3'"/>
<xsl:param name="ebnf.table.border" select="1"/>
<xsl:param name="ebnf.assignment">
-<code>::=</code>
+<code xmlns="http://www.w3.org/1999/xhtml">::=</code>
</xsl:param>
<xsl:param name="ebnf.statement.terminator"/>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
index 4f1b039b8..8b8eb7b17 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<!--This file was created automatically by html2xhtml-->
<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
<!-- ********************************************************************
$Id$
@@ -13,84 +13,1013 @@
******************************************************************** -->
-<xsl:template match="processing-instruction()">
+<doc:reference xmlns=""><info xmlns="http://www.w3.org/1999/xhtml"><title>HTML Processing Instruction Reference</title>
+ <releaseinfo role="meta">
+ $Id$
+ </releaseinfo>
+ </info>
+ <partintro xmlns="http://www.w3.org/1999/xhtml" xml:id="partintro">
+ <title>Introduction</title>
+ <para>This is generated reference documentation for all
+ user-specifiable processing instructions (PIs) in the DocBook
+ XSL stylesheets for HTML output.
+ <note>
+ <para>You add these PIs at particular points in a document to
+ cause specific &#8220;exceptions&#8221; to formatting/output behavior. To
+ make global changes in formatting/output behavior across an
+ entire document, it&#8217;s better to do it by setting an
+ appropriate stylesheet parameter (if there is one).</para>
+ </note>
+ </para>
+ </partintro>
+</doc:reference>
+
+<!-- ==================================================================== -->
+
+<doc:pi xmlns="" name="dbhtml_background-color">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color for an image</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml background-color</tag> PI before or
+ after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>,
+ <tag>imagedata</tag>, or <tag>videodata</tag> element) as a
+ sibling to the element, to set a background color for the
+ image.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml background-color="<replaceable>color</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>background-color="<replaceable>color</replaceable>"</term>
+ <listitem>
+ <para>An HTML color value</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="BGcolor.html">Background color</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_background-color">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'background-color'"/>
+ </xsl:call-template>
</xsl:template>
-<xsl:template match="processing-instruction('dbhtml')">
- <!-- nop -->
+<doc:pi xmlns="" name="dbhtml_bgcolor">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color on a table row or table cell</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml bgcolor</tag> PI as child of a table row
+ or cell to set a background color for that table row or cell.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml bgcolor="<replaceable>color</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term>
+ <listitem>
+ <para>An HTML color value</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="BGtableColor.html#CellBGColor">Cell background color</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_bgcolor">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'bgcolor'"/>
+ </xsl:call-template>
</xsl:template>
-<!-- ==================================================================== -->
+<doc:pi xmlns="" name="dbhtml_cellpadding">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellpadding in table or qandaset output</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml cellpadding</tag> PI as a child of a
+ <tag>table</tag> or <tag>qandaset</tag> to specify the value
+ for the HTML <literal>cellpadding</literal> attribute in the
+ output HTML table.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml cellpadding="<replaceable>number</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>cellpadding="<replaceable>number</replaceable>"</term>
+ <listitem>
+ <para>Specifies the cellpadding</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>html.cellpadding</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
+ <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_cellpadding">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'cellpadding'"/>
+ </xsl:call-template>
+</xsl:template>
-<xsl:template name="dbhtml-attribute">
- <xsl:param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:param name="attribute">filename</xsl:param>
+<doc:pi xmlns="" name="dbhtml_cellspacing">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellspacing in table or qandaset output</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml cellspacing</tag> PI as a child of a
+ <tag>table</tag> or <tag>qandaset</tag> to specify the value
+ for the HTML <literal>cellspacing</literal> attribute in the
+ output HTML table.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml cellspacing="<replaceable>number</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>cellspacing="<replaceable>number</replaceable>"</term>
+ <listitem>
+ <para>Specifies the cellspacing</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>html.cellspacing</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
+ <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_cellspacing">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'cellspacing'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_class">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Set value of the class attribute for a table row</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml class</tag> PI as a child of a
+ <tag>row</tag> to specify a <literal>class</literal>
+ attribute and value in the HTML output for that row.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml class="<replaceable>name</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>class="<replaceable>name</replaceable>"</term>
+ <listitem>
+ <para>Specifies the class name</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="CSSTableCells.html">Table styles in HTML output</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_class">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'class'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_dir">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a directory name in which to write files</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>When chunking output, use the <tag>dbhtml dir</tag> PI
+ as a child of a chunk source to cause the output of that
+ chunk to be written to the specified directory; also, use it
+ as a child of a <tag>mediaobject</tag> to specify a
+ directory into which any long-description files for that
+ <tag>mediaobject</tag> will be written.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml dir="<replaceable>path</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>dir="<replaceable>path</replaceable>"</term>
+ <listitem>
+ <para>Specifies the pathname for the directory</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>base.dir</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Chunking.html#dbhtmlDirPI">dbhtml dir processing instruction</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_dir">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'dir'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_filename">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a filename for a chunk</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>When chunking output, use the <tag>dbhtml filename</tag>
+ PI as a child of a chunk source to specify a filename for
+ the output file for that chunk.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml filename="<replaceable>filename</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>filename="<replaceable>path</replaceable>"</term>
+ <listitem>
+ <para>Specifies the filename for the file</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>use.id.as.filename</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Chunking.html#DbhtmlFilenames">dbhtml filenames</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_filename">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'filename'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_funcsynopsis-style">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a funcsynopsis</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml funcsynopsis-style</tag> PI as a child of
+ a <tag>funcprototype</tag> or anywhere within a funcprototype
+ control the presentation style for the <tag>funcsynopsis</tag>
+ in output.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml funcsynopsis-style="kr"|"ansi"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>funcsynopsis-style="kr"</term>
+ <listitem>
+ <para>Displays the <tag>funcprototype</tag> in K&amp;R style</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>funcsynopsis-style="ansi"</term>
+ <listitem>
+ <para>Displays the <tag>funcprototype</tag> in ANSI style</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>funcsynopsis.style</parameter></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_funcsynopsis-style">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'funcsynopsis-style'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_img.src.path">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a path to the location of an image file</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml img.src.path</tag> PI before or
+ after an image (<tag>graphic</tag>,
+ <tag>inlinegraphic</tag>, <tag>imagedata</tag>, or
+ <tag>videodata</tag> element) as a sibling to the element,
+ to specify a path to the location of the image; in HTML
+ output, the value specified for the
+ <code>img.src.path</code> attribute is prepended to the
+ filename.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml img.src.path="<replaceable>path</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>img.src.path="<replaceable>path</replaceable>"</term>
+ <listitem>
+ <para>Specifies the pathname to prepend to the name of the image file</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>img.src.path</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="GraphicsLocations.html#UsingFileref">Using fileref</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_img.src.path">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'img.src.path'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_label-width">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the label width for a qandaset</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml label-width</tag> PI as a child of a
+ <tag>qandaset</tag> to specify the width of labels.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml label-width="<replaceable>width</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>label-width="<replaceable>width</replaceable>"</term>
+ <listitem>
+ <para>Specifies the label width (including units)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_label-width">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'label-width'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_linenumbering.everyNth">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies interval for lines numbers in verbatims</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml linenumbering.everyNth</tag> PI as a child
+ of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
+ <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
+ the interval at which lines are numbered.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term>
+ <listitem>
+ <para>Specifies numbering interval; a number is output
+ before every <replaceable>N</replaceable>th line</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>linenumbering.everyNth</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_linenumbering.everyNth">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_linenumbering.separator">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text for line numbers in verbatims</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml linenumbering.separator</tag> PI as a child
+ of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
+ <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
+ the separator text output between the line numbers and content.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term>
+ <listitem>
+ <para>Specifies the text (zero or more characters)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>linenumbering.separator</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_linenumbering.separator">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_linenumbering.width">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies width for line numbers in verbatims</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml linenumbering.width</tag> PI as a child
+ of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
+ <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
+ the width set aside for line numbers.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term>
+ <listitem>
+ <para>Specifies the width (inluding units)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>linenumbering.width</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_linenumbering.width">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'linenumbering.width'"/>
+ </xsl:call-template>
+</xsl:template>
+<doc:pi xmlns="" name="dbhtml_list-presentation">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a variablelist or
+ segmentedlist</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml list-presentation</tag> PI as a child of
+ a <tag>variablelist</tag> or <tag>segmentedlist</tag> to
+ control the presentation style for the list (to cause it, for
+ example, to be displayed as a table).</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml list-presentation="list"|"table"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>list-presentation="list"</term>
+ <listitem>
+ <para>Displays the list as a list</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>list-presentation="table"</term>
+ <listitem>
+ <para>Displays the list as a table</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <itemizedlist>
+ <listitem>
+ <para><parameter>variablelist.as.table</parameter></para>
+ </listitem>
+ <listitem>
+ <para><parameter>segmentedlist.as.table</parameter></para>
+ </listitem>
+ </itemizedlist>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_list-presentation">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'list-presentation'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_list-width">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width of a variablelist or simplelist</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml list-width</tag> PI as a child of a
+ <tag>variablelist</tag> or a <tag>simplelist</tag> presented
+ as a table, to specify the output width.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml list-width="<replaceable>width</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>list-width="<replaceable>width</replaceable>"</term>
+ <listitem>
+ <para>Specifies the output width (including units)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_list-width">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'list-width'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_row-height">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the height for a table row</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml row-height</tag> PI as a child of a
+ <tag>row</tag> to specify the height of the row.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml row-height="<replaceable>height</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>row-height="<replaceable>height</replaceable>"</term>
+ <listitem>
+ <para>Specifies the label height (including units)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="RowHeight.html">Row height</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_row-height">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'row-height'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml_start">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">(obsolete) Sets the starting number on an ordered list</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para><emphasis>This PI is obsolete</emphasis>. The intent of
+ this PI was to provide a means for setting a specific starting
+ number for an ordered list. Instead of this PI, set a value
+ for the <literal>override</literal> attribute on the first
+ <tag>listitem</tag> in the list; that will have the same
+ effect as what this PI was intended for.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml start="<replaceable>character</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>start="<replaceable>character</replaceable>"</term>
+ <listitem>
+ <para>Specifies the character to use as the starting
+ number; use 0-9, a-z, A-Z, or lowercase or uppercase
+ Roman numerals</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Orderedlists.html#ListStartNum">List starting number</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_start">
+ <xsl:param name="node" select="."/>
<xsl:call-template name="pi-attribute">
- <xsl:with-param name="pis" select="$pis"/>
- <xsl:with-param name="attribute" select="$attribute"/>
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'start'"/>
</xsl:call-template>
</xsl:template>
-<xsl:template name="dbhtml-filename">
- <xsl:param name="pis" select="./processing-instruction('dbhtml')"/>
+<doc:pi xmlns="" name="dbhtml_table-summary">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies summary for table, variablelist, segmentedlist, or qandaset output</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml table-summary</tag> PI as a child of
+ a <tag>table</tag>, <tag>variablelist</tag>,
+ <tag>segmentedlist</tag>, or <tag>qandaset</tag> to specify
+ the text for the HTML <literal>summary</literal> attribute
+ in the output HTML table.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term>
+ <listitem>
+ <para>Specifies the summary text (zero or more characters)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link>,
+ <link role="tcg" xlink:href="TableSummary.html">Table summary text</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_table-summary">
+ <xsl:param name="node" select="."/>
<xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="$pis"/>
- <xsl:with-param name="attribute">filename</xsl:with-param>
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'table-summary'"/>
</xsl:call-template>
</xsl:template>
-<!--
-<xsl:template name="dbhtml-dir">
- <xsl:param name="pis" select="./processing-instruction('dbhtml')"/>
+<doc:pi xmlns="" name="dbhtml_table-width">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width for a table</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml table-width</tag> PI as a child of a
+ <tag>table</tag> to specify the width of the table in
+ output.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml table-width="<replaceable>width</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>table-width="<replaceable>width</replaceable>"</term>
+ <listitem>
+ <para>Specifies the table width (including units or as a percentage)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>default.table.width</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Tables.html#TableWidth">Table width</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_table-width">
+ <xsl:param name="node" select="."/>
<xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="$pis"/>
- <xsl:with-param name="attribute">dir</xsl:with-param>
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'table-width'"/>
</xsl:call-template>
</xsl:template>
--->
-<xsl:template name="dbhtml-dir">
- <xsl:param name="context" select="."/>
+<doc:pi xmlns="" name="dbhtml_term-presentation">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets character formatting for terms in a variablelist</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml term-presentation</tag> PI as a child
+ of a <tag>variablelist</tag> to set character formatting for
+ the <tag>term</tag> output of the list.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml term-presentation="bold"|"italic"|"bold-italic"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>term-presentation="<replaceable>bold</replaceable>"</term>
+ <listitem>
+ <para>Specifies that terms are displayed in bold</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>term-presentation="<replaceable>italic</replaceable>"</term>
+ <listitem>
+ <para>Specifies that terms are displayed in italic</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>term-presentation="<replaceable>bold-italic</replaceable>"</term>
+ <listitem>
+ <para>Specifies that terms are displayed in bold-italic</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_term-presentation">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'term-presentation'"/>
+ </xsl:call-template>
+</xsl:template>
- <!-- directories are now inherited from previous levels -->
+<doc:pi xmlns="" name="dbhtml_term-separator">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text among terms in a varlistentry</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml term-separator</tag> PI as a child
+ of a <tag>variablelist</tag> to specify the separator text
+ among <tag>term</tag> instances.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml term-separator="<replaceable>text</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>term-separator="<replaceable>text</replaceable>"</term>
+ <listitem>
+ <para>Specifies the text (zero or more characters)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>variablelist.term.separator</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_term-separator">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'term-separator'"/>
+ </xsl:call-template>
+</xsl:template>
- <xsl:variable name="ppath">
- <xsl:if test="$context/parent::*">
- <xsl:call-template name="dbhtml-dir">
- <xsl:with-param name="context" select="$context/parent::*"/>
- </xsl:call-template>
- </xsl:if>
- </xsl:variable>
+<doc:pi xmlns="" name="dbhtml_term-width">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the term width for a variablelist</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml term-width</tag> PI as a child of a
+ <tag>variablelist</tag> to specify the width for
+ <tag>term</tag> output.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>term-width="<replaceable>width</replaceable>"</term>
+ <listitem>
+ <para>Specifies the term width (including units)</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_term-width">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'term-width'"/>
+ </xsl:call-template>
+</xsl:template>
- <xsl:variable name="path">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="$context/processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute">dir</xsl:with-param>
+<doc:pi xmlns="" name="dbhtml_toc">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Species whether a TOC should be generated for a qandaset</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml toc</tag> PI as a child of a
+ <tag>qandaset</tag> to specify whether a table of contents
+ (TOC) is generated for the <tag>qandaset</tag>.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml toc="0"|"1"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>toc="0"</term>
+ <listitem>
+ <para>If zero, no TOC is generated</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry><term>toc="1"</term>
+ <listitem>
+ <para>If <code>1</code> (or any non-zero value),
+ a TOC is generated</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="QandAtoc.html">Q and A list of questions</link>,
+ <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml_toc">
+ <xsl:param name="node" select="."/>
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
+ <xsl:with-param name="attribute" select="'toc'"/>
+ </xsl:call-template>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbcmdlist">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of commands</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbcmdlist</tag> PI as the child of a
+ <tag>refsynopsisdiv</tag> containing multiple
+ <tag>cmdsynopsis</tag> instances; a hyperlinked navigational
+ &#8220;command list&#8221; will be generated at the top of the
+ <tag>refsynopsisdiv</tag>, enabling users to quickly jump
+ to to each command synopsis.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbcmdlist</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <para>[No parameters]</para>
+ </refparameter>
+</doc:pi>
+<xsl:template name="pi.dbcmdlist">
+ <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/>
+ <xsl:if test="count($cmdsynopses)&lt;1">
+ <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text>
+ </xsl:message>
+ </xsl:if>
+ <dl>
+ <xsl:call-template name="process.cmdsynopsis.list">
+ <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/>
</xsl:call-template>
- </xsl:variable>
+ </dl>
+</xsl:template>
+<doc:pi xmlns="" name="dbfunclist">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of functions</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbfunclist</tag> PI as the child of a
+ <tag>refsynopsisdiv</tag> containing multiple
+ <tag>funcsynopsis</tag> instances; a hyperlinked
+ navigational &#8220;function list&#8221; will be generated at the top of
+ the <tag>refsynopsisdiv</tag>, enabling users to quickly
+ jump to to each function synopsis.</para>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbfunclist</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <para>[No parameters]</para>
+ </refparameter>
+</doc:pi>
+<xsl:template name="pi.dbfunclist">
+ <xsl:variable name="funcsynopses" select="..//funcsynopsis"/>
+ <xsl:if test="count($funcsynopses)&lt;1">
+ <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text>
+ </xsl:message>
+ </xsl:if>
+ <dl>
+ <xsl:call-template name="process.funcsynopsis.list">
+ <xsl:with-param name="funcsynopses" select="$funcsynopses"/>
+ </xsl:call-template>
+ </dl>
+</xsl:template>
+
+<doc:pi xmlns="" name="dbhtml-include_href">
+ <refpurpose xmlns="http://www.w3.org/1999/xhtml">Copies an external well-formed HTML/XML file into current doc</refpurpose>
+ <refdescription xmlns="http://www.w3.org/1999/xhtml">
+ <para>Use the <tag>dbhtml-include href</tag> PI anywhere in a
+ document to cause the contents of the file referenced by the
+ <code>href</code> pseudo-attribute to be copied/inserted &#8220;as
+ is&#8221; into your HTML output at the point in document order
+ where the PI occurs in the source.</para>
+ <note>
+ <para>The referenced file may contain plain text (as long as
+ it is &#8220;wrapped&#8221; in an <tag>html</tag> element &#8212; see the
+ note below) or markup in any arbitrary vocabulary,
+ including HTML &#8212; but it must conform to XML
+ well-formedness constraints (because the feature in XSLT
+ 1.0 for opening external files, the
+ <function>document()</function> function, can only handle
+ files that meet XML well-formedness constraints).</para>
+ <para>Among other things, XML well-formedness constraints
+ require a document to have <emphasis>a single root
+ element</emphasis>. So if the content you want to
+ include is plain text or is markup that does
+ <emphasis>not</emphasis> have a single root element,
+ <emphasis role="strong">wrap the content in an
+ <tag>html</tag> element</emphasis>. The stylesheets will
+ strip out that surrounding <tag>html</tag> &#8220;wrapper&#8221; when
+ they find it, leaving just the content you want to
+ insert.</para>
+ </note>
+ </refdescription>
+ <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+ <synopsis><tag class="xmlpi">dbhtml href="<replaceable>URI</replaceable>"</tag></synopsis>
+ </refsynopsisdiv>
+ <refparameter xmlns="http://www.w3.org/1999/xhtml">
+ <variablelist>
+ <varlistentry><term>href="<replaceable>URI</replaceable>"</term>
+ <listitem>
+ <para>Specifies the URI for the file to include; the URI
+ can be, for example, a remote <literal>http:</literal>
+ URI, or a local filesystem <literal>file:</literal>
+ URI</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refparameter>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
+ <para><parameter>textinsert.extension</parameter></para>
+ </refsee>
+ <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+ <para><link role="tcg" xlink:href="InsertExtHtml.html">Inserting external HTML code</link>,
+ <link xlink:href="ExternalCode.html">External code files</link></para>
+ </refsee>
+</doc:pi>
+<xsl:template name="pi.dbhtml-include">
+ <xsl:param name="href">
+ <xsl:call-template name="dbhtml-attribute">
+ <xsl:with-param name="pis" select="."/>
+ <xsl:with-param name="attribute">href</xsl:with-param>
+ </xsl:call-template>
+ </xsl:param>
<xsl:choose>
- <xsl:when test="$path = ''">
- <xsl:if test="$ppath != ''">
- <xsl:value-of select="$ppath"/>
- </xsl:if>
+ <xsl:when test="$href != ''">
+ <xsl:variable name="content" select="document($href,/)"/>
+ <xsl:choose>
+ <xsl:when test="$content/*">
+ <xsl:choose>
+ <xsl:when test="$content/*[1][self::html]">
+ <!-- include just the children of html wrapper -->
+ <xsl:copy-of select="$content/*[1]/node()"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:copy-of select="$content"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message>
+ <xsl:text>ERROR: dbhtml-include processing instruction </xsl:text>
+ <xsl:text>href has no content.</xsl:text>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:when>
<xsl:otherwise>
- <xsl:if test="$ppath != ''">
- <xsl:value-of select="$ppath"/>
- <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'">
- <xsl:text>/</xsl:text>
- </xsl:if>
- </xsl:if>
- <xsl:value-of select="$path"/>
- <xsl:text>/</xsl:text>
+ <xsl:message>
+ <xsl:text>ERROR: dbhtml-include processing instruction has </xsl:text>
+ <xsl:text>missing or empty href value.</xsl:text>
+ </xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<!-- ==================================================================== -->
+<xsl:template name="dbhtml-attribute">
+ <!-- * dbhtml-attribute is an interal utility template for retrieving -->
+ <!-- * pseudo-attributes/parameters from PIs -->
+ <xsl:param name="pis" select="processing-instruction('dbhtml')"/>
+ <xsl:param name="attribute">filename</xsl:param>
+ <xsl:call-template name="pi-attribute">
+ <xsl:with-param name="pis" select="$pis"/>
+ <xsl:with-param name="attribute" select="$attribute"/>
+ </xsl:call-template>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="processing-instruction()">
+</xsl:template>
+
+<xsl:template match="processing-instruction('dbhtml')">
+ <!-- nop -->
+</xsl:template>
+
+<!-- ==================================================================== -->
+
+<xsl:template match="processing-instruction('dbcmdlist')">
+ <xsl:call-template name="pi.dbcmdlist"/>
+</xsl:template>
<xsl:template name="process.cmdsynopsis.list">
<xsl:param name="cmdsynopses"/><!-- empty node list by default -->
<xsl:param name="count" select="1"/>
@@ -103,6 +1032,7 @@
<dt>
<a>
<xsl:attribute name="href">
+ <xsl:text>#</xsl:text>
<xsl:call-template name="object.id">
<xsl:with-param name="object" select="$cmdsyn"/>
</xsl:call-template>
@@ -131,23 +1061,11 @@
</xsl:choose>
</xsl:template>
-<xsl:template match="processing-instruction('dbcmdlist')">
- <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/>
-
- <xsl:if test="count($cmdsynopses)&lt;1">
- <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text>
- </xsl:message>
- </xsl:if>
-
- <dl>
- <xsl:call-template name="process.cmdsynopsis.list">
- <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/>
- </xsl:call-template>
- </dl>
-</xsl:template>
-
<!-- ==================================================================== -->
+<xsl:template match="processing-instruction('dbfunclist')">
+ <xsl:call-template name="pi.dbfunclist"/>
+</xsl:template>
<xsl:template name="process.funcsynopsis.list">
<xsl:param name="funcsynopses"/><!-- empty node list by default -->
<xsl:param name="count" select="1"/>
@@ -160,6 +1078,7 @@
<dt>
<a>
<xsl:attribute name="href">
+ <xsl:text>#</xsl:text>
<xsl:call-template name="object.id">
<xsl:with-param name="object" select="$cmdsyn"/>
</xsl:call-template>
@@ -188,63 +1107,44 @@
</xsl:choose>
</xsl:template>
-<xsl:template match="processing-instruction('dbfunclist')">
- <xsl:variable name="funcsynopses" select="..//funcsynopsis"/>
-
- <xsl:if test="count($funcsynopses)&lt;1">
- <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text>
- </xsl:message>
- </xsl:if>
+<!-- ==================================================================== -->
- <dl>
- <xsl:call-template name="process.funcsynopsis.list">
- <xsl:with-param name="funcsynopses" select="$funcsynopses"/>
- </xsl:call-template>
- </dl>
+<xsl:template match="processing-instruction('dbhtml-include')">
+ <xsl:call-template name="pi.dbhtml-include"/>
</xsl:template>
<!-- ==================================================================== -->
-<!-- Copy well-formed external HTML content to the output. -->
-<!-- An optional <html> wrapper will be removed before content is copied
- to support multiple elements in output without a wrapper.
- No other processing is done to the content. -->
-<xsl:template match="processing-instruction('dbhtml-include')">
- <xsl:param name="href">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="."/>
- <xsl:with-param name="attribute">href</xsl:with-param>
+<xsl:template name="dbhtml-dir">
+ <xsl:param name="context" select="."/>
+ <!-- directories are now inherited from previous levels -->
+ <xsl:variable name="ppath">
+ <xsl:if test="$context/parent::*">
+ <xsl:call-template name="dbhtml-dir">
+ <xsl:with-param name="context" select="$context/parent::*"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:variable>
+ <xsl:variable name="path">
+ <xsl:call-template name="pi.dbhtml_dir">
+ <xsl:with-param name="node" select="$context"/>
</xsl:call-template>
- </xsl:param>
-
+ </xsl:variable>
<xsl:choose>
- <xsl:when test="$href != ''">
- <xsl:variable name="content" select="document($href,/)"/>
- <xsl:choose>
- <xsl:when test="$content/*">
- <xsl:choose>
- <xsl:when test="$content/*[1][self::html]">
- <!-- include just the children of html wrapper -->
- <xsl:copy-of select="$content/*[1]/node()"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:copy-of select="$content"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:when>
- <xsl:otherwise>
- <xsl:message>
- <xsl:text>ERROR: dbhtml-include processing instruction </xsl:text>
- <xsl:text>href has no content.</xsl:text>
- </xsl:message>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:when test="$path = ''">
+ <xsl:if test="$ppath != ''">
+ <xsl:value-of select="$ppath"/>
+ </xsl:if>
</xsl:when>
<xsl:otherwise>
- <xsl:message>
- <xsl:text>ERROR: dbhtml-include processing instruction has </xsl:text>
- <xsl:text>missing or empty href value.</xsl:text>
- </xsl:message>
+ <xsl:if test="$ppath != ''">
+ <xsl:value-of select="$ppath"/>
+ <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'">
+ <xsl:text>/</xsl:text>
+ </xsl:if>
+ </xsl:if>
+ <xsl:value-of select="$path"/>
+ <xsl:text>/</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
index 91184e648..223620938 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
@@ -66,7 +66,7 @@
</xsl:variable>
<xsl:variable name="dbhtml-filename">
- <xsl:call-template name="dbhtml-filename"/>
+ <xsl:call-template name="pi.dbhtml_filename"/>
</xsl:variable>
<xsl:variable name="filename">
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl
index 406149b79..5283675dd 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl
@@ -19,10 +19,7 @@
<xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/>
<xsl:variable name="preamble" select="*[local-name(.) != 'title' and local-name(.) != 'titleabbrev' and local-name(.) != 'qandadiv' and local-name(.) != 'qandaentry']"/>
<xsl:variable name="toc">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'toc'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_toc"/>
</xsl:variable>
<xsl:variable name="toc.params">
@@ -75,10 +72,7 @@
</xsl:if>
<xsl:variable name="toc">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'toc'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_toc"/>
</xsl:variable>
<xsl:variable name="toc.params">
@@ -316,31 +310,19 @@
<xsl:template name="process.qandaset">
<xsl:variable name="label-width">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'label-width'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_label-width"/>
</xsl:variable>
<xsl:variable name="table-summary">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'table-summary'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_table-summary"/>
</xsl:variable>
<xsl:variable name="cellpadding">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'cellpadding'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_cellpadding"/>
</xsl:variable>
<xsl:variable name="cellspacing">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'cellspacing'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_cellspacing"/>
</xsl:variable>
<table border="0" summary="Q and A Set">
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl
index f5b87e16e..42e6917c3 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl
@@ -435,12 +435,15 @@
<xsl:attribute name="style">clear: both</xsl:attribute>
</xsl:if>
</xsl:if>
- <xsl:if test="$allow-anchors != 0">
+ <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0">
<xsl:call-template name="anchor">
<xsl:with-param name="node" select="$section"/>
<xsl:with-param name="conditional" select="0"/>
</xsl:call-template>
</xsl:if>
+ <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')">
+ <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
+ </xsl:if>
<xsl:copy-of select="$title"/>
</xsl:element>
</xsl:template>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
index 8e79b9623..4aa2c2c06 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
@@ -23,7 +23,9 @@
<div>
<xsl:apply-templates select="." mode="class.attribute"/>
<p>
- <xsl:call-template name="anchor"/>
+ <xsl:call-template name="anchor">
+ <xsl:with-param name="conditional" select="0"/>
+ </xsl:call-template>
<xsl:apply-templates/>
</p>
</div>
@@ -177,9 +179,8 @@ paramdef ::= (#PCDATA|type|replaceable|parameter|funcparams)*
<xsl:template match="funcprototype">
<xsl:variable name="html-style">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="ancestor::funcsynopsis//processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'funcsynopsis-style'"/>
+ <xsl:call-template name="pi.dbhtml_funcsynopsis-style">
+ <xsl:with-param name="node" select="ancestor::funcsynopsis/descendant-or-self::*"/>
</xsl:call-template>
</xsl:variable>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl
index c0b77762b..b8a365146 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl
@@ -135,24 +135,15 @@
</xsl:if>
<xsl:variable name="summary">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'table-summary'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_table-summary"/>
</xsl:variable>
<xsl:variable name="cellspacing">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'cellspacing'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_cellspacing"/>
</xsl:variable>
<xsl:variable name="cellpadding">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')[1]"/>
- <xsl:with-param name="attribute" select="'cellpadding'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_cellpadding"/>
</xsl:variable>
<table>
@@ -215,7 +206,6 @@
<xsl:choose>
<xsl:when test="$table.borders.with.css != 0">
- <xsl:attribute name="border">0</xsl:attribute>
<xsl:choose>
<xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')">
<xsl:attribute name="style">
@@ -302,12 +292,18 @@
</xsl:call-template>
</xsl:attribute>
</xsl:when>
+ <xsl:when test="../@frame='none'">
+ <xsl:attribute name="style">
+ <xsl:text>border: none;</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
<xsl:otherwise>
<xsl:attribute name="style">
<xsl:text>border-collapse: collapse;</xsl:text>
</xsl:attribute>
</xsl:otherwise>
</xsl:choose>
+
</xsl:when>
<xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'">
<xsl:attribute name="border">0</xsl:attribute>
@@ -326,9 +322,8 @@
</xsl:variable>
<xsl:variable name="explicit.table.width">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="../processing-instruction('dbhtml')[1]"/>
- <xsl:with-param name="attribute" select="'table-width'"/>
+ <xsl:call-template name="pi.dbhtml_table-width">
+ <xsl:with-param name="node" select=".."/>
</xsl:call-template>
</xsl:variable>
@@ -416,10 +411,7 @@
<xsl:template match="tgroup/processing-instruction('dbhtml')">
<xsl:variable name="summary">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="."/>
- <xsl:with-param name="attribute" select="'table-summary'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_table-summary"/>
</xsl:variable>
<!-- Suppress the table-summary PI -->
@@ -545,28 +537,19 @@
<xsl:variable name="row-height">
<xsl:if test="processing-instruction('dbhtml')">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'row-height'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_row-height"/>
</xsl:if>
</xsl:variable>
<xsl:variable name="bgcolor">
<xsl:if test="processing-instruction('dbhtml')">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'bgcolor'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_bgcolor"/>
</xsl:if>
</xsl:variable>
<xsl:variable name="class">
<xsl:if test="processing-instruction('dbhtml')">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'class'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_class"/>
</xsl:if>
</xsl:variable>
@@ -776,10 +759,7 @@
<xsl:otherwise>
<xsl:variable name="bgcolor">
<xsl:if test="processing-instruction('dbhtml')">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'bgcolor'"/>
- </xsl:call-template>
+ <xsl:call-template name="pi.dbhtml_bgcolor"/>
</xsl:if>
</xsl:variable>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
index cb8c087fd..908d7ed2a 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
@@ -928,7 +928,9 @@
<h1>
<xsl:apply-templates select="." mode="class.attribute"/>
- <a id="{$id}"/>
+ <xsl:if test="$generate.id.attributes = 0">
+ <a id="{$id}"/>
+ </xsl:if>
<xsl:choose>
<xsl:when test="$show.revisionflag != 0 and @revisionflag">
<span class="{@revisionflag}">
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl
index ea8fd0c39..3cb162d96 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl
@@ -169,23 +169,20 @@
<!-- Extract the <?dbhtml linenumbering.*?> PI values -->
<xsl:variable name="pi.linenumbering.everyNth">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
+ <xsl:call-template name="pi.dbhtml_linenumbering.everyNth">
+ <xsl:with-param name="node" select="$pi.context"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="pi.linenumbering.separator">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
+ <xsl:call-template name="pi.dbhtml_linenumbering.separator">
+ <xsl:with-param name="node" select="$pi.context"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="pi.linenumbering.width">
- <xsl:call-template name="dbhtml-attribute">
- <xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/>
- <xsl:with-param name="attribute" select="'linenumbering.width'"/>
+ <xsl:call-template name="pi.dbhtml_linenumbering.width">
+ <xsl:with-param name="node" select="$pi.context"/>
</xsl:call-template>
</xsl:variable>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
index 11ca76b0f..3a9dcd8f8 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
@@ -726,7 +726,6 @@
<xsl:apply-templates select="." mode="callout-bug"/>
</xsl:template>
-<!-- This is currently not working, because there is no corresponding ID generated by Java extensions for processing callouts
<xsl:template match="area|areaset" mode="xref-to">
<xsl:param name="referrer"/>
<xsl:param name="xrefstyle"/>
@@ -737,7 +736,6 @@
</xsl:with-param>
</xsl:call-template>
</xsl:template>
--->
<xsl:template match="book" mode="xref-to">
<xsl:param name="referrer"/>