r8171 - in branches/new-xsl/docbook-xsl-snapshot: . common fo lib profiling xhtml

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Jun 24 03:12:23 PDT 2007


Author: manuel
Date: 2007-06-24 04:12:22 -0600 (Sun, 24 Jun 2007)
New Revision: 8171

Modified:
   branches/new-xsl/docbook-xsl-snapshot/VERSION
   branches/new-xsl/docbook-xsl-snapshot/common/common.xsl
   branches/new-xsl/docbook-xsl-snapshot/common/cs.xml
   branches/new-xsl/docbook-xsl-snapshot/common/entities.ent
   branches/new-xsl/docbook-xsl-snapshot/common/refentry.xsl
   branches/new-xsl/docbook-xsl-snapshot/fo/inline.xsl
   branches/new-xsl/docbook-xsl-snapshot/fo/param.xsl
   branches/new-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl
   branches/new-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl
   branches/new-xsl/docbook-xsl-snapshot/lib/lib.xsl
   branches/new-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/param.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl
   branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
Log:
Updated docbook-xsl-snapshot to r6863

Modified: branches/new-xsl/docbook-xsl-snapshot/VERSION
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/VERSION	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/VERSION	2007-06-24 10:12:22 UTC (rev 8171)
@@ -17,7 +17,7 @@
 <fm:project>
   <fm:Project>DocBook</fm:Project>
   <fm:Branch>XSL Stylesheets</fm:Branch>
-  <fm:Version>snapshot_6830</fm:Version>
+  <fm:Version>snapshot_6863</fm:Version>
 <!--
   <fm:License>MIT/X Consortium License</fm:License>
 -->

Modified: branches/new-xsl/docbook-xsl-snapshot/common/common.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/common/common.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/common/common.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1966,7 +1966,7 @@
 <doc:template name="evaluate.info.profile" xmlns="">
   <refpurpose>Evaluates an info profile</refpurpose>
   <refdescription>
-    <para>This function evaluates an "info profile" matching the XPath
+    <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>
     extension function.</para>
@@ -2033,8 +2033,8 @@
   <refpurpose>Logs/emits formatted notes and warnings</refpurpose>
 
   <refdescription>
-    <para>The <function>log.message</function> function is a utility
-    function for logging/emitting formatted messages&#xa0;– that is,
+    <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>
@@ -2044,7 +2044,8 @@
       <varlistentry>
         <term>level</term>
         <listitem>
-          <para>Text to indicate the message level
+          <para>Text to log/emit in the message-level field to
+            indicate the message level
           (<literal>Note</literal> or
           <literal>Warning</literal>)</para>
         </listitem>
@@ -2052,20 +2053,64 @@
       <varlistentry>
         <term>source</term>
         <listitem>
-          <para>Text to identify source element the
-          notification/warning relates to</para>
+          <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>Message to lot/emit</para>
+          <para>Text to log/emit in the actual message field</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>message-width</term>
+        <term>message-field-length</term>
         <listitem>
-          <para>Expected maximum message width</para>
+          <para>Specifies length of the message
+            field (in characters); default is 45</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -2077,18 +2122,72 @@
 <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-width">50</xsl:param>
-  <xsl:message><xsl:value-of
-  select="$level"/><xsl:text>: </xsl:text><xsl:value-of
-  select="$message"/><xsl:call-template
-  name="copy-string">
-  <xsl:with-param name="string" select="'&#x20;'"/>
-  <xsl:with-param
-      name="count"
-      select="$message-width - string-length($message)"/>
-  </xsl:call-template><xsl:value-of
-  select="$source"/></xsl: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>
 
 </xsl:stylesheet>

Modified: branches/new-xsl/docbook-xsl-snapshot/common/cs.xml
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/common/cs.xml	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/common/cs.xml	2007-06-24 10:12:22 UTC (rev 8171)
@@ -161,12 +161,12 @@
 <l:gentext key="unexpectedelementname" text="Neočekávané jméno prvku"/>
 <l:gentext key="unsupported" text="nepodporovaný"/>
 <l:gentext key="xrefto" text="xref k"/>
-<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="Autoři"/>
+<l:gentext key="copyeditor" text="Korektor"/>
+<l:gentext key="graphicdesigner" text="Grafický designér"/>
+<l:gentext key="productioneditor" text="Produkce"/>
+<l:gentext key="technicaleditor" text="Technický editor"/>
+<l:gentext key="translator" text="Překladatel"/>
 <l:gentext key="listofequations" text="Seznam rovnic"/>
 <l:gentext key="ListofEquations" text="Seznam rovnic"/>
 <l:gentext key="ListofExamples" text="Seznam příkladů"/>

Modified: branches/new-xsl/docbook-xsl-snapshot/common/entities.ent
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/common/entities.ent	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/common/entities.ent	2007-06-24 10:12:22 UTC (rev 8171)
@@ -21,37 +21,12 @@
 <!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
 
 
-<!ENTITY section   '(ancestor-or-self::set
-                     |ancestor-or-self::book
-                     |ancestor-or-self::part
-                     |ancestor-or-self::reference
-                     |ancestor-or-self::partintro
-                     |ancestor-or-self::chapter
-                     |ancestor-or-self::appendix
-                     |ancestor-or-self::preface
-                     |ancestor-or-self::article
-                     |ancestor-or-self::section
-                     |ancestor-or-self::sect1
-                     |ancestor-or-self::sect2
-                     |ancestor-or-self::sect3
-                     |ancestor-or-self::sect4
-                     |ancestor-or-self::sect5
-                     |ancestor-or-self::refentry
-                     |ancestor-or-self::refsect1
-                     |ancestor-or-self::refsect2
-                     |ancestor-or-self::refsect3
-                     |ancestor-or-self::simplesect
-                     |ancestor-or-self::bibliography
-                     |ancestor-or-self::glossary
-                     |ancestor-or-self::index
-                     |ancestor-or-self::webpage)[last()]'>
+<!ENTITY section   '(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]'>
 
 <!ENTITY section.id 'generate-id(§ion;)'>
 <!ENTITY sep '" "'>
 
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
+<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
 
 <!ENTITY setup-language-variable '
 <xsl:variable name="language" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: branches/new-xsl/docbook-xsl-snapshot/common/refentry.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/common/refentry.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/common/refentry.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -16,7 +16,6 @@
      ******************************************************************** -->
 
 <!-- ==================================================================== -->
-
 <doc:reference xmlns="">
   <referenceinfo>
     <releaseinfo role="meta">
@@ -50,10 +49,8 @@
 </doc:reference>
 
 <!-- ==================================================================== -->
-
 <doc:template name="get.refentry.metadata" xmlns="">
   <refpurpose>Gathers metadata from a refentry and its ancestors</refpurpose>
-
   <refdescription>
     <para>Reference documentation for particular commands, functions,
     etc., is sometimes viewed in isolation from its greater "context". For
@@ -73,7 +70,7 @@
     the <sgmltag>releaseinfo</sgmltag> element.</para>
 
     <para>Taking all that in mind, the
-    <function>get.refentry.metadata</function> function tries to gather
+    <function>get.refentry.metadata</function> template tries to gather
     metadata from a <sgmltag>refentry</sgmltag> element and its ancestor
     elements in an intelligent and user-configurable way. The basic
     mechanism used in the XPath expressions throughout this stylesheet
@@ -82,14 +79,13 @@
     <sgmltag>refentry</sgmltag> itself, or on its nearest ancestor.</para>
 
     <note>
-      <para>The <function>get.refentry.metadata</function> function is
-      actually just sort of a "driver" function; it calls other
-      functions that do the actual data collection, then returns the
-      data as a set.</para>
+      <para>The <function>get.refentry.metadata</function>
+        template is actually just sort of a "driver" template; it
+        calls other templates that do the actual data collection,
+        then returns the data as a set.</para>
     </note>
 
   </refdescription>
-
   <refparameter>
     <variablelist>
       <varlistentry>
@@ -114,7 +110,6 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
   <refreturn>
     <para>Returns a node set with the following elements. The
     descriptions are verbatim from the <literal>man(7)</literal> man
@@ -156,7 +151,6 @@
     </para>
   </refreturn>
 </doc:template>
-
 <xsl:template name="get.refentry.metadata">
   <xsl:param name="refname"/>
   <xsl:param name="info"/>
@@ -195,10 +189,8 @@
 </xsl:template>
 
 <!-- ====================================================================== -->
-
 <doc:template name="get.refentry.title" xmlns="">
   <refpurpose>Gets title metadata for a refentry</refpurpose>
-
   <refdescription>
     <para>The <literal>man(7)</literal> man page describes this as "the
     title of the man page (e.g., <literal>MAN</literal>). This differs
@@ -207,7 +199,6 @@
     otherwise, we just use first <sgmltag>refname</sgmltag> in the first
     <sgmltag>refnamediv</sgmltag> in the source.</para>
   </refdescription>
-
   <refparameter>
     <variablelist>
       <varlistentry>
@@ -218,11 +209,9 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
   <refreturn>
   <para>Returns a <sgmltag>title</sgmltag> node.</para></refreturn>
 </doc:template>
-
 <xsl:template name="get.refentry.title">
   <xsl:param name="refname"/>
   <xsl:choose>
@@ -238,10 +227,8 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-
 <doc:template name="get.refentry.section" xmlns="">
   <refpurpose>Gets section metadata for a refentry</refpurpose>
-
   <refdescription>
     <para>The <literal>man(7)</literal> man page describes this as "the
     section number the man page should be placed in (e.g.,
@@ -252,7 +239,6 @@
     default to using <literal>1</literal> ["Executable programs or shell
     commands"].</para>
   </refdescription>
-
   <refparameter>
     <variablelist>
       <varlistentry>
@@ -269,7 +255,6 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
   <refreturn>
   <para>Returns a string representing a section number.</para></refreturn>
 </doc:template>
@@ -286,10 +271,19 @@
           <xsl:call-template name="log.message">
             <xsl:with-param name="level">Note</xsl:with-param>
             <xsl:with-param name="source" select="$refname"/>
-            <xsl:with-param
-                name="message"
-                >meta manvol : No manvolnum</xsl:with-param>
+            <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
+            <xsl:with-param name="message">
+              <xsl:text>no refentry/refmeta/manvolnum</xsl:text>
+            </xsl:with-param>
           </xsl:call-template>
+          <xsl:call-template name="log.message">
+            <xsl:with-param name="level">Note</xsl:with-param>
+            <xsl:with-param name="source" select="$refname"/>
+            <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
+            <xsl:with-param name="message">
+              <xsl:text>see http://docbook.sf.net/el/manvolnum</xsl:text>
+            </xsl:with-param>
+          </xsl:call-template>
         </xsl:if>
       </xsl:if>
       <xsl:choose>
@@ -299,9 +293,10 @@
               <xsl:call-template name="log.message">
                 <xsl:with-param name="level">Note</xsl:with-param>
                 <xsl:with-param name="source" select="$refname"/>
-                <xsl:with-param
-                    name="message"
-                    >meta manvol : Setting man section to 3</xsl:with-param>
+                <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
+                <xsl:with-param name="message">
+                  <xsl:text>Setting man section to 3</xsl:text>
+                </xsl:with-param>
               </xsl:call-template>
             </xsl:if>
           </xsl:if>
@@ -316,16 +311,13 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-
 <doc:template name="get.refentry.date" xmlns="">
   <refpurpose>Gets date metadata for a refentry</refpurpose>
-
   <refdescription>
     <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>
     <variablelist>
       <varlistentry>
@@ -349,10 +341,10 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
-  <refreturn><para>Returns a <sgmltag>date</sgmltag> node.</para></refreturn>
+  <refreturn>
+    <para>Returns a <sgmltag>date</sgmltag> node.</para>
+  </refreturn>
 </doc:template>
-
 <xsl:template name="get.refentry.date">
   <xsl:param name="refname"/>
   <xsl:param name="info"/>
@@ -398,10 +390,19 @@
         <xsl:call-template name="log.message">
           <xsl:with-param name="level">Note</xsl:with-param>
           <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param
-              name="message"
-              >meta date   : No date. Using generated date</xsl:with-param>
+          <xsl:with-param name="context-desc">meta date</xsl:with-param>
+          <xsl:with-param name="message">
+            <xsl:text>no date; using generated date</xsl:text>
+          </xsl:with-param>
         </xsl:call-template>
+        <xsl:call-template name="log.message">
+          <xsl:with-param name="level">Note</xsl:with-param>
+          <xsl:with-param name="source" select="$refname"/>
+          <xsl:with-param name="context-desc">meta date</xsl:with-param>
+          <xsl:with-param name="message">
+            <xsl:text>see http://docbook.sf.net/el/date</xsl:text>
+          </xsl:with-param>
+        </xsl:call-template>
       </xsl:if>
       <xsl:call-template name="datetime.format">
         <xsl:with-param name="date">
@@ -427,10 +428,8 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-
 <doc:template name="get.refentry.source" xmlns="">
   <refpurpose>Gets source metadata for a refentry</refpurpose>
-
   <refdescription>
     <para>The <literal>man(7)</literal> man page describes this as "the
     source of the command", and provides the following examples:
@@ -491,7 +490,6 @@
     probably will be no <replaceable>Version</replaceable>.
     </para>
   </refdescription>
-
   <refparameter>
     <variablelist>
       <varlistentry>
@@ -516,10 +514,10 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
-  <refreturn><para>Returns a <sgmltag>source</sgmltag> node.</para></refreturn>
+  <refreturn>
+    <para>Returns a <sgmltag>source</sgmltag> node.</para>
+  </refreturn>
 </doc:template>
-
 <xsl:template name="get.refentry.source">
   <xsl:param name="refname"/>
   <xsl:param name="info"/>
@@ -575,9 +573,10 @@
             <xsl:call-template name="log.message">
               <xsl:with-param name="level">Warn</xsl:with-param>
               <xsl:with-param name="source" select="$refname"/>
-              <xsl:with-param
-                  name="message"
-                  >meta source : No valid fallback. Leaving empty</xsl:with-param>
+              <xsl:with-param name="context-desc">meta source</xsl:with-param>
+              <xsl:with-param name="message">
+                <xsl:text>no valid fallback for source; leaving empty</xsl:text>
+              </xsl:with-param>
             </xsl:call-template>
           </xsl:if>
         </xsl:otherwise>
@@ -588,9 +587,10 @@
         <xsl:call-template name="log.message">
           <xsl:with-param name="level">Warn</xsl:with-param>
           <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param
-              name="message"
-              >meta source : No fallback specified; leaving empty.</xsl:with-param>
+          <xsl:with-param name="context-desc">meta source</xsl:with-param>
+          <xsl:with-param name="message">
+            <xsl:text>no source fallback specified; leaving empty</xsl:text>
+          </xsl:with-param>
         </xsl:call-template>
       </xsl:if>
     </xsl:otherwise>
@@ -598,17 +598,14 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-
 <doc:template name="get.refentry.source.name" xmlns="">
   <refpurpose>Gets source-name metadata for a refentry</refpurpose>
-
   <refdescription>
     <para>A "source name" is one part of a (potentially) two-part
     <replaceable>Name</replaceable> <replaceable>Version</replaceable>
     source field. For more details, see the documentation for the
     <function>get.refentry.source</function> template.</para>
   </refdescription>
-
   <refparameter>
     <variablelist>
       <varlistentry>
@@ -633,12 +630,12 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
-  <refreturn><para>Depending on what output method is used for the
+  <refreturn>
+    <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></refreturn>
+  node, containing "source name" data.</para>
+  </refreturn>
 </doc:template>
-
 <xsl:template name="get.refentry.source.name">
   <xsl:param name="refname"/>
   <xsl:param name="info"/>
@@ -746,17 +743,35 @@
                 <xsl:call-template name="log.message">
                   <xsl:with-param name="level">Note</xsl:with-param>
                   <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param
-                      name="message"
-                      >meta source : No productname or alternative</xsl:with-param>
+                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>no *info/productname or alternative</xsl:text>
+                  </xsl:with-param>
                 </xsl:call-template>
                 <xsl:call-template name="log.message">
                   <xsl:with-param name="level">Note</xsl:with-param>
                   <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param
-                      name="message"
-                      >meta source : No refmiscinfo at class=source</xsl:with-param>
+                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>see http://docbook.sf.net/el/productname</xsl:text>
+                  </xsl:with-param>
                 </xsl:call-template>
+                <xsl:call-template name="log.message">
+                  <xsl:with-param name="level">Note</xsl:with-param>
+                  <xsl:with-param name="source" select="$refname"/>
+                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>no refentry/refmeta/refmiscinfo at class=source</xsl:text>
+                  </xsl:with-param>
+                </xsl:call-template>
+                <xsl:call-template name="log.message">
+                  <xsl:with-param name="level">Note</xsl:with-param>
+                  <xsl:with-param name="source" select="$refname"/>
+                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
+                  </xsl:with-param>
+                </xsl:call-template>
               </xsl:if>
             </xsl:otherwise>
           </xsl:choose>
@@ -767,17 +782,14 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-
 <doc:template name="get.refentry.version" xmlns="">
   <refpurpose>Gets version metadata for a refentry</refpurpose>
-
   <refdescription>
     <para>A "version" is one part of a (potentially) two-part
     <replaceable>Name</replaceable> <replaceable>Version</replaceable>
     source field. For more details, see the documentation for the
     <function>get.refentry.source</function> template.</para>
   </refdescription>
-
   <refparameter>
     <variablelist>
       <varlistentry>
@@ -802,12 +814,12 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
-  <refreturn><para>Depending on what output method is used for the
+  <refreturn>
+    <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></refreturn>
+  node, containing "version" data.</para>
+  </refreturn>
 </doc:template>
-
 <xsl:template name="get.refentry.version">
   <xsl:param name="refname"/>
   <xsl:param name="info"/>
@@ -876,17 +888,35 @@
                 <xsl:call-template name="log.message">
                   <xsl:with-param name="level">Note</xsl:with-param>
                   <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param
-                      name="message"
-                      >meta version: No productnumber or alternative</xsl:with-param>
+                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>no *info/productnumber or alternative</xsl:text>
+                  </xsl:with-param>
                 </xsl:call-template>
                 <xsl:call-template name="log.message">
                   <xsl:with-param name="level">Note</xsl:with-param>
                   <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param
-                      name="message"
-                      >meta version: No refmiscinfo at class=version</xsl:with-param>
+                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>see http://docbook.sf.net/el/productnumber</xsl:text>
+                  </xsl:with-param>
                 </xsl:call-template>
+                <xsl:call-template name="log.message">
+                  <xsl:with-param name="level">Note</xsl:with-param>
+                  <xsl:with-param name="source" select="$refname"/>
+                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>no refentry/refmeta/refmiscinfo at class=version</xsl:text>
+                  </xsl:with-param>
+                </xsl:call-template>
+                <xsl:call-template name="log.message">
+                  <xsl:with-param name="level">Note</xsl:with-param>
+                  <xsl:with-param name="source" select="$refname"/>
+                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
+                  <xsl:with-param name="message">
+                    <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
+                  </xsl:with-param>
+                </xsl:call-template>
               </xsl:if>
             </xsl:otherwise>
           </xsl:choose>
@@ -897,10 +927,8 @@
 </xsl:template>
 
 <!-- ==================================================================== -->
-
 <doc:template name="get.refentry.manual" xmlns="">
   <refpurpose>Gets source metadata for a refentry</refpurpose>
-
   <refdescription>
     <para>The <literal>man(7)</literal> man page describes this as "the
     title of the manual (e.g., <citetitle>Linux Programmer's
@@ -948,7 +976,6 @@
     </para>
 
   </refdescription>
-
   <refparameter>
     <variablelist>
       <varlistentry>
@@ -973,8 +1000,9 @@
       </varlistentry>
     </variablelist>
   </refparameter>
-
-  <refreturn><para>Returns a <sgmltag>manual</sgmltag> node.</para></refreturn>
+  <refreturn>
+    <para>Returns a <sgmltag>manual</sgmltag> node.</para>
+  </refreturn>
 </doc:template>
 <xsl:template name="get.refentry.manual">
   <xsl:param name="refname"/>
@@ -1032,17 +1060,27 @@
                   <xsl:call-template name="log.message">
                     <xsl:with-param name="level">Note</xsl:with-param>
                     <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param
-                        name="message"
-                        >meta manual : No ancestor with title</xsl:with-param>
+                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+                    <xsl:with-param name="message">
+                      <xsl:text>no titled ancestor of refentry</xsl:text>
+                    </xsl:with-param>
                   </xsl:call-template>
                   <xsl:call-template name="log.message">
                     <xsl:with-param name="level">Note</xsl:with-param>
                     <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param
-                        name="message"
-                        >meta manual : No refmiscinfo at class=manual</xsl:with-param>
+                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+                    <xsl:with-param name="message">
+                      <xsl:text>no refentry/refmeta/refmiscinfo at class=manual</xsl:text>
+                    </xsl:with-param>
                   </xsl:call-template>
+                  <xsl:call-template name="log.message">
+                    <xsl:with-param name="level">Note</xsl:with-param>
+                    <xsl:with-param name="source" select="$refname"/>
+                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+                    <xsl:with-param name="message">
+                      <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
+                    </xsl:with-param>
+                  </xsl:call-template>
                 </xsl:if>
               </xsl:otherwise>
             </xsl:choose>
@@ -1072,9 +1110,10 @@
             <xsl:call-template name="log.message">
               <xsl:with-param name="level">Warn</xsl:with-param>
               <xsl:with-param name="source" select="$refname"/>
-              <xsl:with-param
-                  name="message"
-                  >meta manual : No valid fallback. Leaving empty</xsl:with-param>
+              <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+              <xsl:with-param name="message">
+                <xsl:text>no valid fallback for manual; leaving empty</xsl:text>
+              </xsl:with-param>
             </xsl:call-template>
           </xsl:if>
         </xsl:otherwise>
@@ -1086,9 +1125,10 @@
         <xsl:call-template name="log.message">
           <xsl:with-param name="level">Warn</xsl:with-param>
           <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param
-              name="message"
-              >meta manual : No fallback specified; leaving empty.</xsl:with-param>
+          <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+          <xsl:with-param name="message">
+            <xsl:text>no manual fallback specified; leaving empty</xsl:text>
+          </xsl:with-param>
         </xsl:call-template>
       </xsl:if>
     </xsl:otherwise>
@@ -1096,32 +1136,31 @@
 </xsl:template>
 
 <!-- ====================================================================== -->
-
 <doc:template name="get.refentry.metadata.prefs" xmlns="">
   <refpurpose>Gets user preferences for refentry metadata gathering</refpurpose>
-
   <refdescription>
     <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
-    other <sgmltag>refentry</sgmltag> metadata-gathering functions. Instead, they
-    are read only by the <function>get.refentry.metadata.prefs</function>
-    function, which assembles them into a structure that is then passed to
-    the other <sgmltag>refentry</sgmltag> metadata-gathering functions.</para>
+    other <sgmltag>refentry</sgmltag> metadata-gathering
+    templates. Instead, they are read only by the
+    <function>get.refentry.metadata.prefs</function> template,
+    which assembles them into a structure that is then passed to
+    the other <sgmltag>refentry</sgmltag> metadata-gathering
+    templates.</para>
 
     <para>So the, <function>get.refentry.metadata.prefs</function>
-    function is the only interface to collecting stylesheet parameters for
+    template is the only interface to collecting stylesheet parameters for
     controlling <sgmltag>refentry</sgmltag> metadata gathering.</para>
   </refdescription>
-
   <refparameter>
-    <para>There are no local parameters for this function; however, it
+    <para>There are no local parameters for this template; however, it
     does rely on a number of global parameters.</para>
   </refparameter>
-
-  <refreturn><para>Returns a <sgmltag>manual</sgmltag> node.</para></refreturn>
+  <refreturn>
+    <para>Returns a <sgmltag>manual</sgmltag> node.</para>
+  </refreturn>
 </doc:template>
-
 <xsl:template name="get.refentry.metadata.prefs">
   <DatePrefs>
     <xsl:attribute name="profile">
@@ -1172,16 +1211,13 @@
 </xsl:template>
 
 <!-- ====================================================================== -->
-
 <doc:template name="set.refentry.metadata" xmlns="">
   <refpurpose>Sets content of a refentry metadata item</refpurpose>
-
   <refdescription>
-    <para>The <function>set.refentry.metadata</function> function is
+    <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>
     <variablelist>
       <varlistentry>
@@ -1206,7 +1242,7 @@
         <term>context</term>
         <listitem>
           <para>A string describing the metadata context in which the
-          <function>set.refentry.metadata</function> function was
+          <function>set.refentry.metadata</function> template was
           called: either "date", "source", "version", or "manual".</para>
         </listitem>
       </varlistentry>
@@ -1215,7 +1251,6 @@
   <refreturn>
   <para>Returns formatted contents of a selected source element.</para></refreturn>
 </doc:template>
-
 <xsl:template name="set.refentry.metadata">
   <xsl:param name="refname"/>
   <xsl:param name="info"/>
@@ -1227,47 +1262,23 @@
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param
-            name="message"
-            >meta <xsl:value-of
-            select="$context"/><xsl:call-template
-            name="copy-string">
-        <xsl:with-param name="string" select="'&#x20;'"/>
-        <xsl:with-param
-            name="count"
-            select="7 - string-length($context)"/>
-        </xsl:call-template>: No <xsl:value-of select="$preferred"
-        /></xsl:with-param>
+        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
+        <xsl:with-param name="message" select="concat('No ', $preferred)"/>
       </xsl:call-template>
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param
-            name="message"
-            >meta <xsl:value-of
-            select="$context"/><xsl:call-template
-            name="copy-string">
-        <xsl:with-param name="string" select="'&#x20;'"/>
-        <xsl:with-param
-            name="count"
-            select="7 - string-length($context)"/>
-        </xsl:call-template>: No refmiscinfo at class=<xsl:value-of
-        select="$context"/></xsl:with-param>
+        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
+        <xsl:with-param name="message">
+          <xsl:text>no refentry/refmeta/refmiscinfo at class=</xsl:text>
+          <xsl:value-of select="$context"/>
+        </xsl:with-param>
       </xsl:call-template>
       <xsl:call-template name="log.message">
         <xsl:with-param name="level">Note</xsl:with-param>
         <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param
-            name="message"
-            >meta <xsl:value-of
-            select="$context"/><xsl:call-template
-            name="copy-string">
-        <xsl:with-param name="string" select="'&#x20;'"/>
-        <xsl:with-param
-            name="count"
-            select="7 - string-length($context)"/>
-        </xsl:call-template>: Using <xsl:value-of
-        select="local-name($contents)"/></xsl:with-param>
+        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
+        <xsl:with-param name="message" select="concat('Using ', local-name($contents))"/>
       </xsl:call-template>
     </xsl:if>
   </xsl:if>

Modified: branches/new-xsl/docbook-xsl-snapshot/fo/inline.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/fo/inline.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/fo/inline.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1186,6 +1186,10 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template match="person">
+  <xsl:apply-templates select="personname"/>
+</xsl:template>
+
 <xsl:template match="personname">
   <xsl:call-template name="simple.xlink">
     <xsl:with-param name="content">

Modified: branches/new-xsl/docbook-xsl-snapshot/fo/param.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/fo/param.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/fo/param.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <!-- ********************************************************************
      $Id$
@@ -391,7 +391,7 @@
 <xsl:param name="margin.note.float.type" select="'none'"/>
 <xsl:param name="margin.note.width" select="'1in'"/>
 <xsl:param name="marker.section.level" select="2"/>
-<xsl:param name="menuchoice.menu.separator"> → </xsl:param>
+<xsl:param name="menuchoice.menu.separator"> → </xsl:param>
 <xsl:param name="menuchoice.separator" select="'+'"/>
 <xsl:param name="monospace.font.family" select="'monospace'"/>
 <xsl:attribute-set name="monospace.properties">

Modified: branches/new-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by xsl2profile-->
-<!--from the DocBook XSL stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
+<?xml version="1.0" encoding="US-ASCII"?><!--This file was created automatically by xsl2profile--><!--from the DocBook XSL stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
 
 <!-- It is important to use indent="no" here, otherwise verbatim -->
 <!-- environments get broken by indented tags...at least when the -->
@@ -275,4 +272,4 @@
 
 <!-- ==================================================================== -->
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
 
-<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
+<!-- This stylesheet was created by template/titlepage.xsl-->
 
 <xsl:template name="article.titlepage.recto">
   <xsl:choose>

Modified: branches/new-xsl/docbook-xsl-snapshot/lib/lib.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/lib/lib.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/lib/lib.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -310,17 +310,32 @@
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
-  <xsl:template name="prepend-pad">    
-  <!-- recursive template to right justify and prepend-->
-  <!-- the value with whatever padChar is passed in   -->
+  <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) < $length">
-        <xsl:call-template name="prepend-pad">
+        <xsl:call-template name="pad-string">
           <xsl:with-param name="padChar" select="$padChar"/>
-          <xsl:with-param name="padVar" select="concat($padChar,$padVar)"/>
+          <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>
@@ -528,7 +543,7 @@
   <xsl:template name="trim-left">
     <xsl:param name="contents"/>
     <xsl:choose>
-      <xsl:when test="starts-with($contents,'&#xA;') or                       starts-with($contents,'&#xA;') or                       starts-with($contents,' ') or                       starts-with($contents,'&#x9;')">
+      <xsl:when test="starts-with($contents,'&#xA;') or                       starts-with($contents,'&#xD;') or                       starts-with($contents,' ') or                       starts-with($contents,'&#x9;')">
         <xsl:call-template name="trim-left">
           <xsl:with-param name="contents" select="substring($contents, 2)"/>
         </xsl:call-template>

Modified: branches/new-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -14,13 +14,9 @@
 <xsl:preserve-space elements="*"/>
 
 <xsl:template match="/">
-  <xsl:text>
</xsl:text>
   <xsl:comment>This file was created automatically by xsl2profile</xsl:comment>
-  <xsl:text>
</xsl:text>
-  <xsl:comment>from the DocBook XSL stylesheets. Do not edit this file.</xsl:comment>
-  <xsl:text>
</xsl:text>
+  <xsl:comment>from the DocBook XSL stylesheets.</xsl:comment>
   <xsl:apply-templates/>
-  <xsl:text>
</xsl:text>
 </xsl:template>
 
 <!-- Make sure we override some templates and parameters appropriately for XHTML -->

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="k" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="k" version="1.0">
 
 <!-- ********************************************************************
      $Id$
@@ -75,7 +72,7 @@
     </xsl:if>
   </xsl:variable>
 
-  <xsl:variable name="terms" select="//indexterm[count(.|key('k-group',                    k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))                    [count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))][1]) = 1                    and not(@class = 'endofrange')]"/>
+  <xsl:variable name="terms" select="//indexterm[count(.|key('k-group', k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical" select="$terms[not(starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))),                 '#NUMERIC'                 ))]"/>
 
@@ -119,13 +116,13 @@
 
   <xsl:variable name="label" select="k:getIndexGroupLabel(concat(/*/@lang, /*/@xml:lang), $key)"/>
 
-  <xsl:if test="key('k-group', $label)[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))]                 [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
+  <xsl:if test="key('k-group', $label)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
     <div class="indexdiv">
       <h3>
         <xsl:value-of select="$label"/>
       </h3>
       <dl>
-        <xsl:apply-templates select="key('k-group', $key)[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))]                             [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))]                             [1])=1]" mode="index-primary">
+        <xsl:apply-templates select="key('k-group', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [1])=1]" mode="index-primary">
           <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))" lang="{$sort.lang}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -136,4 +133,4 @@
   </xsl:if>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:i="urn:cz-kosek:functions:index" xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" xmlns:func="http://exslt.org/functions" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="func exslt" exclude-result-prefixes="func exslt i l k" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:i="urn:cz-kosek:functions:index" xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" xmlns:func="http://exslt.org/functions" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="func exslt" exclude-result-prefixes="func exslt i l k" version="1.0">
 
 <!-- ********************************************************************
      $Id$
@@ -66,7 +63,7 @@
     </xsl:if>
   </xsl:variable>
 
-  <xsl:variable name="terms" select="//indexterm[count(.|key('group-code',                                           i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))                                           [count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))][1]) = 1                                     and not(@class = 'endofrange')]"/>
+  <xsl:variable name="terms" select="//indexterm[count(.|key('group-code', i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
 
   <div class="index">
     <xsl:apply-templates select="$terms" mode="index-div-kosek">
@@ -89,13 +86,13 @@
     <xsl:call-template name="l10n.language"/>
   </xsl:variable>
 
-  <xsl:if test="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))]                 [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
+  <xsl:if test="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
     <div class="indexdiv">
       <h3>
         <xsl:value-of select="i:group-letter($key)"/>
       </h3>
       <dl>
-        <xsl:apply-templates select="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))]                                      [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node())                 and ($role = @role or $type = @type or                 (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
+        <xsl:apply-templates select="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
           <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))" lang="{$lang}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -106,4 +103,4 @@
   </xsl:if>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 
 <!-- ********************************************************************
@@ -114,7 +111,7 @@
   <xsl:call-template name="iso690.edition">
     <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
   </xsl:call-template>
-  <!-- Issue designation (date and/or n?) [nonEL] -->
+  <!-- Issue designation (date and/or num) [nonEL] -->
   <xsl:if test="not(./bibliomisc[@role='medium'])">
     <xsl:call-template name="iso690.issuing"/>
   </xsl:if>
@@ -590,7 +587,7 @@
   </xsl:call-template>
 </xsl:template>
 
-<!-- Issue designation (date and/or n?) -->
+<!-- Issue designation (date and/or num) -->
 <xsl:template name="iso690.issuing">
   <xsl:param name="issuing.div">
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
@@ -1297,4 +1294,4 @@
 
 <!-- ==================================================================== -->
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/inline.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/inline.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink suwl" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink suwl" version="1.0">
 
 <!-- ********************************************************************
      $Id$
@@ -1247,7 +1244,7 @@
 
 <!-- ==================================================================== -->
 
-<xsl:template match="comment[parent::answer|parent::appendix|parent::article|parent::bibliodiv|                                   parent::bibliography|parent::blockquote|parent::caution|parent::chapter|                                   parent::glossary|parent::glossdiv|parent::important|parent::index|                                   parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|                                   parent::partintro|parent::preface|parent::procedure|parent::qandadiv|                                   parent::qandaset|parent::question|parent::refentry|parent::refnamediv|                                   parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|                                   parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|                                   parent::sect5|parent::section|parent::setindex|parent::sidebar|                                   parent::simplesect|parent::taskprerequisites|parent::taskrelated|                                   parent::tasksummary|parent::warning]|remark[parent::answer|parent::appendix|parent::article|parent::bibliodiv|                                   parent::bibliography|parent::blockquote|parent::caution|parent::chapter|                                   parent::glossary|parent::glossdiv|parent::important|parent::index|                                   parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|                                   parent::partintro|parent::preface|parent::procedure|parent::qandadiv|                                   parent::qandaset|parent::question|parent::refentry|parent::refnamediv|                                   parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|                                   parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|                                   parent::sect5|parent::section|parent::setindex|parent::sidebar|                                   parent::simplesect|parent::taskprerequisites|parent::taskrelated|                                   parent::tasksummary|parent::warning]">
+<xsl:template match="comment[parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning]|remark[parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning]">
   <xsl:if test="$show.comments != 0">
     <p class="remark"><i><xsl:call-template name="inline.charseq"/></i></p>
   </xsl:if>
@@ -1401,4 +1398,4 @@
   <!-- does nothing; this *is not* markup to force a page break. -->
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/param.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/param.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/param.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<!-- This file is generated from param.xweb; do not edit this file! --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><!-- This file is generated from param.xweb --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
      $Id$
@@ -402,4 +399,4 @@
 <xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
 <xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<!--This file was created automatically by xsl2profile--><!--from the DocBook XSL stylesheets. Do not edit this file.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="exsl cf ng db exslt" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><!--This file was created automatically by xsl2profile--><!--from the DocBook XSL stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="exsl cf ng db exslt" version="1.0">
 
 <!-- ********************************************************************
      $Id$
@@ -586,4 +583,4 @@
 <xsl:template match="text()" mode="enumerate-files">
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
+<?xml version="1.0" encoding="US-ASCII"?><!--This file was created automatically by xsl2profile--><!--from the DocBook XSL stylesheets.--><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets. Do not edit this file.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" xmlns:exslt="http://exslt.org/common" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="exsl exslt">
 
 <!-- ********************************************************************
      $Id$
@@ -47,6 +44,6 @@
      customizations that use xsl:apply-imports to wrongly
      apply the chunking version instead of the original
      non-chunking version to format an element.  -->
-<xsl:include href="profile-chunk-code.xsl"/>
+<xsl:include href="chunk-code.xsl"/>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<!--This file was created automatically by xsl2profile--><!--from the DocBook XSL stylesheets. Do not edit this file.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><!--This file was created automatically by xsl2profile--><!--from the DocBook XSL stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
 
 <xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
 
@@ -92,7 +89,7 @@
     <xsl:text>, but no template matches.</xsl:text>
   </xsl:message>
 
-  <span class="ERROR">
+  <span xmlns:saxon="http://icl.com/saxon" class="ERROR">
     <xsl:text><</xsl:text>
     <xsl:value-of select="name(.)"/>
     <xsl:text>></xsl:text>
@@ -398,4 +395,4 @@
 
 <!-- ==================================================================== -->
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
+<?xml version="1.0" encoding="US-ASCII"?><!--This file was created automatically by xsl2profile--><!--from the DocBook XSL stylesheets.--><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets. Do not edit this file.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:exslt="http://exslt.org/common" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" version="1.0" exclude-result-prefixes="doc exslt">
 
 <!-- ********************************************************************
      $Id$
@@ -15,7 +12,7 @@
 
 <!-- ==================================================================== -->
 
-<xsl:import href="profile-chunk.xsl"/>
+<xsl:import href="chunk.xsl"/>
 
 <!-- Ok, using the onechunk parameter makes this all work again. -->
 <!-- It does have the disadvantage that it only works for documents that have -->
@@ -33,4 +30,4 @@
   </xsl:call-template>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -1,9 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
+<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
 
-<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
+<!-- This stylesheet was created by template/titlepage.xsl-->
 
 <xsl:template name="article.titlepage.recto">
   <xsl:choose>
@@ -3619,4 +3616,4 @@
 </div>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file

Modified: branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
===================================================================
--- branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl	2007-06-17 11:59:57 UTC (rev 8170)
+++ branches/new-xsl/docbook-xsl-snapshot/xhtml/xref.xsl	2007-06-24 10:12:22 UTC (rev 8171)
@@ -835,6 +835,14 @@
   <xsl:apply-templates select="." mode="number"/>
 </xsl:template>
 
+<xsl:template match="step[not(./title)]" mode="title.markup">
+  <xsl:call-template name="gentext">
+    <xsl:with-param name="key" select="'Step'"/>
+  </xsl:call-template>
+  <xsl:text> </xsl:text>
+  <xsl:apply-templates select="." mode="number"/>
+</xsl:template>
+
 <xsl:template match="co" mode="xref-title">
   <xsl:variable name="title">
     <xsl:apply-templates select="." mode="callout-bug"/>




More information about the lfs-book mailing list