diff options
| author | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2007-08-30 18:19:10 +0000 |
|---|---|---|
| committer | Jeremy Huntwork <jhuntwork@linuxfromscratch.org> | 2007-08-30 18:19:10 +0000 |
| commit | ab42f55d687e06d3c3f819fbf8e8746a1c17aeab (patch) | |
| tree | a8d8729dc7ae2752b4e1859e9de1e69809dd57d7 | |
| parent | b1ba0fa3a86632f4bc9063ef2cc22e44c9fde32d (diff) | |
Updated stylesheets to match trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8354 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
43 files changed, 2397 insertions, 1133 deletions
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION b/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION index 6bbaa86a7..146b24160 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION @@ -11,14 +11,14 @@ <xsl:param name="PreviousRelease">1.72.0</xsl:param> <xsl:param name="PreviousReleaseRevision">6553</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:strip-space elements="fm:*"/> <fm:project> <fm:Project>DocBook</fm:Project> <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> --> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl index 484e7ee2d..0f6c378f9 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl @@ -14,38 +14,24 @@ See ../README or http://docbook.sf.net/release/xsl/current/ for copyright and other information. - This file contains general templates common to both the HTML and FO - versions of the DocBook stylesheets. ******************************************************************** --> -<doc:reference xmlns=""> -<referenceinfo> -<releaseinfo role="meta"> -$Id$ -</releaseinfo> -<author><surname>Walsh</surname> -<firstname>Norman</firstname></author> -<copyright><year>1999-2007</year> -<holder>Norman Walsh</holder> -</copyright> -</referenceinfo> -<title>Common Template Reference</title> - -<partintro id="partintro"> -<title>Introduction</title> - -<para>This is technical reference documentation for the “common” -templates in the DocBook XSL Stylesheets. The common templates are -“common” because they are shared across output formats (that is, -they’re not output-format-dependent).</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> - +<doc:reference xmlns="" xml:id="base"> + <info> + <title>Common » Base Template Reference</title> + <releaseinfo role="meta"> + $Id$ + </releaseinfo> + </info> + <!-- * yes, partintro is a valid child of a reference... --> + <partintro xml:id="partintro"> + <title>Introduction</title> + <para>This is technical reference documentation for the “base” + set of common templates in the DocBook XSL Stylesheets.</para> + <para>This is not intended to be user documentation. It is + provided for developers writing customization layers for the + stylesheets.</para> + </partintro> </doc:reference> <!-- ==================================================================== --> @@ -183,7 +169,7 @@ manvolnum <refdescription id="section.level-desc"> <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> <para>Recursive sections are calculated down to the fifth level.</para> @@ -1324,45 +1310,24 @@ pointed to by the link is one of the elements listed in <!-- ====================================================================== --> <!-- OrderedList Numeration --> - -<xsl:template name="orderedlist-starting-number"> - <xsl:param name="list" select="."/> - - <!-- 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:template name="output-orderedlist-starting-number"> + <xsl:param name="list"/> + <xsl:param name="pi-start"/> <xsl:choose> <xsl:when test="not($list/@continuation = 'continues')"> <xsl:choose> <xsl:when test="@startingnumber"> <xsl:value-of select="@startingnumber"/> </xsl:when> - <xsl:when test="$pi-html-start != ''"> - <xsl:value-of select="$pi-html-start"/> - </xsl:when> - <xsl:when test="$pi-fo-start != ''"> - <xsl:value-of select="$pi-fo-start"/> + <xsl:when test="$pi-start != ''"> + <xsl:value-of select="$pi-start"/> </xsl:when> <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:variable name="prevlist" - select="$list/preceding::orderedlist[1]"/> + select="$list/preceding::orderedlist[1]"/> <xsl:choose> <xsl:when test="count($prevlist) = 0">2</xsl:when> <xsl:otherwise> @@ -1382,7 +1347,6 @@ pointed to by the link is one of the elements listed in <xsl:template name="orderedlist-item-number"> <!-- context node must be a listitem in an orderedlist --> <xsl:param name="node" select="."/> - <xsl:choose> <xsl:when test="$node/@override"> <xsl:value-of select="$node/@override"/> @@ -1903,33 +1867,28 @@ unchanged.</para> localized "choice" separator (for example, "and" or "or") before the final item in an inline list (though it could also be useful for generating choice separators for non-inline lists).</para> - <para>It currently works by evaluating a processing instruction (PI) of the form <?dbchoice choice="foo"?> : - <itemizedlist> <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" or "or"</simpara> </listitem> <listitem> <simpara>otherwise returns the literal value of the - <sgmltag>choice</sgmltag> pseudo-attribute</simpara> + <tag>choice</tag> pseudo-attribute</simpara> </listitem> </itemizedlist> - The latter is provided only as a temporary workaround because the locale files do not currently have translations for the word <wordasword>or</wordasword>. So if you want to generate a a logical "or" separator in French (for example), you currently need to do this: - <literallayout><?dbchoice choice="ou"?></literallayout> </para> - <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 (particularly if and when a more appropriate means for marking up "choice" lists becomes available in DocBook).</para> @@ -1937,14 +1896,9 @@ unchanged.</para> </refdescription> </doc:template> <xsl:template name="select.choice.separator"> - <xsl:variable name="choice"> - <xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbchoice')"/> - <xsl:with-param name="attribute">choice</xsl:with-param> - </xsl:call-template> + <xsl:call-template name="pi.dbchoice_choice"/> </xsl:variable> - <xsl:choose> <!-- if value of $choice is "and" or "or", translate to equivalent in --> <!-- current locale --> @@ -2024,5 +1978,4 @@ engine does not support it. </xsl:otherwise> </xsl:choose> </xsl:template> - </xsl:stylesheet> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml index 79b2201b1..a8233d13c 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml @@ -19,6 +19,13 @@ <!-- 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"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml index a5ef40079..1aa99856b 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml @@ -19,6 +19,13 @@ <!-- 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"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml index c6d6bb630..11592e1e8 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml @@ -19,6 +19,13 @@ <!-- 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"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml index 5d590f725..58826b96c 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml @@ -19,6 +19,13 @@ <!-- 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é"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml index a07b68eea..fc473dfef 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml @@ -19,6 +19,13 @@ <!-- 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"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl index 98050d012..38b123a35 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl @@ -193,12 +193,31 @@ element label.</para> <xsl:value-of select="@label"/> </xsl:when> <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:call-template name="autolabel.format"> <xsl:with-param name="format" select="$reference.autolabel"/> </xsl:call-template> </xsl:variable> - <xsl:number from="book" count="reference" format="{$format}" level="any"/> + <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:otherwise> + </xsl:choose> </xsl:when> </xsl:choose> </xsl:template> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl index cc2d6c264..5c3df8815 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl @@ -1,11 +1,13 @@ <?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" - xmlns:date="http://exslt.org/dates-and-times" - xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="doc date exsl" - extension-element-prefixes="date exsl" - version='1.0'> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" + xmlns:date="http://exslt.org/dates-and-times" + xmlns:exsl="http://exslt.org/common" + xmlns:xlink="http://www.w3.org/1999/xlink" + exclude-result-prefixes="doc date exsl" + extension-element-prefixes="date exsl" + version='1.0'> <!-- ******************************************************************** $Id$ @@ -15,17 +17,108 @@ See ../README or http://docbook.sf.net/release/xsl/current/ for 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 --> -<xsl:template match="processing-instruction()" mode="titlepage.mode"> - <xsl:apply-templates select="."/> +<doc:reference xmlns=""><info><title>Common Processing Instruction Reference</title> + <releaseinfo role="meta"> + $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, it’s 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 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="pi-format"> <xsl:call-template name="pi-attribute"> @@ -44,8 +137,7 @@ </xsl:call-template> </xsl:otherwise> </xsl:choose> - </xsl:variable> - + </xsl:variable> <xsl:variable name="padding"> <xsl:variable name="pi-padding"> <xsl:call-template name="pi-attribute"> @@ -60,7 +152,6 @@ <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:variable> - <xsl:variable name="date"> <xsl:choose> <xsl:when test="function-available('date:date-time')"> @@ -72,10 +163,9 @@ </xsl:when> </xsl:choose> </xsl:variable> - <xsl:choose> <xsl:when test="function-available('date:date-time') or - function-available('date:dateTime')"> + function-available('date:dateTime')"> <xsl:call-template name="datetime.format"> <xsl:with-param name="date" select="$date"/> <xsl:with-param name="format" select="$format"/> @@ -88,124 +178,169 @@ </xsl:message> </xsl:otherwise> </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 name="datetime.format"> <xsl:param name="date"/> <xsl:param name="format"/> <xsl:param name="padding" select="1"/> - <xsl:if test="$format != ''"> <!-- replace any whitespace in the format string with a non-breaking space --> <xsl:variable name="format-nbsp" - select="translate($format, - ' 	
', - '    ')"/> + select="translate($format, + ' 	
', + '    ')"/> <xsl:variable name="tokenized-format-string"> <xsl:call-template name="str.tokenize.keep.delimiters"> - <xsl:with-param name="string" select="$format-nbsp"/> - <xsl:with-param name="delimiters" select="' ,./-()[]:'"/> + <xsl:with-param name="string" select="$format-nbsp"/> + <xsl:with-param name="delimiters" select="' ,./-()[]:'"/> </xsl:call-template> </xsl:variable> - - <xsl:choose> - <!-- include extra test for Xalan quirk --> - <xsl:when test="function-available('exsl:node-set') or - contains(system-property('xsl:vendor'),'Apache Software Foundation')"> - <!-- We must preserve context node in order to get valid language --> - <xsl:variable name="context" select="."/> - <xsl:for-each select="exsl:node-set($tokenized-format-string)/node()"> - <xsl:variable name="token"> - <xsl:value-of select="."/> - </xsl:variable> - <!-- Restore context node --> - <xsl:for-each select="$context"> - <xsl:choose> - <xsl:when test="$token = 'a'"> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'datetime-abbrev'"/> - <xsl:with-param name="name" select="date:day-abbreviation($date)"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$token = 'A'"> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'datetime-full'"/> - <xsl:with-param name="name" select="date:day-name($date)"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$token = 'b'"> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'datetime-abbrev'"/> - <xsl:with-param name="name" select="date:month-abbreviation($date)"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$token = 'c'"> - <xsl:value-of select="date:date($date)"/> - <xsl:text> </xsl:text> - <xsl:value-of select="date:time($date)"/> - </xsl:when> - <xsl:when test="$token = 'B'"> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'datetime-full'"/> - <xsl:with-param name="name" select="date:month-name($date)"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$token = 'd'"> - <xsl:if test="$padding = 1 and - string-length(date:day-in-month($date)) = 1">0</xsl:if> - <xsl:value-of select="date:day-in-month($date)"/> - </xsl:when> - <xsl:when test="$token = 'H'"> - <xsl:if test="$padding = 1 and string-length(date:hour-in-day($date)) = 1">0</xsl:if> - <xsl:value-of select="date:hour-in-day($date)"/> - </xsl:when> - <xsl:when test="$token = 'j'"> - <xsl:value-of select="date:day-in-year($date)"/> - </xsl:when> - <xsl:when test="$token = 'm'"> - <xsl:if test="$padding = 1 and string-length(date:month-in-year($date)) = 1">0</xsl:if> - <xsl:value-of select="date:month-in-year($date)"/> - </xsl:when> - <xsl:when test="$token = 'M'"> - <xsl:if test="string-length(date:minute-in-hour($date)) = 1">0</xsl:if> - <xsl:value-of select="date:minute-in-hour($date)"/> - </xsl:when> - <xsl:when test="$token = 'S'"> - <xsl:if test="string-length(date:second-in-minute($date)) = 1">0</xsl:if> - <xsl:value-of select="date:second-in-minute($date)"/> - </xsl:when> - <xsl:when test="$token = 'U'"> - <xsl:value-of select="date:week-in-year($date)"/> - </xsl:when> - <xsl:when test="$token = 'w'"> - <xsl:value-of select="date:day-in-week($date)"/> - </xsl:when> - <xsl:when test="$token = 'x'"> - <xsl:value-of select="date:date($date)"/> - </xsl:when> - <xsl:when test="$token = 'X'"> - <xsl:value-of select="date:time($date)"/> - </xsl:when> - <xsl:when test="$token = 'Y'"> - <xsl:value-of select="date:year($date)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$token"/> - </xsl:otherwise> - </xsl:choose> + <xsl:choose> + <!-- include extra test for Xalan quirk --> + <xsl:when test="function-available('exsl:node-set') or + contains(system-property('xsl:vendor'),'Apache Software Foundation')"> + <!-- We must preserve context node in order to get valid language --> + <xsl:variable name="context" select="."/> + <xsl:for-each select="exsl:node-set($tokenized-format-string)/node()"> + <xsl:variable name="token"> + <xsl:value-of select="."/> + </xsl:variable> + <!-- Restore context node --> + <xsl:for-each select="$context"> + <xsl:choose> + <xsl:when test="$token = 'a'"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'datetime-abbrev'"/> + <xsl:with-param name="name" select="date:day-abbreviation($date)"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$token = 'A'"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'datetime-full'"/> + <xsl:with-param name="name" select="date:day-name($date)"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$token = 'b'"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'datetime-abbrev'"/> + <xsl:with-param name="name" select="date:month-abbreviation($date)"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$token = 'c'"> + <xsl:value-of select="date:date($date)"/> + <xsl:text> </xsl:text> + <xsl:value-of select="date:time($date)"/> + </xsl:when> + <xsl:when test="$token = 'B'"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'datetime-full'"/> + <xsl:with-param name="name" select="date:month-name($date)"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$token = 'd'"> + <xsl:if test="$padding = 1 and + string-length(date:day-in-month($date)) = 1">0</xsl:if> + <xsl:value-of select="date:day-in-month($date)"/> + </xsl:when> + <xsl:when test="$token = 'H'"> + <xsl:if test="$padding = 1 and string-length(date:hour-in-day($date)) = 1">0</xsl:if> + <xsl:value-of select="date:hour-in-day($date)"/> + </xsl:when> + <xsl:when test="$token = 'j'"> + <xsl:value-of select="date:day-in-year($date)"/> + </xsl:when> + <xsl:when test="$token = 'm'"> + <xsl:if test="$padding = 1 and string-length(date:month-in-year($date)) = 1">0</xsl:if> + <xsl:value-of select="date:month-in-year($date)"/> + </xsl:when> + <xsl:when test="$token = 'M'"> + <xsl:if test="string-length(date:minute-in-hour($date)) = 1">0</xsl:if> + <xsl:value-of select="date:minute-in-hour($date)"/> + </xsl:when> + <xsl:when test="$token = 'S'"> + <xsl:if test="string-length(date:second-in-minute($date)) = 1">0</xsl:if> + <xsl:value-of select="date:second-in-minute($date)"/> + </xsl:when> + <xsl:when test="$token = 'U'"> + <xsl:value-of select="date:week-in-year($date)"/> + </xsl:when> + <xsl:when test="$token = 'w'"> + <xsl:value-of select="date:day-in-week($date)"/> + </xsl:when> + <xsl:when test="$token = 'x'"> + <xsl:value-of select="date:date($date)"/> + </xsl:when> + <xsl:when test="$token = 'X'"> + <xsl:value-of select="date:time($date)"/> + </xsl:when> + <xsl:when test="$token = 'Y'"> + <xsl:value-of select="date:year($date)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$token"/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> </xsl:for-each> - </xsl:for-each> - </xsl:when> - <xsl:otherwise> - <xsl:message> - Timestamp processing requires an XSLT processor with support - for the EXSLT node-set() function. - </xsl:message> - </xsl:otherwise> - </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:message> + Timestamp processing requires an XSLT processor with support + for the EXSLT node-set() function. + </xsl:message> + </xsl:otherwise> + </xsl:choose> </xsl:if> - </xsl:template> </xsl:stylesheet> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl index 4373e4849..892b9fb72 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl @@ -16,36 +16,25 @@ ******************************************************************** --> <!-- ==================================================================== --> -<doc:reference xmlns=""> - <referenceinfo> +<doc:reference xmlns="" xml:id="refentry"> + <info> + <title>Common » Refentry Metadata Template Reference</title> <releaseinfo role="meta"> $Id$ </releaseinfo> - <corpauthor>The DocBook Project</corpauthor> - <copyright> - <year>2005-2007</year> - <holder>The DocBook Project</holder> - </copyright> - </referenceinfo> - <title>Refentry Metadata-Gathering Template Reference</title> - - <partintro id="partintro"> + </info> + <!-- * yes, partintro is a valid child of a reference... --> + <partintro xml:id="partintro"> <title>Introduction</title> - - <para>This is technical reference documentation for the "refentry - metadata gathering" templates in the DocBook XSL Stylesheets.</para> - + <para>This is technical reference documentation for the “refentry + metadata” templates in the DocBook XSL Stylesheets.</para> <para>This is not intended to be user documentation. It is provided - for developers writing customization layers for the - stylesheets.</para> - + for developers writing customization layers for the stylesheets.</para> <note> <para>Currently, only the manpages stylesheets make use of these templates. They are, however, potentially useful elsewhere.</para> </note> - </partintro> - </doc:reference> <!-- ==================================================================== --> @@ -56,27 +45,27 @@ etc., is sometimes viewed in isolation from its greater "context". For 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 - 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 context information in different ways. Often (usually), the context information is not actually part of the content of the - <sgmltag>refentry</sgmltag> itself, but instead part of the content of a - parent or ancestor element to the the <sgmltag>refentry</sgmltag>. And + <tag>refentry</tag> itself, but instead part of the content of a + parent or ancestor element to the the <tag>refentry</tag>. And even then, DocBook provides a variety of elements that users might 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 - the <sgmltag>releaseinfo</sgmltag> element.</para> + the <tag>releaseinfo</tag> element.</para> <para>Taking all that in mind, the <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 mechanism used in the XPath expressions throughout this stylesheet is to select the relevant metadata from the *info element that is - closest to the actual <sgmltag>refentry</sgmltag> – either on the - <sgmltag>refentry</sgmltag> itself, or on its nearest ancestor.</para> + closest to the actual <tag>refentry</tag> – either on the + <tag>refentry</tag> itself, or on its nearest ancestor.</para> <note> <para>The <function>get.refentry.metadata</function> @@ -91,13 +80,13 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> <term>info</term> <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> </listitem> </varlistentry> @@ -194,23 +183,23 @@ <refdescription id="get.refentry.title-desc"> <para>The <literal>man(7)</literal> man page describes this as "the 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 - <sgmltag>refentrytitle</sgmltag>, we use that as the <sgmltag>title</sgmltag>; - otherwise, we just use first <sgmltag>refname</sgmltag> in the first - <sgmltag>refnamediv</sgmltag> in the source.</para> + from <tag>refname</tag> in that, if the <tag>refentry</tag> has a + <tag>refentrytitle</tag>, we use that as the <tag>title</tag>; + otherwise, we just use first <tag>refname</tag> in the first + <tag>refnamediv</tag> in the source.</para> </refdescription> <refparameter id="get.refentry.title-params"> <variablelist> <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> </variablelist> </refparameter> <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> <xsl:template name="get.refentry.title"> <xsl:param name="refname"/> @@ -232,8 +221,8 @@ <refdescription id="get.refentry.section-desc"> <para>The <literal>man(7)</literal> man page describes this as "the section number the man page should be placed in (e.g., - <literal>7</literal>)". If we do not find a <sgmltag>manvolnum</sgmltag> - specified in the source, and we find that the <sgmltag>refentry</sgmltag> is + <literal>7</literal>)". If we do not find a <tag>manvolnum</tag> + specified in the source, and we find that the <tag>refentry</tag> is for a function, we use the section number <literal>3</literal> ["Library calls (functions within program libraries)"]; otherwise, we default to using <literal>1</literal> ["Executable programs or shell @@ -244,7 +233,7 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> @@ -323,13 +312,13 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> <term>info</term> <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> </listitem> </varlistentry> @@ -342,7 +331,7 @@ </variablelist> </refparameter> <refreturn id="get.refentry.date-returns"> - <para>Returns a <sgmltag>date</sgmltag> node.</para> + <para>Returns a <tag>date</tag> node.</para> </refreturn> </doc:template> <xsl:template name="get.refentry.date"> @@ -495,13 +484,13 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> <term>info</term> <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> </listitem> </varlistentry> @@ -515,7 +504,7 @@ </variablelist> </refparameter> <refreturn id="get.refentry.source-returns"> - <para>Returns a <sgmltag>source</sgmltag> node.</para> + <para>Returns a <tag>source</tag> node.</para> </refreturn> </doc:template> <xsl:template name="get.refentry.source"> @@ -611,13 +600,13 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> <term>info</term> <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> </listitem> </varlistentry> @@ -795,13 +784,13 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> <term>info</term> <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> </listitem> </varlistentry> @@ -981,13 +970,13 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> <term>info</term> <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> </listitem> </varlistentry> @@ -1001,7 +990,7 @@ </variablelist> </refparameter> <refreturn id="get.refentry.manual-returns"> - <para>Returns a <sgmltag>manual</sgmltag> node.</para> + <para>Returns a <tag>manual</tag> node.</para> </refreturn> </doc:template> <xsl:template name="get.refentry.manual"> @@ -1140,25 +1129,25 @@ <refpurpose>Gets user preferences for refentry metadata gathering</refpurpose> <refdescription id="get.refentry.metadata.prefs-desc"> <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 - other <sgmltag>refentry</sgmltag> metadata-gathering + other <tag>refentry</tag> metadata-gathering templates. Instead, they are read only by the <function>get.refentry.metadata.prefs</function> template, 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> <para>So the, <function>get.refentry.metadata.prefs</function> 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> <refparameter id="get.refentry.metadata.prefs-params"> <para>There are no local parameters for this template; however, it does rely on a number of global parameters.</para> </refparameter> <refreturn id="get.refentry.metadata.prefs-returns"> - <para>Returns a <sgmltag>manual</sgmltag> node.</para> + <para>Returns a <tag>manual</tag> node.</para> </refreturn> </doc:template> <xsl:template name="get.refentry.metadata.prefs"> @@ -1223,7 +1212,7 @@ <varlistentry> <term>refname</term> <listitem> - <para>The first <sgmltag>refname</sgmltag> in the refentry</para> + <para>The first <tag>refname</tag> in the refentry</para> </listitem> </varlistentry> <varlistentry> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl index 9c0c49844..562d3412a 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl @@ -124,17 +124,17 @@ <doc:template name="entry.colnum" xmlns=""> <refpurpose>Determine the column number in which a given entry occurs</refpurpose> <refdescription id="entry.colnum-desc"> -<para>If an <sgmltag>entry</sgmltag> has a -<sgmltag class="attribute">colname</sgmltag> or -<sgmltag class="attribute">namest</sgmltag> attribute, this template +<para>If an <tag>entry</tag> has a +<tag class="attribute">colname</tag> or +<tag class="attribute">namest</tag> attribute, this template 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> <refparameter id="entry.colnum-params"> <variablelist> <varlistentry><term>entry</term> <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> </varlistentry> </variablelist> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl index 8f9fadd9f..f6b3a0186 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl @@ -3,6 +3,7 @@ xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:dyn="http://exslt.org/dynamic" xmlns:saxon="http://icl.com/saxon" + xmlns:xlink="http://www.w3.org/1999/xlink" exclude-result-prefixes="doc dyn saxon" version='1.0'> @@ -15,42 +16,33 @@ copyright and other information. ******************************************************************** --> - -<doc:reference xmlns=""> -<referenceinfo> -<releaseinfo role="meta"> -$Id$ -</releaseinfo> -<corpauthor>The DocBook Project Development Team</corpauthor> -<copyright><year>2007</year> -<holder>The DocBook Project</holder> -</copyright> -</referenceinfo> -<title>Utility Template Reference</title> - -<partintro id="partintro"> -<title>Introduction</title> - -<para>This is technical reference documentation for the - miscellaneous utility templates in the DocBook XSL - Stylesheets.</para> - -<note> -<para>These templates are defined in a separate file from the set - of “common” templates because some of the comment templates - reference DocBook XSL stylesheet parameters, requiring the - entire set of parameters to be imported/included in any - stylesheet that imports/includes the common templates.</para> -<para>The utility templates don’t import or include any DocBook - XSL stylesheet parameters, so the utility templates can be used - without importing the whole set of parameters.</para> -</note> - -<para>The following 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> +<doc:reference xmlns="" xml:id="utility"> + <info> + <title>Common » Utility Template Reference</title> + <releaseinfo role="meta"> + $Id$ + </releaseinfo> + </info> + <!-- * yes, partintro is a valid child of a reference... --> + <partintro xml:id="partintro"> + <title>Introduction</title> + <para>This is technical reference documentation for the + miscellaneous utility templates in the DocBook XSL + Stylesheets.</para> + <note> + <para>These templates are defined in a separate file from the set + of “common” templates because some of the comment templates + reference DocBook XSL stylesheet parameters, requiring the + entire set of parameters to be imported/included in any + stylesheet that imports/includes the common templates.</para> + <para>The utility templates don’t import or include any DocBook + XSL stylesheet parameters, so the utility templates can be used + without importing the whole set of parameters.</para> + </note> + <para>This is not intended to be user documentation. It is + provided for developers writing customization layers for the + stylesheets.</para> + </partintro> </doc:reference> <!-- ====================================================================== --> @@ -67,8 +59,7 @@ $Id$ <refparameter id="log.message-params"> <variablelist> - <varlistentry> - <term>level</term> + <varlistentry><term>level</term> <listitem> <para>Text to log/emit in the message-level field to indicate the message level @@ -76,8 +67,7 @@ $Id$ <literal>Warning</literal>)</para> </listitem> </varlistentry> - <varlistentry> - <term>source</term> + <varlistentry><term>source</term> <listitem> <para>Text to log/emit in the source field to identify the “source” to which the notification/warning relates. @@ -96,15 +86,13 @@ $Id$ XPath expression.</para> </listitem> </varlistentry> - <varlistentry> - <term>context-desc</term> + <varlistentry><term>context-desc</term> <listitem> <para>Text to log/emit in the context-description field to describe the context for the message.</para> </listitem> </varlistentry> - <varlistentry> - <term>context-desc-field-length</term> + <varlistentry><term>context-desc-field-length</term> <listitem> <para>Specifies length of the context-description field (in characters); default is 12</para> @@ -126,14 +114,12 @@ $Id$ parameter.</para> </listitem> </varlistentry> - <varlistentry> - <term>message</term> + <varlistentry><term>message</term> <listitem> <para>Text to log/emit in the actual message field</para> </listitem> </varlistentry> - <varlistentry> - <term>message-field-length</term> + <varlistentry><term>message-field-length</term> <listitem> <para>Specifies length of the message field (in characters); default is 45</para> @@ -255,11 +241,11 @@ $Id$ character).</para> <note> <para>This function began as a copy of Nate Austin's - <function>prepend-pad</function> function in the <ulink - url="http://www.dpawson.co.uk/xsl/sect2/padding.html" >Padding - Content</ulink> section of Dave Pawson's <ulink - url="http://www.dpawson.co.uk/xsl/index.html" >XSLT - FAQ</ulink>.</para> + <function>prepend-pad</function> function in the <link + xlink:href="http://www.dpawson.co.uk/xsl/sect2/padding.html" >Padding + Content</link> section of Dave Pawson's <link + xlink:href="http://www.dpawson.co.uk/xsl/index.html" >XSLT + FAQ</link>.</para> </note> </refdescription> <refreturn id="pad-string-returns"> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml index 9f1c8d431..6a782fca0 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml @@ -19,6 +19,13 @@ <!-- 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="摘要"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml index fbc52f415..db63cdca5 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml @@ -19,6 +19,13 @@ <!-- 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="摘要"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl index 550faee2b..af1f1e40b 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl @@ -713,31 +713,46 @@ </xsl:param> <xsl:param name="element" select="local-name(.)"/> <xsl:param name="gentext-key" select="local-name(.)"/> + <xsl:param name="language"> + <xsl:call-template name="l10n.language"/> + </xsl:param> + + <xsl:param name="format"> + <xsl:call-template name="page.number.format"> + <xsl:with-param name="master-reference" select="$master-reference"/> + <xsl:with-param name="element" select="$element"/> + </xsl:call-template> + </xsl:param> + + <xsl:param name="initial-page-number"> + <xsl:call-template name="initial.page.number"> + <xsl:with-param name="master-reference" select="$master-reference"/> + <xsl:with-param name="element" select="$element"/> + </xsl:call-template> + </xsl:param> + + <xsl:param name="force-page-count"> + <xsl:call-template name="force.page.count"> + <xsl:with-param name="master-reference" select="$master-reference"/> + <xsl:with-param name="element" select="$element"/> + </xsl:call-template> + </xsl:param> <fo:page-sequence hyphenate="{$hyphenate}" master-reference="{$master-reference}"> <xsl:attribute name="language"> - <xsl:call-template name="l10n.language"/> + <xsl:value-of select="$language"/> </xsl:attribute> <xsl:attribute name="format"> - <xsl:call-template name="page.number.format"> - <xsl:with-param name="master-reference" select="$master-reference"/> - <xsl:with-param name="element" select="$element"/> - </xsl:call-template> + <xsl:value-of select="$format"/> </xsl:attribute> <xsl:attribute name="initial-page-number"> - <xsl:call-template name="initial.page.number"> - <xsl:with-param name="master-reference" select="$master-reference"/> - <xsl:with-param name="element" select="$element"/> - </xsl:call-template> + <xsl:value-of select="$initial-page-number"/> </xsl:attribute> <xsl:attribute name="force-page-count"> - <xsl:call-template name="force.page.count"> - <xsl:with-param name="master-reference" select="$master-reference"/> - <xsl:with-param name="element" select="$element"/> - </xsl:call-template> + <xsl:value-of select="$force-page-count"/> </xsl:attribute> <xsl:attribute name="hyphenation-character"> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl index ee31ed093..ffdfaec9a 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl @@ -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> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl index 4b03eabea..6156ee9e9 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl @@ -1,5 +1,5 @@ <?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 --> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl index 5f0a2c264..e03e989e2 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl @@ -1,9 +1,11 @@ <?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - exclude-result-prefixes="doc" - version='1.0'> +<xsl:stylesheet + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + xmlns:xlink="http://www.w3.org/1999/xlink" + exclude-result-prefixes="doc" + version='1.0'> <!-- ******************************************************************** $Id$ @@ -15,63 +17,57 @@ ******************************************************************** --> -<doc:reference xmlns=""> -<referenceinfo> -<releaseinfo role="meta"> -$Id$ -</releaseinfo> -<authorgroup> - <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"> -<title>Introduction</title> - -<para>This is generated reference documentation for all - user-configurable processing instructions (PIs) in the DocBook - XSL stylesheets for FO output. - <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, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one).</para> - </note> -</para> -</partintro> +<doc:reference xmlns=""><info><title>FO Processing Instruction Reference</title> + <releaseinfo role="meta"> + $Id$ + </releaseinfo> + </info> + + <partintro id="partintro"> + <title>Introduction</title> + + <para>This is generated reference documentation for all + user-specifiable processing instructions (PIs) in the DocBook + XSL stylesheets for FO output. + <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, it’s better to do it by setting an + appropriate stylesheet parameter (if there is one).</para> + </note> + </para> + </partintro> </doc:reference> <!-- ==================================================================== --> <doc:pi name="dbfo_background-color" xmlns=""> -<refpurpose>Sets background color for an image</refpurpose> -<refdescription> - <para>Use the <tag>dbfo background-color</tag> PI before or - after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>, - <tag>imagedata</tag>, or <tag>videodata</tag> element) as a - sibling to the element, to set a background color for the - image.</para> -</refdescription> + <refpurpose>Sets background color for an image</refpurpose> + <refdescription> + <para>Use the <tag>dbfo background-color</tag> PI before or + after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>, + <tag>imagedata</tag>, or <tag>videodata</tag> element) as a + sibling to the element, to set a background color for the + image.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo background-color="<replaceable>color</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>background-color="<replaceable>color</replaceable>"</term> - <listitem> - <para>FIXME: A color value? [In hex, as a name, or what?]</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>background-color="<replaceable>color</replaceable>"</term> + <listitem> + <para>An HTML color value</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="BGcolor.html" + >Background color</link></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo_background-color"> <xsl:param name="node" select="."/> @@ -82,23 +78,28 @@ $Id$ </xsl:template> <doc:pi name="dbfo_bgcolor" xmlns=""> -<refpurpose>Sets background color on an table row or table cell</refpurpose> -<refdescription> - <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> -</refdescription> + <refpurpose>Sets background color on a table row or table cell</refpurpose> + <refdescription> + <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> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo bgcolor="<replaceable>color</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term> - <listitem> - <para>FIXME: A color value? [In hex, as a name, or what?]</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term> + <listitem> + <para>An HTML color value</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="BGtableColor.html#CellBGColor" + >Cell background color</link></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo_bgcolor"> <xsl:param name="node" select="."/> @@ -109,25 +110,36 @@ $Id$ </xsl:template> <doc:pi name="dbfo_float-type" xmlns=""> -<refpurpose>Specifies float behavior for a sidebar</refpurpose> -<refdescription> - <para>Use the <tag>dbfo float-type</tag> PI to specify the float - behavior for a <tag>sidebar</tag> (to cause the sidebar to be - displayed as a marginal note).</para> -</refdescription> + <refpurpose>Specifies float behavior for a sidebar</refpurpose> + <refdescription> + <para>Use the <tag>dbfo float-type</tag> PI to specify the float + behavior for a <tag>sidebar</tag> (to cause the sidebar to be + displayed as a marginal note).</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo float-type="margin.note"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>float-type="margin.note"</term> - <listitem> - <para>Specifies that the <tag>sidebar</tag> should be - displayed as a marginal note.</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>float-type="margin.note"</term> + <listitem> + <para>Specifies that the <tag>sidebar</tag> should be + displayed as a marginal note.</para> + </listitem> + </varlistentry> + </variablelist> + </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> <xsl:template name="pi.dbfo_float-type"> <xsl:param name="node" select="."/> @@ -138,28 +150,35 @@ $Id$ </xsl:template> <doc:pi name="dbfo_glossary-presentation" xmlns=""> -<refpurpose>Specifies presentation style for a glossary</refpurpose> -<refdescription> - <para>Use the <tag>dbfo glossary-presentation</tag> PI as a child of - a <tag>glossary</tag> to control its presentation style.</para> -</refdescription> + <refpurpose>Specifies presentation style for a glossary</refpurpose> + <refdescription> + <para>Use the <tag>dbfo glossary-presentation</tag> PI as a child of + a <tag>glossary</tag> to control its presentation style.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo glossary-presentation="list"|"blocks"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>glossary-presentation="list"</term> - <listitem> - <para>Displayed the glossary as a list</para> - </listitem> - </varlistentry> - <varlistentry><term>glossary-presentation="blocks"</term> - <listitem> - <para>Displays the glossary as blocks</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>glossary-presentation="list"</term> + <listitem> + <para>Displays the glossary as a list</para> + </listitem> + </varlistentry> + <varlistentry><term>glossary-presentation="blocks"</term> + <listitem> + <para>Displays the glossary as blocks</para> + </listitem> + </varlistentry> + </variablelist> + </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> <xsl:template name="pi.dbfo_glossary-presentation"> <xsl:param name="node" select="."/> @@ -170,28 +189,35 @@ $Id$ </xsl:template> <doc:pi name="dbfo_glosslist-presentation" xmlns=""> -<refpurpose>Specifies presentation style for a glosslist</refpurpose> -<refdescription> - <para>Use the <tag>dbfo glosslist-presentation</tag> PI as a child of - a <tag>glosslist</tag> to control its presentation style.</para> -</refdescription> + <refpurpose>Specifies presentation style for a glosslist</refpurpose> + <refdescription> + <para>Use the <tag>dbfo glosslist-presentation</tag> PI as a child of + a <tag>glosslist</tag> to control its presentation style.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo glosslist-presentation="list"|"blocks"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>glosslist-presentation="list"</term> - <listitem> - <para>Displayed the glosslist as a list</para> - </listitem> - </varlistentry> - <varlistentry><term>glosslist-presentation="blocks"</term> - <listitem> - <para>Displays the glosslist as blocks</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>glosslist-presentation="list"</term> + <listitem> + <para>Displays the glosslist as a list</para> + </listitem> + </varlistentry> + <varlistentry><term>glosslist-presentation="blocks"</term> + <listitem> + <para>Displays the glosslist as blocks</para> + </listitem> + </varlistentry> + </variablelist> + </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> <xsl:template name="pi.dbfo_glosslist-presentation"> <xsl:param name="node" select="."/> @@ -202,26 +228,35 @@ $Id$ </xsl:template> <doc:pi name="dbfo_glossterm-width" xmlns=""> -<refpurpose>Specifies the glossterm width for a glossary or - glosslist</refpurpose> -<refdescription> - <para>Use the <tag>dbfo glossterm-width</tag> PI as a child of a - <tag>glossary</tag> or <tag>glosslist</tag> to specify the - width for output of <tag>glossterm</tag> instances in the - output.</para> -</refdescription> + <refpurpose>Specifies the glossterm width for a glossary or + glosslist</refpurpose> + <refdescription> + <para>Use the <tag>dbfo glossterm-width</tag> PI as a child of a + <tag>glossary</tag> or <tag>glosslist</tag> to specify the + width for output of <tag>glossterm</tag> instances in the + output.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo glossterm-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>glossterm-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the glossterm width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>glossterm-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the glossterm width (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </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> <xsl:template name="pi.dbfo_glossterm-width"> <xsl:param name="node" select="."/> @@ -232,33 +267,40 @@ $Id$ </xsl:template> <doc:pi name="dbfo_keep-together" xmlns=""> -<refpurpose>Specifies “keep” behavior for a table, example, - figure, or equation</refpurpose> -<refdescription> - <para>Use the <tag>dbfo keep-together</tag> PI as a child of a - formal object (<tag>table</tag>, <tag>example</tag>, - <tag>figure</tag>, or <tag>equation</tag>) or their informal - equivalents) to specify “keep” behavior for the object (to - allow the object to “break” across a page).</para> -</refdescription> + <refpurpose>Specifies “keep” behavior for a table, example, + figure, or equation</refpurpose> + <refdescription> + <para>Use the <tag>dbfo keep-together</tag> PI as a child of a + formal object (<tag>table</tag>, <tag>example</tag>, + <tag>figure</tag>, or <tag>equation</tag>) or their informal + equivalents) to specify “keep” behavior for the object (to + allow the object to “break” across a page).</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo keep-together="auto"|"always"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>keep-together="auto"</term> - <listitem> - <para>Enables the object to break across a page</para> - </listitem> - </varlistentry> - <varlistentry><term>keep-together="always"</term> - <listitem> - <para>Prevents the object from breaking across a page (the - default stylesheet behavior)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>keep-together="auto"</term> + <listitem> + <para>Enables the object to break across a page</para> + </listitem> + </varlistentry> + <varlistentry><term>keep-together="always"</term> + <listitem> + <para>Prevents the object from breaking across a page (the + default stylesheet behavior)</para> + </listitem> + </varlistentry> + </variablelist> + </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> <xsl:template name="pi.dbfo_keep-together"> <xsl:param name="node" select="."/> @@ -269,25 +311,28 @@ $Id$ </xsl:template> <doc:pi name="dbfo_label-width" xmlns=""> -<refpurpose>Specifies the label width for an itemizedlist, - orderedlist, or qandaset</refpurpose> -<refdescription> - <para>Use the <tag>dbfo label-width</tag> PI as a child of an - <tag>itemizedlist</tag>, <tag>orderedlist</tag>, or - <tag>qandaset</tag> to specify the width of labels.</para> -</refdescription> + <refpurpose>Specifies the label width for a qandaset</refpurpose> + <refdescription> + <para>Use the <tag>dbfo label-width</tag> PI as a child of a + <tag>qandaset</tag> to specify the width of labels.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo label-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>label-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the label width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>label-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the label width (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="QandAformat.html" + >Q and A formatting</link></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo_label-width"> <xsl:param name="node" select="."/> @@ -298,188 +343,221 @@ $Id$ </xsl:template> <doc:pi name="dbfo_linenumbering.everyNth" xmlns=""> -<refpurpose>Specifies the interval at which lines are numbered - output of verbatim environments</refpurpose> -<refdescription> - <para>Use the <tag>dbfo linenumbering.everyNth</tag> PI as a child - of a “verbatim” element – <tag>programlisting</tag>, - <tag>screen</tag>, <tag>synopsis</tag> — to specify - the interval at which lines are numbered.</para> -</refdescription> + <refpurpose>Specifies interval for lines numbers in verbatims</refpurpose> + <refdescription> + <para>Use the <tag>dbfo linenumbering.everyNth</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the interval at which lines are numbered.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term> - <listitem> - <para>FIXME: Specifies numbering interval; a number is - output before every <replaceable>N</replaceable>th line</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term> + <listitem> + <para>Specifies numbering interval; a number is output + before every <replaceable>N</replaceable>th line</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee 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> <xsl:template name="pi.dbfo_linenumbering.everyNth"> <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="pis" select="$node/processing-instruction('dbfo')"/> <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/> </xsl:call-template> </xsl:template> <doc:pi name="dbfo_linenumbering.separator" xmlns=""> -<refpurpose>Specifies the separator text used between line numbers - and content in output of verbatim environments</refpurpose> -<refdescription> - <para>Use the <tag>dbfo linenumbering.separator</tag> PI as a child - of a “verbatim” element – <tag>programlisting</tag>, - <tag>screen</tag>, <tag>synopsis</tag> — to specify - the separator text output between the line numbers and content.</para> -</refdescription> + <refpurpose>Specifies separator text for line numbers in verbatims</refpurpose> + <refdescription> + <para>Use the <tag>dbfo linenumbering.separator</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the separator text output between the line numbers and content.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the text (zero or more characters)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> + </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> <xsl:template name="pi.dbfo_linenumbering.separator"> <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="pis" select="$node/processing-instruction('dbfo')"/> <xsl:with-param name="attribute" select="'linenumbering.separator'"/> </xsl:call-template> </xsl:template> <doc:pi name="dbfo_linenumbering.width" xmlns=""> -<refpurpose>Specifies the width set aside for line numbers in - output of verbatim environments</refpurpose> -<refdescription> - <para>Use the <tag>dbfo linenumbering.width</tag> PI as a child - of a “verbatim” element – <tag>programlisting</tag>, - <tag>screen</tag>, <tag>synopsis</tag> — to specify - the width set aside for line numbers.</para> -</refdescription> + <refpurpose>Specifies width for line numbers in verbatims</refpurpose> + <refdescription> + <para>Use the <tag>dbfo linenumbering.width</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the width set aside for line numbers.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the width (inluding units)</para> + </listitem> + </varlistentry> + </variablelist> + </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> <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="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> +<doc:pi name="dbfo_list-presentation" xmlns=""> + <refpurpose>Specifies presentation style for a variablelist or + segmentedlist</refpurpose> + <refdescription> + <para>Use the <tag>dbfo list-presentation</tag> PI as a child of + a <tag>variablelist</tag> or <tag>segmentedlist</tag> to + control the presentation style for the list (to cause it, for + example, to be displayed as a table).</para> + </refdescription> <refsynopsisdiv> - <synopsis><tag class="xmlpi">dbfo list-width="<replaceable>width</replaceable>"</tag></synopsis> + <synopsis><tag class="xmlpi">dbfo list-presentation="list"|"blocks"|"table"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>list-width="<replaceable>width</replaceable>"</term> + <refparameter> + <variablelist> + <varlistentry><term>list-presentation="list"</term> + <listitem> + <para>Displays the list as a list</para> + </listitem> + </varlistentry> + <varlistentry><term>list-presentation="blocks"</term> + <listitem> + <para>(<tag>variablelist</tag> only) Displays the list as blocks</para> + </listitem> + </varlistentry> + <varlistentry><term>list-presentation="table"</term> + <listitem> + <para>(<tag>segmentedlist</tag> only) Displays the list as a table</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <itemizedlist> + <listitem> + <para><parameter>variablelist.as.blocks</parameter></para> + </listitem> <listitem> - <para>FIXME: Specifies the <tag>simplelist</tag> width (in what units?)</para> + <para><parameter>variablelist.as.table</parameter></para> </listitem> - </varlistentry> - </variablelist> -</refparameter> + </itemizedlist> + </refsee> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="Variablelists.html#ListIndents" + >Variable list formatting in print</link></para> + </refsee> </doc:pi> -<xsl:template name="pi.dbfo_list-width"> +<xsl:template name="pi.dbfo_list-presentation"> <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:with-param name="attribute" select="'list-presentation'"/> </xsl:call-template> </xsl:template> -<doc:pi name="dbfo_list-presentation" xmlns=""> -<refpurpose>Specifies presentation style for a variablelist or - segmentedlist</refpurpose> -<refdescription> - <para>Use the <tag>dbfo list-presentation</tag> PI as a child of - a <tag>variablelist</tag> or <tag>segmentedlist</tag> to - control the presentation style for the list (to cause it, for - example, to be displayed as a table).</para> -</refdescription> +<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-presentation="list"|"blocks"|"table"</tag></synopsis> + <synopsis><tag class="xmlpi">dbfo list-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>list-presentation="list"</term> - <listitem> - <para>Displayed the list as a list</para> - </listitem> - </varlistentry> - <varlistentry><term>list-presentation="blocks"</term> - <listitem> - <para>(<tag>variablelist</tag> only) Displays the list as blocks</para> - </listitem> - </varlistentry> - <varlistentry><term>list-presentation="table"</term> - <listitem> - <para>(<tag>segmentedlist</tag> only) Displays the list as a table</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <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-presentation"> +<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-presentation'"/> + <xsl:with-param name="attribute" select="'list-width'"/> </xsl:call-template> </xsl:template> <doc:pi name="dbfo_orientation" xmlns=""> -<refpurpose>Specifies the orientation for table row or cell</refpurpose> -<refdescription> - <para>Use the <tag>dbfo orientation</tag> PI as a child of an - <tag>table</tag> row or cell to specify the orientation - (rotation) for the row or cell.</para> -</refdescription> + <refpurpose>Specifies the orientation for table row or cell</refpurpose> + <refdescription> + <para>Use the <tag>dbfo orientation</tag> PI as a child of an + <tag>table</tag> row or cell to specify the orientation + (rotation) for the row or cell.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270"</term> - <listitem> - <para>Specifies the number of degrees by which the cell or - row is rotated</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270"</term> + <listitem> + <para>Specifies the number of degrees by which the cell or + row is rotated</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbfo_orientation"> <xsl:param name="node" select="."/> @@ -490,33 +568,34 @@ $Id$ </xsl:template> <doc:pi name="dbfo_pgwide" xmlns=""> - <refpurpose>Species whether an <tag>equation</tag> or - <tag>example</tag> should rendered across the full width of a - page</refpurpose> -<refdescription> - <para>Use the <tag>dbfo pgwide</tag> PI as a child of an - <tag>equation</tag> or <tag>example</tag> to specify that the - content should rendered across the full width of the page.</para> -</refdescription> + <refpurpose>Specifies if an <tag>equation</tag> or <tag>example</tag> goes across full page width</refpurpose> + <refdescription> + <para>Use the <tag>dbfo pgwide</tag> PI as a child of an + <tag>equation</tag> or <tag>example</tag> to specify that the + content should rendered across the full width of the page.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo pgwide="0"|"1"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>pgwide="0"</term> - <listitem> - <para>If zero, the content is rendered across the current - text flow</para> - </listitem> - </varlistentry> - <varlistentry><term>pgwide="1"</term> - <listitem> - <para>If <code>1</code> (or any non-zero value), the - content is rendered across the full width of the page</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>pgwide="0"</term> + <listitem> + <para>If zero, the content is rendered across the current + text flow</para> + </listitem> + </varlistentry> + <varlistentry><term>pgwide="1"</term> + <listitem> + <para>If <code>1</code> (or any non-zero value), the + content is rendered across the full width of the page</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="params"> + <para><parameter>pgwide.properties</parameter></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo_pgwide"> <xsl:param name="node" select="."/> @@ -529,53 +608,63 @@ $Id$ <doc:pi name="dbfo_rotated-width" xmlns=""> <refpurpose>Specifies the width for a table <tag>entry</tag> or <tag>row</tag></refpurpose> -<refdescription> - <para>Use the <tag>dbfo rotated-width</tag> PI as a child of an - <tag>entry</tag> or <tag>row</tag> instance to specify the - width of that the <tag>entry</tag> or <tag>row</tag>; or - use it higher up in table to cause the width to be inherited - recursively down.</para> -</refdescription> + <refdescription> + <para>Use the <tag>dbfo rotated-width</tag> PI as a child of an + <tag>entry</tag> or <tag>row</tag> instance to specify the + width of that the <tag>entry</tag> or <tag>row</tag>; or + use it higher up in table to cause the width to be inherited + recursively down.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo rotated-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>rotated-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the width of a row or cell (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>rotated-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the width of a row or cell (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> </doc:pi> <xsl:template name="pi.dbfo_rotated-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="pis" select="$node/processing-instruction('dbfo')"/> <xsl:with-param name="attribute" select="'rotated-width'"/> </xsl:call-template> </xsl:template> <doc:pi name="dbfo_sidebar-width" xmlns=""> -<refpurpose>Specifies the width of a sidebar</refpurpose> -<refdescription> - <para>Use the <tag>dbfo sidebar-width</tag> PI as a child of a - <tag>sidebar</tag> to specify the width of the sidebar.</para> -</refdescription> + <refpurpose>Specifies the width of a sidebar</refpurpose> + <refdescription> + <para>Use the <tag>dbfo sidebar-width</tag> PI as a child of a + <tag>sidebar</tag> to specify the width of the sidebar.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo sidebar-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>sidebar-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the <tag>sidebar</tag> width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>sidebar-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the <tag>sidebar</tag> width (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </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> <xsl:template name="pi.dbfo_sidebar-width"> <xsl:param name="node" select="."/> @@ -585,27 +674,71 @@ $Id$ </xsl:call-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=""> -<refpurpose>Specifies the width for a table or for revhistory - output</refpurpose> -<refdescription> - <para>Use the <tag>dbfo table-width</tag> PI as a child of a - <tag>table</tag> or <tag>revhistory</tag> instance (which is - rendered as a table in output) to specify the width of the - table in output.</para> -</refdescription> + <refpurpose>Specifies the width for a table or for revhistory + output</refpurpose> + <refdescription> + <para>Use the <tag>dbfo table-width</tag> PI as a child or + sibling of a <tag>table</tag>, or as a child of an + <tag>informaltable</tag>, <tag>entrybl</tag>, or + <tag>revhistory</tag> instance (which is rendered as a table + in output) to specify the width of the table in output.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo table-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>table-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the table width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>table-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the table width (including units or as a percentage)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="Tables.html#TableWidth" + >Table width</link></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo_table-width"> <xsl:param name="node" select="."/> @@ -616,24 +749,29 @@ $Id$ </xsl:template> <doc:pi name="dbfo_term-width" xmlns=""> -<refpurpose>Specifies the term width for a variablelist</refpurpose> -<refdescription> - <para>Use the <tag>dbfo term-width</tag> PI as a child of a - <tag>variablelist</tag> to specify the width for - <tag>term</tag> output.</para> -</refdescription> + <refpurpose>Specifies the term width for a variablelist</refpurpose> + <refdescription> + <para>Use the <tag>dbfo term-width</tag> PI as a child of a + <tag>variablelist</tag> to specify the width for + <tag>term</tag> output.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo term-width="<replaceable>width</replaceable>"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> - <listitem> - <para>FIXME: Specifies the term width (in what units?)</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the term width (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="Variablelists.html#ListIndents" + >Variable list formatting in print</link></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo_term-width"> <xsl:param name="node" select="."/> @@ -644,30 +782,38 @@ $Id$ </xsl:template> <doc:pi name="dbfo_toc" xmlns=""> -<refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose> -<refdescription> - <para>Use the <tag>dbfo toc</tag> PI as a child of a - <tag>jandaset</tag> to specify whether a table of contents - (TOC) is generated for the <tag>qandaset</tag>.</para> -</refdescription> + <refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose> + <refdescription> + <para>Use the <tag>dbfo toc</tag> PI as a child of a + <tag>qandaset</tag> to specify whether a table of contents + (TOC) is generated for the <tag>qandaset</tag>.</para> + </refdescription> <refsynopsisdiv> <synopsis><tag class="xmlpi">dbfo toc="0"|"1"</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>toc="0"</term> - <listitem> - <para>If zero, no TOC is generated</para> - </listitem> - </varlistentry> - <varlistentry><term>toc="1"</term> - <listitem> - <para>If <code>1</code> (or any non-zero value), - a TOC is generated</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>toc="0"</term> + <listitem> + <para>If zero, no TOC is generated</para> + </listitem> + </varlistentry> + <varlistentry><term>toc="1"</term> + <listitem> + <para>If <code>1</code> (or any non-zero value), + a TOC is generated</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="QandAtoc.html" + >Q and A list of questions</link>, + <link role="tcg" + xlink:href="QandAformat.html" + >Q and A formatting</link></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo_toc"> <xsl:param name="node" select="."/> @@ -677,36 +823,37 @@ $Id$ </xsl:call-template> </xsl:template> -<!-- ==================================================================== --> - <doc:pi name="dbfo-need" xmlns=""> -<refpurpose>Specify a need for space (a kind of soft page break)</refpurpose> -<refdescription> - <para>A “need” is a request for space on a page. If the - requested space is not available, the page breaks and the - content that follows the need request appears on the next - page. If the requested space is available, then the request is - ignored.</para> -</refdescription> + <refpurpose>Specify a need for space (a kind of soft page break)</refpurpose> + <refdescription> + <para>A “need” is a request for space on a page. If the + requested space is not available, the page breaks and the + content that follows the need request appears on the next + page. If the requested space is available, then no page break + is inserted.</para> + </refdescription> <refsynopsisdiv> - <synopsis><tag class="xmlpi">dbfo-need height="<replaceable>n</replaceable>"</tag></synopsis> - <synopsis><tag class="xmlpi">dbfo-need space-before="<replaceable>n</replaceable>"</tag></synopsis> + <synopsis><tag class="xmlpi">dbfo-need height="<replaceable>n</replaceable>" [space-before="<replaceable>n</replaceable>"]</tag></synopsis> </refsynopsisdiv> -<refparameter> - <variablelist> - <varlistentry><term>height="<replaceable>n</replaceable>"</term> - <listitem> - <para>FIXME: the amount of height(?) needed? In what units? pt?.</para> - </listitem> - </varlistentry> - <varlistentry><term>space-before"<replaceable>n</replaceable>"</term> - <listitem> - <para>FIXME: the amount of space needed before the - [something]? In what units? pt?.</para> - </listitem> - </varlistentry> - </variablelist> -</refparameter> + <refparameter> + <variablelist> + <varlistentry><term>height="<replaceable>n</replaceable>"</term> + <listitem> + <para>The amount of height needed (including units)</para> + </listitem> + </varlistentry> + <varlistentry><term>space-before"<replaceable>n</replaceable>"</term> + <listitem> + <para>The amount of extra vertical space to add (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee role="tcg"> + <para><link role="tcg" + xlink:href="PageBreaking.html#SoftPageBreaks" + >Soft page breaks</link></para> + </refsee> </doc:pi> <xsl:template name="pi.dbfo-need"> <xsl:variable name="pi-height"> @@ -743,49 +890,49 @@ $Id$ <!-- Doesn't work in fop --> </xsl:when> <xsl:when test="$pi-before != '' and - not(following-sibling::listitem) and - not(following-sibling::step)"> + not(following-sibling::listitem) and + not(following-sibling::step)"> <fo:block space-after="0pt" space-before="{$pi-before}"> <xsl:copy-of select="$spacer"/> </fo:block> </xsl:when> <xsl:when test="following-sibling::para"> <fo:block space-after="0pt" - xsl:use-attribute-sets="normal.para.spacing"> + xsl:use-attribute-sets="normal.para.spacing"> <xsl:copy-of select="$spacer"/> </fo:block> </xsl:when> <xsl:when test="following-sibling::table or - following-sibling::figure or - following-sibling::example or - following-sibling::equation"> + following-sibling::figure or + following-sibling::example or + following-sibling::equation"> <fo:block space-after="0pt" - xsl:use-attribute-sets="formal.object.properties"> + xsl:use-attribute-sets="formal.object.properties"> <xsl:copy-of select="$spacer"/> </fo:block> </xsl:when> <xsl:when test="following-sibling::informaltable or - following-sibling::informalfigure or - following-sibling::informalexample or - following-sibling::informalequation"> + following-sibling::informalfigure or + following-sibling::informalexample or + following-sibling::informalequation"> <fo:block space-after="0pt" - xsl:use-attribute-sets="informal.object.properties"> + xsl:use-attribute-sets="informal.object.properties"> <xsl:copy-of select="$spacer"/> </fo:block> </xsl:when> <xsl:when test="following-sibling::itemizedlist or - following-sibling::orderedlist or - following-sibling::variablelist or - following-sibling::simplelist"> + following-sibling::orderedlist or + following-sibling::variablelist or + following-sibling::simplelist"> <fo:block space-after="0pt" - xsl:use-attribute-sets="informal.object.properties"> + xsl:use-attribute-sets="informal.object.properties"> <xsl:copy-of select="$spacer"/> </fo:block> </xsl:when> <xsl:when test="following-sibling::listitem or - following-sibling::step"> + following-sibling::step"> <fo:list-item space-after="0pt" - xsl:use-attribute-sets="informal.object.properties"> + xsl:use-attribute-sets="informal.object.properties"> <fo:list-item-label/> <fo:list-item-body start-indent="0pt" end-indent="0pt"> <xsl:copy-of select="$spacer"/> @@ -793,13 +940,13 @@ $Id$ </fo:list-item> </xsl:when> <xsl:when test="following-sibling::sect1 or - following-sibling::sect2 or - following-sibling::sect3 or - following-sibling::sect4 or - following-sibling::sect5 or - following-sibling::section"> + following-sibling::sect2 or + following-sibling::sect3 or + following-sibling::sect4 or + following-sibling::sect5 or + following-sibling::section"> <fo:block space-after="0pt" - xsl:use-attribute-sets="section.title.properties"> + xsl:use-attribute-sets="section.title.properties"> <xsl:copy-of select="$spacer"/> </fo:block> </xsl:when> @@ -815,20 +962,20 @@ $Id$ <!-- Doesn't work in fop --> </xsl:when> <xsl:when test="following-sibling::listitem or - following-sibling::step"> + following-sibling::step"> <fo:list-item space-before.precedence="force" - space-before="-{$height}" - space-after="0pt" - space-after.precedence="force"> + space-before="-{$height}" + space-after="0pt" + space-after.precedence="force"> <fo:list-item-label/> <fo:list-item-body start-indent="0pt" end-indent="0pt"/> </fo:list-item> </xsl:when> <xsl:otherwise> <fo:block space-before.precedence="force" - space-before="-{$height}" - space-after="0pt" - space-after.precedence="force"> + space-before="-{$height}" + space-after="0pt" + space-after.precedence="force"> </fo:block> </xsl:otherwise> </xsl:choose> @@ -848,6 +995,7 @@ $Id$ </xsl:template> <!-- ==================================================================== --> + <xsl:template match="processing-instruction()"> </xsl:template> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl index 276afeade..658f3a632 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl @@ -22,31 +22,22 @@ ******************************************************************** --> -<doc:reference xmlns=""> -<referenceinfo> -<releaseinfo role="meta"> -$Id$ -</releaseinfo> -<author><surname>Walsh</surname> -<firstname>Norman</firstname></author> -<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> - -<para>This is technical reference documentation for the FO -table-processing templates in the DocBook XSL Stylesheets.</para> - -<para>This 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> +<doc:reference xmlns="" xml:id="table-templates"> + <?dbhtml dir="fo"?> + <info> + <title>Formatting Object Table Reference</title> + <releaseinfo role="meta"> + $Id$ + </releaseinfo> + </info> + <partintro xml:id="partintro"> + <title>Introduction</title> + <para>This is technical reference documentation for the FO + table-processing templates in the DocBook XSL Stylesheets.</para> + <para>This is not intended to be user documentation. It is + provided for developers writing customization layers for the + stylesheets.</para> + </partintro> </doc:reference> <!-- ==================================================================== --> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl index 2286c1b6f..56b4240c1 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl @@ -350,7 +350,8 @@ <xsl:template match="node()|@*" mode="hyphenate.verbatim"> <xsl:copy> - <xsl:apply-templates select="node()|@*" mode="hyphenate.verbatim"/> + <xsl:copy-of select="@*"/> + <xsl:apply-templates mode="hyphenate.verbatim"/> </xsl:copy> </xsl:template> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl index 021eaf2ca..2b0d813df 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl @@ -718,6 +718,17 @@ <xsl:apply-templates select="." mode="callout-bug"/> </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:param name="referrer"/> <xsl:param name="xrefstyle"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl index a1314bc36..c8cde1fb3 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl @@ -1,5 +1,4 @@ -<?xml version="1.0"?> - +<?xml version="1.0" encoding="ASCII"?> <!-- ******************************************************************** $Id$ ******************************************************************** @@ -11,9 +10,7 @@ This module implements DTD-independent functions ******************************************************************** --> - - -<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: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:template name="dot.count"> <!-- Returns the number of "." characters in a string --> @@ -312,63 +309,60 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template name="str.tokenize.keep.delimiters"> <xsl:param name="string" select="''"/> <xsl:param name="delimiters" select="' '"/> <xsl:choose> <xsl:when test="not($string)"/> <xsl:when test="not($delimiters)"> - <xsl:call-template name="str.tokenize.keep.delimiters-characters"> - <xsl:with-param name="string" select="$string"/> - </xsl:call-template> + <xsl:call-template name="str.tokenize.keep.delimiters-characters"> + <xsl:with-param name="string" select="$string"/> + </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="$string"/> - <xsl:with-param name="delimiters" select="$delimiters"/> - </xsl:call-template> + <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> + <xsl:with-param name="string" select="$string"/> + <xsl:with-param name="delimiters" select="$delimiters"/> + </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> - <xsl:template name="str.tokenize.keep.delimiters-characters"> <xsl:param name="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:with-param name="string" select="substring($string, 2)"/> + <xsl:with-param name="string" select="substring($string, 2)"/> </xsl:call-template> </xsl:if> </xsl:template> - <xsl:template name="str.tokenize.keep.delimiters-delimiters"> <xsl:param name="string"/> <xsl:param name="delimiters"/> <xsl:variable name="delimiter" select="substring($delimiters, 1, 1)"/> <xsl:choose> <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 test="contains($string, $delimiter)"> - <xsl:if test="not(starts-with($string, $delimiter))"> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="substring-before($string, $delimiter)"/> - <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/> - </xsl:call-template> - </xsl:if> - <!-- output each delimiter --> - <xsl:value-of select="$delimiter"/> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="substring-after($string, $delimiter)"/> - <xsl:with-param name="delimiters" select="$delimiters"/> - </xsl:call-template> + <xsl:if test="not(starts-with($string, $delimiter))"> + <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> + <xsl:with-param name="string" select="substring-before($string, $delimiter)"/> + <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/> + </xsl:call-template> + </xsl:if> + <!-- output each delimiter --> + <xsl:value-of select="$delimiter"/> + <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> + <xsl:with-param name="string" select="substring-after($string, $delimiter)"/> + <xsl:with-param name="delimiters" select="$delimiters"/> + </xsl:call-template> </xsl:when> <xsl:otherwise> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="$string"/> - <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/> - </xsl:call-template> + <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> + <xsl:with-param name="string" select="$string"/> + <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/> + </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl index da3a19471..9a73ed628 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl @@ -113,12 +113,12 @@ </xsl:attribute> </xsl:if> - <h3 class="title"> - <xsl:call-template name="anchor"/> - <xsl:if test="$admon.textlabel != 0 or title or info/title"> + <xsl:if test="$admon.textlabel != 0 or title or info/title"> + <h3 class="title"> + <xsl:call-template name="anchor"/> <xsl:apply-templates select="." mode="object.title.markup"/> - </xsl:if> - </h3> + </h3> + </xsl:if> <xsl:apply-templates/> </div> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl index 2614964f5..6b62d829d 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl @@ -309,6 +309,7 @@ <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="context" select="$toc-context"/> + <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> </xsl:attribute> @@ -482,7 +483,9 @@ <span class="refentrytitle"> <a> <xsl:attribute name="href"> - <xsl:call-template name="href.target"/> + <xsl:call-template name="href.target"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> </xsl:attribute> <xsl:copy-of select="$title"/> </a> @@ -505,6 +508,7 @@ <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select=".."/> + <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> </xsl:attribute> <xsl:apply-templates/> @@ -532,6 +536,7 @@ <xsl:attribute name="href"> <xsl:call-template name="href.target"> <xsl:with-param name="object" select="$node"/> + <xsl:with-param name="toc-context" select="$toc-context"/> </xsl:call-template> </xsl:attribute> <xsl:apply-templates select="$node" mode="titleabbrev.markup"/> @@ -602,7 +607,9 @@ </xsl:if> <a> <xsl:attribute name="href"> - <xsl:call-template name="href.target"/> + <xsl:call-template name="href.target"> + <xsl:with-param name="toc-context" select="$toc-context"/> + </xsl:call-template> </xsl:attribute> <xsl:apply-templates select="." mode="titleabbrev.markup"/> </a> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl index 76e8858f6..fb6390eab 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl @@ -64,7 +64,7 @@ </xsl:variable> <xsl:variable name="dbhtml-filename"> - <xsl:call-template name="dbhtml-filename"/> + <xsl:call-template name="pi.dbhtml_filename"/> </xsl:variable> <xsl:variable name="filename"> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl index cfd057fe4..f452b4414 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl @@ -737,32 +737,98 @@ <xsl:template name="href.target"> <xsl:param name="context" select="."/> <xsl:param name="object" select="."/> - + <xsl:param name="toc-context" select="."/> + <!-- * If $toc-context contains some node other than the current node, --> + <!-- * it means we're processing a link in a TOC. In that case, to --> + <!-- * ensure the link will work correctly, we need to take a look at --> + <!-- * where the file containing the TOC will get written, and where --> + <!-- * the file that's being linked to will get written. --> + <xsl:variable name="toc-output-dir"> + <xsl:if test="not($toc-context = .)"> + <!-- * Get the $toc-context node and all its ancestors, look down --> + <!-- * through them to find the last/closest node to the --> + <!-- * toc-context node that has a "dbhtml dir" PI, and get the --> + <!-- * directory name from that. That's the name of the directory --> + <!-- * to which the current toc output file will get written. --> + <xsl:call-template name="dbhtml-dir"> + <xsl:with-param name="context" select="$toc-context/ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/> + </xsl:call-template> + </xsl:if> + </xsl:variable> + <xsl:variable name="linked-file-output-dir"> + <xsl:if test="not($toc-context = .)"> + <!-- * Get the current node and all its ancestors, look down --> + <!-- * through them to find the last/closest node to the current --> + <!-- * node that has a "dbhtml dir" PI, and get the directory name --> + <!-- * from that. That's the name of the directory to which the --> + <!-- * file that's being linked to will get written. --> + <xsl:call-template name="dbhtml-dir"> + <xsl:with-param name="context" select="ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/> + </xsl:call-template> + </xsl:if> + </xsl:variable> <xsl:variable name="href.to.uri"> <xsl:call-template name="href.target.uri"> <xsl:with-param name="object" select="$object"/> </xsl:call-template> </xsl:variable> - <xsl:variable name="href.from.uri"> <xsl:call-template name="href.target.uri"> <xsl:with-param name="object" select="$context"/> </xsl:call-template> </xsl:variable> - - <!-- - <xsl:message>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message> - <xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></xsl:message> - --> - + <!-- * <xsl:message>toc-context: <xsl:value-of select="local-name($toc-context)"/></xsl:message> --> + <!-- * <xsl:message>node: <xsl:value-of select="local-name(.)"/></xsl:message> --> + <!-- * <xsl:message>context: <xsl:value-of select="local-name($context)"/></xsl:message> --> + <!-- * <xsl:message>object: <xsl:value-of select="local-name($object)"/></xsl:message> --> + <!-- * <xsl:message>toc-output-dir: <xsl:value-of select="$toc-output-dir"/></xsl:message> --> + <!-- * <xsl:message>linked-file-output-dir: <xsl:value-of select="$linked-file-output-dir"/></xsl:message> --> + <!-- * <xsl:message>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message> --> + <!-- * <xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></xsl:message> --> <xsl:variable name="href.to"> - <xsl:call-template name="trim.common.uri.paths"> - <xsl:with-param name="uriA" select="$href.to.uri"/> - <xsl:with-param name="uriB" select="$href.from.uri"/> - <xsl:with-param name="return" select="'A'"/> - </xsl:call-template> + <xsl:choose> + <!-- * 2007-07-19, MikeSmith: Added the following conditional to --> + <!-- * deal with a problem case for links in TOCs. It checks to see --> + <!-- * if the output dir that a TOC will get written to is --> + <!-- * different from the output dir of the file being linked to. --> + <!-- * If it is different, we do not call trim.common.uri.paths. --> + <!-- * --> + <!-- * Reason why I added that conditional is: I ran into a bug for --> + <!-- * this case: --> + <!-- * --> + <!-- * 1. we are chunking into separate dirs --> + <!-- * --> + <!-- * 2. output for the TOC is written to current dir, but the file --> + <!-- * being linked to is written to some subdir "foo". --> + <!-- * --> + <!-- * For that case, links to that file in that TOC did not show --> + <!-- * the correct path - they omitted the "foo". --> + <!-- * --> + <!-- * The cause of that problem was that the trim.common.uri.paths --> + <!-- * template[1] was being called under all conditions. But it's --> + <!-- * apparent that we don't want to call trim.common.uri.paths in --> + <!-- * the case where a linked file is being written to a different --> + <!-- * directory than the TOC that contains the link, because doing --> + <!-- * so will cause a necessary (not redundant) directory-name --> + <!-- * part of the link to get inadvertently trimmed, resulting in --> + <!-- * a broken link to that file. Thus, added the conditional. --> + <!-- * --> + <!-- * [1] The purpose of the trim.common.uri.paths template is to --> + <!-- * prevent cases where, if we didn't call it, we end up with --> + <!-- * unnecessary, redundant directory names getting output; for --> + <!-- * example, "foo/foo/refname.html". --> + <xsl:when test="not($toc-output-dir = $linked-file-output-dir)"> + <xsl:value-of select="$href.to.uri"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="trim.common.uri.paths"> + <xsl:with-param name="uriA" select="$href.to.uri"/> + <xsl:with-param name="uriB" select="$href.from.uri"/> + <xsl:with-param name="return" select="'A'"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> </xsl:variable> - <xsl:variable name="href.from"> <xsl:call-template name="trim.common.uri.paths"> <xsl:with-param name="uriA" select="$href.to.uri"/> @@ -770,13 +836,11 @@ <xsl:with-param name="return" select="'B'"/> </xsl:call-template> </xsl:variable> - <xsl:variable name="depth"> <xsl:call-template name="count.uri.path.depth"> <xsl:with-param name="filename" select="$href.from"/> </xsl:call-template> </xsl:variable> - <xsl:variable name="href"> <xsl:call-template name="copy-string"> <xsl:with-param name="string" select="'../'"/> @@ -784,7 +848,6 @@ </xsl:call-template> <xsl:value-of select="$href.to"/> </xsl:variable> - <!-- <xsl:message> <xsl:text>In </xsl:text> @@ -799,7 +862,6 @@ <xsl:value-of select="$href"/> </xsl:message> --> - <xsl:value-of select="$href"/> </xsl:template> @@ -1444,4 +1506,40 @@ </xsl:call-template> </xsl:template> +<!-- ==================================================================== --> + +<xsl:template name="dbhtml-dir"> + <xsl:param name="context" select="."/> + <!-- directories are now inherited from previous levels --> + <xsl:variable name="ppath"> + <xsl:if test="$context/parent::*"> + <xsl:call-template name="dbhtml-dir"> + <xsl:with-param name="context" select="$context/parent::*"/> + </xsl:call-template> + </xsl:if> + </xsl:variable> + <xsl:variable name="path"> + <xsl:call-template name="pi.dbhtml_dir"> + <xsl:with-param name="node" select="$context"/> + </xsl:call-template> + </xsl:variable> + <xsl:choose> + <xsl:when test="$path = ''"> + <xsl:if test="$ppath != ''"> + <xsl:value-of select="$ppath"/> + </xsl:if> + </xsl:when> + <xsl:otherwise> + <xsl:if test="$ppath != ''"> + <xsl:value-of select="$ppath"/> + <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'"> + <xsl:text>/</xsl:text> + </xsl:if> + </xsl:if> + <xsl:value-of select="$path"/> + <xsl:text>/</xsl:text> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + </xsl:stylesheet> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl index dbf4a04cd..e16c88ceb 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl @@ -49,8 +49,8 @@ <xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/> <xsl:variable name="filename"> - <xsl:call-template name="dbhtml-filename"> - <xsl:with-param name="pis" select="$chunk/processing-instruction('dbhtml')"/> + <xsl:call-template name="pi.dbhtml_filename"> + <xsl:with-param name="node" select="$chunk"/> </xsl:call-template> </xsl:variable> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl index 66ce157e0..007f27f9c 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl @@ -37,11 +37,13 @@ <xsl:element name="h{$level+1}" namespace="http://www.w3.org/1999/xhtml"> <xsl:attribute name="class">title</xsl:attribute> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:if test="$generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$node"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:apply-templates select="$node" mode="object.title.markup"> <xsl:with-param name="allow-anchors" select="1"/> </xsl:apply-templates> </xsl:element> @@ -350,7 +352,7 @@ </div> </xsl:template> -<xsl:template match="article/title" mode="titlepage.mode" priority="2"> +<xsl:template match="article/title|article/articleinfo/title" mode="titlepage.mode" priority="2"> <xsl:call-template name="component.title"> <xsl:with-param name="node" select="ancestor::article[1]"/> </xsl:call-template> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl index c7dca21ca..b5af13ea2 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl @@ -213,11 +213,13 @@ <h1> <xsl:attribute name="class">title</xsl:attribute> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select="$node"/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:if test="$generate.id.attributes = 0"> + <xsl:call-template name="anchor"> + <xsl:with-param name="node" select="$node"/> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> + </xsl:if> + <xsl:apply-templates select="$node" mode="object.title.markup"> <xsl:with-param name="allow-anchors" select="1"/> </xsl:apply-templates> </h1> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl index b1f57efeb..f906e34b9 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl @@ -103,7 +103,9 @@ <xsl:variable name="content"> <div class="{$class}"> <xsl:if test="$spacing.paras != 0"><p/></xsl:if> - <xsl:call-template name="anchor"/> + <xsl:call-template name="anchor"> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <xsl:apply-templates/> <!-- HACK: This doesn't belong inside formal.object; it diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl index 9d8da5fe1..4fa715323 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl @@ -221,9 +221,8 @@ </xsl:variable> <xsl:variable name="img.src.path.pi"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'img.src.path'"/> + <xsl:call-template name="pi.dbhtml_img.src.path"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> @@ -598,9 +597,8 @@ valign: <xsl:value-of select="@valign"/></xsl:message> </xsl:variable> <xsl:variable name="bgcolor"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'background-color'"/> + <xsl:call-template name="pi.dbhtml_background-color"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl index fb2127c55..dcb72e352 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl @@ -196,10 +196,7 @@ <xsl:template match="variablelist"> <xsl:variable name="pi-presentation"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-presentation'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-presentation"/> </xsl:variable> <xsl:variable name="presentation"> @@ -217,24 +214,15 @@ </xsl:variable> <xsl:variable name="list-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-width"/> </xsl:variable> <xsl:variable name="term-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'term-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_term-width"/> </xsl:variable> <xsl:variable name="table-summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <div> @@ -334,16 +322,14 @@ <xsl:template match="varlistentry" mode="varlist-table"> <xsl:variable name="presentation"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'term-presentation'"/> + <xsl:call-template name="pi.dbhtml_term-presentation"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> <xsl:variable name="separator"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="../processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'term-separator'"/> + <xsl:call-template name="pi.dbhtml_term-separator"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> <tr> @@ -462,10 +448,10 @@ <xsl:variable name="localized-choice-separator"> <xsl:choose> <xsl:when test="processing-instruction('dbchoice')"> - <xsl:call-template name="select.choice.separator"/> + <xsl:call-template name="select.choice.separator"/> </xsl:when> <xsl:otherwise> - <!-- empty --> + <!-- empty --> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -743,10 +729,7 @@ <xsl:template match="segmentedlist"> <xsl:variable name="presentation"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-presentation'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-presentation"/> </xsl:variable> <div> @@ -814,17 +797,11 @@ <xsl:template match="segmentedlist" mode="seglist-table"> <xsl:variable name="table-summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <xsl:variable name="list-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'list-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_list-width"/> </xsl:variable> <xsl:apply-templates select="title"/> @@ -1052,4 +1029,17 @@ <!-- ==================================================================== --> +<xsl:template name="orderedlist-starting-number"> + <xsl:param name="list" select="."/> + <xsl:variable name="pi-start"> + <xsl:call-template name="pi.dbhtml_start"> + <xsl:with-param name="node" select="$list"/> + </xsl:call-template> + </xsl:variable> + <xsl:call-template name="output-orderedlist-starting-number"> + <xsl:with-param name="list" select="$list"/> + <xsl:with-param name="pi-start" select="$pi-start"/> + </xsl:call-template> +</xsl:template> + </xsl:stylesheet> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl index 1fbf10755..f9b55356d 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl @@ -267,9 +267,8 @@ <xsl:template name="tex.math.output.delims"> <xsl:variable name="pi.delims"> - <xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" select=".//processing-instruction('dbtex')"/> - <xsl:with-param name="attribute" select="'delims'"/> + <xsl:call-template name="pi.dbtex_delims"> + <xsl:with-param name="node" select="descendant-or-self::*"/> </xsl:call-template> </xsl:variable> <xsl:variable name="result"> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl index e9017f240..ad241519c 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl @@ -2,7 +2,7 @@ <!--This file was created automatically by html2xhtml--> <!--from the HTML stylesheets.--> <!-- This file is generated from param.xweb --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns="http://docbook.org/ns/docbook" exclude-result-prefixes="src" version="1.0"> <!-- ******************************************************************** $Id$ @@ -65,7 +65,7 @@ div.annotation-close { position: absolute; right: 2px; } </xsl:param> -<xsl:param name="annotation.js" select="'http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js'"/> +<xsl:param name="annotation.js" select="'http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js'"/> <xsl:param name="annotation.graphic.open" select="'http://docbook.sourceforge.net/release/images/annot-open.png'"/> <xsl:param name="annotation.graphic.close" select="'http://docbook.sourceforge.net/release/images/annot-close.png'"/> <xsl:param name="annotation.support" select="0"/> @@ -121,7 +121,7 @@ div.annotation-close { position: absolute; <xsl:param name="ebnf.table.bgcolor" select="'#F5DCB3'"/> <xsl:param name="ebnf.table.border" select="1"/> <xsl:param name="ebnf.assignment"> -<code>::=</code> +<code xmlns="http://www.w3.org/1999/xhtml">::=</code> </xsl:param> <xsl:param name="ebnf.statement.terminator"/> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl index 4f1b039b8..8b8eb7b17 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <!--This file was created automatically by html2xhtml--> <!--from the HTML stylesheets.--> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0"> <!-- ******************************************************************** $Id$ @@ -13,84 +13,1013 @@ ******************************************************************** --> -<xsl:template match="processing-instruction()"> +<doc:reference xmlns=""><info xmlns="http://www.w3.org/1999/xhtml"><title>HTML Processing Instruction Reference</title> + <releaseinfo role="meta"> + $Id$ + </releaseinfo> + </info> + <partintro xmlns="http://www.w3.org/1999/xhtml" xml:id="partintro"> + <title>Introduction</title> + <para>This is generated reference documentation for all + user-specifiable processing instructions (PIs) in the DocBook + XSL stylesheets for HTML output. + <note> + <para>You add these PIs at particular points in a document to + cause specific “exceptions” to formatting/output behavior. To + make global changes in formatting/output behavior across an + entire document, it’s better to do it by setting an + appropriate stylesheet parameter (if there is one).</para> + </note> + </para> + </partintro> +</doc:reference> + +<!-- ==================================================================== --> + +<doc:pi xmlns="" name="dbhtml_background-color"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color for an image</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml background-color</tag> PI before or + after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>, + <tag>imagedata</tag>, or <tag>videodata</tag> element) as a + sibling to the element, to set a background color for the + image.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml background-color="<replaceable>color</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>background-color="<replaceable>color</replaceable>"</term> + <listitem> + <para>An HTML color value</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="BGcolor.html">Background color</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_background-color"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'background-color'"/> + </xsl:call-template> </xsl:template> -<xsl:template match="processing-instruction('dbhtml')"> - <!-- nop --> +<doc:pi xmlns="" name="dbhtml_bgcolor"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color on a table row or table cell</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml bgcolor</tag> PI as child of a table row + or cell to set a background color for that table row or cell.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml bgcolor="<replaceable>color</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term> + <listitem> + <para>An HTML color value</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="BGtableColor.html#CellBGColor">Cell background color</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_bgcolor"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'bgcolor'"/> + </xsl:call-template> </xsl:template> -<!-- ==================================================================== --> +<doc:pi xmlns="" name="dbhtml_cellpadding"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellpadding in table or qandaset output</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml cellpadding</tag> PI as a child of a + <tag>table</tag> or <tag>qandaset</tag> to specify the value + for the HTML <literal>cellpadding</literal> attribute in the + output HTML table.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml cellpadding="<replaceable>number</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>cellpadding="<replaceable>number</replaceable>"</term> + <listitem> + <para>Specifies the cellpadding</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>html.cellpadding</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>, + <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_cellpadding"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'cellpadding'"/> + </xsl:call-template> +</xsl:template> -<xsl:template name="dbhtml-attribute"> - <xsl:param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:param name="attribute">filename</xsl:param> +<doc:pi xmlns="" name="dbhtml_cellspacing"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellspacing in table or qandaset output</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml cellspacing</tag> PI as a child of a + <tag>table</tag> or <tag>qandaset</tag> to specify the value + for the HTML <literal>cellspacing</literal> attribute in the + output HTML table.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml cellspacing="<replaceable>number</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>cellspacing="<replaceable>number</replaceable>"</term> + <listitem> + <para>Specifies the cellspacing</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>html.cellspacing</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>, + <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_cellspacing"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'cellspacing'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_class"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Set value of the class attribute for a table row</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml class</tag> PI as a child of a + <tag>row</tag> to specify a <literal>class</literal> + attribute and value in the HTML output for that row.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml class="<replaceable>name</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>class="<replaceable>name</replaceable>"</term> + <listitem> + <para>Specifies the class name</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="CSSTableCells.html">Table styles in HTML output</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_class"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'class'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_dir"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a directory name in which to write files</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>When chunking output, use the <tag>dbhtml dir</tag> PI + as a child of a chunk source to cause the output of that + chunk to be written to the specified directory; also, use it + as a child of a <tag>mediaobject</tag> to specify a + directory into which any long-description files for that + <tag>mediaobject</tag> will be written.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml dir="<replaceable>path</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>dir="<replaceable>path</replaceable>"</term> + <listitem> + <para>Specifies the pathname for the directory</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>base.dir</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Chunking.html#dbhtmlDirPI">dbhtml dir processing instruction</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_dir"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'dir'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_filename"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a filename for a chunk</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>When chunking output, use the <tag>dbhtml filename</tag> + PI as a child of a chunk source to specify a filename for + the output file for that chunk.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml filename="<replaceable>filename</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>filename="<replaceable>path</replaceable>"</term> + <listitem> + <para>Specifies the filename for the file</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>use.id.as.filename</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Chunking.html#DbhtmlFilenames">dbhtml filenames</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_filename"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'filename'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_funcsynopsis-style"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a funcsynopsis</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml funcsynopsis-style</tag> PI as a child of + a <tag>funcprototype</tag> or anywhere within a funcprototype + control the presentation style for the <tag>funcsynopsis</tag> + in output.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml funcsynopsis-style="kr"|"ansi"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>funcsynopsis-style="kr"</term> + <listitem> + <para>Displays the <tag>funcprototype</tag> in K&R style</para> + </listitem> + </varlistentry> + <varlistentry><term>funcsynopsis-style="ansi"</term> + <listitem> + <para>Displays the <tag>funcprototype</tag> in ANSI style</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>funcsynopsis.style</parameter></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_funcsynopsis-style"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'funcsynopsis-style'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_img.src.path"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a path to the location of an image file</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml img.src.path</tag> PI before or + after an image (<tag>graphic</tag>, + <tag>inlinegraphic</tag>, <tag>imagedata</tag>, or + <tag>videodata</tag> element) as a sibling to the element, + to specify a path to the location of the image; in HTML + output, the value specified for the + <code>img.src.path</code> attribute is prepended to the + filename.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml img.src.path="<replaceable>path</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>img.src.path="<replaceable>path</replaceable>"</term> + <listitem> + <para>Specifies the pathname to prepend to the name of the image file</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>img.src.path</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="GraphicsLocations.html#UsingFileref">Using fileref</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_img.src.path"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'img.src.path'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_label-width"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the label width for a qandaset</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml label-width</tag> PI as a child of a + <tag>qandaset</tag> to specify the width of labels.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml label-width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>label-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the label width (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_label-width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'label-width'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_linenumbering.everyNth"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies interval for lines numbers in verbatims</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml linenumbering.everyNth</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the interval at which lines are numbered.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term> + <listitem> + <para>Specifies numbering interval; a number is output + before every <replaceable>N</replaceable>th line</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>linenumbering.everyNth</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_linenumbering.everyNth"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_linenumbering.separator"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text for line numbers in verbatims</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml linenumbering.separator</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the separator text output between the line numbers and content.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>linenumbering.separator</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_linenumbering.separator"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'linenumbering.separator'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_linenumbering.width"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies width for line numbers in verbatims</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml linenumbering.width</tag> PI as a child + of a “verbatim” element – <tag>programlisting</tag>, + <tag>screen</tag>, <tag>synopsis</tag> — to specify + the width set aside for line numbers.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the width (inluding units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>linenumbering.width</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_linenumbering.width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'linenumbering.width'"/> + </xsl:call-template> +</xsl:template> +<doc:pi xmlns="" name="dbhtml_list-presentation"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a variablelist or + segmentedlist</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml list-presentation</tag> PI as a child of + a <tag>variablelist</tag> or <tag>segmentedlist</tag> to + control the presentation style for the list (to cause it, for + example, to be displayed as a table).</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml list-presentation="list"|"table"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>list-presentation="list"</term> + <listitem> + <para>Displays the list as a list</para> + </listitem> + </varlistentry> + <varlistentry><term>list-presentation="table"</term> + <listitem> + <para>Displays the list as a table</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <itemizedlist> + <listitem> + <para><parameter>variablelist.as.table</parameter></para> + </listitem> + <listitem> + <para><parameter>segmentedlist.as.table</parameter></para> + </listitem> + </itemizedlist> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_list-presentation"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'list-presentation'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_list-width"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width of a variablelist or simplelist</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml list-width</tag> PI as a child of a + <tag>variablelist</tag> or a <tag>simplelist</tag> presented + as a table, to specify the output width.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml list-width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>list-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the output width (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_list-width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'list-width'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_row-height"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the height for a table row</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml row-height</tag> PI as a child of a + <tag>row</tag> to specify the height of the row.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml row-height="<replaceable>height</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>row-height="<replaceable>height</replaceable>"</term> + <listitem> + <para>Specifies the label height (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="RowHeight.html">Row height</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_row-height"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'row-height'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml_start"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">(obsolete) Sets the starting number on an ordered list</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para><emphasis>This PI is obsolete</emphasis>. The intent of + this PI was to provide a means for setting a specific starting + number for an ordered list. Instead of this PI, set a value + for the <literal>override</literal> attribute on the first + <tag>listitem</tag> in the list; that will have the same + effect as what this PI was intended for.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml start="<replaceable>character</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>start="<replaceable>character</replaceable>"</term> + <listitem> + <para>Specifies the character to use as the starting + number; use 0-9, a-z, A-Z, or lowercase or uppercase + Roman numerals</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Orderedlists.html#ListStartNum">List starting number</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_start"> + <xsl:param name="node" select="."/> <xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" select="$pis"/> - <xsl:with-param name="attribute" select="$attribute"/> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'start'"/> </xsl:call-template> </xsl:template> -<xsl:template name="dbhtml-filename"> - <xsl:param name="pis" select="./processing-instruction('dbhtml')"/> +<doc:pi xmlns="" name="dbhtml_table-summary"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies summary for table, variablelist, segmentedlist, or qandaset output</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml table-summary</tag> PI as a child of + a <tag>table</tag>, <tag>variablelist</tag>, + <tag>segmentedlist</tag>, or <tag>qandaset</tag> to specify + the text for the HTML <literal>summary</literal> attribute + in the output HTML table.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the summary text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link>, + <link role="tcg" xlink:href="TableSummary.html">Table summary text</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_table-summary"> + <xsl:param name="node" select="."/> <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$pis"/> - <xsl:with-param name="attribute">filename</xsl:with-param> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'table-summary'"/> </xsl:call-template> </xsl:template> -<!-- -<xsl:template name="dbhtml-dir"> - <xsl:param name="pis" select="./processing-instruction('dbhtml')"/> +<doc:pi xmlns="" name="dbhtml_table-width"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width for a table</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml table-width</tag> PI as a child of a + <tag>table</tag> to specify the width of the table in + output.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml table-width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>table-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the table width (including units or as a percentage)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>default.table.width</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Tables.html#TableWidth">Table width</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_table-width"> + <xsl:param name="node" select="."/> <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$pis"/> - <xsl:with-param name="attribute">dir</xsl:with-param> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'table-width'"/> </xsl:call-template> </xsl:template> ---> -<xsl:template name="dbhtml-dir"> - <xsl:param name="context" select="."/> +<doc:pi xmlns="" name="dbhtml_term-presentation"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets character formatting for terms in a variablelist</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml term-presentation</tag> PI as a child + of a <tag>variablelist</tag> to set character formatting for + the <tag>term</tag> output of the list.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml term-presentation="bold"|"italic"|"bold-italic"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>term-presentation="<replaceable>bold</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in bold</para> + </listitem> + </varlistentry> + <varlistentry><term>term-presentation="<replaceable>italic</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in italic</para> + </listitem> + </varlistentry> + <varlistentry><term>term-presentation="<replaceable>bold-italic</replaceable>"</term> + <listitem> + <para>Specifies that terms are displayed in bold-italic</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_term-presentation"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'term-presentation'"/> + </xsl:call-template> +</xsl:template> - <!-- directories are now inherited from previous levels --> +<doc:pi xmlns="" name="dbhtml_term-separator"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text among terms in a varlistentry</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml term-separator</tag> PI as a child + of a <tag>variablelist</tag> to specify the separator text + among <tag>term</tag> instances.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml term-separator="<replaceable>text</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>term-separator="<replaceable>text</replaceable>"</term> + <listitem> + <para>Specifies the text (zero or more characters)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>variablelist.term.separator</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_term-separator"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'term-separator'"/> + </xsl:call-template> +</xsl:template> - <xsl:variable name="ppath"> - <xsl:if test="$context/parent::*"> - <xsl:call-template name="dbhtml-dir"> - <xsl:with-param name="context" select="$context/parent::*"/> - </xsl:call-template> - </xsl:if> - </xsl:variable> +<doc:pi xmlns="" name="dbhtml_term-width"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the term width for a variablelist</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml term-width</tag> PI as a child of a + <tag>variablelist</tag> to specify the width for + <tag>term</tag> output.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>term-width="<replaceable>width</replaceable>"</term> + <listitem> + <para>Specifies the term width (including units)</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_term-width"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'term-width'"/> + </xsl:call-template> +</xsl:template> - <xsl:variable name="path"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute">dir</xsl:with-param> +<doc:pi xmlns="" name="dbhtml_toc"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Species whether a TOC should be generated for a qandaset</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml toc</tag> PI as a child of a + <tag>qandaset</tag> to specify whether a table of contents + (TOC) is generated for the <tag>qandaset</tag>.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml toc="0"|"1"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>toc="0"</term> + <listitem> + <para>If zero, no TOC is generated</para> + </listitem> + </varlistentry> + <varlistentry><term>toc="1"</term> + <listitem> + <para>If <code>1</code> (or any non-zero value), + a TOC is generated</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="QandAtoc.html">Q and A list of questions</link>, + <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml_toc"> + <xsl:param name="node" select="."/> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/> + <xsl:with-param name="attribute" select="'toc'"/> + </xsl:call-template> +</xsl:template> + +<doc:pi xmlns="" name="dbcmdlist"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of commands</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbcmdlist</tag> PI as the child of a + <tag>refsynopsisdiv</tag> containing multiple + <tag>cmdsynopsis</tag> instances; a hyperlinked navigational + “command list” will be generated at the top of the + <tag>refsynopsisdiv</tag>, enabling users to quickly jump + to to each command synopsis.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbcmdlist</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <para>[No parameters]</para> + </refparameter> +</doc:pi> +<xsl:template name="pi.dbcmdlist"> + <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/> + <xsl:if test="count($cmdsynopses)<1"> + <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text> + </xsl:message> + </xsl:if> + <dl> + <xsl:call-template name="process.cmdsynopsis.list"> + <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/> </xsl:call-template> - </xsl:variable> + </dl> +</xsl:template> +<doc:pi xmlns="" name="dbfunclist"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of functions</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbfunclist</tag> PI as the child of a + <tag>refsynopsisdiv</tag> containing multiple + <tag>funcsynopsis</tag> instances; a hyperlinked + navigational “function list” will be generated at the top of + the <tag>refsynopsisdiv</tag>, enabling users to quickly + jump to to each function synopsis.</para> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbfunclist</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <para>[No parameters]</para> + </refparameter> +</doc:pi> +<xsl:template name="pi.dbfunclist"> + <xsl:variable name="funcsynopses" select="..//funcsynopsis"/> + <xsl:if test="count($funcsynopses)<1"> + <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text> + </xsl:message> + </xsl:if> + <dl> + <xsl:call-template name="process.funcsynopsis.list"> + <xsl:with-param name="funcsynopses" select="$funcsynopses"/> + </xsl:call-template> + </dl> +</xsl:template> + +<doc:pi xmlns="" name="dbhtml-include_href"> + <refpurpose xmlns="http://www.w3.org/1999/xhtml">Copies an external well-formed HTML/XML file into current doc</refpurpose> + <refdescription xmlns="http://www.w3.org/1999/xhtml"> + <para>Use the <tag>dbhtml-include href</tag> PI anywhere in a + document to cause the contents of the file referenced by the + <code>href</code> pseudo-attribute to be copied/inserted “as + is” into your HTML output at the point in document order + where the PI occurs in the source.</para> + <note> + <para>The referenced file may contain plain text (as long as + it is “wrapped” in an <tag>html</tag> element — see the + note below) or markup in any arbitrary vocabulary, + including HTML — but it must conform to XML + well-formedness constraints (because the feature in XSLT + 1.0 for opening external files, the + <function>document()</function> function, can only handle + files that meet XML well-formedness constraints).</para> + <para>Among other things, XML well-formedness constraints + require a document to have <emphasis>a single root + element</emphasis>. So if the content you want to + include is plain text or is markup that does + <emphasis>not</emphasis> have a single root element, + <emphasis role="strong">wrap the content in an + <tag>html</tag> element</emphasis>. The stylesheets will + strip out that surrounding <tag>html</tag> “wrapper” when + they find it, leaving just the content you want to + insert.</para> + </note> + </refdescription> + <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml"> + <synopsis><tag class="xmlpi">dbhtml href="<replaceable>URI</replaceable>"</tag></synopsis> + </refsynopsisdiv> + <refparameter xmlns="http://www.w3.org/1999/xhtml"> + <variablelist> + <varlistentry><term>href="<replaceable>URI</replaceable>"</term> + <listitem> + <para>Specifies the URI for the file to include; the URI + can be, for example, a remote <literal>http:</literal> + URI, or a local filesystem <literal>file:</literal> + URI</para> + </listitem> + </varlistentry> + </variablelist> + </refparameter> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="params"> + <para><parameter>textinsert.extension</parameter></para> + </refsee> + <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg"> + <para><link role="tcg" xlink:href="InsertExtHtml.html">Inserting external HTML code</link>, + <link xlink:href="ExternalCode.html">External code files</link></para> + </refsee> +</doc:pi> +<xsl:template name="pi.dbhtml-include"> + <xsl:param name="href"> + <xsl:call-template name="dbhtml-attribute"> + <xsl:with-param name="pis" select="."/> + <xsl:with-param name="attribute">href</xsl:with-param> + </xsl:call-template> + </xsl:param> <xsl:choose> - <xsl:when test="$path = ''"> - <xsl:if test="$ppath != ''"> - <xsl:value-of select="$ppath"/> - </xsl:if> + <xsl:when test="$href != ''"> + <xsl:variable name="content" select="document($href,/)"/> + <xsl:choose> + <xsl:when test="$content/*"> + <xsl:choose> + <xsl:when test="$content/*[1][self::html]"> + <!-- include just the children of html wrapper --> + <xsl:copy-of select="$content/*[1]/node()"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$content"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:message> + <xsl:text>ERROR: dbhtml-include processing instruction </xsl:text> + <xsl:text>href has no content.</xsl:text> + </xsl:message> + </xsl:otherwise> + </xsl:choose> </xsl:when> <xsl:otherwise> - <xsl:if test="$ppath != ''"> - <xsl:value-of select="$ppath"/> - <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'"> - <xsl:text>/</xsl:text> - </xsl:if> - </xsl:if> - <xsl:value-of select="$path"/> - <xsl:text>/</xsl:text> + <xsl:message> + <xsl:text>ERROR: dbhtml-include processing instruction has </xsl:text> + <xsl:text>missing or empty href value.</xsl:text> + </xsl:message> </xsl:otherwise> </xsl:choose> </xsl:template> <!-- ==================================================================== --> +<xsl:template name="dbhtml-attribute"> + <!-- * dbhtml-attribute is an interal utility template for retrieving --> + <!-- * pseudo-attributes/parameters from PIs --> + <xsl:param name="pis" select="processing-instruction('dbhtml')"/> + <xsl:param name="attribute">filename</xsl:param> + <xsl:call-template name="pi-attribute"> + <xsl:with-param name="pis" select="$pis"/> + <xsl:with-param name="attribute" select="$attribute"/> + </xsl:call-template> +</xsl:template> + +<!-- ==================================================================== --> + +<xsl:template match="processing-instruction()"> +</xsl:template> + +<xsl:template match="processing-instruction('dbhtml')"> + <!-- nop --> +</xsl:template> + +<!-- ==================================================================== --> + +<xsl:template match="processing-instruction('dbcmdlist')"> + <xsl:call-template name="pi.dbcmdlist"/> +</xsl:template> <xsl:template name="process.cmdsynopsis.list"> <xsl:param name="cmdsynopses"/><!-- empty node list by default --> <xsl:param name="count" select="1"/> @@ -103,6 +1032,7 @@ <dt> <a> <xsl:attribute name="href"> + <xsl:text>#</xsl:text> <xsl:call-template name="object.id"> <xsl:with-param name="object" select="$cmdsyn"/> </xsl:call-template> @@ -131,23 +1061,11 @@ </xsl:choose> </xsl:template> -<xsl:template match="processing-instruction('dbcmdlist')"> - <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/> - - <xsl:if test="count($cmdsynopses)<1"> - <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text> - </xsl:message> - </xsl:if> - - <dl> - <xsl:call-template name="process.cmdsynopsis.list"> - <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/> - </xsl:call-template> - </dl> -</xsl:template> - <!-- ==================================================================== --> +<xsl:template match="processing-instruction('dbfunclist')"> + <xsl:call-template name="pi.dbfunclist"/> +</xsl:template> <xsl:template name="process.funcsynopsis.list"> <xsl:param name="funcsynopses"/><!-- empty node list by default --> <xsl:param name="count" select="1"/> @@ -160,6 +1078,7 @@ <dt> <a> <xsl:attribute name="href"> + <xsl:text>#</xsl:text> <xsl:call-template name="object.id"> <xsl:with-param name="object" select="$cmdsyn"/> </xsl:call-template> @@ -188,63 +1107,44 @@ </xsl:choose> </xsl:template> -<xsl:template match="processing-instruction('dbfunclist')"> - <xsl:variable name="funcsynopses" select="..//funcsynopsis"/> - - <xsl:if test="count($funcsynopses)<1"> - <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text> - </xsl:message> - </xsl:if> +<!-- ==================================================================== --> - <dl> - <xsl:call-template name="process.funcsynopsis.list"> - <xsl:with-param name="funcsynopses" select="$funcsynopses"/> - </xsl:call-template> - </dl> +<xsl:template match="processing-instruction('dbhtml-include')"> + <xsl:call-template name="pi.dbhtml-include"/> </xsl:template> <!-- ==================================================================== --> -<!-- Copy well-formed external HTML content to the output. --> -<!-- An optional <html> wrapper will be removed before content is copied - to support multiple elements in output without a wrapper. - No other processing is done to the content. --> -<xsl:template match="processing-instruction('dbhtml-include')"> - <xsl:param name="href"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="."/> - <xsl:with-param name="attribute">href</xsl:with-param> +<xsl:template name="dbhtml-dir"> + <xsl:param name="context" select="."/> + <!-- directories are now inherited from previous levels --> + <xsl:variable name="ppath"> + <xsl:if test="$context/parent::*"> + <xsl:call-template name="dbhtml-dir"> + <xsl:with-param name="context" select="$context/parent::*"/> + </xsl:call-template> + </xsl:if> + </xsl:variable> + <xsl:variable name="path"> + <xsl:call-template name="pi.dbhtml_dir"> + <xsl:with-param name="node" select="$context"/> </xsl:call-template> - </xsl:param> - + </xsl:variable> <xsl:choose> - <xsl:when test="$href != ''"> - <xsl:variable name="content" select="document($href,/)"/> - <xsl:choose> - <xsl:when test="$content/*"> - <xsl:choose> - <xsl:when test="$content/*[1][self::html]"> - <!-- include just the children of html wrapper --> - <xsl:copy-of select="$content/*[1]/node()"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$content"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>ERROR: dbhtml-include processing instruction </xsl:text> - <xsl:text>href has no content.</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> + <xsl:when test="$path = ''"> + <xsl:if test="$ppath != ''"> + <xsl:value-of select="$ppath"/> + </xsl:if> </xsl:when> <xsl:otherwise> - <xsl:message> - <xsl:text>ERROR: dbhtml-include processing instruction has </xsl:text> - <xsl:text>missing or empty href value.</xsl:text> - </xsl:message> + <xsl:if test="$ppath != ''"> + <xsl:value-of select="$ppath"/> + <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'"> + <xsl:text>/</xsl:text> + </xsl:if> + </xsl:if> + <xsl:value-of select="$path"/> + <xsl:text>/</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:template> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl index 91184e648..223620938 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl @@ -66,7 +66,7 @@ </xsl:variable> <xsl:variable name="dbhtml-filename"> - <xsl:call-template name="dbhtml-filename"/> + <xsl:call-template name="pi.dbhtml_filename"/> </xsl:variable> <xsl:variable name="filename"> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl index 406149b79..5283675dd 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl @@ -19,10 +19,7 @@ <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/> <xsl:variable name="preamble" select="*[local-name(.) != 'title' and local-name(.) != 'titleabbrev' and local-name(.) != 'qandadiv' and local-name(.) != 'qandaentry']"/> <xsl:variable name="toc"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'toc'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_toc"/> </xsl:variable> <xsl:variable name="toc.params"> @@ -75,10 +72,7 @@ </xsl:if> <xsl:variable name="toc"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'toc'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_toc"/> </xsl:variable> <xsl:variable name="toc.params"> @@ -316,31 +310,19 @@ <xsl:template name="process.qandaset"> <xsl:variable name="label-width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'label-width'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_label-width"/> </xsl:variable> <xsl:variable name="table-summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <xsl:variable name="cellpadding"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'cellpadding'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_cellpadding"/> </xsl:variable> <xsl:variable name="cellspacing"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'cellspacing'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_cellspacing"/> </xsl:variable> <table border="0" summary="Q and A Set"> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl index f5b87e16e..42e6917c3 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl @@ -435,12 +435,15 @@ <xsl:attribute name="style">clear: both</xsl:attribute> </xsl:if> </xsl:if> - <xsl:if test="$allow-anchors != 0"> + <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0"> <xsl:call-template name="anchor"> <xsl:with-param name="node" select="$section"/> <xsl:with-param name="conditional" select="0"/> </xsl:call-template> </xsl:if> + <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')"> + <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> + </xsl:if> <xsl:copy-of select="$title"/> </xsl:element> </xsl:template> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl index 8e79b9623..4aa2c2c06 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl @@ -23,7 +23,9 @@ <div> <xsl:apply-templates select="." mode="class.attribute"/> <p> - <xsl:call-template name="anchor"/> + <xsl:call-template name="anchor"> + <xsl:with-param name="conditional" select="0"/> + </xsl:call-template> <xsl:apply-templates/> </p> </div> @@ -177,9 +179,8 @@ paramdef ::= (#PCDATA|type|replaceable|parameter|funcparams)* <xsl:template match="funcprototype"> <xsl:variable name="html-style"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="ancestor::funcsynopsis//processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'funcsynopsis-style'"/> + <xsl:call-template name="pi.dbhtml_funcsynopsis-style"> + <xsl:with-param name="node" select="ancestor::funcsynopsis/descendant-or-self::*"/> </xsl:call-template> </xsl:variable> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl index c0b77762b..b8a365146 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl @@ -135,24 +135,15 @@ </xsl:if> <xsl:variable name="summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <xsl:variable name="cellspacing"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'cellspacing'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_cellspacing"/> </xsl:variable> <xsl:variable name="cellpadding"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')[1]"/> - <xsl:with-param name="attribute" select="'cellpadding'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_cellpadding"/> </xsl:variable> <table> @@ -215,7 +206,6 @@ <xsl:choose> <xsl:when test="$table.borders.with.css != 0"> - <xsl:attribute name="border">0</xsl:attribute> <xsl:choose> <xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')"> <xsl:attribute name="style"> @@ -302,12 +292,18 @@ </xsl:call-template> </xsl:attribute> </xsl:when> + <xsl:when test="../@frame='none'"> + <xsl:attribute name="style"> + <xsl:text>border: none;</xsl:text> + </xsl:attribute> + </xsl:when> <xsl:otherwise> <xsl:attribute name="style"> <xsl:text>border-collapse: collapse;</xsl:text> </xsl:attribute> </xsl:otherwise> </xsl:choose> + </xsl:when> <xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'"> <xsl:attribute name="border">0</xsl:attribute> @@ -326,9 +322,8 @@ </xsl:variable> <xsl:variable name="explicit.table.width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="../processing-instruction('dbhtml')[1]"/> - <xsl:with-param name="attribute" select="'table-width'"/> + <xsl:call-template name="pi.dbhtml_table-width"> + <xsl:with-param name="node" select=".."/> </xsl:call-template> </xsl:variable> @@ -416,10 +411,7 @@ <xsl:template match="tgroup/processing-instruction('dbhtml')"> <xsl:variable name="summary"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="."/> - <xsl:with-param name="attribute" select="'table-summary'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_table-summary"/> </xsl:variable> <!-- Suppress the table-summary PI --> @@ -545,28 +537,19 @@ <xsl:variable name="row-height"> <xsl:if test="processing-instruction('dbhtml')"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'row-height'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_row-height"/> </xsl:if> </xsl:variable> <xsl:variable name="bgcolor"> <xsl:if test="processing-instruction('dbhtml')"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'bgcolor'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_bgcolor"/> </xsl:if> </xsl:variable> <xsl:variable name="class"> <xsl:if test="processing-instruction('dbhtml')"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'class'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_class"/> </xsl:if> </xsl:variable> @@ -776,10 +759,7 @@ <xsl:otherwise> <xsl:variable name="bgcolor"> <xsl:if test="processing-instruction('dbhtml')"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'bgcolor'"/> - </xsl:call-template> + <xsl:call-template name="pi.dbhtml_bgcolor"/> </xsl:if> </xsl:variable> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl index cb8c087fd..908d7ed2a 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl @@ -928,7 +928,9 @@ <h1> <xsl:apply-templates select="." mode="class.attribute"/> - <a id="{$id}"/> + <xsl:if test="$generate.id.attributes = 0"> + <a id="{$id}"/> + </xsl:if> <xsl:choose> <xsl:when test="$show.revisionflag != 0 and @revisionflag"> <span class="{@revisionflag}"> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl index ea8fd0c39..3cb162d96 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl @@ -169,23 +169,20 @@ <!-- Extract the <?dbhtml linenumbering.*?> PI values --> <xsl:variable name="pi.linenumbering.everyNth"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/> + <xsl:call-template name="pi.dbhtml_linenumbering.everyNth"> + <xsl:with-param name="node" select="$pi.context"/> </xsl:call-template> </xsl:variable> <xsl:variable name="pi.linenumbering.separator"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'linenumbering.separator'"/> + <xsl:call-template name="pi.dbhtml_linenumbering.separator"> + <xsl:with-param name="node" select="$pi.context"/> </xsl:call-template> </xsl:variable> <xsl:variable name="pi.linenumbering.width"> - <xsl:call-template name="dbhtml-attribute"> - <xsl:with-param name="pis" select="$pi.context/processing-instruction('dbhtml')"/> - <xsl:with-param name="attribute" select="'linenumbering.width'"/> + <xsl:call-template name="pi.dbhtml_linenumbering.width"> + <xsl:with-param name="node" select="$pi.context"/> </xsl:call-template> </xsl:variable> diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl index 11ca76b0f..3a9dcd8f8 100644 --- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl +++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl @@ -726,7 +726,6 @@ <xsl:apply-templates select="." mode="callout-bug"/> </xsl:template> -<!-- This is currently not working, because there is no corresponding ID generated by Java extensions for processing callouts <xsl:template match="area|areaset" mode="xref-to"> <xsl:param name="referrer"/> <xsl:param name="xrefstyle"/> @@ -737,7 +736,6 @@ </xsl:with-param> </xsl:call-template> </xsl:template> ---> <xsl:template match="book" mode="xref-to"> <xsl:param name="referrer"/> |