Updated docbook-xsl-snapshoot to r6925

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/new-xsl@8186 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

docbook-xsl-snapshot/VERSION

@@ -1,9 +1,9 @@
-<?xml version='1.0'?> <!-- -*- nxml -*- -->
+<?xml version='1.0'?> <!-- -*- nxml -*- vim: set foldlevel=2: -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-		xmlns:sf="http://sourceforge.net/"
-		exclude-result-prefixes="fm sf"
-                version='1.0'>
+  xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
+  xmlns:sf="http://sourceforge.net/"
+  exclude-result-prefixes="fm sf"
+  version='1.0'>
 
 <xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
 <xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/>
@@ -11,13 +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="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_6877</fm:Version>
+  <fm:Version>snapshot_6925</fm:Version>
 <!--
   <fm:License>MIT/X Consortium License</fm:License>
 -->
@@ -37,7 +38,7 @@ Major feature enhancements
   <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download</fm:Zipped-Tar-URL>
   <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download</fm:Bzipped-Tar-URL>
   <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
-  <fm:CVS-URL>http://docbook.cvs.sourceforge.net/docbook/</fm:CVS-URL>
+  <fm:CVS-URL>http://docbook.svn.sourceforge.net/viewvc/docbook/</fm:CVS-URL>
   <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
   <fm:Changes>This is a bug-fix release with a few feature enhancements.
 </fm:Changes>

docbook-xsl-snapshot/common/autoidx-kimber.xsl

@@ -17,7 +17,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/common/autoidx-kosek.xsl

@@ -19,7 +19,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/common/common.xsl

@@ -11,8 +11,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     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.
@@ -25,7 +25,7 @@ $Id$
 </releaseinfo>
 <author><surname>Walsh</surname>
 <firstname>Norman</firstname></author>
-<copyright><year>1999</year><year>2000</year>
+<copyright><year>1999-2007</year>
 <holder>Norman Walsh</holder>
 </copyright>
 </referenceinfo>
@@ -34,17 +34,16 @@ $Id$
 <partintro id="partintro">
 <title>Introduction</title>
 
-<para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
-other elements of the stylesheets.</para>
+<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 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>
+<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>
 
-<para>Although I am trying to be thorough, this documentation is known
-to be incomplete. Don't forget to read the source, too :-)</para>
 </partintro>
 
 </doc:reference>
@@ -99,12 +98,12 @@ manvolnum
 <doc:template name="is.component" xmlns="">
 <refpurpose>Tests if a given node is a component-level element</refpurpose>
 
-<refdescription>
+<refdescription id="is.component-desc">
 <para>This template returns '1' if the specified node is a component
 (Chapter, Appendix, etc.), and '0' otherwise.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="is.component-params">
 <variablelist>
 <varlistentry><term>node</term>
 <listitem>
@@ -114,7 +113,7 @@ manvolnum
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="is.component-returns">
 <para>This template returns '1' if the specified node is a component
 (Chapter, Appendix, etc.), and '0' otherwise.</para>
 </refreturn>
@@ -139,12 +138,12 @@ manvolnum
 <doc:template name="is.section" xmlns="">
 <refpurpose>Tests if a given node is a section-level element</refpurpose>
 
-<refdescription>
+<refdescription id="is.section-desc">
 <para>This template returns '1' if the specified node is a section
 (Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="is.section-params">
 <variablelist>
 <varlistentry><term>node</term>
 <listitem>
@@ -154,7 +153,7 @@ manvolnum
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="is.section-returns">
 <para>This template returns '1' if the specified node is a section
 (Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
 </refreturn>
@@ -182,7 +181,7 @@ manvolnum
 <doc:template name="section.level" xmlns="">
 <refpurpose>Returns the hierarchical level of a section</refpurpose>
 
-<refdescription>
+<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
 at level 2, etc.</para>
@@ -190,7 +189,7 @@ at level 2, etc.</para>
 <para>Recursive sections are calculated down to the fifth level.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="section.level-params">
 <variablelist>
 <varlistentry><term>node</term>
 <listitem>
@@ -201,7 +200,7 @@ Defaults to the context node.</para>
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="section.level-returns">
 <para>The section level, <quote>1</quote>, <quote>2</quote>, etc.
 </para>
 </refreturn>
@@ -259,12 +258,12 @@ Defaults to the context node.</para>
 <doc:template name="qanda.section.level" xmlns="">
 <refpurpose>Returns the hierarchical level of a QandASet</refpurpose>
 
-<refdescription>
+<refdescription id="qanda.section.level-desc">
 <para>This template calculates the hierarchical level of a QandASet.
 </para>
 </refdescription>
 
-<refreturn>
+<refreturn id="qanda.section.level-returns">
 <para>The level, <quote>1</quote>, <quote>2</quote>, etc.
 </para>
 </refreturn>
@@ -506,6 +505,9 @@ Defaults to the context node.</para>
     </xsl:when>
 
     <!-- handle corpauthor as a special case...-->
+    <!-- * MikeSmith 2007-06: I'm wondering if the person.name template -->
+    <!-- * actually ever gets called to handle corpauthor.. maybe -->
+    <!-- * we don't actually need to check for corpauthor here. -->
     <xsl:when test="local-name($node)='corpauthor'">
       <xsl:apply-templates select="$node"/>
     </xsl:when>
@@ -828,7 +830,7 @@ Defaults to the context node.</para>
 <doc:template name="select.mediaobject" xmlns="">
 <refpurpose>Selects and processes an appropriate media object from a list</refpurpose>
 
-<refdescription>
+<refdescription id="select.mediaobject-desc">
 <para>This template takes a list of media objects (usually the
 children of a mediaobject or inlinemediaobject) and processes
 the "right" object.</para>
@@ -840,7 +842,7 @@ in the list is appropriate.</para>
 <para>If no acceptable object is located, nothing happens.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="select.mediaobject-params">
 <variablelist>
 <varlistentry><term>olist</term>
 <listitem>
@@ -850,7 +852,7 @@ in the list is appropriate.</para>
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="select.mediaobject-returns">
 <para>Calls &lt;xsl:apply-templates&gt; on the selected object.</para>
 </refreturn>
 </doc:template>
@@ -877,7 +879,7 @@ in the list is appropriate.</para>
 <doc:template name="select.mediaobject.index" xmlns="">
 <refpurpose>Selects the position of the appropriate media object from a list</refpurpose>
 
-<refdescription>
+<refdescription id="select.mediaobject.index-desc">
 <para>This template takes a list of media objects (usually the
 children of a mediaobject or inlinemediaobject) and determines
 the "right" object. It returns the position of that object
@@ -897,7 +899,7 @@ of media objects is that the first acceptable graphic should be used.
 <para>If no acceptable object is located, no index is returned.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="select.mediaobject.index-params">
 <variablelist>
 <varlistentry><term>olist</term>
 <listitem>
@@ -913,7 +915,7 @@ recursive process.</para>
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="select.mediaobject.index-returns">
 <para>Returns the position in the original list of the selected object.</para>
 </refreturn>
 </doc:template>
@@ -1045,12 +1047,12 @@ recursive process.</para>
 <doc:template name="is.acceptable.mediaobject" xmlns="">
 <refpurpose>Returns '1' if the specified media object is recognized</refpurpose>
 
-<refdescription>
+<refdescription id="is.acceptable.mediaobject-desc">
 <para>This template examines a media object and returns '1' if the
 object is recognized as a graphic.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="is.acceptable.mediaobject-params">
 <variablelist>
 <varlistentry><term>object</term>
 <listitem>
@@ -1060,7 +1062,7 @@ object is recognized as a graphic.</para>
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="is.acceptable.mediaobject-returns">
 <para>0 or 1</para>
 </refreturn>
 </doc:template>
@@ -1191,7 +1193,7 @@ object is recognized as a graphic.</para>
 
 <doc:template name="check.id.unique" xmlns="">
 <refpurpose>Warn users about references to non-unique IDs</refpurpose>
-<refdescription>
+<refdescription id="check.id.unique-desc">
 <para>If passed an ID in <varname>linkend</varname>,
 <function>check.id.unique</function> prints
 a warning message to the user if either the ID does not exist or
@@ -1231,7 +1233,7 @@ the ID is not unique.</para>
 
 <doc:template name="check.idref.targets" xmlns="">
 <refpurpose>Warn users about incorrectly typed references</refpurpose>
-<refdescription>
+<refdescription id="check.idref.targets-desc">
 <para>If passed an ID in <varname>linkend</varname>,
 <function>check.idref.targets</function> makes sure that the element
 pointed to by the link is one of the elements listed in
@@ -1487,7 +1489,7 @@ pointed to by the link is one of the elements listed in
 <doc:template name="copyright.years" xmlns="">
 <refpurpose>Print a set of years with collapsed ranges</refpurpose>
 
-<refdescription>
+<refdescription id="copyright.years-desc">
 <para>This template prints a list of year elements with consecutive
 years printed as a range. In other words:</para>
 
@@ -1509,7 +1511,7 @@ are expressed in full <quote>century+year</quote>
 (<quote>1999</quote> not <quote>99</quote>) notation.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="copyright.years-params">
 <variablelist>
 <varlistentry><term>years</term>
 <listitem>
@@ -1533,7 +1535,7 @@ year range is <quote>1991-1992</quote> but discretely it's
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="copyright.years-returns">
 <para>This template returns the formatted list of years.</para>
 </refreturn>
 </doc:template>
@@ -1665,7 +1667,7 @@ year range is <quote>1991-1992</quote> but discretely it's
 <doc:template name="find.path.params" xmlns="">
 <refpurpose>Search in a table for the "best" match for the node</refpurpose>
 
-<refdescription>
+<refdescription id="find.path.params-desc">
 <para>This template searches in a table for the value that most-closely
 (in the typical best-match sense of XSLT) matches the current (element)
 node location.</para>
@@ -1815,7 +1817,7 @@ node location.</para>
 <doc:template name="string.upper" xmlns="">
 <refpurpose>Converts a string to all uppercase letters</refpurpose>
 
-<refdescription>
+<refdescription id="string.upper-desc">
 <para>Given a string, this template does a language-aware conversion
 of that string to all uppercase letters, based on the values of the
 <literal>lowercase.alpha</literal> and
@@ -1826,7 +1828,7 @@ locale. It affects only those characters found in the values of
 unchanged.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="string.upper-params">
 <variablelist>
 <varlistentry><term>string</term>
 <listitem>
@@ -1856,7 +1858,7 @@ unchanged.</para>
 <doc:template name="string.lower" xmlns="">
 <refpurpose>Converts a string to all lowercase letters</refpurpose>
 
-<refdescription>
+<refdescription id="string.lower-desc">
 <para>Given a string, this template does a language-aware conversion
 of that string to all lowercase letters, based on the values of the
 <literal>uppercase.alpha</literal> and
@@ -1867,7 +1869,7 @@ locale. It affects only those characters found in the values of
 unchanged.</para>
 </refdescription>
 
-<refparameter>
+<refparameter id="string.lower-params">
 <variablelist>
 <varlistentry><term>string</term>
 <listitem>
@@ -1896,7 +1898,7 @@ unchanged.</para>
 
 <doc:template name="select.choice.separator" xmlns="">
   <refpurpose>Returns localized choice separator</refpurpose>
-  <refdescription>
+  <refdescription id="select.choice.separator-desc">
     <para>This template enables auto-generation of an appropriate
     localized "choice" separator (for example, "and" or "or") before
     the final item in an inline list (though it could also be useful
@@ -1962,7 +1964,7 @@ unchanged.</para>
 
 <doc:template name="evaluate.info.profile" xmlns="">
   <refpurpose>Evaluates an info profile</refpurpose>
-  <refdescription>
+  <refdescription id="evaluate.info.profile-desc">
     <para>This template evaluates an "info profile" matching the XPath
     expression given by the <parameter>profile</parameter>
     parameter. It relies on the XSLT <function>evaluate()</function>
@@ -1977,7 +1979,7 @@ unchanged.</para>
     expression is then evaluated using the XSLT
     <function>evaluate()</function> extension function.</para>
   </refdescription>
-  <refparameter>
+  <refparameter id="evaluate.info.profile-params">
     <variablelist>
        <varlistentry>
         <term>profile</term>
@@ -1994,7 +1996,7 @@ unchanged.</para>
     </variablelist>
   </refparameter>
 
-  <refreturn>
+  <refreturn id="evaluate.info.profile-returns">
     <para>Returns a node (the result of evaluating the
     <parameter>profile</parameter> parameter)</para>
   </refreturn>
@@ -2023,254 +2025,4 @@ engine does not support it.
     </xsl:choose>
   </xsl:template>
 
-<!-- ===================================== -->
-
-<doc:template name="log.message" xmlns="">
-  <refpurpose>Logs/emits formatted notes and warnings</refpurpose>
-
-  <refdescription>
-    <para>The <function>log.message</function> template is a utility
-    template for logging/emitting formatted messages&#xa0;– that is,
-    notes and warnings, along with a given log "level" and an
-    identifier for the "source" that the message relates to.</para>
-  </refdescription>
-
-  <refparameter>
-    <variablelist>
-      <varlistentry>
-        <term>level</term>
-        <listitem>
-          <para>Text to log/emit in the message-level field to
-            indicate the message level
-          (<literal>Note</literal> or
-          <literal>Warning</literal>)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>source</term>
-        <listitem>
-          <para>Text to log/emit in the source field to identify the
-            “source” to which the notification/warning relates.
-            This can be any arbitrary string, but because the
-            message lacks line and column numbers to identify the
-            exact part of the source document to which it
-            relates, the intention is that the value you pass
-            into the <literal>source</literal> parameter should
-            give the user some way to identify the portion of
-            their source document on which to take potentially
-            take action in response to the log message (for
-            example, to edit, change, or add content).</para>
-          <para>So the <literal>source</literal> value should be,
-            for example, an ID, book/chapter/article title, title
-            of some formal object, or even a string giving an
-            XPath expression.</para>
-        </listitem>
-      </varlistentry>
-      <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>
-        <listitem>
-          <para>Specifies length of the context-description field
-            (in characters); default is 12</para>
-          <para>If the text specified by the
-            <literal>context-desc</literal> parameter is longer
-            than the number of characters specified in
-            <literal>context-desc-field-length</literal>, it is
-            truncated to <literal>context-desc-field-length</literal>
-            (12 characters by default).</para>
-          <para>If the specified text is shorter than
-            <literal>context-desc-field-length</literal>,
-          it is right-padded out to
-          <literal>context-desc-field-length</literal> (12 by
-          default).</para>
-        <para>If no value has been specified for the
-          <literal>context-desc</literal> parameter, the field is
-          left empty and the text of the log message begins with
-          the value of the <literal>message</literal>
-          parameter.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>message</term>
-        <listitem>
-          <para>Text to log/emit in the actual message field</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>message-field-length</term>
-        <listitem>
-          <para>Specifies length of the message
-            field (in characters); default is 45</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn>
-  <para>Outputs a message (generally, to standard error).</para></refreturn>
-</doc:template>
-<xsl:template name="log.message">
-  <xsl:param name="level"/>
-  <xsl:param name="source"/>
-  <xsl:param name="context-desc"/>
-  <xsl:param name="context-desc-field-length">12</xsl:param>
-  <xsl:param name="context-desc-padded">
-    <xsl:if test="not($context-desc = '')">
-      <xsl:call-template name="pad-string">
-        <xsl:with-param name="leftRight">right</xsl:with-param>
-        <xsl:with-param name="padVar"
-          select="substring($context-desc, 1, $context-desc-field-length)"/>
-        <xsl:with-param name="length" select="$context-desc-field-length"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:param>
-  <xsl:param name="message"/>
-  <xsl:param name="message-field-length" select="45"/>
-  <xsl:param name="message-padded">
-    <xsl:variable name="spaces-for-blank-level">
-      <!-- * if the level field is blank, we'll need to pad out -->
-      <!-- * the message field with spaces to compensate -->
-      <xsl:choose>
-        <xsl:when test="$level = ''">
-          <xsl:value-of select="4 + 2"/>
-          <!-- * 4 = hard-coded length of comment text ("Note" or "Warn") -->
-          <!-- * + 2 = length of colon-plus-space separator ": " -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="0"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="spaces-for-blank-context-desc">
-      <!-- * if the context-description field is blank, we'll need -->
-      <!-- * to pad out the message field with spaces to compensate -->
-      <xsl:choose>
-        <xsl:when test="$context-desc = ''">
-          <xsl:value-of select="$context-desc-field-length + 2"/>
-          <!-- * + 2 = length of colon-plus-space separator ": " -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="0"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="extra-spaces"
-      select="$spaces-for-blank-level + $spaces-for-blank-context-desc"/>
-    <xsl:call-template name="pad-string">
-      <xsl:with-param name="leftRight">right</xsl:with-param>
-      <xsl:with-param name="padVar"
-        select="substring($message, 1, ($message-field-length + $extra-spaces))"/>
-      <xsl:with-param name="length"
-        select="$message-field-length + $extra-spaces"/>
-    </xsl:call-template>
-  </xsl:param>
-  <!-- * emit the actual log message -->
-  <xsl:message>
-    <xsl:if test="not($level = '')">
-      <xsl:value-of select="$level"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:if test="not($context-desc = '')">
-      <xsl:value-of select="$context-desc-padded"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$message-padded"/>
-    <xsl:text>  </xsl:text>
-    <xsl:value-of select="$source"/>
-  </xsl:message>
-</xsl:template>
-
-<!-- ===================================== -->
-<doc:template name="get.doc.title" xmlns="">
-  <refpurpose>Get a title for the current document</refpurpose>
-  <refdescription>
-    <para>The <function>get.doc.title</function> template is a
-      utility template for returning the first title found in the
-      current document.</para>
-  </refdescription>
-  <refreturn>
-  <para>Returns a string containing some identifying title for the
-    current document .</para></refreturn>
-</doc:template>
-<xsl:template name="get.doc.title">
-  <xsl:choose>
-    <xsl:when test="//*[local-name() = 'title'
-      or local-name() = 'refname']">
-      <xsl:value-of select="//*[local-name() = 'title'
-        or local-name() = 'refname'][1]"/>
-    </xsl:when>
-    <xsl:when test="substring(local-name(*[1]),
-      string-length(local-name(*[1])-3) = 'info')
-      and *[1]/*[local-name() = 'title']">
-      <xsl:value-of select="*[1]/*[local-name() = 'title'][1]"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ===================================== -->
-<doc:template name="pad.string" xmlns="">
-  <refpurpose>Right-pad or left-pad a string out to a certain length</refpurpose>
-  <refdescription>
-    <para>This function takes string <parameter>padVar</parameter> and
-      pads it out in the direction <parameter>rightLeft</parameter> to
-      the string-length <parameter>length</parameter>, using string
-      <parameter>padChar</parameter> (a space character by default) as
-      the padding string (note that <parameter>padChar</parameter> can
-      be a string; it is not limited to just being a single
-      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>
-    </note>
-  </refdescription>
-  <refreturn>
-  <para>Returns a (padded) string.</para></refreturn>
-</doc:template>
-
-<xsl:template name="pad-string">
-  <!-- * recursive template to right/left pad the value with -->
-  <!-- * whatever padChar is passed in -->
-  <xsl:param name="padChar" select="' '"/>
-  <xsl:param name="leftRight">left</xsl:param>
-  <xsl:param name="padVar"/>
-  <xsl:param name="length"/>
-  <xsl:choose>
-    <xsl:when test="string-length($padVar) &lt; $length">
-      <xsl:call-template name="pad-string">
-        <xsl:with-param name="padChar" select="$padChar"/>
-        <xsl:with-param name="leftRight" select="$leftRight"/>
-        <xsl:with-param name="padVar">
-          <xsl:choose>
-            <!-- * determine whether string should be -->
-            <!-- * right- or left-padded -->
-            <xsl:when test="$leftRight = 'left'">
-              <!-- * pad it to left -->
-              <xsl:value-of select="concat($padChar,$padVar)"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- * otherwise, right-pad the string -->
-              <xsl:value-of select="concat($padVar,$padChar)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="length" select="$length"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of 
-        select="substring($padVar,string-length($padVar) - $length + 1)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
 </xsl:stylesheet>

docbook-xsl-snapshot/common/entities.ent

@@ -6,8 +6,8 @@
      sorting by various templates.
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/common/gentext.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/common/l10n.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      This file contains localization templates (for internationalization)
      ******************************************************************** -->

docbook-xsl-snapshot/common/labels.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -20,7 +20,7 @@
 
 <doc:mode mode="label.markup" xmlns="">
 <refpurpose>Provides access to element labels</refpurpose>
-<refdescription>
+<refdescription id="label.markup-desc">
 <para>Processing an element in the
 <literal role="mode">label.markup</literal> mode produces the
 element label.</para>
@@ -773,7 +773,7 @@ element label.</para>
 
 <doc:template name="label.this.section" xmlns="">
 <refpurpose>Returns true if $section should be labelled</refpurpose>
-<refdescription>
+<refdescription id="label.this.section-desc">
 <para>Returns true if the specified section should be labelled.
 By default, this template returns zero unless 
 the section level is less than or equal to the value of the
@@ -836,7 +836,7 @@ Custom stylesheets may override it to get more selective behavior.</para>
 
 <doc:template name="autolabel.format" xmlns="">
 <refpurpose>Returns format for autolabel parameters</refpurpose>
-<refdescription>
+<refdescription id="autolabel.format-desc">
 <para>Returns format passed as parameter if non zero. Supported
   format are 'arabic' or '1', 'loweralpha' or 'a', 'lowerroman' or 'i', 
   'upperlapha' or 'A', 'upperroman' or 'I', 'arabicindic' or '&#x661;'.

docbook-xsl-snapshot/common/pi.xsl

@@ -12,8 +12,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     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-xsl-snapshot/common/refentry.xsl

@@ -51,7 +51,7 @@
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.metadata" xmlns="">
   <refpurpose>Gathers metadata from a refentry and its ancestors</refpurpose>
-  <refdescription>
+  <refdescription id="get.refentry.metadata-desc">
     <para>Reference documentation for particular commands, functions,
     etc., is sometimes viewed in isolation from its greater "context". For
     example, users view Unix man pages as, well, individual pages, not as
@@ -86,7 +86,7 @@
     </note>
 
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.metadata-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -110,7 +110,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.metadata-returns">
     <para>Returns a node set with the following elements. The
     descriptions are verbatim from the <literal>man(7)</literal> man
     page.
@@ -191,7 +191,7 @@
 <!-- ====================================================================== -->
 <doc:template name="get.refentry.title" xmlns="">
   <refpurpose>Gets title metadata for a refentry</refpurpose>
-  <refdescription>
+  <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
@@ -199,7 +199,7 @@
     otherwise, we just use first <sgmltag>refname</sgmltag> in the first
     <sgmltag>refnamediv</sgmltag> in the source.</para>
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.title-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -209,7 +209,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.title-returns">
   <para>Returns a <sgmltag>title</sgmltag> node.</para></refreturn>
 </doc:template>
 <xsl:template name="get.refentry.title">
@@ -229,7 +229,7 @@
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.section" xmlns="">
   <refpurpose>Gets section metadata for a refentry</refpurpose>
-  <refdescription>
+  <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>
@@ -239,7 +239,7 @@
     default to using <literal>1</literal> ["Executable programs or shell
     commands"].</para>
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.section-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -255,7 +255,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.section-returns">
   <para>Returns a string representing a section number.</para></refreturn>
 </doc:template>
 <xsl:template name="get.refentry.section">
@@ -313,12 +313,12 @@
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.date" xmlns="">
   <refpurpose>Gets date metadata for a refentry</refpurpose>
-  <refdescription>
+  <refdescription id="get.refentry.date-desc">
     <para>The <literal>man(7)</literal> man page describes this as "the
     date of the last revision". If we cannot find a date in the source, we
     generate one.</para>
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.date-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -341,7 +341,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.date-returns">
     <para>Returns a <sgmltag>date</sgmltag> node.</para>
   </refreturn>
 </doc:template>
@@ -430,7 +430,7 @@
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.source" xmlns="">
   <refpurpose>Gets source metadata for a refentry</refpurpose>
-  <refdescription>
+  <refdescription id="get.refentry.source-desc">
     <para>The <literal>man(7)</literal> man page describes this as "the
     source of the command", and provides the following examples:
     <itemizedlist>
@@ -490,7 +490,7 @@
     probably will be no <replaceable>Version</replaceable>.
     </para>
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.source-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -514,7 +514,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.source-returns">
     <para>Returns a <sgmltag>source</sgmltag> node.</para>
   </refreturn>
 </doc:template>
@@ -600,13 +600,13 @@
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.source.name" xmlns="">
   <refpurpose>Gets source-name metadata for a refentry</refpurpose>
-  <refdescription>
+  <refdescription id="get.refentry.source.name-desc">
     <para>A "source name" is one part of a (potentially) two-part
     <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>
     source field. For more details, see the documentation for the
     <function>get.refentry.source</function> template.</para>
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.source.name-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -630,7 +630,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.source.name-returns">
     <para>Depending on what output method is used for the
   current stylesheet, either returns a text node or possibly an element
   node, containing "source name" data.</para>
@@ -784,13 +784,13 @@
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.version" xmlns="">
   <refpurpose>Gets version metadata for a refentry</refpurpose>
-  <refdescription>
+  <refdescription id="get.refentry.version-desc">
     <para>A "version" is one part of a (potentially) two-part
     <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>
     source field. For more details, see the documentation for the
     <function>get.refentry.source</function> template.</para>
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.version-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -814,7 +814,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.version-returns">
     <para>Depending on what output method is used for the
   current stylesheet, either returns a text node or possibly an element
   node, containing "version" data.</para>
@@ -929,7 +929,7 @@
 <!-- ==================================================================== -->
 <doc:template name="get.refentry.manual" xmlns="">
   <refpurpose>Gets source metadata for a refentry</refpurpose>
-  <refdescription>
+  <refdescription id="get.refentry.manual-desc">
     <para>The <literal>man(7)</literal> man page describes this as "the
     title of the manual (e.g., <citetitle>Linux Programmer's
     Manual</citetitle>)". Here are some examples from existing man pages:
@@ -976,7 +976,7 @@
     </para>
 
   </refdescription>
-  <refparameter>
+  <refparameter id="get.refentry.manual-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -1000,7 +1000,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="get.refentry.manual-returns">
     <para>Returns a <sgmltag>manual</sgmltag> node.</para>
   </refreturn>
 </doc:template>
@@ -1138,7 +1138,7 @@
 <!-- ====================================================================== -->
 <doc:template name="get.refentry.metadata.prefs" xmlns="">
   <refpurpose>Gets user preferences for refentry metadata gathering</refpurpose>
-  <refdescription>
+  <refdescription id="get.refentry.metadata.prefs-desc">
     <para>The DocBook XSL stylesheets include several user-configurable
     global stylesheet parameters for controlling <sgmltag>refentry</sgmltag>
     metadata gathering. Those parameters are not read directly by the
@@ -1153,11 +1153,11 @@
     template is the only interface to collecting stylesheet parameters for
     controlling <sgmltag>refentry</sgmltag> metadata gathering.</para>
   </refdescription>
-  <refparameter>
+  <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>
+  <refreturn id="get.refentry.metadata.prefs-returns">
     <para>Returns a <sgmltag>manual</sgmltag> node.</para>
   </refreturn>
 </doc:template>
@@ -1213,12 +1213,12 @@
 <!-- ====================================================================== -->
 <doc:template name="set.refentry.metadata" xmlns="">
   <refpurpose>Sets content of a refentry metadata item</refpurpose>
-  <refdescription>
+  <refdescription id="set.refentry.metadata-desc">
     <para>The <function>set.refentry.metadata</function> template is
     called each time a suitable source element is found for a certain
     metadata field.</para>
   </refdescription>
-  <refparameter>
+  <refparameter id="set.refentry.metadata-params">
     <variablelist>
       <varlistentry>
         <term>refname</term>
@@ -1248,7 +1248,7 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-  <refreturn>
+  <refreturn id="set.refentry.metadata-returns">
   <para>Returns formatted contents of a selected source element.</para></refreturn>
 </doc:template>
 <xsl:template name="set.refentry.metadata">

docbook-xsl-snapshot/common/stripns.xsl

@@ -13,14 +13,14 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     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.
      ******************************************************************** -->
 
-<xsl:import href="../common/common.xsl"/>
+<xsl:import href="utility.xsl"/>
 
 <!-- * Get a title for current doc so that we let the user -->
 <!-- * know what document we are processing at this point. -->

docbook-xsl-snapshot/common/subtitles.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -20,7 +20,7 @@
 
 <doc:mode mode="subtitle.markup" xmlns="">
 <refpurpose>Provides access to element subtitles</refpurpose>
-<refdescription>
+<refdescription id="subtitle.markup-desc">
 <para>Processing an element in the
 <literal role="mode">subtitle.markup</literal> mode produces the
 subtitle of the element.

docbook-xsl-snapshot/common/table.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -123,14 +123,14 @@
 
 <doc:template name="entry.colnum" xmlns="">
 <refpurpose>Determine the column number in which a given entry occurs</refpurpose>
-<refdescription>
+<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
 will determine the number of the column in which the entry should occur.
 For other <sgmltag>entry</sgmltag>s, nothing is returned.</para>
 </refdescription>
-<refparameter>
+<refparameter id="entry.colnum-params">
 <variablelist>
 <varlistentry><term>entry</term>
 <listitem>
@@ -140,7 +140,7 @@ For other <sgmltag>entry</sgmltag>s, nothing is returned.</para>
 </variablelist>
 </refparameter>
 
-<refreturn>
+<refreturn id="entry.colnum-returns">
 <para>This template returns the column number if it can be determined,
 or 0 (the empty string)</para>
 </refreturn>

docbook-xsl-snapshot/common/targets.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -20,7 +20,7 @@
 
 <doc:mode mode="collect.targets" xmlns="">
 <refpurpose>Collects information for potential cross reference targets</refpurpose>
-<refdescription>
+<refdescription id="collect.targets-desc">
 <para>Processing the root element in the
 <literal role="mode">collect.targets</literal> mode produces 
 a set of target database elements that can be used by

docbook-xsl-snapshot/common/titles.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -20,7 +20,7 @@
 
 <doc:mode mode="title.markup" xmlns="">
 <refpurpose>Provides access to element titles</refpurpose>
-<refdescription>
+<refdescription id="title.markup-desc">
 <para>Processing an element in the
 <literal role="mode">title.markup</literal> mode produces the
 title of the element. This does not include the label.

docbook-xsl-snapshot/common/utility.xsl

@@ -0,0 +1,304 @@
+<?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:dyn="http://exslt.org/dynamic"
+                xmlns:saxon="http://icl.com/saxon"
+                exclude-result-prefixes="doc dyn saxon"
+                version='1.0'>
+
+<!-- ********************************************************************
+     $Id$
+     ********************************************************************
+
+     This file is part of the XSL DocBook Stylesheet distribution.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     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>
+
+<!-- ====================================================================== -->
+
+<doc:template name="log.message" xmlns="">
+  <refpurpose>Logs/emits formatted notes and warnings</refpurpose>
+
+  <refdescription id="log.message-desc">
+    <para>The <function>log.message</function> template is a utility
+    template for logging/emitting formatted messages&#xa0;– that is,
+    notes and warnings, along with a given log “level” and an
+    identifier for the “source” that the message relates to.</para>
+  </refdescription>
+
+  <refparameter id="log.message-params">
+    <variablelist>
+      <varlistentry>
+        <term>level</term>
+        <listitem>
+          <para>Text to log/emit in the message-level field to
+            indicate the message level
+          (<literal>Note</literal> or
+          <literal>Warning</literal>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>source</term>
+        <listitem>
+          <para>Text to log/emit in the source field to identify the
+            “source” to which the notification/warning relates.
+            This can be any arbitrary string, but because the
+            message lacks line and column numbers to identify the
+            exact part of the source document to which it
+            relates, the intention is that the value you pass
+            into the <literal>source</literal> parameter should
+            give the user some way to identify the portion of
+            their source document on which to take potentially
+            take action in response to the log message (for
+            example, to edit, change, or add content).</para>
+          <para>So the <literal>source</literal> value should be,
+            for example, an ID, book/chapter/article title, title
+            of some formal object, or even a string giving an
+            XPath expression.</para>
+        </listitem>
+      </varlistentry>
+      <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>
+        <listitem>
+          <para>Specifies length of the context-description field
+            (in characters); default is 12</para>
+          <para>If the text specified by the
+            <literal>context-desc</literal> parameter is longer
+            than the number of characters specified in
+            <literal>context-desc-field-length</literal>, it is
+            truncated to <literal>context-desc-field-length</literal>
+            (12 characters by default).</para>
+          <para>If the specified text is shorter than
+            <literal>context-desc-field-length</literal>,
+          it is right-padded out to
+          <literal>context-desc-field-length</literal> (12 by
+          default).</para>
+        <para>If no value has been specified for the
+          <literal>context-desc</literal> parameter, the field is
+          left empty and the text of the log message begins with
+          the value of the <literal>message</literal>
+          parameter.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>message</term>
+        <listitem>
+          <para>Text to log/emit in the actual message field</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>message-field-length</term>
+        <listitem>
+          <para>Specifies length of the message
+            field (in characters); default is 45</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refparameter>
+  <refreturn id="log.message-returns">
+  <para>Outputs a message (generally, to standard error).</para></refreturn>
+</doc:template>
+<xsl:template name="log.message">
+  <xsl:param name="level"/>
+  <xsl:param name="source"/>
+  <xsl:param name="context-desc"/>
+  <xsl:param name="context-desc-field-length">12</xsl:param>
+  <xsl:param name="context-desc-padded">
+    <xsl:if test="not($context-desc = '')">
+      <xsl:call-template name="pad-string">
+        <xsl:with-param name="leftRight">right</xsl:with-param>
+        <xsl:with-param name="padVar"
+          select="substring($context-desc, 1, $context-desc-field-length)"/>
+        <xsl:with-param name="length" select="$context-desc-field-length"/>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:param>
+  <xsl:param name="message"/>
+  <xsl:param name="message-field-length" select="45"/>
+  <xsl:param name="message-padded">
+    <xsl:variable name="spaces-for-blank-level">
+      <!-- * if the level field is blank, we'll need to pad out -->
+      <!-- * the message field with spaces to compensate -->
+      <xsl:choose>
+        <xsl:when test="$level = ''">
+          <xsl:value-of select="4 + 2"/>
+          <!-- * 4 = hard-coded length of comment text ("Note" or "Warn") -->
+          <!-- * + 2 = length of colon-plus-space separator ": " -->
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="0"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="spaces-for-blank-context-desc">
+      <!-- * if the context-description field is blank, we'll need -->
+      <!-- * to pad out the message field with spaces to compensate -->
+      <xsl:choose>
+        <xsl:when test="$context-desc = ''">
+          <xsl:value-of select="$context-desc-field-length + 2"/>
+          <!-- * + 2 = length of colon-plus-space separator ": " -->
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="0"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="extra-spaces"
+      select="$spaces-for-blank-level + $spaces-for-blank-context-desc"/>
+    <xsl:call-template name="pad-string">
+      <xsl:with-param name="leftRight">right</xsl:with-param>
+      <xsl:with-param name="padVar"
+        select="substring($message, 1, ($message-field-length + $extra-spaces))"/>
+      <xsl:with-param name="length"
+        select="$message-field-length + $extra-spaces"/>
+    </xsl:call-template>
+  </xsl:param>
+  <!-- * emit the actual log message -->
+  <xsl:message>
+    <xsl:if test="not($level = '')">
+      <xsl:value-of select="$level"/>
+      <xsl:text>: </xsl:text>
+    </xsl:if>
+    <xsl:if test="not($context-desc = '')">
+      <xsl:value-of select="$context-desc-padded"/>
+      <xsl:text>: </xsl:text>
+    </xsl:if>
+    <xsl:value-of select="$message-padded"/>
+    <xsl:text>  </xsl:text>
+    <xsl:value-of select="$source"/>
+  </xsl:message>
+</xsl:template>
+
+<!-- ===================================== -->
+<doc:template name="get.doc.title" xmlns="">
+  <refpurpose>Gets a title from the current document</refpurpose>
+  <refdescription id="get.doc.title-desc">
+    <para>The <function>get.doc.title</function> template is a
+      utility template for returning the first title found in the
+      current document.</para>
+  </refdescription>
+  <refreturn id="get.doc.title-returns">
+  <para>Returns a string containing some identifying title for the
+    current document .</para></refreturn>
+</doc:template>
+<xsl:template name="get.doc.title">
+  <xsl:choose>
+    <xsl:when test="//*[local-name() = 'title'
+      or local-name() = 'refname']">
+      <xsl:value-of select="//*[local-name() = 'title'
+        or local-name() = 'refname'][1]"/>
+    </xsl:when>
+    <xsl:when test="substring(local-name(*[1]),
+      string-length(local-name(*[1])-3) = 'info')
+      and *[1]/*[local-name() = 'title']">
+      <xsl:value-of select="*[1]/*[local-name() = 'title'][1]"/>
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
+<!-- ===================================== -->
+<doc:template name="pad-string" xmlns="">
+  <refpurpose>Right-pads or left-pads a string out to a certain length</refpurpose>
+  <refdescription id="pad-string-desc">
+    <para>This function takes string <parameter>padVar</parameter> and
+      pads it out in the direction <parameter>rightLeft</parameter> to
+      the string-length <parameter>length</parameter>, using string
+      <parameter>padChar</parameter> (a space character by default) as
+      the padding string (note that <parameter>padChar</parameter> can
+      be a string; it is not limited to just being a single
+      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>
+    </note>
+  </refdescription>
+  <refreturn id="pad-string-returns">
+  <para>Returns a (padded) string.</para></refreturn>
+</doc:template>
+<xsl:template name="pad-string">
+  <!-- * recursive template to right/left pad the value with -->
+  <!-- * whatever padChar is passed in -->
+  <xsl:param name="padChar" select="' '"/>
+  <xsl:param name="leftRight">left</xsl:param>
+  <xsl:param name="padVar"/>
+  <xsl:param name="length"/>
+  <xsl:choose>
+    <xsl:when test="string-length($padVar) &lt; $length">
+      <xsl:call-template name="pad-string">
+        <xsl:with-param name="padChar" select="$padChar"/>
+        <xsl:with-param name="leftRight" select="$leftRight"/>
+        <xsl:with-param name="padVar">
+          <xsl:choose>
+            <!-- * determine whether string should be -->
+            <!-- * right- or left-padded -->
+            <xsl:when test="$leftRight = 'left'">
+              <!-- * pad it to left -->
+              <xsl:value-of select="concat($padChar,$padVar)"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <!-- * otherwise, right-pad the string -->
+              <xsl:value-of select="concat($padVar,$padChar)"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:with-param>
+        <xsl:with-param name="length" select="$length"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of 
+        select="substring($padVar,string-length($padVar) - $length + 1)"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>

docbook-xsl-snapshot/common/zh_cn.xml

@@ -46,7 +46,7 @@
 <l:gentext key="dedication" text="题词"/>
 <l:gentext key="Edition" text="版"/>
 <l:gentext key="edition" text="版"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
+<l:gentext key="Editor" text="编者"/>
 <l:gentext key="Equation" text="公式"/>
 <l:gentext key="equation" text="公式"/>
 <l:gentext key="Example" text="例"/>
@@ -83,22 +83,22 @@
 <l:gentext key="preface" text="前言"/>
 <l:gentext key="Procedure" text="过程"/>
 <l:gentext key="procedure" text="过程"/>
-<l:gentext key="ProductionSet" text="Production"/>
+<l:gentext key="ProductionSet" text="产品"/>
 <l:gentext key="PubDate" text="出版日期"/>
 <l:gentext key="pubdate" text="出版日期"/>
 <l:gentext key="Published" text="出版方"/>
 <l:gentext key="published" text="出版方"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
+<l:gentext key="Publisher" text="出版者"/>
 <l:gentext key="Qandadiv" text="质保"/>
 <l:gentext key="qandadiv" text="质保"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
+<l:gentext key="QandASet" text="常见问题"/>
 <l:gentext key="Question" text="问："/>
 <l:gentext key="question" text="问："/>
 <l:gentext key="RefEntry" text=""/>
 <l:gentext key="refentry" text=""/>
 <l:gentext key="Reference" text="参考"/>
 <l:gentext key="reference" text="参考"/>
-<l:gentext key="References" text="References" lang="en"/>
+<l:gentext key="References" text="参考"/>
 <l:gentext key="RefName" text="名称"/>
 <l:gentext key="refname" text="名称"/>
 <l:gentext key="RefSection" text=""/>
@@ -131,8 +131,8 @@
 <l:gentext key="Step" text="步骤"/>
 <l:gentext key="table" text="表"/>
 <l:gentext key="Table" text="表"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
+<l:gentext key="task" text="任务"/>
+<l:gentext key="Task" text="任务"/>
 <l:gentext key="tip" text="提示"/>
 <l:gentext key="TIP" text="提示"/>
 <l:gentext key="Tip" text="提示"/>
@@ -162,12 +162,12 @@
 <l:gentext key="unexpectedelementname" text="未预期的名称"/>
 <l:gentext key="unsupported" text="不支持"/>
 <l:gentext key="xrefto" text="xref to"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
+<l:gentext key="Authors" text="作者"/>
+<l:gentext key="copyeditor" text="版权编辑"/>
+<l:gentext key="graphicdesigner" text="美术编辑"/>
+<l:gentext key="productioneditor" text="产品编辑"/>
+<l:gentext key="technicaleditor" text="技术编辑"/>
+<l:gentext key="translator" text="译者"/>
 <l:gentext key="listofequations" text="公式清单"/>
 <l:gentext key="ListofEquations" text="公式清单"/>
 <l:gentext key="ListofExamples" text="范例清单"/>
@@ -188,8 +188,8 @@
 <l:gentext key="nav-up" text="上一级"/>
 <l:gentext key="nav-toc" text="目录"/>
 <l:gentext key="Draft" text="草稿"/>
-<l:gentext key="above" text="above"/>
-<l:gentext key="below" text="below"/>
+<l:gentext key="above" text="以上"/>
+<l:gentext key="below" text="以下"/>
 <l:gentext key="sectioncalled" text="一节"/>
 <l:gentext key="index symbols" text="符号"/>
 <l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
@@ -258,7 +258,7 @@
 <l:template name="procedure" text="%t"/>
 <l:template name="procedure.formal" text="过程 %n. %t"/>
 <l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="Production %n"/>
+<l:template name="productionset.formal" text="产品 %n"/>
 <l:template name="qandadiv" text="%t"/>
 <l:template name="qandaentry" text="%t"/>
 <l:template name="qandaset" text="%t"/>
@@ -444,7 +444,7 @@
 <l:template name="figure" text="图 %n"/>
 <l:template name="part" text="第 %n 部分"/>
 <l:template name="procedure" text="过程 %n"/>
-<l:template name="productionset" text="Production %n"/>
+<l:template name="productionset" text="产品 %n"/>
 <l:template name="qandadiv" text="质保 %n"/>
 <l:template name="qandaentry" text="问： %n"/>
 <l:template name="question" text="问： %n"/>
@@ -464,7 +464,7 @@
 <l:template name="figure" text="图 %n “%t”"/>
 <l:template name="part" text="第 %n 部分 “%t”"/>
 <l:template name="procedure" text="过程 %n, “%t”"/>
-<l:template name="productionset" text="Production %n, “%t”"/>
+<l:template name="productionset" text="产品 %n, “%t”"/>
 <l:template name="qandadiv" text="质保 %n, “%t”"/>
 <l:template name="refsect1" text="“%t”一节"/>
 <l:template name="refsect2" text="“%t”一节"/>

docbook-xsl-snapshot/fo/admon.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/annotations.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/autoidx-kimber.xsl

@@ -26,7 +26,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/autoidx-kosek.xsl

@@ -31,7 +31,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/autoidx-ng.xsl

@@ -8,7 +8,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/autoidx.xsl

@@ -18,7 +18,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/autotoc.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/biblio-iso690.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      The original code for processing bibliography in ISO690 style
      was provided by Jana Dvorakova <jana4u@seznam.cz>

docbook-xsl-snapshot/fo/biblio.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/block.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/callout.xsl

@@ -12,8 +12,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/component.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/division.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/docbook.xsl

@@ -17,8 +17,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -29,6 +29,7 @@
 <xsl:include href="../lib/lib.xsl"/>
 <xsl:include href="../common/l10n.xsl"/>
 <xsl:include href="../common/common.xsl"/>
+<xsl:include href="../common/utility.xsl"/>
 <xsl:include href="../common/labels.xsl"/>
 <xsl:include href="../common/titles.xsl"/>
 <xsl:include href="../common/subtitles.xsl"/>

docbook-xsl-snapshot/fo/ebnf.xsl

@@ -10,8 +10,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/fo-rtf.xsl

@@ -12,7 +12,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/fo.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/footnote.xsl

@@ -10,8 +10,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/formal.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/glossary.xsl

@@ -12,8 +12,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/graphics.xsl

@@ -18,8 +18,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      Contributors:
      Colin Paul Adams, <colin@colina.demon.co.uk>
@@ -612,8 +612,8 @@
 <xsl:template match="@fileref">
   <!-- need a check for absolute urls -->
   <xsl:choose>
-    <xsl:when test="contains(., ':')">
-      <!-- it has a uri scheme so it is an absolute uri -->
+    <xsl:when test="contains(., ':') or starts-with(.,'/')">
+      <!-- it has a uri scheme or starts with '/', so it is an absolute uri -->
       <xsl:value-of select="."/>
     </xsl:when>
     <xsl:when test="$keep.relative.image.uris != 0">

docbook-xsl-snapshot/fo/highlight.xsl

@@ -10,7 +10,7 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
      and other information.
 
      ******************************************************************** -->

docbook-xsl-snapshot/fo/htmltbl.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/index.xsl

@@ -14,8 +14,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/info.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/inline.xsl

@@ -23,8 +23,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/keywords.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/lists.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -639,9 +639,48 @@
 
 <!-- ==================================================================== -->
 
-<xsl:template match="simplelist">
+<xsl:template match="simplelist|simplelist[@type='vert']">
   <!-- with no type specified, the default is 'vert' -->
+
+  <xsl:variable name="explicit.table.width">
+    <xsl:call-template name="dbfo-attribute">
+      <xsl:with-param name="pis"
+		      select="processing-instruction('dbfo')"/>
+      <xsl:with-param name="attribute" select="'list-width'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="table.width">
+    <xsl:choose>
+      <xsl:when test="$explicit.table.width != ''">
+        <xsl:value-of select="$explicit.table.width"/>
+      </xsl:when>
+      <xsl:when test="$default.table.width = ''">
+        <xsl:text>100%</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$default.table.width"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <fo:table xsl:use-attribute-sets="normal.para.spacing">
+
+    <xsl:choose>
+      <xsl:when test="$axf.extensions != 0 or $xep.extensions != 0">
+	<xsl:attribute name="table-layout">auto</xsl:attribute>
+        <xsl:if test="$explicit.table.width != ''">
+          <xsl:attribute name="width"><xsl:value-of 
+	  select="$explicit.table.width"/></xsl:attribute>
+        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:attribute name="table-layout">fixed</xsl:attribute>
+        <xsl:attribute name="width"><xsl:value-of 
+                                      select="$table.width"/></xsl:attribute>
+      </xsl:otherwise>
+    </xsl:choose>
+
     <xsl:call-template name="simplelist.table.columns">
       <xsl:with-param name="cols">
         <xsl:choose>
@@ -763,33 +802,6 @@
   </fo:table>
 </xsl:template>
 
-<xsl:template match="simplelist[@type='vert']">
-  <fo:table xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="simplelist.table.columns">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <xsl:call-template name="simplelist.vert">
-        <xsl:with-param name="cols">
-          <xsl:choose>
-            <xsl:when test="@columns">
-              <xsl:value-of select="@columns"/>
-            </xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
 <xsl:template name="simplelist.table.columns">
   <xsl:param name="cols" select="1"/>
   <xsl:param name="curcol" select="1"/>

docbook-xsl-snapshot/fo/math.xsl

@@ -10,8 +10,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/pagesetup.xsl

@@ -9,7 +9,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/param.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/pi.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/profile-docbook.xsl

@@ -13,8 +13,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -25,6 +25,7 @@
 <xsl:include href="../lib/lib.xsl"/>
 <xsl:include href="../common/l10n.xsl"/>
 <xsl:include href="../common/common.xsl"/>
+<xsl:include href="../common/utility.xsl"/>
 <xsl:include href="../common/labels.xsl"/>
 <xsl:include href="../common/titles.xsl"/>
 <xsl:include href="../common/subtitles.xsl"/>

docbook-xsl-snapshot/fo/qandaset.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/refentry.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/sections.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/synop.xsl

@@ -12,8 +12,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/table.xsl

@@ -17,8 +17,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -38,17 +38,14 @@ $Id$
 <partintro id="partintro">
 <title>Introduction</title>
 
-<para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
-other elements of the stylesheets.</para>
+<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>
 
-<para>Although I am trying to be thorough, this documentation is known
-to be incomplete. Don't forget to read the source, too :-)</para>
 </partintro>
 </doc:reference>
 

docbook-xsl-snapshot/fo/task.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/titlepage.templates.xml

@@ -23,7 +23,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/titlepage.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/toc.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/verbatim.xsl

@@ -13,8 +13,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/fo/xep.xsl

@@ -18,7 +18,8 @@
 
 <xsl:template name="xep-document-information">
   <rx:meta-info>
-    <xsl:variable name="authors" select="(//author|//editor|//corpauthor|//authorgroup)[1]"/>
+    <xsl:variable name="authors" 
+                  select="(//author|//editor|//corpauthor|//authorgroup)[1]"/>
     <xsl:if test="$authors">
       <xsl:variable name="author">
         <xsl:choose>

docbook-xsl-snapshot/fo/xref.xsl

@@ -11,8 +11,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/highlighting/common.xsl

@@ -10,7 +10,7 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
      and other information.
 
      ******************************************************************** -->

docbook-xsl-snapshot/html/chunker.xsl

@@ -13,8 +13,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/lib/lib.xsl

@@ -5,8 +5,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      This module implements DTD-independent functions
 

docbook-xsl-snapshot/xhtml/admon.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/autoidx-ng.xsl

@@ -9,7 +9,7 @@
 
      This file is part of the DocBook XSL Stylesheet distribution.
      See ../README or http://docbook.sf.net/ for copyright
-     and other information.
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/autoidx.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/autotoc.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/biblio-iso690.xsl

@@ -9,8 +9,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      The original code for processing bibliography in ISO690 style
      was provided by Jana Dvorakova <jana4u@seznam.cz>

docbook-xsl-snapshot/xhtml/biblio.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/block.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/callout.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/changebars.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/chunk-code.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -78,11 +78,26 @@
         <xsl:value-of select="$html.ext"/>
       </xsl:when>
       <!-- Special case -->
-      <xsl:when test="self::legalnotice and $generate.legalnotice.link != 0">
-        <xsl:variable name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:variable>
-        <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+      <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)">
+        <xsl:choose>
+          <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)">
+            <!-- * if this legalnotice has an ID, then go ahead and use -->
+            <!-- * just the value of that ID as the basename for the file -->
+            <!-- * (that is, without prepending an "ln-" too it) -->
+            <xsl:value-of select="(@id|@xml:id)[1]"/>
+            <xsl:value-of select="$html.ext"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- * otherwise, if this legalnotice does not have an ID, -->
+            <!-- * then we generate an ID... -->
+            <xsl:variable name="id">
+              <xsl:call-template name="object.id"/>
+            </xsl:variable>
+            <!-- * ...and then we take that generated ID, prepend an -->
+            <!-- * "ln-" to it, and use that as the basename for the file -->
+            <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:when>
       <!-- if there's no dbhtml filename, and if we're to use IDs as -->
       <!-- filenames, then use the ID to generate the filename. -->

docbook-xsl-snapshot/xhtml/chunk-common.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/chunk.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/chunker.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/chunkfast.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/chunktoc.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/component.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/division.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/docbook.xsl

@@ -10,8 +10,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 
@@ -22,6 +22,7 @@
 <xsl:include href="../lib/lib.xsl"/>
 <xsl:include href="../common/l10n.xsl"/>
 <xsl:include href="../common/common.xsl"/>
+<xsl:include href="../common/utility.xsl"/>
 <xsl:include href="../common/labels.xsl"/>
 <xsl:include href="../common/titles.xsl"/>
 <xsl:include href="../common/subtitles.xsl"/>

docbook-xsl-snapshot/xhtml/ebnf.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/footnote.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/formal.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/glossary.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/graphics.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      Contributors:
      Colin Paul Adams, <colin@colina.demon.co.uk>
@@ -1151,14 +1151,8 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 
 <xsl:template name="longdesc.uri">
   <xsl:param name="mediaobject" select="."/>
-
   <xsl:if test="$html.longdesc">
     <xsl:if test="$mediaobject/textobject[not(phrase)]">
-      <xsl:variable name="image-id">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$mediaobject"/>
-        </xsl:call-template>
-      </xsl:variable>
       <xsl:variable name="dbhtml.dir">
         <xsl:call-template name="dbhtml-dir"/>
       </xsl:variable>
@@ -1174,7 +1168,29 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:with-param>
-          <xsl:with-param name="base.name" select="concat('ld-',$image-id,$html.ext)"/>
+          <xsl:with-param name="base.name">
+            <xsl:choose>
+              <xsl:when test="                 $mediaobject/@*[local-name() = 'id']                 and not($use.id.as.filename = 0)">
+                <!-- * if this mediaobject has an ID, then we use the -->
+                <!-- * value of that ID as basename for the "longdesc" -->
+                <!-- * file (that is, without prepending an "ld-" too it) -->
+                <xsl:value-of select="$mediaobject/@*[local-name() = 'id']"/>
+                <xsl:value-of select="$html.ext"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <!-- * otherwise, if this mediaobject does not have an -->
+                <!-- * ID, then we generate an ID... -->
+                <xsl:variable name="image-id">
+                  <xsl:call-template name="object.id">
+                    <xsl:with-param name="object" select="$mediaobject"/>
+                  </xsl:call-template>
+                </xsl:variable>
+                <!-- * ...and then we take that generated ID, prepend an -->
+                <!-- * "ld-" to it, and use that as the basename for the file -->
+                <xsl:value-of select="concat('ld-',$image-id,$html.ext)"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:with-param>
         </xsl:call-template>
       </xsl:variable>
 

docbook-xsl-snapshot/xhtml/highlight.xsl

@@ -8,7 +8,7 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
      and other information.
 
      ******************************************************************** -->

docbook-xsl-snapshot/xhtml/html-rtf.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/html.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/htmltbl.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/index.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/info.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/inline.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 <xsl:template name="simple.xlink">

docbook-xsl-snapshot/xhtml/keywords.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/lists.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->
 

docbook-xsl-snapshot/xhtml/maketoc.xsl

@@ -8,8 +8,8 @@
      ********************************************************************
 
      This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://nwalsh.com/docbook/xsl/ for copyright
-     and other information.
+     See ../README or http://docbook.sf.net/release/xsl/current/ for
+     copyright and other information.
 
      ******************************************************************** -->