Merged r8226 from new-xsl branch.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8228 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Manuel Canales Esparcia 2007-07-21 15:00:15 +00:00
parent 85117fe2b9
commit 60a5a938e6
43 changed files with 2443 additions and 1179 deletions

View File

@ -11,14 +11,14 @@
<xsl:param name="PreviousRelease">1.72.0</xsl:param> <xsl:param name="PreviousRelease">1.72.0</xsl:param>
<xsl:param name="PreviousReleaseRevision">6553</xsl:param> <xsl:param name="PreviousReleaseRevision">6553</xsl:param>
<xsl:param name="Revision">$Revision$</xsl:param> <xsl:param name="Revision">$Revision$</xsl:param>
<xsl:param name="VersionFileURL">$URL: https://svn.sourceforge.net/svnroot/docbook/trunk/xsl/VERSION $</xsl:param> <xsl:param name="VersionFileURL">$URL: https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl/VERSION $</xsl:param>
<xsl:param name="sf-relid" select="0"/> <xsl:param name="sf-relid" select="0"/>
<xsl:strip-space elements="fm:*"/> <xsl:strip-space elements="fm:*"/>
<fm:project> <fm:project>
<fm:Project>DocBook</fm:Project> <fm:Project>DocBook</fm:Project>
<fm:Branch>XSL Stylesheets</fm:Branch> <fm:Branch>XSL Stylesheets</fm:Branch>
<fm:Version>snapshot_6933</fm:Version> <fm:Version>snapshot_7094</fm:Version>
<!-- <!--
<fm:License>MIT/X Consortium License</fm:License> <fm:License>MIT/X Consortium License</fm:License>
--> -->

View File

@ -14,38 +14,24 @@
See ../README or http://docbook.sf.net/release/xsl/current/ for See ../README or http://docbook.sf.net/release/xsl/current/ for
copyright and other information. copyright and other information.
This file contains general templates common to both the HTML and FO
versions of the DocBook stylesheets.
******************************************************************** --> ******************************************************************** -->
<doc:reference xmlns=""> <doc:reference xmlns="" xml:id="base">
<referenceinfo> <info>
<title>Common » Base Template Reference</title>
<releaseinfo role="meta"> <releaseinfo role="meta">
$Id$ $Id$
</releaseinfo> </releaseinfo>
<author><surname>Walsh</surname> </info>
<firstname>Norman</firstname></author> <!-- * yes, partintro is a valid child of a reference... -->
<copyright><year>1999-2007</year> <partintro xml:id="partintro">
<holder>Norman Walsh</holder>
</copyright>
</referenceinfo>
<title>Common Template Reference</title>
<partintro id="partintro">
<title>Introduction</title> <title>Introduction</title>
<para>This is technical reference documentation for the “base”
<para>This is technical reference documentation for the “common” set of common templates in the DocBook XSL Stylesheets.</para>
templates in the DocBook XSL Stylesheets. The common templates are <para>This is not intended to be user documentation. It is
“common” because they are shared across output formats (that is, provided for developers writing customization layers for the
theyre not output-format-dependent).</para> stylesheets.</para>
<para>This documentation is not intended to be <quote>user</quote>
documentation. It is provided for developers writing
customization layers for the stylesheets, and for anyone who's
interested in <quote>how it works</quote>.</para>
</partintro> </partintro>
</doc:reference> </doc:reference>
<!-- ==================================================================== --> <!-- ==================================================================== -->
@ -183,7 +169,7 @@ manvolnum
<refdescription id="section.level-desc"> <refdescription id="section.level-desc">
<para>This template calculates the hierarchical level of a section. <para>This template calculates the hierarchical level of a section.
The element <sgmltag>sect1</sgmltag> is at level 1, <sgmltag>sect2</sgmltag> is The element <tag>sect1</tag> is at level 1, <tag>sect2</tag> is
at level 2, etc.</para> at level 2, etc.</para>
<para>Recursive sections are calculated down to the fifth level.</para> <para>Recursive sections are calculated down to the fifth level.</para>
@ -1324,38 +1310,17 @@ pointed to by the link is one of the elements listed in
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- OrderedList Numeration --> <!-- OrderedList Numeration -->
<xsl:template name="output-orderedlist-starting-number">
<xsl:template name="orderedlist-starting-number"> <xsl:param name="list"/>
<xsl:param name="list" select="."/> <xsl:param name="pi-start"/>
<!-- Need a neutral dbxxx -->
<xsl:variable name="pi-html-start">
<xsl:call-template name="pi-attribute">
<xsl:with-param name="pis"
select="$list/processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'start'"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="pi-fo-start">
<xsl:call-template name="pi-attribute">
<xsl:with-param name="pis"
select="$list/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'start'"/>
</xsl:call-template>
</xsl:variable>
<xsl:choose> <xsl:choose>
<xsl:when test="not($list/@continuation = 'continues')"> <xsl:when test="not($list/@continuation = 'continues')">
<xsl:choose> <xsl:choose>
<xsl:when test="@startingnumber"> <xsl:when test="@startingnumber">
<xsl:value-of select="@startingnumber"/> <xsl:value-of select="@startingnumber"/>
</xsl:when> </xsl:when>
<xsl:when test="$pi-html-start != ''"> <xsl:when test="$pi-start != ''">
<xsl:value-of select="$pi-html-start"/> <xsl:value-of select="$pi-start"/>
</xsl:when>
<xsl:when test="$pi-fo-start != ''">
<xsl:value-of select="$pi-fo-start"/>
</xsl:when> </xsl:when>
<xsl:otherwise>1</xsl:otherwise> <xsl:otherwise>1</xsl:otherwise>
</xsl:choose> </xsl:choose>
@ -1382,7 +1347,6 @@ pointed to by the link is one of the elements listed in
<xsl:template name="orderedlist-item-number"> <xsl:template name="orderedlist-item-number">
<!-- context node must be a listitem in an orderedlist --> <!-- context node must be a listitem in an orderedlist -->
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
<xsl:choose> <xsl:choose>
<xsl:when test="$node/@override"> <xsl:when test="$node/@override">
<xsl:value-of select="$node/@override"/> <xsl:value-of select="$node/@override"/>
@ -1903,33 +1867,28 @@ unchanged.</para>
localized "choice" separator (for example, "and" or "or") before localized "choice" separator (for example, "and" or "or") before
the final item in an inline list (though it could also be useful the final item in an inline list (though it could also be useful
for generating choice separators for non-inline lists).</para> for generating choice separators for non-inline lists).</para>
<para>It currently works by evaluating a processing instruction <para>It currently works by evaluating a processing instruction
(PI) of the form &lt;?dbchoice&#xa0;choice="foo"?> : (PI) of the form &lt;?dbchoice&#xa0;choice="foo"?> :
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<simpara>if the value of the <sgmltag>choice</sgmltag> <simpara>if the value of the <tag>choice</tag>
pseudo-attribute is "and" or "or", returns a localized "and" pseudo-attribute is "and" or "or", returns a localized "and"
or "or"</simpara> or "or"</simpara>
</listitem> </listitem>
<listitem> <listitem>
<simpara>otherwise returns the literal value of the <simpara>otherwise returns the literal value of the
<sgmltag>choice</sgmltag> pseudo-attribute</simpara> <tag>choice</tag> pseudo-attribute</simpara>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
The latter is provided only as a temporary workaround because the The latter is provided only as a temporary workaround because the
locale files do not currently have translations for the word locale files do not currently have translations for the word
<wordasword>or</wordasword>. So if you want to generate a a <wordasword>or</wordasword>. So if you want to generate a a
logical "or" separator in French (for example), you currently need logical "or" separator in French (for example), you currently need
to do this: to do this:
<literallayout>&lt;?dbchoice choice="ou"?></literallayout> <literallayout>&lt;?dbchoice choice="ou"?></literallayout>
</para> </para>
<warning> <warning>
<para>The <sgmltag>dbchoice</sgmltag> processing instruction is <para>The <tag>dbchoice</tag> processing instruction is
an unfortunate hack; support for it may disappear in the future an unfortunate hack; support for it may disappear in the future
(particularly if and when a more appropriate means for marking (particularly if and when a more appropriate means for marking
up "choice" lists becomes available in DocBook).</para> up "choice" lists becomes available in DocBook).</para>
@ -1937,14 +1896,9 @@ unchanged.</para>
</refdescription> </refdescription>
</doc:template> </doc:template>
<xsl:template name="select.choice.separator"> <xsl:template name="select.choice.separator">
<xsl:variable name="choice"> <xsl:variable name="choice">
<xsl:call-template name="pi-attribute"> <xsl:call-template name="pi.dbchoice_choice"/>
<xsl:with-param name="pis" select="processing-instruction('dbchoice')"/>
<xsl:with-param name="attribute">choice</xsl:with-param>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:choose> <xsl:choose>
<!-- if value of $choice is "and" or "or", translate to equivalent in --> <!-- if value of $choice is "and" or "or", translate to equivalent in -->
<!-- current locale --> <!-- current locale -->
@ -2024,5 +1978,4 @@ engine does not support it.
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

View File

@ -19,6 +19,13 @@
<!-- copyright and other information. --> <!-- copyright and other information. -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<!-- In these files, % with a letter is used for a placeholder: -->
<!-- %t is the current element's title -->
<!-- %s is the current element's subtitle (if applicable)-->
<!-- %n is the current element's number label-->
<!-- %p is the current element's page number (if applicable)-->
<!-- ******************************************************************** -->
<l:gentext key="Abstract" text="Zusammenfassung"/> <l:gentext key="Abstract" text="Zusammenfassung"/>
<l:gentext key="abstract" text="Zusammenfassung"/> <l:gentext key="abstract" text="Zusammenfassung"/>

View File

@ -19,6 +19,13 @@
<!-- copyright and other information. --> <!-- copyright and other information. -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<!-- In these files, % with a letter is used for a placeholder: -->
<!-- %t is the current element's title -->
<!-- %s is the current element's subtitle (if applicable)-->
<!-- %n is the current element's number label-->
<!-- %p is the current element's page number (if applicable)-->
<!-- ******************************************************************** -->
<l:gentext key="Abstract" text="Abstract"/> <l:gentext key="Abstract" text="Abstract"/>
<l:gentext key="abstract" text="Abstract"/> <l:gentext key="abstract" text="Abstract"/>

View File

@ -19,6 +19,13 @@
<!-- copyright and other information. --> <!-- copyright and other information. -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<!-- In these files, % with a letter is used for a placeholder: -->
<!-- %t is the current element's title -->
<!-- %s is the current element's subtitle (if applicable)-->
<!-- %n is the current element's number label-->
<!-- %p is the current element's page number (if applicable)-->
<!-- ******************************************************************** -->
<l:gentext key="Abstract" text="Resumen"/> <l:gentext key="Abstract" text="Resumen"/>
<l:gentext key="abstract" text="resumen"/> <l:gentext key="abstract" text="resumen"/>

View File

@ -19,6 +19,13 @@
<!-- copyright and other information. --> <!-- copyright and other information. -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<!-- In these files, % with a letter is used for a placeholder: -->
<!-- %t is the current element's title -->
<!-- %s is the current element's subtitle (if applicable)-->
<!-- %n is the current element's number label-->
<!-- %p is the current element's page number (if applicable)-->
<!-- ******************************************************************** -->
<l:gentext key="Abstract" text="Résumé"/> <l:gentext key="Abstract" text="Résumé"/>
<l:gentext key="abstract" text="Résumé"/> <l:gentext key="abstract" text="Résumé"/>

View File

@ -19,6 +19,13 @@
<!-- copyright and other information. --> <!-- copyright and other information. -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<!-- In these files, % with a letter is used for a placeholder: -->
<!-- %t is the current element's title -->
<!-- %s is the current element's subtitle (if applicable)-->
<!-- %n is the current element's number label-->
<!-- %p is the current element's page number (if applicable)-->
<!-- ******************************************************************** -->
<l:gentext key="Abstract" text="Estratto"/> <l:gentext key="Abstract" text="Estratto"/>
<l:gentext key="abstract" text="Estratto"/> <l:gentext key="abstract" text="Estratto"/>

View File

@ -193,12 +193,31 @@ element label.</para>
<xsl:value-of select="@label"/> <xsl:value-of select="@label"/>
</xsl:when> </xsl:when>
<xsl:when test="string($reference.autolabel) != 0"> <xsl:when test="string($reference.autolabel) != 0">
<xsl:if test="$component.label.includes.part.label != 0 and
ancestor::part">
<xsl:variable name="part.label">
<xsl:apply-templates select="ancestor::part"
mode="label.markup"/>
</xsl:variable>
<xsl:if test="$part.label != ''">
<xsl:value-of select="$part.label"/>
<xsl:apply-templates select="ancestor::part"
mode="intralabel.punctuation"/>
</xsl:if>
</xsl:if>
<xsl:variable name="format"> <xsl:variable name="format">
<xsl:call-template name="autolabel.format"> <xsl:call-template name="autolabel.format">
<xsl:with-param name="format" select="$reference.autolabel"/> <xsl:with-param name="format" select="$reference.autolabel"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:choose>
<xsl:when test="$label.from.part != 0 and ancestor::part">
<xsl:number from="part" count="reference" format="{$format}" level="any"/>
</xsl:when>
<xsl:otherwise>
<xsl:number from="book" count="reference" format="{$format}" level="any"/> <xsl:number from="book" count="reference" format="{$format}" level="any"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>

View File

@ -1,8 +1,10 @@
<?xml version='1.0'?> <?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
xmlns:date="http://exslt.org/dates-and-times" xmlns:date="http://exslt.org/dates-and-times"
xmlns:exsl="http://exslt.org/common" xmlns:exsl="http://exslt.org/common"
xmlns:xlink="http://www.w3.org/1999/xlink"
exclude-result-prefixes="doc date exsl" exclude-result-prefixes="doc date exsl"
extension-element-prefixes="date exsl" extension-element-prefixes="date exsl"
version='1.0'> version='1.0'>
@ -15,17 +17,108 @@
See ../README or http://docbook.sf.net/release/xsl/current/ for See ../README or http://docbook.sf.net/release/xsl/current/ for
copyright and other information. copyright and other information.
This file contains general templates for processing processing
instructions common to both the HTML and FO versions of the
DocBook stylesheets.
******************************************************************** --> ******************************************************************** -->
<!-- Process PIs also on title pages --> <doc:reference xmlns=""><info><title>Common Processing Instruction Reference</title>
<xsl:template match="processing-instruction()" mode="titlepage.mode"> <releaseinfo role="meta">
<xsl:apply-templates select="."/> $Id$
</releaseinfo>
</info>
<partintro id="partintro">
<title>Introduction</title>
<para>This is generated reference documentation for all
user-specifiable processing instructions (PIs) in the
“common” part of the DocBook XSL stylesheets.
<note>
<para>You add these PIs at particular points in a document to
cause specific “exceptions” to formatting/output behavior. To
make global changes in formatting/output behavior across an
entire document, its better to do it by setting an
appropriate stylesheet parameter (if there is one).</para>
</note>
</para>
</partintro>
</doc:reference>
<!-- ==================================================================== -->
<doc:pi name="dbchoice_choice" xmlns="">
<refpurpose>Generates a localized choice separator</refpurpose>
<refdescription id="select.choice.separator-desc">
<para>Use the <tag class="xmlpi">dbchoice choice</tag> PI to
generate an appropriate localized “choice” separator (for
example, <literal>and</literal> or <literal>or</literal>)
before the final item in an inline <tag>simplelist</tag></para>
<warning>
<para>This PI is a less-than-ideal hack; support for it may
disappear in the future (particularly if and when a more
appropriate means for marking up "choice" lists becomes
available in DocBook).</para>
</warning>
</refdescription>
<refsynopsisdiv>
<synopsis><tag class="xmlpi">dbchoice choice="and"|"or"|<replaceable>string</replaceable>"</tag></synopsis>
</refsynopsisdiv>
<refparameter>
<variablelist>
<varlistentry><term>choice="and"</term>
<listitem>
<para>generates a localized <literal>and</literal> separator</para>
</listitem>
</varlistentry>
<varlistentry><term>choice="or"</term>
<listitem>
<para>generates a localized <literal>or</literal> separator</para>
</listitem>
</varlistentry>
<varlistentry><term>choice="<replaceable>string</replaceable>"</term>
<listitem>
<para>generates a literal <replaceable>string</replaceable> separator</para>
</listitem>
</varlistentry>
</variablelist>
</refparameter>
</doc:pi>
<xsl:template name="pi.dbchoice_choice">
<xsl:param name="node" select="."/>
<xsl:call-template name="pi-attribute">
<xsl:with-param name="pis" select="$node/processing-instruction('dbchoice')"/>
<xsl:with-param name="attribute">choice</xsl:with-param>
</xsl:call-template>
</xsl:template> </xsl:template>
<xsl:template match="processing-instruction('dbtimestamp')"> <doc:pi name="dbtimestamp" xmlns="">
<refpurpose>Inserts a date timestamp</refpurpose>
<refdescription>
<para>Use the <tag>dbtimestamp</tag> PI at any point in a
source document to cause a date timestamp (a formatted
string representing the current date and time) to be
inserted in output of the document.</para>
</refdescription>
<refsynopsisdiv>
<synopsis><tag class="xmlpi">dbtimestamp format="<replaceable>formatstring</replaceable>" [padding="0"|"1"]</tag></synopsis>
</refsynopsisdiv>
<refparameter>
<variablelist>
<varlistentry><term>format="<replaceable>formatstring</replaceable>"</term>
<listitem>
<para>Specifies format in which the date and time are
output</para>
<note>
<para>For details of the content of the format string,
see <link role="tcg" xlink:href="Datetime.html"
>Date and time</link>.</para>
</note>
</listitem>
</varlistentry>
<varlistentry><term>padding="0"|"1"</term>
<listitem>
<para>Specifies padding behavior; if non-zero, padding is is added</para>
</listitem>
</varlistentry>
</variablelist>
</refparameter>
</doc:pi>
<xsl:template name="pi.dbtimestamp">
<xsl:variable name="format"> <xsl:variable name="format">
<xsl:variable name="pi-format"> <xsl:variable name="pi-format">
<xsl:call-template name="pi-attribute"> <xsl:call-template name="pi-attribute">
@ -45,7 +138,6 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>
<xsl:variable name="padding"> <xsl:variable name="padding">
<xsl:variable name="pi-padding"> <xsl:variable name="pi-padding">
<xsl:call-template name="pi-attribute"> <xsl:call-template name="pi-attribute">
@ -60,7 +152,6 @@
<xsl:otherwise>1</xsl:otherwise> <xsl:otherwise>1</xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>
<xsl:variable name="date"> <xsl:variable name="date">
<xsl:choose> <xsl:choose>
<xsl:when test="function-available('date:date-time')"> <xsl:when test="function-available('date:date-time')">
@ -72,7 +163,6 @@
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:variable> </xsl:variable>
<xsl:choose> <xsl:choose>
<xsl:when test="function-available('date:date-time') or <xsl:when test="function-available('date:date-time') or
function-available('date:dateTime')"> function-available('date:dateTime')">
@ -88,14 +178,61 @@
</xsl:message> </xsl:message>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:template>
<doc:pi name="dbtex_delims" xmlns="">
<refpurpose>Generates delimiters around embedded TeX equations
in output</refpurpose>
<refdescription>
<para>Use the <tag class="xmlpi">dbtex delims</tag> PI as a
child of a <tag>textobject</tag> containing embedded TeX
markup, to cause that markup to be surrounded by
<literal>$</literal> delimiter characters in output.</para>
</refdescription>
<refsynopsisdiv>
<synopsis><tag class="xmlpi">dbtex delims="no"|"yes"</tag></synopsis>
</refsynopsisdiv>
<refparameter>
<variablelist>
<varlistentry><term>dbtex delims="no"|"yes"</term>
<listitem>
<para>Specifies whether delimiters are output</para>
</listitem>
</varlistentry>
</variablelist>
</refparameter>
<refsee role="params">
<para><parameter>tex.math.delims</parameter></para>
</refsee>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="TexMath.html"
>DBTeXMath</link></para>
</refsee>
</doc:pi>
<xsl:template name="pi.dbtex_delims">
<xsl:param name="node" select="."/>
<xsl:call-template name="pi-attribute">
<xsl:with-param name="pis" select="$node/processing-instruction('dbtex')"/>
<xsl:with-param name="attribute" select="'delims'"/>
</xsl:call-template>
</xsl:template>
<!-- ==================================================================== -->
<xsl:template match="processing-instruction()" mode="titlepage.mode">
<!-- * Als process PIs on title pages -->
<xsl:apply-templates select="."/>
</xsl:template>
<xsl:template match="processing-instruction('dbtimestamp')">
<xsl:call-template name="pi.dbtimestamp"/>
</xsl:template> </xsl:template>
<xsl:template name="datetime.format"> <xsl:template name="datetime.format">
<xsl:param name="date"/> <xsl:param name="date"/>
<xsl:param name="format"/> <xsl:param name="format"/>
<xsl:param name="padding" select="1"/> <xsl:param name="padding" select="1"/>
<xsl:if test="$format != ''"> <xsl:if test="$format != ''">
<!-- replace any whitespace in the format string with a non-breaking space --> <!-- replace any whitespace in the format string with a non-breaking space -->
<xsl:variable name="format-nbsp" <xsl:variable name="format-nbsp"
@ -108,7 +245,6 @@
<xsl:with-param name="delimiters" select="'&#xa0;,./-()[]:'"/> <xsl:with-param name="delimiters" select="'&#xa0;,./-()[]:'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:choose> <xsl:choose>
<!-- include extra test for Xalan quirk --> <!-- include extra test for Xalan quirk -->
<xsl:when test="function-available('exsl:node-set') or <xsl:when test="function-available('exsl:node-set') or
@ -205,7 +341,6 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

View File

@ -16,36 +16,25 @@
******************************************************************** --> ******************************************************************** -->
<!-- ==================================================================== --> <!-- ==================================================================== -->
<doc:reference xmlns=""> <doc:reference xmlns="" xml:id="refentry">
<referenceinfo> <info>
<title>Common » Refentry Metadata Template Reference</title>
<releaseinfo role="meta"> <releaseinfo role="meta">
$Id$ $Id$
</releaseinfo> </releaseinfo>
<corpauthor>The DocBook Project</corpauthor> </info>
<copyright> <!-- * yes, partintro is a valid child of a reference... -->
<year>2005-2007</year> <partintro xml:id="partintro">
<holder>The DocBook Project</holder>
</copyright>
</referenceinfo>
<title>Refentry Metadata-Gathering Template Reference</title>
<partintro id="partintro">
<title>Introduction</title> <title>Introduction</title>
<para>This is technical reference documentation for the “refentry
<para>This is technical reference documentation for the "refentry metadata” templates in the DocBook XSL Stylesheets.</para>
metadata gathering" templates in the DocBook XSL Stylesheets.</para>
<para>This is not intended to be user documentation. It is provided <para>This is not intended to be user documentation. It is provided
for developers writing customization layers for the for developers writing customization layers for the stylesheets.</para>
stylesheets.</para>
<note> <note>
<para>Currently, only the manpages stylesheets make use of these <para>Currently, only the manpages stylesheets make use of these
templates. They are, however, potentially useful elsewhere.</para> templates. They are, however, potentially useful elsewhere.</para>
</note> </note>
</partintro> </partintro>
</doc:reference> </doc:reference>
<!-- ==================================================================== --> <!-- ==================================================================== -->
@ -56,27 +45,27 @@
etc., is sometimes viewed in isolation from its greater "context". For etc., is sometimes viewed in isolation from its greater "context". For
example, users view Unix man pages as, well, individual pages, not as example, users view Unix man pages as, well, individual pages, not as
part of a "book" of some kind. Therefore, it is sometimes necessary to part of a "book" of some kind. Therefore, it is sometimes necessary to
embed "context" information in output for each <sgmltag>refentry</sgmltag>.</para> embed "context" information in output for each <tag>refentry</tag>.</para>
<para>However, one problem is that different users mark up that <para>However, one problem is that different users mark up that
context information in different ways. Often (usually), the context information in different ways. Often (usually), the
context information is not actually part of the content of the context information is not actually part of the content of the
<sgmltag>refentry</sgmltag> itself, but instead part of the content of a <tag>refentry</tag> itself, but instead part of the content of a
parent or ancestor element to the the <sgmltag>refentry</sgmltag>. And parent or ancestor element to the the <tag>refentry</tag>. And
even then, DocBook provides a variety of elements that users might even then, DocBook provides a variety of elements that users might
potentially use to mark up the same kind of information. One user potentially use to mark up the same kind of information. One user
might use the <sgmltag>productnumber</sgmltag> element to mark up version might use the <tag>productnumber</tag> element to mark up version
information about a particular product, while another might use information about a particular product, while another might use
the <sgmltag>releaseinfo</sgmltag> element.</para> the <tag>releaseinfo</tag> element.</para>
<para>Taking all that in mind, the <para>Taking all that in mind, the
<function>get.refentry.metadata</function> template tries to gather <function>get.refentry.metadata</function> template tries to gather
metadata from a <sgmltag>refentry</sgmltag> element and its ancestor metadata from a <tag>refentry</tag> element and its ancestor
elements in an intelligent and user-configurable way. The basic elements in an intelligent and user-configurable way. The basic
mechanism used in the XPath expressions throughout this stylesheet mechanism used in the XPath expressions throughout this stylesheet
is to select the relevant metadata from the *info element that is is to select the relevant metadata from the *info element that is
closest to the actual <sgmltag>refentry</sgmltag>&#160; either on the closest to the actual <tag>refentry</tag>&#160; either on the
<sgmltag>refentry</sgmltag> itself, or on its nearest ancestor.</para> <tag>refentry</tag> itself, or on its nearest ancestor.</para>
<note> <note>
<para>The <function>get.refentry.metadata</function> <para>The <function>get.refentry.metadata</function>
@ -91,13 +80,13 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>info</term> <term>info</term>
<listitem> <listitem>
<para>A set of info nodes (from a <sgmltag>refentry</sgmltag> <para>A set of info nodes (from a <tag>refentry</tag>
element and its ancestors)</para> element and its ancestors)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -194,23 +183,23 @@
<refdescription id="get.refentry.title-desc"> <refdescription id="get.refentry.title-desc">
<para>The <literal>man(7)</literal> man page describes this as "the <para>The <literal>man(7)</literal> man page describes this as "the
title of the man page (e.g., <literal>MAN</literal>). This differs title of the man page (e.g., <literal>MAN</literal>). This differs
from <sgmltag>refname</sgmltag> in that, if the <sgmltag>refentry</sgmltag> has a from <tag>refname</tag> in that, if the <tag>refentry</tag> has a
<sgmltag>refentrytitle</sgmltag>, we use that as the <sgmltag>title</sgmltag>; <tag>refentrytitle</tag>, we use that as the <tag>title</tag>;
otherwise, we just use first <sgmltag>refname</sgmltag> in the first otherwise, we just use first <tag>refname</tag> in the first
<sgmltag>refnamediv</sgmltag> in the source.</para> <tag>refnamediv</tag> in the source.</para>
</refdescription> </refdescription>
<refparameter id="get.refentry.title-params"> <refparameter id="get.refentry.title-params">
<variablelist> <variablelist>
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refreturn id="get.refentry.title-returns"> <refreturn id="get.refentry.title-returns">
<para>Returns a <sgmltag>title</sgmltag> node.</para></refreturn> <para>Returns a <tag>title</tag> node.</para></refreturn>
</doc:template> </doc:template>
<xsl:template name="get.refentry.title"> <xsl:template name="get.refentry.title">
<xsl:param name="refname"/> <xsl:param name="refname"/>
@ -232,8 +221,8 @@
<refdescription id="get.refentry.section-desc"> <refdescription id="get.refentry.section-desc">
<para>The <literal>man(7)</literal> man page describes this as "the <para>The <literal>man(7)</literal> man page describes this as "the
section number the man page should be placed in (e.g., section number the man page should be placed in (e.g.,
<literal>7</literal>)". If we do not find a <sgmltag>manvolnum</sgmltag> <literal>7</literal>)". If we do not find a <tag>manvolnum</tag>
specified in the source, and we find that the <sgmltag>refentry</sgmltag> is specified in the source, and we find that the <tag>refentry</tag> is
for a function, we use the section number <literal>3</literal> for a function, we use the section number <literal>3</literal>
["Library calls (functions within program libraries)"]; otherwise, we ["Library calls (functions within program libraries)"]; otherwise, we
default to using <literal>1</literal> ["Executable programs or shell default to using <literal>1</literal> ["Executable programs or shell
@ -244,7 +233,7 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
@ -323,13 +312,13 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>info</term> <term>info</term>
<listitem> <listitem>
<para>A set of info nodes (from a <sgmltag>refentry</sgmltag> <para>A set of info nodes (from a <tag>refentry</tag>
element and its ancestors)</para> element and its ancestors)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -342,7 +331,7 @@
</variablelist> </variablelist>
</refparameter> </refparameter>
<refreturn id="get.refentry.date-returns"> <refreturn id="get.refentry.date-returns">
<para>Returns a <sgmltag>date</sgmltag> node.</para> <para>Returns a <tag>date</tag> node.</para>
</refreturn> </refreturn>
</doc:template> </doc:template>
<xsl:template name="get.refentry.date"> <xsl:template name="get.refentry.date">
@ -495,13 +484,13 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>info</term> <term>info</term>
<listitem> <listitem>
<para>A set of info nodes (from a <sgmltag>refentry</sgmltag> <para>A set of info nodes (from a <tag>refentry</tag>
element and its ancestors)</para> element and its ancestors)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -515,7 +504,7 @@
</variablelist> </variablelist>
</refparameter> </refparameter>
<refreturn id="get.refentry.source-returns"> <refreturn id="get.refentry.source-returns">
<para>Returns a <sgmltag>source</sgmltag> node.</para> <para>Returns a <tag>source</tag> node.</para>
</refreturn> </refreturn>
</doc:template> </doc:template>
<xsl:template name="get.refentry.source"> <xsl:template name="get.refentry.source">
@ -611,13 +600,13 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>info</term> <term>info</term>
<listitem> <listitem>
<para>A set of info nodes (from a <sgmltag>refentry</sgmltag> <para>A set of info nodes (from a <tag>refentry</tag>
element and its ancestors)</para> element and its ancestors)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -795,13 +784,13 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>info</term> <term>info</term>
<listitem> <listitem>
<para>A set of info nodes (from a <sgmltag>refentry</sgmltag> <para>A set of info nodes (from a <tag>refentry</tag>
element and its ancestors)</para> element and its ancestors)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -981,13 +970,13 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>info</term> <term>info</term>
<listitem> <listitem>
<para>A set of info nodes (from a <sgmltag>refentry</sgmltag> <para>A set of info nodes (from a <tag>refentry</tag>
element and its ancestors)</para> element and its ancestors)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -1001,7 +990,7 @@
</variablelist> </variablelist>
</refparameter> </refparameter>
<refreturn id="get.refentry.manual-returns"> <refreturn id="get.refentry.manual-returns">
<para>Returns a <sgmltag>manual</sgmltag> node.</para> <para>Returns a <tag>manual</tag> node.</para>
</refreturn> </refreturn>
</doc:template> </doc:template>
<xsl:template name="get.refentry.manual"> <xsl:template name="get.refentry.manual">
@ -1140,25 +1129,25 @@
<refpurpose>Gets user preferences for refentry metadata gathering</refpurpose> <refpurpose>Gets user preferences for refentry metadata gathering</refpurpose>
<refdescription id="get.refentry.metadata.prefs-desc"> <refdescription id="get.refentry.metadata.prefs-desc">
<para>The DocBook XSL stylesheets include several user-configurable <para>The DocBook XSL stylesheets include several user-configurable
global stylesheet parameters for controlling <sgmltag>refentry</sgmltag> global stylesheet parameters for controlling <tag>refentry</tag>
metadata gathering. Those parameters are not read directly by the metadata gathering. Those parameters are not read directly by the
other <sgmltag>refentry</sgmltag> metadata-gathering other <tag>refentry</tag> metadata-gathering
templates. Instead, they are read only by the templates. Instead, they are read only by the
<function>get.refentry.metadata.prefs</function> template, <function>get.refentry.metadata.prefs</function> template,
which assembles them into a structure that is then passed to which assembles them into a structure that is then passed to
the other <sgmltag>refentry</sgmltag> metadata-gathering the other <tag>refentry</tag> metadata-gathering
templates.</para> templates.</para>
<para>So the, <function>get.refentry.metadata.prefs</function> <para>So the, <function>get.refentry.metadata.prefs</function>
template is the only interface to collecting stylesheet parameters for template is the only interface to collecting stylesheet parameters for
controlling <sgmltag>refentry</sgmltag> metadata gathering.</para> controlling <tag>refentry</tag> metadata gathering.</para>
</refdescription> </refdescription>
<refparameter id="get.refentry.metadata.prefs-params"> <refparameter id="get.refentry.metadata.prefs-params">
<para>There are no local parameters for this template; however, it <para>There are no local parameters for this template; however, it
does rely on a number of global parameters.</para> does rely on a number of global parameters.</para>
</refparameter> </refparameter>
<refreturn id="get.refentry.metadata.prefs-returns"> <refreturn id="get.refentry.metadata.prefs-returns">
<para>Returns a <sgmltag>manual</sgmltag> node.</para> <para>Returns a <tag>manual</tag> node.</para>
</refreturn> </refreturn>
</doc:template> </doc:template>
<xsl:template name="get.refentry.metadata.prefs"> <xsl:template name="get.refentry.metadata.prefs">
@ -1223,7 +1212,7 @@
<varlistentry> <varlistentry>
<term>refname</term> <term>refname</term>
<listitem> <listitem>
<para>The first <sgmltag>refname</sgmltag> in the refentry</para> <para>The first <tag>refname</tag> in the refentry</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

View File

@ -124,17 +124,17 @@
<doc:template name="entry.colnum" xmlns=""> <doc:template name="entry.colnum" xmlns="">
<refpurpose>Determine the column number in which a given entry occurs</refpurpose> <refpurpose>Determine the column number in which a given entry occurs</refpurpose>
<refdescription id="entry.colnum-desc"> <refdescription id="entry.colnum-desc">
<para>If an <sgmltag>entry</sgmltag> has a <para>If an <tag>entry</tag> has a
<sgmltag class="attribute">colname</sgmltag> or <tag class="attribute">colname</tag> or
<sgmltag class="attribute">namest</sgmltag> attribute, this template <tag class="attribute">namest</tag> attribute, this template
will determine the number of the column in which the entry should occur. will determine the number of the column in which the entry should occur.
For other <sgmltag>entry</sgmltag>s, nothing is returned.</para> For other <tag>entry</tag>s, nothing is returned.</para>
</refdescription> </refdescription>
<refparameter id="entry.colnum-params"> <refparameter id="entry.colnum-params">
<variablelist> <variablelist>
<varlistentry><term>entry</term> <varlistentry><term>entry</term>
<listitem> <listitem>
<para>The <sgmltag>entry</sgmltag>-element which is to be tested.</para> <para>The <tag>entry</tag>-element which is to be tested.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

View File

@ -3,6 +3,7 @@
xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
xmlns:dyn="http://exslt.org/dynamic" xmlns:dyn="http://exslt.org/dynamic"
xmlns:saxon="http://icl.com/saxon" xmlns:saxon="http://icl.com/saxon"
xmlns:xlink="http://www.w3.org/1999/xlink"
exclude-result-prefixes="doc dyn saxon" exclude-result-prefixes="doc dyn saxon"
version='1.0'> version='1.0'>
@ -15,26 +16,19 @@
copyright and other information. copyright and other information.
******************************************************************** --> ******************************************************************** -->
<doc:reference xmlns="" xml:id="utility">
<doc:reference xmlns=""> <info>
<referenceinfo> <title>Common » Utility Template Reference</title>
<releaseinfo role="meta"> <releaseinfo role="meta">
$Id$ $Id$
</releaseinfo> </releaseinfo>
<corpauthor>The DocBook Project Development Team</corpauthor> </info>
<copyright><year>2007</year> <!-- * yes, partintro is a valid child of a reference... -->
<holder>The DocBook Project</holder> <partintro xml:id="partintro">
</copyright>
</referenceinfo>
<title>Utility Template Reference</title>
<partintro id="partintro">
<title>Introduction</title> <title>Introduction</title>
<para>This is technical reference documentation for the <para>This is technical reference documentation for the
miscellaneous utility templates in the DocBook XSL miscellaneous utility templates in the DocBook XSL
Stylesheets.</para> Stylesheets.</para>
<note> <note>
<para>These templates are defined in a separate file from the set <para>These templates are defined in a separate file from the set
of “common” templates because some of the comment templates of “common” templates because some of the comment templates
@ -45,11 +39,9 @@ $Id$
XSL stylesheet parameters, so the utility templates can be used XSL stylesheet parameters, so the utility templates can be used
without importing the whole set of parameters.</para> without importing the whole set of parameters.</para>
</note> </note>
<para>This is not intended to be user documentation. It is
<para>The following documentation is not intended to be provided for developers writing customization layers for the
<quote>user</quote> documentation. It is provided for developers stylesheets.</para>
writing customization layers for the stylesheets, and for anyone
who's interested in <quote>how it works</quote>.</para>
</partintro> </partintro>
</doc:reference> </doc:reference>
@ -67,8 +59,7 @@ $Id$
<refparameter id="log.message-params"> <refparameter id="log.message-params">
<variablelist> <variablelist>
<varlistentry> <varlistentry><term>level</term>
<term>level</term>
<listitem> <listitem>
<para>Text to log/emit in the message-level field to <para>Text to log/emit in the message-level field to
indicate the message level indicate the message level
@ -76,8 +67,7 @@ $Id$
<literal>Warning</literal>)</para> <literal>Warning</literal>)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry><term>source</term>
<term>source</term>
<listitem> <listitem>
<para>Text to log/emit in the source field to identify the <para>Text to log/emit in the source field to identify the
“source” to which the notification/warning relates. “source” to which the notification/warning relates.
@ -96,15 +86,13 @@ $Id$
XPath expression.</para> XPath expression.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry><term>context-desc</term>
<term>context-desc</term>
<listitem> <listitem>
<para>Text to log/emit in the context-description field to <para>Text to log/emit in the context-description field to
describe the context for the message.</para> describe the context for the message.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry><term>context-desc-field-length</term>
<term>context-desc-field-length</term>
<listitem> <listitem>
<para>Specifies length of the context-description field <para>Specifies length of the context-description field
(in characters); default is 12</para> (in characters); default is 12</para>
@ -126,14 +114,12 @@ $Id$
parameter.</para> parameter.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry><term>message</term>
<term>message</term>
<listitem> <listitem>
<para>Text to log/emit in the actual message field</para> <para>Text to log/emit in the actual message field</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry><term>message-field-length</term>
<term>message-field-length</term>
<listitem> <listitem>
<para>Specifies length of the message <para>Specifies length of the message
field (in characters); default is 45</para> field (in characters); default is 45</para>
@ -255,11 +241,11 @@ $Id$
character).</para> character).</para>
<note> <note>
<para>This function began as a copy of Nate Austin's <para>This function began as a copy of Nate Austin's
<function>prepend-pad</function> function in the <ulink <function>prepend-pad</function> function in the <link
url="http://www.dpawson.co.uk/xsl/sect2/padding.html" >Padding xlink:href="http://www.dpawson.co.uk/xsl/sect2/padding.html" >Padding
Content</ulink> section of Dave Pawson's <ulink Content</link> section of Dave Pawson's <link
url="http://www.dpawson.co.uk/xsl/index.html" >XSLT xlink:href="http://www.dpawson.co.uk/xsl/index.html" >XSLT
FAQ</ulink>.</para> FAQ</link>.</para>
</note> </note>
</refdescription> </refdescription>
<refreturn id="pad-string-returns"> <refreturn id="pad-string-returns">

View File

@ -19,6 +19,13 @@
<!-- copyright and other information. --> <!-- copyright and other information. -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<!-- In these files, % with a letter is used for a placeholder: -->
<!-- %t is the current element's title -->
<!-- %s is the current element's subtitle (if applicable)-->
<!-- %n is the current element's number label-->
<!-- %p is the current element's page number (if applicable)-->
<!-- ******************************************************************** -->
<l:gentext key="Abstract" text="摘要"/> <l:gentext key="Abstract" text="摘要"/>
<l:gentext key="abstract" text="摘要"/> <l:gentext key="abstract" text="摘要"/>

View File

@ -19,6 +19,13 @@
<!-- copyright and other information. --> <!-- copyright and other information. -->
<!-- ******************************************************************** --> <!-- ******************************************************************** -->
<!-- In these files, % with a letter is used for a placeholder: -->
<!-- %t is the current element's title -->
<!-- %s is the current element's subtitle (if applicable)-->
<!-- %n is the current element's number label-->
<!-- %p is the current element's page number (if applicable)-->
<!-- ******************************************************************** -->
<l:gentext key="Abstract" text="摘要"/> <l:gentext key="Abstract" text="摘要"/>
<l:gentext key="abstract" text="摘要"/> <l:gentext key="abstract" text="摘要"/>

View File

@ -713,31 +713,46 @@
</xsl:param> </xsl:param>
<xsl:param name="element" select="local-name(.)"/> <xsl:param name="element" select="local-name(.)"/>
<xsl:param name="gentext-key" select="local-name(.)"/> <xsl:param name="gentext-key" select="local-name(.)"/>
<xsl:param name="language">
<fo:page-sequence hyphenate="{$hyphenate}"
master-reference="{$master-reference}">
<xsl:attribute name="language">
<xsl:call-template name="l10n.language"/> <xsl:call-template name="l10n.language"/>
</xsl:attribute> </xsl:param>
<xsl:attribute name="format">
<xsl:param name="format">
<xsl:call-template name="page.number.format"> <xsl:call-template name="page.number.format">
<xsl:with-param name="master-reference" select="$master-reference"/> <xsl:with-param name="master-reference" select="$master-reference"/>
<xsl:with-param name="element" select="$element"/> <xsl:with-param name="element" select="$element"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:param>
<xsl:attribute name="initial-page-number"> <xsl:param name="initial-page-number">
<xsl:call-template name="initial.page.number"> <xsl:call-template name="initial.page.number">
<xsl:with-param name="master-reference" select="$master-reference"/> <xsl:with-param name="master-reference" select="$master-reference"/>
<xsl:with-param name="element" select="$element"/> <xsl:with-param name="element" select="$element"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:param>
<xsl:attribute name="force-page-count"> <xsl:param name="force-page-count">
<xsl:call-template name="force.page.count"> <xsl:call-template name="force.page.count">
<xsl:with-param name="master-reference" select="$master-reference"/> <xsl:with-param name="master-reference" select="$master-reference"/>
<xsl:with-param name="element" select="$element"/> <xsl:with-param name="element" select="$element"/>
</xsl:call-template> </xsl:call-template>
</xsl:param>
<fo:page-sequence hyphenate="{$hyphenate}"
master-reference="{$master-reference}">
<xsl:attribute name="language">
<xsl:value-of select="$language"/>
</xsl:attribute>
<xsl:attribute name="format">
<xsl:value-of select="$format"/>
</xsl:attribute>
<xsl:attribute name="initial-page-number">
<xsl:value-of select="$initial-page-number"/>
</xsl:attribute>
<xsl:attribute name="force-page-count">
<xsl:value-of select="$force-page-count"/>
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="hyphenation-character"> <xsl:attribute name="hyphenation-character">

View File

@ -1271,5 +1271,17 @@
<!-- ==================================================================== --> <!-- ==================================================================== -->
</xsl:stylesheet> <xsl:template name="orderedlist-starting-number">
<xsl:param name="list" select="."/>
<xsl:variable name="pi-start">
<xsl:call-template name="pi.dbfo_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>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?> <?xml version="1.0" encoding="ASCII"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 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">
<!-- This file is generated from param.xweb --> <!-- This file is generated from param.xweb -->

View File

@ -1,7 +1,9 @@
<?xml version='1.0'?> <?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:fo="http://www.w3.org/1999/XSL/Format"
xmlns:xlink="http://www.w3.org/1999/xlink"
exclude-result-prefixes="doc" exclude-result-prefixes="doc"
version='1.0'> version='1.0'>
@ -15,28 +17,17 @@
******************************************************************** --> ******************************************************************** -->
<doc:reference xmlns=""> <doc:reference xmlns=""><info><title>FO Processing Instruction Reference</title>
<referenceinfo>
<releaseinfo role="meta"> <releaseinfo role="meta">
$Id$ $Id$
</releaseinfo> </releaseinfo>
<authorgroup> </info>
<author>
<orgname>The DocBook Project Development Team</orgname>
</author>
</authorgroup>
<copyright>
<year>2007</year>
<holder>The DocBook Project</holder>
</copyright>
</referenceinfo>
<title>FO Processing Instruction Reference</title>
<partintro id="partintro"> <partintro id="partintro">
<title>Introduction</title> <title>Introduction</title>
<para>This is generated reference documentation for all <para>This is generated reference documentation for all
user-configurable processing instructions (PIs) in the DocBook user-specifiable processing instructions (PIs) in the DocBook
XSL stylesheets for FO output. XSL stylesheets for FO output.
<note> <note>
<para>You add these PIs at particular points in a document to <para>You add these PIs at particular points in a document to
@ -67,11 +58,16 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>background-color="<replaceable>color</replaceable>"</term> <varlistentry><term>background-color="<replaceable>color</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: A color value? [In hex, as a name, or what?]</para> <para>An HTML color value</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="BGcolor.html"
>Background color</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_background-color"> <xsl:template name="pi.dbfo_background-color">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -82,7 +78,7 @@ $Id$
</xsl:template> </xsl:template>
<doc:pi name="dbfo_bgcolor" xmlns=""> <doc:pi name="dbfo_bgcolor" xmlns="">
<refpurpose>Sets background color on an table row or table cell</refpurpose> <refpurpose>Sets background color on a table row or table cell</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo bgcolor</tag> PI as child of a table row <para>Use the <tag>dbfo bgcolor</tag> PI as child of a table row
or cell to set a background color for that table row or cell.</para> or cell to set a background color for that table row or cell.</para>
@ -94,11 +90,16 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term> <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: A color value? [In hex, as a name, or what?]</para> <para>An HTML color value</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="BGtableColor.html#CellBGColor"
>Cell background color</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_bgcolor"> <xsl:template name="pi.dbfo_bgcolor">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -128,6 +129,17 @@ $Id$
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>sidebar.float.type parameter</parameter>,
<parameter>sidebar.float.width parameter</parameter>,
<parameter>sidebar.properties attribute-set</parameter>,
<parameter>sidebar.title.properties</parameter>
</para>
</refsee>
<refsee role="tcg">
<para><link xlink:href="SideFloats.html#SidebarFloats" >A sidebar as
side float</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_float-type"> <xsl:template name="pi.dbfo_float-type">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -150,7 +162,7 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>glossary-presentation="list"</term> <varlistentry><term>glossary-presentation="list"</term>
<listitem> <listitem>
<para>Displayed the glossary as a list</para> <para>Displays the glossary as a list</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>glossary-presentation="blocks"</term> <varlistentry><term>glossary-presentation="blocks"</term>
@ -160,6 +172,13 @@ $Id$
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>glossary.as.blocks</parameter></para>
</refsee>
<refsee role="tcg">
<para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
formatting in print</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_glossary-presentation"> <xsl:template name="pi.dbfo_glossary-presentation">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -182,7 +201,7 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>glosslist-presentation="list"</term> <varlistentry><term>glosslist-presentation="list"</term>
<listitem> <listitem>
<para>Displayed the glosslist as a list</para> <para>Displays the glosslist as a list</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>glosslist-presentation="blocks"</term> <varlistentry><term>glosslist-presentation="blocks"</term>
@ -192,6 +211,13 @@ $Id$
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>glosslist.as.blocks</parameter> </para>
</refsee>
<refsee role="tcg">
<para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
formatting in print</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_glosslist-presentation"> <xsl:template name="pi.dbfo_glosslist-presentation">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -217,11 +243,20 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>glossterm-width="<replaceable>width</replaceable>"</term> <varlistentry><term>glossterm-width="<replaceable>width</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the glossterm width (in what units?)</para> <para>Specifies the glossterm width (including units)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>glossterm.width</parameter>,
<parameter>glossterm.separation</parameter>
</para>
</refsee>
<refsee role="tcg">
<para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
formatting in print</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_glossterm-width"> <xsl:template name="pi.dbfo_glossterm-width">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -259,6 +294,13 @@ $Id$
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para>formal.object.properties</para>
</refsee>
<refsee role="tcg">
<para><link xlink:href="PageBreaking.html#KeepTogetherPI"
>Keep-together processing instruction</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_keep-together"> <xsl:template name="pi.dbfo_keep-together">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -269,11 +311,9 @@ $Id$
</xsl:template> </xsl:template>
<doc:pi name="dbfo_label-width" xmlns=""> <doc:pi name="dbfo_label-width" xmlns="">
<refpurpose>Specifies the label width for an itemizedlist, <refpurpose>Specifies the label width for a qandaset</refpurpose>
orderedlist, or qandaset</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo label-width</tag> PI as a child of an <para>Use the <tag>dbfo label-width</tag> PI as a child of a
<tag>itemizedlist</tag>, <tag>orderedlist</tag>, or
<tag>qandaset</tag> to specify the width of labels.</para> <tag>qandaset</tag> to specify the width of labels.</para>
</refdescription> </refdescription>
<refsynopsisdiv> <refsynopsisdiv>
@ -283,11 +323,16 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>label-width="<replaceable>width</replaceable>"</term> <varlistentry><term>label-width="<replaceable>width</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the label width (in what units?)</para> <para>Specifies the label width (including units)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="QandAformat.html"
>Q and A formatting</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_label-width"> <xsl:template name="pi.dbfo_label-width">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -298,8 +343,7 @@ $Id$
</xsl:template> </xsl:template>
<doc:pi name="dbfo_linenumbering.everyNth" xmlns=""> <doc:pi name="dbfo_linenumbering.everyNth" xmlns="">
<refpurpose>Specifies the interval at which lines are numbered <refpurpose>Specifies interval for lines numbers in verbatims</refpurpose>
output of verbatim environments</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo linenumbering.everyNth</tag> PI as a child <para>Use the <tag>dbfo linenumbering.everyNth</tag> PI as a child
of a “verbatim” element <tag>programlisting</tag>, of a “verbatim” element <tag>programlisting</tag>,
@ -313,25 +357,31 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term> <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies numbering interval; a number is <para>Specifies numbering interval; a number is output
output before every <replaceable>N</replaceable>th line</para> before every <replaceable>N</replaceable>th line</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>linenumbering.everyNth</parameter></para>
</refsee>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="AnnotateListing.html#LineNumbering"
>Line numbering</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_linenumbering.everyNth"> <xsl:template name="pi.dbfo_linenumbering.everyNth">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
<xsl:call-template name="dbfo-attribute"> <xsl:call-template name="dbfo-attribute">
<xsl:with-param name="pis" <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
select="$node/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'linenumbering.everyNth'"/> <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<doc:pi name="dbfo_linenumbering.separator" xmlns=""> <doc:pi name="dbfo_linenumbering.separator" xmlns="">
<refpurpose>Specifies the separator text used between line numbers <refpurpose>Specifies separator text for line numbers in verbatims</refpurpose>
and content in output of verbatim environments</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo linenumbering.separator</tag> PI as a child <para>Use the <tag>dbfo linenumbering.separator</tag> PI as a child
of a “verbatim” element <tag>programlisting</tag>, of a “verbatim” element <tag>programlisting</tag>,
@ -345,24 +395,30 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term> <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the text (zero or more characters)</para> <para>Specifies the text (zero or more characters)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>linenumbering.separator</parameter></para>
</refsee>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="AnnotateListing.html#LineNumbering"
>Line numbering</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_linenumbering.separator"> <xsl:template name="pi.dbfo_linenumbering.separator">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
<xsl:call-template name="dbfo-attribute"> <xsl:call-template name="dbfo-attribute">
<xsl:with-param name="pis" <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
select="$node/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'linenumbering.separator'"/> <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<doc:pi name="dbfo_linenumbering.width" xmlns=""> <doc:pi name="dbfo_linenumbering.width" xmlns="">
<refpurpose>Specifies the width set aside for line numbers in <refpurpose>Specifies width for line numbers in verbatims</refpurpose>
output of verbatim environments</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo linenumbering.width</tag> PI as a child <para>Use the <tag>dbfo linenumbering.width</tag> PI as a child
of a “verbatim” element <tag>programlisting</tag>, of a “verbatim” element <tag>programlisting</tag>,
@ -376,47 +432,25 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term> <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the width (in what units?)</para> <para>Specifies the width (inluding units)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>linenumbering.width</parameter></para>
</refsee>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="AnnotateListing.html#LineNumbering"
>Line numbering</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_linenumbering.width"> <xsl:template name="pi.dbfo_linenumbering.width">
<xsl:param name="node" select="."/>
<xsl:call-template name="dbfo-attribute">
<xsl:with-param name="pis"
select="$node/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'linenumbering.width'"/>
</xsl:call-template>
</xsl:template>
<doc:pi name="dbfo_list-width" xmlns="">
<refpurpose>Specifies the width of a horizontal simplelist</refpurpose>
<refdescription>
<para>Use the <tag>dbfo list-width</tag> PI as a child of a
<tag>simplelist</tag> whose <tag class="attribute">class</tag>
value is <literal>horizontal</literal>, to specify the width
of the <tag>simplelist</tag>.</para>
</refdescription>
<refsynopsisdiv>
<synopsis><tag class="xmlpi">dbfo list-width="<replaceable>width</replaceable>"</tag></synopsis>
</refsynopsisdiv>
<refparameter>
<variablelist>
<varlistentry><term>list-width="<replaceable>width</replaceable>"</term>
<listitem>
<para>FIXME: Specifies the <tag>simplelist</tag> width (in what units?)</para>
</listitem>
</varlistentry>
</variablelist>
</refparameter>
</doc:pi>
<xsl:template name="pi.dbfo_list-width">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
<xsl:call-template name="dbfo-attribute"> <xsl:call-template name="dbfo-attribute">
<xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/> <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'list-width'"/> <xsl:with-param name="attribute" select="'linenumbering.width'"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
@ -436,7 +470,7 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>list-presentation="list"</term> <varlistentry><term>list-presentation="list"</term>
<listitem> <listitem>
<para>Displayed the list as a list</para> <para>Displays the list as a list</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>list-presentation="blocks"</term> <varlistentry><term>list-presentation="blocks"</term>
@ -451,6 +485,21 @@ $Id$
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<itemizedlist>
<listitem>
<para><parameter>variablelist.as.blocks</parameter></para>
</listitem>
<listitem>
<para><parameter>variablelist.as.table</parameter></para>
</listitem>
</itemizedlist>
</refsee>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="Variablelists.html#ListIndents"
>Variable list formatting in print</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_list-presentation"> <xsl:template name="pi.dbfo_list-presentation">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -460,6 +509,35 @@ $Id$
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<doc:pi name="dbfo_list-width" xmlns="">
<refpurpose>Specifies the width of a horizontal simplelist</refpurpose>
<refdescription>
<para>Use the <tag>dbfo list-width</tag> PI as a child of a
<tag>simplelist</tag> whose <tag class="attribute">class</tag>
value is <literal>horizontal</literal>, to specify the width
of the <tag>simplelist</tag>.</para>
</refdescription>
<refsynopsisdiv>
<synopsis><tag class="xmlpi">dbfo list-width="<replaceable>width</replaceable>"</tag></synopsis>
</refsynopsisdiv>
<refparameter>
<variablelist>
<varlistentry><term>list-width="<replaceable>width</replaceable>"</term>
<listitem>
<para>Specifies the <tag>simplelist</tag> width (including units)</para>
</listitem>
</varlistentry>
</variablelist>
</refparameter>
</doc:pi>
<xsl:template name="pi.dbfo_list-width">
<xsl:param name="node" select="."/>
<xsl:call-template name="dbfo-attribute">
<xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'list-width'"/>
</xsl:call-template>
</xsl:template>
<doc:pi name="dbfo_orientation" xmlns=""> <doc:pi name="dbfo_orientation" xmlns="">
<refpurpose>Specifies the orientation for table row or cell</refpurpose> <refpurpose>Specifies the orientation for table row or cell</refpurpose>
<refdescription> <refdescription>
@ -490,9 +568,7 @@ $Id$
</xsl:template> </xsl:template>
<doc:pi name="dbfo_pgwide" xmlns=""> <doc:pi name="dbfo_pgwide" xmlns="">
<refpurpose>Species whether an <tag>equation</tag> or <refpurpose>Specifies if an <tag>equation</tag> or <tag>example</tag> goes across full page width</refpurpose>
<tag>example</tag> should rendered across the full width of a
page</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo pgwide</tag> PI as a child of an <para>Use the <tag>dbfo pgwide</tag> PI as a child of an
<tag>equation</tag> or <tag>example</tag> to specify that the <tag>equation</tag> or <tag>example</tag> to specify that the
@ -517,6 +593,9 @@ $Id$
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>pgwide.properties</parameter></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_pgwide"> <xsl:template name="pi.dbfo_pgwide">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -543,7 +622,7 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>rotated-width="<replaceable>width</replaceable>"</term> <varlistentry><term>rotated-width="<replaceable>width</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the width of a row or cell (in what units?)</para> <para>Specifies the width of a row or cell (including units)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
@ -552,8 +631,7 @@ $Id$
<xsl:template name="pi.dbfo_rotated-width"> <xsl:template name="pi.dbfo_rotated-width">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
<xsl:call-template name="dbfo-attribute"> <xsl:call-template name="dbfo-attribute">
<xsl:with-param name="pis" <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
select="$node/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'rotated-width'"/> <xsl:with-param name="attribute" select="'rotated-width'"/>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
@ -571,11 +649,22 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>sidebar-width="<replaceable>width</replaceable>"</term> <varlistentry><term>sidebar-width="<replaceable>width</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the <tag>sidebar</tag> width (in what units?)</para> <para>Specifies the <tag>sidebar</tag> width (including units)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="params">
<para><parameter>sidebar.float.type parameter</parameter>,
<parameter>sidebar.float.width parameter</parameter>,
<parameter>sidebar.properties attribute-set</parameter>,
<parameter>sidebar.title.properties</parameter>
</para>
</refsee>
<refsee role="tcg">
<para><link xlink:href="SideFloats.html#SidebarFloats" >A sidebar as
side float</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_sidebar-width"> <xsl:template name="pi.dbfo_sidebar-width">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -585,14 +674,53 @@ $Id$
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<doc:pi name="dbfo_start" xmlns="">
<refpurpose>(obsolete) Sets the starting number on an ordered list</refpurpose>
<refdescription>
<para><emphasis>This PI is obsolete</emphasis>. The intent of
it 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>
<synopsis><tag class="xmlpi">dbfo start="<replaceable>character</replaceable>"</tag></synopsis>
</refsynopsisdiv>
<refparameter>
<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 role="tcg">
<para><link role="tcg"
xlink:href="Orderedlists.html#ListStartNum"
>List starting number</link></para>
</refsee>
</doc:pi>
<xsl:template name="pi.dbfo_start">
<xsl:param name="node" select="."/>
<xsl:call-template name="pi-attribute">
<xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
<xsl:with-param name="attribute" select="'start'"/>
</xsl:call-template>
</xsl:template>
<doc:pi name="dbfo_table-width" xmlns=""> <doc:pi name="dbfo_table-width" xmlns="">
<refpurpose>Specifies the width for a table or for revhistory <refpurpose>Specifies the width for a table or for revhistory
output</refpurpose> output</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo table-width</tag> PI as a child of a <para>Use the <tag>dbfo table-width</tag> PI as a child or
<tag>table</tag> or <tag>revhistory</tag> instance (which is sibling of a <tag>table</tag>, or as a child of an
rendered as a table in output) to specify the width of the <tag>informaltable</tag>, <tag>entrybl</tag>, or
table in output.</para> <tag>revhistory</tag> instance (which is rendered as a table
in output) to specify the width of the table in output.</para>
</refdescription> </refdescription>
<refsynopsisdiv> <refsynopsisdiv>
<synopsis><tag class="xmlpi">dbfo table-width="<replaceable>width</replaceable>"</tag></synopsis> <synopsis><tag class="xmlpi">dbfo table-width="<replaceable>width</replaceable>"</tag></synopsis>
@ -601,11 +729,16 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>table-width="<replaceable>width</replaceable>"</term> <varlistentry><term>table-width="<replaceable>width</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the table width (in what units?)</para> <para>Specifies the table width (including units or as a percentage)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="Tables.html#TableWidth"
>Table width</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_table-width"> <xsl:template name="pi.dbfo_table-width">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -629,11 +762,16 @@ $Id$
<variablelist> <variablelist>
<varlistentry><term>term-width="<replaceable>width</replaceable>"</term> <varlistentry><term>term-width="<replaceable>width</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: Specifies the term width (in what units?)</para> <para>Specifies the term width (including units)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="Variablelists.html#ListIndents"
>Variable list formatting in print</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo_term-width"> <xsl:template name="pi.dbfo_term-width">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -647,7 +785,7 @@ $Id$
<refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose> <refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose>
<refdescription> <refdescription>
<para>Use the <tag>dbfo toc</tag> PI as a child of a <para>Use the <tag>dbfo toc</tag> PI as a child of a
<tag>jandaset</tag> to specify whether a table of contents <tag>qandaset</tag> to specify whether a table of contents
(TOC) is generated for the <tag>qandaset</tag>.</para> (TOC) is generated for the <tag>qandaset</tag>.</para>
</refdescription> </refdescription>
<refsynopsisdiv> <refsynopsisdiv>
@ -668,6 +806,14 @@ $Id$
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee 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> </doc:pi>
<xsl:template name="pi.dbfo_toc"> <xsl:template name="pi.dbfo_toc">
<xsl:param name="node" select="."/> <xsl:param name="node" select="."/>
@ -677,36 +823,37 @@ $Id$
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
<!-- ==================================================================== -->
<doc:pi name="dbfo-need" xmlns=""> <doc:pi name="dbfo-need" xmlns="">
<refpurpose>Specify a need for space (a kind of soft page break)</refpurpose> <refpurpose>Specify a need for space (a kind of soft page break)</refpurpose>
<refdescription> <refdescription>
<para>A “need” is a request for space on a page. If the <para>A “need” is a request for space on a page. If the
requested space is not available, the page breaks and the requested space is not available, the page breaks and the
content that follows the need request appears on the next content that follows the need request appears on the next
page. If the requested space is available, then the request is page. If the requested space is available, then no page break
ignored.</para> is inserted.</para>
</refdescription> </refdescription>
<refsynopsisdiv> <refsynopsisdiv>
<synopsis><tag class="xmlpi">dbfo-need height="<replaceable>n</replaceable>"</tag></synopsis> <synopsis><tag class="xmlpi">dbfo-need height="<replaceable>n</replaceable>" [space-before="<replaceable>n</replaceable>"]</tag></synopsis>
<synopsis><tag class="xmlpi">dbfo-need space-before="<replaceable>n</replaceable>"</tag></synopsis>
</refsynopsisdiv> </refsynopsisdiv>
<refparameter> <refparameter>
<variablelist> <variablelist>
<varlistentry><term>height="<replaceable>n</replaceable>"</term> <varlistentry><term>height="<replaceable>n</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: the amount of height(?) needed? In what units? pt?.</para> <para>The amount of height needed (including units)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry><term>space-before"<replaceable>n</replaceable>"</term> <varlistentry><term>space-before"<replaceable>n</replaceable>"</term>
<listitem> <listitem>
<para>FIXME: the amount of space needed before the <para>The amount of extra vertical space to add (including units)</para>
[something]? In what units? pt?.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</refparameter> </refparameter>
<refsee role="tcg">
<para><link role="tcg"
xlink:href="PageBreaking.html#SoftPageBreaks"
>Soft page breaks</link></para>
</refsee>
</doc:pi> </doc:pi>
<xsl:template name="pi.dbfo-need"> <xsl:template name="pi.dbfo-need">
<xsl:variable name="pi-height"> <xsl:variable name="pi-height">
@ -848,6 +995,7 @@ $Id$
</xsl:template> </xsl:template>
<!-- ==================================================================== --> <!-- ==================================================================== -->
<xsl:template match="processing-instruction()"> <xsl:template match="processing-instruction()">
</xsl:template> </xsl:template>

View File

@ -22,30 +22,21 @@
******************************************************************** --> ******************************************************************** -->
<doc:reference xmlns=""> <doc:reference xmlns="" xml:id="table-templates">
<referenceinfo> <?dbhtml dir="fo"?>
<info>
<title>Formatting Object Table Reference</title>
<releaseinfo role="meta"> <releaseinfo role="meta">
$Id$ $Id$
</releaseinfo> </releaseinfo>
<author><surname>Walsh</surname> </info>
<firstname>Norman</firstname></author> <partintro xml:id="partintro">
<copyright><year>1999</year><year>2000</year>
<holder>Norman Walsh</holder>
</copyright>
</referenceinfo>
<title>Formatting Object Table Reference</title>
<partintro id="partintro">
<title>Introduction</title> <title>Introduction</title>
<para>This is technical reference documentation for the FO <para>This is technical reference documentation for the FO
table-processing templates in the DocBook XSL Stylesheets.</para> table-processing templates in the DocBook XSL Stylesheets.</para>
<para>This is not intended to be user documentation. It is
<para>This is not intended to be <quote>user</quote> documentation. provided for developers writing customization layers for the
It is provided for developers writing customization layers for the stylesheets.</para>
stylesheets, and for anyone who's interested in <quote>how it
works</quote>.</para>
</partintro> </partintro>
</doc:reference> </doc:reference>

View File

@ -350,7 +350,8 @@
<xsl:template match="node()|@*" mode="hyphenate.verbatim"> <xsl:template match="node()|@*" mode="hyphenate.verbatim">
<xsl:copy> <xsl:copy>
<xsl:apply-templates select="node()|@*" mode="hyphenate.verbatim"/> <xsl:copy-of select="@*"/>
<xsl:apply-templates mode="hyphenate.verbatim"/>
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>

View File

@ -718,6 +718,17 @@
<xsl:apply-templates select="." mode="callout-bug"/> <xsl:apply-templates select="." mode="callout-bug"/>
</xsl:template> </xsl:template>
<xsl:template match="area|areaset" mode="xref-to">
<xsl:param name="referrer"/>
<xsl:param name="xrefstyle"/>
<xsl:call-template name="callout-bug">
<xsl:with-param name="conum">
<xsl:apply-templates select="." mode="conumber"/>
</xsl:with-param>
</xsl:call-template>
</xsl:template>
<xsl:template match="book" mode="xref-to"> <xsl:template match="book" mode="xref-to">
<xsl:param name="referrer"/> <xsl:param name="referrer"/>
<xsl:param name="xrefstyle"/> <xsl:param name="xrefstyle"/>

View File

@ -1,5 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="ASCII"?>
<!-- ******************************************************************** <!-- ********************************************************************
$Id$ $Id$
******************************************************************** ********************************************************************
@ -11,9 +10,7 @@
This module implements DTD-independent functions This module implements DTD-independent functions
******************************************************************** --> ******************************************************************** -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:ssb="http://sideshowbarker.net/ns" xmlns:dyn="http://exslt.org/dynamic" 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">
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:dyn="http://exslt.org/dynamic" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0">
<xsl:template name="dot.count"> <xsl:template name="dot.count">
<!-- Returns the number of "." characters in a string --> <!-- Returns the number of "." characters in a string -->
@ -312,7 +309,6 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template name="str.tokenize.keep.delimiters"> <xsl:template name="str.tokenize.keep.delimiters">
<xsl:param name="string" select="''"/> <xsl:param name="string" select="''"/>
<xsl:param name="delimiters" select="' '"/> <xsl:param name="delimiters" select="' '"/>
@ -331,24 +327,22 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template name="str.tokenize.keep.delimiters-characters"> <xsl:template name="str.tokenize.keep.delimiters-characters">
<xsl:param name="string"/> <xsl:param name="string"/>
<xsl:if test="$string"> <xsl:if test="$string">
<token><xsl:value-of select="substring($string, 1, 1)"/></token> <ssb:token><xsl:value-of select="substring($string, 1, 1)"/></ssb:token>
<xsl:call-template name="str.tokenize.keep.delimiters-characters"> <xsl:call-template name="str.tokenize.keep.delimiters-characters">
<xsl:with-param name="string" select="substring($string, 2)"/> <xsl:with-param name="string" select="substring($string, 2)"/>
</xsl:call-template> </xsl:call-template>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
<xsl:template name="str.tokenize.keep.delimiters-delimiters"> <xsl:template name="str.tokenize.keep.delimiters-delimiters">
<xsl:param name="string"/> <xsl:param name="string"/>
<xsl:param name="delimiters"/> <xsl:param name="delimiters"/>
<xsl:variable name="delimiter" select="substring($delimiters, 1, 1)"/> <xsl:variable name="delimiter" select="substring($delimiters, 1, 1)"/>
<xsl:choose> <xsl:choose>
<xsl:when test="not($delimiter)"> <xsl:when test="not($delimiter)">
<token><xsl:value-of select="$string"/></token> <ssb:token><xsl:value-of select="$string"/></ssb:token>
</xsl:when> </xsl:when>
<xsl:when test="contains($string, $delimiter)"> <xsl:when test="contains($string, $delimiter)">
<xsl:if test="not(starts-with($string, $delimiter))"> <xsl:if test="not(starts-with($string, $delimiter))">

View File

@ -113,12 +113,12 @@
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="$admon.textlabel != 0 or title or info/title">
<h3 class="title"> <h3 class="title">
<xsl:call-template name="anchor"/> <xsl:call-template name="anchor"/>
<xsl:if test="$admon.textlabel != 0 or title or info/title">
<xsl:apply-templates select="." mode="object.title.markup"/> <xsl:apply-templates select="." mode="object.title.markup"/>
</xsl:if>
</h3> </h3>
</xsl:if>
<xsl:apply-templates/> <xsl:apply-templates/>
</div> </div>

View File

@ -309,6 +309,7 @@
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:call-template name="href.target"> <xsl:call-template name="href.target">
<xsl:with-param name="context" select="$toc-context"/> <xsl:with-param name="context" select="$toc-context"/>
<xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
@ -482,7 +483,9 @@
<span class="refentrytitle"> <span class="refentrytitle">
<a> <a>
<xsl:attribute name="href"> <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:attribute>
<xsl:copy-of select="$title"/> <xsl:copy-of select="$title"/>
</a> </a>
@ -505,6 +508,7 @@
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:call-template name="href.target"> <xsl:call-template name="href.target">
<xsl:with-param name="object" select=".."/> <xsl:with-param name="object" select=".."/>
<xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:apply-templates/> <xsl:apply-templates/>
@ -532,6 +536,7 @@
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:call-template name="href.target"> <xsl:call-template name="href.target">
<xsl:with-param name="object" select="$node"/> <xsl:with-param name="object" select="$node"/>
<xsl:with-param name="toc-context" select="$toc-context"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:apply-templates select="$node" mode="titleabbrev.markup"/> <xsl:apply-templates select="$node" mode="titleabbrev.markup"/>
@ -602,7 +607,9 @@
</xsl:if> </xsl:if>
<a> <a>
<xsl:attribute name="href"> <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:attribute>
<xsl:apply-templates select="." mode="titleabbrev.markup"/> <xsl:apply-templates select="." mode="titleabbrev.markup"/>
</a> </a>

View File

@ -64,7 +64,7 @@
</xsl:variable> </xsl:variable>
<xsl:variable name="dbhtml-filename"> <xsl:variable name="dbhtml-filename">
<xsl:call-template name="dbhtml-filename"/> <xsl:call-template name="pi.dbhtml_filename"/>
</xsl:variable> </xsl:variable>
<xsl:variable name="filename"> <xsl:variable name="filename">

View File

@ -737,32 +737,98 @@
<xsl:template name="href.target"> <xsl:template name="href.target">
<xsl:param name="context" select="."/> <xsl:param name="context" select="."/>
<xsl:param name="object" 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:variable name="href.to.uri">
<xsl:call-template name="href.target.uri"> <xsl:call-template name="href.target.uri">
<xsl:with-param name="object" select="$object"/> <xsl:with-param name="object" select="$object"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="href.from.uri"> <xsl:variable name="href.from.uri">
<xsl:call-template name="href.target.uri"> <xsl:call-template name="href.target.uri">
<xsl:with-param name="object" select="$context"/> <xsl:with-param name="object" select="$context"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<!-- * <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>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message> <!-- * <xsl:message>context: <xsl:value-of select="local-name($context)"/></xsl:message> -->
<xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></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:variable name="href.to">
<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:call-template name="trim.common.uri.paths">
<xsl:with-param name="uriA" select="$href.to.uri"/> <xsl:with-param name="uriA" select="$href.to.uri"/>
<xsl:with-param name="uriB" select="$href.from.uri"/> <xsl:with-param name="uriB" select="$href.from.uri"/>
<xsl:with-param name="return" select="'A'"/> <xsl:with-param name="return" select="'A'"/>
</xsl:call-template> </xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:variable> </xsl:variable>
<xsl:variable name="href.from"> <xsl:variable name="href.from">
<xsl:call-template name="trim.common.uri.paths"> <xsl:call-template name="trim.common.uri.paths">
<xsl:with-param name="uriA" select="$href.to.uri"/> <xsl:with-param name="uriA" select="$href.to.uri"/>
@ -770,13 +836,11 @@
<xsl:with-param name="return" select="'B'"/> <xsl:with-param name="return" select="'B'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="depth"> <xsl:variable name="depth">
<xsl:call-template name="count.uri.path.depth"> <xsl:call-template name="count.uri.path.depth">
<xsl:with-param name="filename" select="$href.from"/> <xsl:with-param name="filename" select="$href.from"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="href"> <xsl:variable name="href">
<xsl:call-template name="copy-string"> <xsl:call-template name="copy-string">
<xsl:with-param name="string" select="'../'"/> <xsl:with-param name="string" select="'../'"/>
@ -784,7 +848,6 @@
</xsl:call-template> </xsl:call-template>
<xsl:value-of select="$href.to"/> <xsl:value-of select="$href.to"/>
</xsl:variable> </xsl:variable>
<!-- <!--
<xsl:message> <xsl:message>
<xsl:text>In </xsl:text> <xsl:text>In </xsl:text>
@ -799,7 +862,6 @@
<xsl:value-of select="$href"/> <xsl:value-of select="$href"/>
</xsl:message> </xsl:message>
--> -->
<xsl:value-of select="$href"/> <xsl:value-of select="$href"/>
</xsl:template> </xsl:template>
@ -1444,4 +1506,40 @@
</xsl:call-template> </xsl:call-template>
</xsl: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> </xsl:stylesheet>

View File

@ -49,8 +49,8 @@
<xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/> <xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/>
<xsl:variable name="filename"> <xsl:variable name="filename">
<xsl:call-template name="dbhtml-filename"> <xsl:call-template name="pi.dbhtml_filename">
<xsl:with-param name="pis" select="$chunk/processing-instruction('dbhtml')"/> <xsl:with-param name="node" select="$chunk"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>

View File

@ -37,10 +37,12 @@
<xsl:element name="h{$level+1}" namespace="http://www.w3.org/1999/xhtml"> <xsl:element name="h{$level+1}" namespace="http://www.w3.org/1999/xhtml">
<xsl:attribute name="class">title</xsl:attribute> <xsl:attribute name="class">title</xsl:attribute>
<xsl:if test="$generate.id.attributes = 0">
<xsl:call-template name="anchor"> <xsl:call-template name="anchor">
<xsl:with-param name="node" select="$node"/> <xsl:with-param name="node" select="$node"/>
<xsl:with-param name="conditional" select="0"/> <xsl:with-param name="conditional" select="0"/>
</xsl:call-template> </xsl:call-template>
</xsl:if>
<xsl:apply-templates select="$node" mode="object.title.markup"> <xsl:apply-templates select="$node" mode="object.title.markup">
<xsl:with-param name="allow-anchors" select="1"/> <xsl:with-param name="allow-anchors" select="1"/>
</xsl:apply-templates> </xsl:apply-templates>
@ -350,7 +352,7 @@
</div> </div>
</xsl:template> </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:call-template name="component.title">
<xsl:with-param name="node" select="ancestor::article[1]"/> <xsl:with-param name="node" select="ancestor::article[1]"/>
</xsl:call-template> </xsl:call-template>

View File

@ -213,10 +213,12 @@
<h1> <h1>
<xsl:attribute name="class">title</xsl:attribute> <xsl:attribute name="class">title</xsl:attribute>
<xsl:if test="$generate.id.attributes = 0">
<xsl:call-template name="anchor"> <xsl:call-template name="anchor">
<xsl:with-param name="node" select="$node"/> <xsl:with-param name="node" select="$node"/>
<xsl:with-param name="conditional" select="0"/> <xsl:with-param name="conditional" select="0"/>
</xsl:call-template> </xsl:call-template>
</xsl:if>
<xsl:apply-templates select="$node" mode="object.title.markup"> <xsl:apply-templates select="$node" mode="object.title.markup">
<xsl:with-param name="allow-anchors" select="1"/> <xsl:with-param name="allow-anchors" select="1"/>
</xsl:apply-templates> </xsl:apply-templates>

View File

@ -103,7 +103,9 @@
<xsl:variable name="content"> <xsl:variable name="content">
<div class="{$class}"> <div class="{$class}">
<xsl:if test="$spacing.paras != 0"><p/></xsl:if> <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/> <xsl:apply-templates/>
<!-- HACK: This doesn't belong inside formal.object; it <!-- HACK: This doesn't belong inside formal.object; it

View File

@ -221,9 +221,8 @@
</xsl:variable> </xsl:variable>
<xsl:variable name="img.src.path.pi"> <xsl:variable name="img.src.path.pi">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_img.src.path">
<xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> <xsl:with-param name="node" select=".."/>
<xsl:with-param name="attribute" select="'img.src.path'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
@ -598,9 +597,8 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
</xsl:variable> </xsl:variable>
<xsl:variable name="bgcolor"> <xsl:variable name="bgcolor">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_background-color">
<xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> <xsl:with-param name="node" select=".."/>
<xsl:with-param name="attribute" select="'background-color'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>

View File

@ -196,10 +196,7 @@
<xsl:template match="variablelist"> <xsl:template match="variablelist">
<xsl:variable name="pi-presentation"> <xsl:variable name="pi-presentation">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_list-presentation"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'list-presentation'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="presentation"> <xsl:variable name="presentation">
@ -217,24 +214,15 @@
</xsl:variable> </xsl:variable>
<xsl:variable name="list-width"> <xsl:variable name="list-width">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_list-width"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'list-width'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="term-width"> <xsl:variable name="term-width">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_term-width"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'term-width'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="table-summary"> <xsl:variable name="table-summary">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_table-summary"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'table-summary'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<div> <div>
@ -334,16 +322,14 @@
<xsl:template match="varlistentry" mode="varlist-table"> <xsl:template match="varlistentry" mode="varlist-table">
<xsl:variable name="presentation"> <xsl:variable name="presentation">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_term-presentation">
<xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> <xsl:with-param name="node" select=".."/>
<xsl:with-param name="attribute" select="'term-presentation'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="separator"> <xsl:variable name="separator">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_term-separator">
<xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> <xsl:with-param name="node" select=".."/>
<xsl:with-param name="attribute" select="'term-separator'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<tr> <tr>
@ -743,10 +729,7 @@
<xsl:template match="segmentedlist"> <xsl:template match="segmentedlist">
<xsl:variable name="presentation"> <xsl:variable name="presentation">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_list-presentation"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'list-presentation'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<div> <div>
@ -814,17 +797,11 @@
<xsl:template match="segmentedlist" mode="seglist-table"> <xsl:template match="segmentedlist" mode="seglist-table">
<xsl:variable name="table-summary"> <xsl:variable name="table-summary">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_table-summary"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'table-summary'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="list-width"> <xsl:variable name="list-width">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_list-width"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'list-width'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:apply-templates select="title"/> <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> </xsl:stylesheet>

View File

@ -267,9 +267,8 @@
<xsl:template name="tex.math.output.delims"> <xsl:template name="tex.math.output.delims">
<xsl:variable name="pi.delims"> <xsl:variable name="pi.delims">
<xsl:call-template name="pi-attribute"> <xsl:call-template name="pi.dbtex_delims">
<xsl:with-param name="pis" select=".//processing-instruction('dbtex')"/> <xsl:with-param name="node" select="descendant-or-self::*"/>
<xsl:with-param name="attribute" select="'delims'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="result"> <xsl:variable name="result">

View File

@ -2,7 +2,7 @@
<!--This file was created automatically by html2xhtml--> <!--This file was created automatically by html2xhtml-->
<!--from the HTML stylesheets.--> <!--from the HTML stylesheets.-->
<!-- This file is generated from param.xweb --> <!-- 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$ $Id$
@ -121,7 +121,7 @@ div.annotation-close { position: absolute;
<xsl:param name="ebnf.table.bgcolor" select="'#F5DCB3'"/> <xsl:param name="ebnf.table.bgcolor" select="'#F5DCB3'"/>
<xsl:param name="ebnf.table.border" select="1"/> <xsl:param name="ebnf.table.border" select="1"/>
<xsl:param name="ebnf.assignment"> <xsl:param name="ebnf.assignment">
<code>::=</code> <code xmlns="http://www.w3.org/1999/xhtml">::=</code>
</xsl:param> </xsl:param>
<xsl:param name="ebnf.statement.terminator"/> <xsl:param name="ebnf.statement.terminator"/>

File diff suppressed because it is too large Load Diff

View File

@ -66,7 +66,7 @@
</xsl:variable> </xsl:variable>
<xsl:variable name="dbhtml-filename"> <xsl:variable name="dbhtml-filename">
<xsl:call-template name="dbhtml-filename"/> <xsl:call-template name="pi.dbhtml_filename"/>
</xsl:variable> </xsl:variable>
<xsl:variable name="filename"> <xsl:variable name="filename">

View File

@ -19,10 +19,7 @@
<xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/> <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="preamble" select="*[local-name(.) != 'title' and local-name(.) != 'titleabbrev' and local-name(.) != 'qandadiv' and local-name(.) != 'qandaentry']"/>
<xsl:variable name="toc"> <xsl:variable name="toc">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_toc"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'toc'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="toc.params"> <xsl:variable name="toc.params">
@ -75,10 +72,7 @@
</xsl:if> </xsl:if>
<xsl:variable name="toc"> <xsl:variable name="toc">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_toc"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'toc'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="toc.params"> <xsl:variable name="toc.params">
@ -316,31 +310,19 @@
<xsl:template name="process.qandaset"> <xsl:template name="process.qandaset">
<xsl:variable name="label-width"> <xsl:variable name="label-width">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_label-width"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'label-width'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="table-summary"> <xsl:variable name="table-summary">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_table-summary"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'table-summary'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="cellpadding"> <xsl:variable name="cellpadding">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_cellpadding"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'cellpadding'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="cellspacing"> <xsl:variable name="cellspacing">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_cellspacing"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'cellspacing'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<table border="0" summary="Q and A Set"> <table border="0" summary="Q and A Set">

View File

@ -435,12 +435,15 @@
<xsl:attribute name="style">clear: both</xsl:attribute> <xsl:attribute name="style">clear: both</xsl:attribute>
</xsl:if> </xsl:if>
</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:call-template name="anchor">
<xsl:with-param name="node" select="$section"/> <xsl:with-param name="node" select="$section"/>
<xsl:with-param name="conditional" select="0"/> <xsl:with-param name="conditional" select="0"/>
</xsl:call-template> </xsl:call-template>
</xsl:if> </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:copy-of select="$title"/>
</xsl:element> </xsl:element>
</xsl:template> </xsl:template>

View File

@ -23,7 +23,9 @@
<div> <div>
<xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="." mode="class.attribute"/>
<p> <p>
<xsl:call-template name="anchor"/> <xsl:call-template name="anchor">
<xsl:with-param name="conditional" select="0"/>
</xsl:call-template>
<xsl:apply-templates/> <xsl:apply-templates/>
</p> </p>
</div> </div>
@ -177,9 +179,8 @@ paramdef ::= (#PCDATA|type|replaceable|parameter|funcparams)*
<xsl:template match="funcprototype"> <xsl:template match="funcprototype">
<xsl:variable name="html-style"> <xsl:variable name="html-style">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_funcsynopsis-style">
<xsl:with-param name="pis" select="ancestor::funcsynopsis//processing-instruction('dbhtml')"/> <xsl:with-param name="node" select="ancestor::funcsynopsis/descendant-or-self::*"/>
<xsl:with-param name="attribute" select="'funcsynopsis-style'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>

View File

@ -135,24 +135,15 @@
</xsl:if> </xsl:if>
<xsl:variable name="summary"> <xsl:variable name="summary">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_table-summary"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'table-summary'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="cellspacing"> <xsl:variable name="cellspacing">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_cellspacing"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'cellspacing'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="cellpadding"> <xsl:variable name="cellpadding">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_cellpadding"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')[1]"/>
<xsl:with-param name="attribute" select="'cellpadding'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<table> <table>
@ -215,7 +206,6 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$table.borders.with.css != 0"> <xsl:when test="$table.borders.with.css != 0">
<xsl:attribute name="border">0</xsl:attribute>
<xsl:choose> <xsl:choose>
<xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')"> <xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')">
<xsl:attribute name="style"> <xsl:attribute name="style">
@ -302,12 +292,18 @@
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
</xsl:when> </xsl:when>
<xsl:when test="../@frame='none'">
<xsl:attribute name="style">
<xsl:text>border: none;</xsl:text>
</xsl:attribute>
</xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:attribute name="style"> <xsl:attribute name="style">
<xsl:text>border-collapse: collapse;</xsl:text> <xsl:text>border-collapse: collapse;</xsl:text>
</xsl:attribute> </xsl:attribute>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'"> <xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'">
<xsl:attribute name="border">0</xsl:attribute> <xsl:attribute name="border">0</xsl:attribute>
@ -326,9 +322,8 @@
</xsl:variable> </xsl:variable>
<xsl:variable name="explicit.table.width"> <xsl:variable name="explicit.table.width">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_table-width">
<xsl:with-param name="pis" select="../processing-instruction('dbhtml')[1]"/> <xsl:with-param name="node" select=".."/>
<xsl:with-param name="attribute" select="'table-width'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
@ -416,10 +411,7 @@
<xsl:template match="tgroup/processing-instruction('dbhtml')"> <xsl:template match="tgroup/processing-instruction('dbhtml')">
<xsl:variable name="summary"> <xsl:variable name="summary">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_table-summary"/>
<xsl:with-param name="pis" select="."/>
<xsl:with-param name="attribute" select="'table-summary'"/>
</xsl:call-template>
</xsl:variable> </xsl:variable>
<!-- Suppress the table-summary PI --> <!-- Suppress the table-summary PI -->
@ -545,28 +537,19 @@
<xsl:variable name="row-height"> <xsl:variable name="row-height">
<xsl:if test="processing-instruction('dbhtml')"> <xsl:if test="processing-instruction('dbhtml')">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_row-height"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'row-height'"/>
</xsl:call-template>
</xsl:if> </xsl:if>
</xsl:variable> </xsl:variable>
<xsl:variable name="bgcolor"> <xsl:variable name="bgcolor">
<xsl:if test="processing-instruction('dbhtml')"> <xsl:if test="processing-instruction('dbhtml')">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_bgcolor"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'bgcolor'"/>
</xsl:call-template>
</xsl:if> </xsl:if>
</xsl:variable> </xsl:variable>
<xsl:variable name="class"> <xsl:variable name="class">
<xsl:if test="processing-instruction('dbhtml')"> <xsl:if test="processing-instruction('dbhtml')">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_class"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'class'"/>
</xsl:call-template>
</xsl:if> </xsl:if>
</xsl:variable> </xsl:variable>
@ -776,10 +759,7 @@
<xsl:otherwise> <xsl:otherwise>
<xsl:variable name="bgcolor"> <xsl:variable name="bgcolor">
<xsl:if test="processing-instruction('dbhtml')"> <xsl:if test="processing-instruction('dbhtml')">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_bgcolor"/>
<xsl:with-param name="pis" select="processing-instruction('dbhtml')"/>
<xsl:with-param name="attribute" select="'bgcolor'"/>
</xsl:call-template>
</xsl:if> </xsl:if>
</xsl:variable> </xsl:variable>

View File

@ -928,7 +928,9 @@
<h1> <h1>
<xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="." mode="class.attribute"/>
<xsl:if test="$generate.id.attributes = 0">
<a id="{$id}"/> <a id="{$id}"/>
</xsl:if>
<xsl:choose> <xsl:choose>
<xsl:when test="$show.revisionflag != 0 and @revisionflag"> <xsl:when test="$show.revisionflag != 0 and @revisionflag">
<span class="{@revisionflag}"> <span class="{@revisionflag}">

View File

@ -169,23 +169,20 @@
<!-- Extract the <?dbhtml linenumbering.*?> PI values --> <!-- Extract the <?dbhtml linenumbering.*?> PI values -->
<xsl:variable name="pi.linenumbering.everyNth"> <xsl:variable name="pi.linenumbering.everyNth">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_linenumbering.everyNth">
<xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/> <xsl:with-param name="node" select="$pi.context"/>
<xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="pi.linenumbering.separator"> <xsl:variable name="pi.linenumbering.separator">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_linenumbering.separator">
<xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/> <xsl:with-param name="node" select="$pi.context"/>
<xsl:with-param name="attribute" select="'linenumbering.separator'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>
<xsl:variable name="pi.linenumbering.width"> <xsl:variable name="pi.linenumbering.width">
<xsl:call-template name="dbhtml-attribute"> <xsl:call-template name="pi.dbhtml_linenumbering.width">
<xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/> <xsl:with-param name="node" select="$pi.context"/>
<xsl:with-param name="attribute" select="'linenumbering.width'"/>
</xsl:call-template> </xsl:call-template>
</xsl:variable> </xsl:variable>

View File

@ -726,7 +726,6 @@
<xsl:apply-templates select="." mode="callout-bug"/> <xsl:apply-templates select="." mode="callout-bug"/>
</xsl:template> </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:template match="area|areaset" mode="xref-to">
<xsl:param name="referrer"/> <xsl:param name="referrer"/>
<xsl:param name="xrefstyle"/> <xsl:param name="xrefstyle"/>
@ -737,7 +736,6 @@
</xsl:with-param> </xsl:with-param>
</xsl:call-template> </xsl:call-template>
</xsl:template> </xsl:template>
-->
<xsl:template match="book" mode="xref-to"> <xsl:template match="book" mode="xref-to">
<xsl:param name="referrer"/> <xsl:param name="referrer"/>