Updated docbook-xsl-snapshot to r6877

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

docbook-xsl-snapshot/VERSION

@@ -17,7 +17,7 @@
 <fm:project>
   <fm:Project>DocBook</fm:Project>
   <fm:Branch>XSL Stylesheets</fm:Branch>
-  <fm:Version>snapshot_6863</fm:Version>
+  <fm:Version>snapshot_6877</fm:Version>
 <!--
   <fm:License>MIT/X Consortium License</fm:License>
 -->

docbook-xsl-snapshot/common/af.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="af" english-language-name="Afrikaans">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="af" english-language-name="Afrikaans">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/am.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="am" english-language-name="Amharic">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="am" english-language-name="Amharic">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ar.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ar" english-language-name="Arabic">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ar" english-language-name="Arabic">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/az.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="az" english-language-name="Azerbaijani">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="az" english-language-name="Azerbaijani">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -655,4 +656,4 @@
 <l:l i="32">Z</l:l>
 <l:l i="32">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/bg.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="bg" english-language-name="Bulgarian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="bg" english-language-name="Bulgarian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -707,4 +708,4 @@
 <l:l i="660">Z</l:l>
 <l:l i="660">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/bn.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="bn" english-language-name="Bangla">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="bn" english-language-name="Bangla">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/bs.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="bs" english-language-name="Bosnian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="bs" english-language-name="Bosnian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -645,4 +646,4 @@
 <l:l i="260">Ž</l:l>
 <l:l i="260">ž</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ca.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ca" english-language-name="Catalan">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ca" english-language-name="Catalan">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/common.xsl

@@ -1836,7 +1836,6 @@ unchanged.</para>
 </variablelist>
 </refparameter>
 </doc:template>
-
 <xsl:template name="string.upper">
   <xsl:param name="string" select="''"/>
   <xsl:variable name="lowercase.alpha">
@@ -1878,7 +1877,6 @@ unchanged.</para>
 </variablelist>
 </refparameter>
 </doc:template>
-
 <xsl:template name="string.lower">
   <xsl:param name="string" select="''"/>
   <xsl:variable name="uppercase.alpha">
@@ -1936,7 +1934,6 @@ unchanged.</para>
     </warning>
   </refdescription>
 </doc:template>
-
 <xsl:template name="select.choice.separator">
   
   <xsl:variable name="choice">
@@ -2002,7 +1999,6 @@ unchanged.</para>
     <parameter>profile</parameter> parameter)</para>
   </refreturn>
 </doc:template>
-
   <xsl:template name="evaluate.info.profile">
     <xsl:param name="profile"/>
     <xsl:param name="info"/>
@@ -2118,7 +2114,6 @@ engine does not support it.
   <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"/>
@@ -2190,4 +2185,92 @@ engine does not support it.
   </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/cs.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="cs" english-language-name="Czech">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="cs" english-language-name="Czech">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -683,4 +684,4 @@
 <l:l i="34">Ž</l:l>
 <l:l i="34">ž</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/cy.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="cy" english-language-name="Welsh">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="cy" english-language-name="Welsh">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1228,4 +1229,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/da.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="da" english-language-name="Danish">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="da" english-language-name="Danish">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -647,4 +648,4 @@
 <l:l i="29">Å</l:l>
 <l:l i="29">å</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/de.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de" english-language-name="German">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de" english-language-name="German">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -649,4 +650,4 @@
 <l:l i="26">Z</l:l>
 <l:l i="26">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/el.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="el" english-language-name="Greek">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="el" english-language-name="Greek">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/en.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en" english-language-name="English">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en" english-language-name="English">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/eo.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="eo" english-language-name="Esperanto">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="eo" english-language-name="Esperanto">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -223,7 +224,7 @@
 <l:template name="book" text="%t"/>
 <l:template name="calloutlist" text="%t"/>
 <l:template name="caution" text="%t"/>
-<l:template name="chapter" text="Ĉapitro %n. %t&#34;"/>
+<l:template name="chapter" text="Ĉapitro %n. %t&quot;"/>
 <l:template name="colophon" text="%t"/>
 <l:template name="dedication" text="%t"/>
 <l:template name="equation" text="Ekvacio %n. %t"/>
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/es.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="es" english-language-name="Spanish">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="es" english-language-name="Spanish">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -659,4 +660,4 @@
 <l:l i="29">Z</l:l>
 <l:l i="29">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/et.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="et" english-language-name="Estonian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="et" english-language-name="Estonian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/eu.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="eu" english-language-name="Basque">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="eu" english-language-name="Basque">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/fa.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fa" english-language-name="Farsi">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fa" english-language-name="Farsi">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -209,7 +210,7 @@
 </l:context>
 <l:context name="title"><l:template name="abstract" text="%t"/>
 <l:template name="answer" text="%t"/>
-<l:template name="appendix" text="&#xA;      پيوست %n. %t"/>
+<l:template name="appendix" text="&#10;      پيوست %n. %t"/>
 <l:template name="article" text="%t"/>
 <l:template name="authorblurb" text="%t"/>
 <l:template name="bibliodiv" text="%t"/>
@@ -223,12 +224,12 @@
 <l:template name="book" text="%t"/>
 <l:template name="calloutlist" text="%t"/>
 <l:template name="caution" text="%t"/>
-<l:template name="chapter" text="&#xA;      فصل %n. %t"/>
+<l:template name="chapter" text="&#10;      فصل %n. %t"/>
 <l:template name="colophon" text="%t"/>
 <l:template name="dedication" text="%t"/>
-<l:template name="equation" text="&#xA;      معادله %n. %t"/>
-<l:template name="example" text="&#xA;      مثال %n. %t"/>
-<l:template name="figure" text="&#xA;      شكل %n. %t"/>
+<l:template name="equation" text="&#10;      معادله %n. %t"/>
+<l:template name="example" text="&#10;      مثال %n. %t"/>
+<l:template name="figure" text="&#10;      شكل %n. %t"/>
 <l:template name="foil" text="%t"/>
 <l:template name="foilgroup" text="%t"/>
 <l:template name="formalpara" text="%t"/>
@@ -251,13 +252,13 @@
 <l:template name="msgsub" text="%t"/>
 <l:template name="note" text="%t"/>
 <l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="&#xA;      بخش %n. %t"/>
+<l:template name="part" text="&#10;      بخش %n. %t"/>
 <l:template name="partintro" text="%t"/>
 <l:template name="preface" text="%t"/>
 <l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="&#xA;      رويه %n. %t"/>
+<l:template name="procedure.formal" text="&#10;      رويه %n. %t"/>
 <l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="&#xA;      توليد %n"/>
+<l:template name="productionset.formal" text="&#10;      توليد %n"/>
 <l:template name="qandadiv" text="%t"/>
 <l:template name="qandaentry" text="%t"/>
 <l:template name="qandaset" text="%t"/>
@@ -275,7 +276,7 @@
 <l:template name="setindex" text="%t"/>
 <l:template name="sidebar" text="%t"/>
 <l:template name="step" text="%t"/>
-<l:template name="table" text="&#xA;      جدول %n. %t"/>
+<l:template name="table" text="&#10;      جدول %n. %t"/>
 <l:template name="task" text="%t"/>
 <l:template name="tasksummary" text="%t" lang="en"/>
 <l:template name="taskprerequisites" text="%t" lang="en"/>
@@ -299,11 +300,11 @@
 <l:template name="simplesect" text="%t"/>
 <l:template name="part" text="%t" lang="en"/>
 </l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="&#xA;      پيوست %n. %t"/>
+<l:context name="title-numbered"><l:template name="appendix" text="&#10;      پيوست %n. %t"/>
 <l:template name="article/appendix" text="%n. %t"/>
 <l:template name="bridgehead" text="%n. %t"/>
-<l:template name="chapter" text="&#xA;      فصل %n. %t"/>
-<l:template name="part" text="&#xA;      بخش %n. %t"/>
+<l:template name="chapter" text="&#10;      فصل %n. %t"/>
+<l:template name="part" text="&#10;      بخش %n. %t"/>
 <l:template name="sect1" text="%n. %t"/>
 <l:template name="sect2" text="%n. %t"/>
 <l:template name="sect3" text="%n. %t"/>
@@ -352,7 +353,7 @@
 <l:template name="toc" text="%s"/>
 </l:context>
 <l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="&#xA;      ج: %n"/>
+<l:template name="answer" text="&#10;      ج: %n"/>
 <l:template name="appendix" text="%t"/>
 <l:template name="article" text="%t"/>
 <l:template name="authorblurb" text="%t"/>
@@ -397,9 +398,9 @@
 <l:template name="procedure" text="%t"/>
 <l:template name="productionset" text="%t"/>
 <l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="&#xA;      :پرسش %n"/>
+<l:template name="qandaentry" text="&#10;      :پرسش %n"/>
 <l:template name="qandaset" text="%t"/>
-<l:template name="question" text="&#xA;      :پرسش %n"/>
+<l:template name="question" text="&#10;      :پرسش %n"/>
 <l:template name="reference" text="%t"/>
 <l:template name="refsynopsisdiv" text="%t"/>
 <l:template name="segmentedlist" text="%t"/>
@@ -421,73 +422,73 @@
 <l:template name="docnamelong" text="%o در مستندی بنام "/>
 <l:template name="pageabbrev" text="(%p ص)"/>
 <l:template name="Page" text="%p صفحه‌ی"/>
-<l:template name="bridgehead" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="refsection" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="refsect1" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="refsect2" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="refsect3" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="sect1" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="sect2" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="sect3" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="sect4" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="sect5" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="section" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="simplesect" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
+<l:template name="bridgehead" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="refsection" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="refsect1" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="refsect2" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="refsect3" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="sect1" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="sect2" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="sect3" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="sect4" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="sect5" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="section" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="simplesect" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
 </l:context>
-<l:context name="xref-number"><l:template name="answer" text="&#xA;      ج: %n"/>
-<l:template name="appendix" text="&#xA;      پيوست %n"/>
-<l:template name="bridgehead" text="&#xA;      قسمت %n"/>
-<l:template name="chapter" text="&#xA;      فصل %n"/>
-<l:template name="equation" text="&#xA;      معادله %n"/>
-<l:template name="example" text="&#xA;      مثال %n"/>
-<l:template name="figure" text="&#xA;      شكل %n"/>
-<l:template name="part" text="&#xA;      بخش %n"/>
-<l:template name="procedure" text="&#xA;      رويه %n"/>
-<l:template name="productionset" text="&#xA;      توليد %n"/>
-<l:template name="qandadiv" text="&#xA;      پرسش و‌ پاسخ %n"/>
-<l:template name="qandaentry" text="&#xA;      :پرسش %n"/>
-<l:template name="question" text="&#xA;      :پرسش %n"/>
-<l:template name="sect1" text="&#xA;      قسمت %n"/>
-<l:template name="sect2" text="&#xA;      قسمت %n"/>
-<l:template name="sect3" text="&#xA;      قسمت %n"/>
-<l:template name="sect4" text="&#xA;      قسمت %n"/>
-<l:template name="sect5" text="&#xA;      قسمت %n"/>
-<l:template name="section" text="&#xA;      قسمت %n"/>
-<l:template name="table" text="&#xA;      جدول %n"/>
+<l:context name="xref-number"><l:template name="answer" text="&#10;      ج: %n"/>
+<l:template name="appendix" text="&#10;      پيوست %n"/>
+<l:template name="bridgehead" text="&#10;      قسمت %n"/>
+<l:template name="chapter" text="&#10;      فصل %n"/>
+<l:template name="equation" text="&#10;      معادله %n"/>
+<l:template name="example" text="&#10;      مثال %n"/>
+<l:template name="figure" text="&#10;      شكل %n"/>
+<l:template name="part" text="&#10;      بخش %n"/>
+<l:template name="procedure" text="&#10;      رويه %n"/>
+<l:template name="productionset" text="&#10;      توليد %n"/>
+<l:template name="qandadiv" text="&#10;      پرسش و‌ پاسخ %n"/>
+<l:template name="qandaentry" text="&#10;      :پرسش %n"/>
+<l:template name="question" text="&#10;      :پرسش %n"/>
+<l:template name="sect1" text="&#10;      قسمت %n"/>
+<l:template name="sect2" text="&#10;      قسمت %n"/>
+<l:template name="sect3" text="&#10;      قسمت %n"/>
+<l:template name="sect4" text="&#10;      قسمت %n"/>
+<l:template name="sect5" text="&#10;      قسمت %n"/>
+<l:template name="section" text="&#10;      قسمت %n"/>
+<l:template name="table" text="&#10;      جدول %n"/>
 </l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="&#xA;      پيوست %n, %t"/>
-<l:template name="bridgehead" text="&#xA;      قسمت %n, “%t”&#xA;    "/>
-<l:template name="chapter" text="&#xA;      فصل %n, %t"/>
-<l:template name="equation" text="&#xA;      معادله %n, “%t”&#xA;    "/>
-<l:template name="example" text="&#xA;      مثال %n, “%t”&#xA;    "/>
-<l:template name="figure" text="&#xA;      شكل %n, “%t”&#xA;    "/>
-<l:template name="part" text="&#xA;      بخش %n, “%t”&#xA;    "/>
-<l:template name="procedure" text="&#xA;      رويه %n, “%t”&#xA;    "/>
-<l:template name="productionset" text="&#xA;      توليد %n, “%t”&#xA;    "/>
-<l:template name="qandadiv" text="&#xA;      پرسش و‌ پاسخ %n, “%t”&#xA;    "/>
-<l:template name="refsect1" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="refsect2" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="refsect3" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="refsection" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="sect1" text="&#xA;      قسمت %n, “%t”&#xA;    "/>
-<l:template name="sect2" text="&#xA;      قسمت %n, “%t”&#xA;    "/>
-<l:template name="sect3" text="&#xA;      قسمت %n, “%t”&#xA;    "/>
-<l:template name="sect4" text="&#xA;      قسمت %n, “%t”&#xA;    "/>
-<l:template name="sect5" text="&#xA;      قسمت %n, “%t”&#xA;    "/>
-<l:template name="section" text="&#xA;      قسمت %n, “%t”&#xA;    "/>
-<l:template name="simplesect" text="&#xA;      بخشی بنام&#xA;      “%t”&#xA;    "/>
-<l:template name="table" text="&#xA;      جدول %n, “%t”&#xA;    "/>
+<l:context name="xref-number-and-title"><l:template name="appendix" text="&#10;      پيوست %n, %t"/>
+<l:template name="bridgehead" text="&#10;      قسمت %n, “%t”&#10;    "/>
+<l:template name="chapter" text="&#10;      فصل %n, %t"/>
+<l:template name="equation" text="&#10;      معادله %n, “%t”&#10;    "/>
+<l:template name="example" text="&#10;      مثال %n, “%t”&#10;    "/>
+<l:template name="figure" text="&#10;      شكل %n, “%t”&#10;    "/>
+<l:template name="part" text="&#10;      بخش %n, “%t”&#10;    "/>
+<l:template name="procedure" text="&#10;      رويه %n, “%t”&#10;    "/>
+<l:template name="productionset" text="&#10;      توليد %n, “%t”&#10;    "/>
+<l:template name="qandadiv" text="&#10;      پرسش و‌ پاسخ %n, “%t”&#10;    "/>
+<l:template name="refsect1" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="refsect2" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="refsect3" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="refsection" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="sect1" text="&#10;      قسمت %n, “%t”&#10;    "/>
+<l:template name="sect2" text="&#10;      قسمت %n, “%t”&#10;    "/>
+<l:template name="sect3" text="&#10;      قسمت %n, “%t”&#10;    "/>
+<l:template name="sect4" text="&#10;      قسمت %n, “%t”&#10;    "/>
+<l:template name="sect5" text="&#10;      قسمت %n, “%t”&#10;    "/>
+<l:template name="section" text="&#10;      قسمت %n, “%t”&#10;    "/>
+<l:template name="simplesect" text="&#10;      بخشی بنام&#10;      “%t”&#10;    "/>
+<l:template name="table" text="&#10;      جدول %n, “%t”&#10;    "/>
 </l:context>
-<l:context name="authorgroup"><l:template name="sep" text="&#xA;      ،&#xA;    "/>
-<l:template name="sep2" text="&#xA;      و&#xA;    "/>
-<l:template name="seplast" text="&#xA;      ،&#xA;      و&#xA;    "/>
+<l:context name="authorgroup"><l:template name="sep" text="&#10;      ،&#10;    "/>
+<l:template name="sep2" text="&#10;      و&#10;    "/>
+<l:template name="seplast" text="&#10;      ،&#10;      و&#10;    "/>
 </l:context>
 <l:context name="glossary"><l:template name="see" text=" %t ببیند"/>
 <l:template name="seealso" text="%t همچنین ببیند"/>
 </l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="&#xA;      شنودگان: "/>
-<l:template name="MsgLevel" text="&#xA;      سطح پیام: "/>
-<l:template name="MsgOrig" text="&#xA;      اصل: "/>
+<l:context name="msgset"><l:template name="MsgAud" text="&#10;      شنودگان: "/>
+<l:template name="MsgLevel" text="&#10;      سطح پیام: "/>
+<l:template name="MsgOrig" text="&#10;      اصل: "/>
 </l:context>
 <l:context name="datetime"><l:template name="format" text="m/d/Y"/>
 </l:context>
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/fi.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fi" english-language-name="Finnish">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fi" english-language-name="Finnish">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -653,4 +654,4 @@
 <l:l i="31">Ö</l:l>
 <l:l i="31">ö</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/fr.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fr" english-language-name="French">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fr" english-language-name="French">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -673,4 +674,4 @@
 <l:l i="26">Z</l:l>
 <l:l i="26">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ga.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ga" english-language-name="Irish">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ga" english-language-name="Irish">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/gu.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="gu" english-language-name="Gujarati">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="gu" english-language-name="Gujarati">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/he.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="he" english-language-name="Hebrew">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="he" english-language-name="Hebrew">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/hi.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="hi" english-language-name="Hindi">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="hi" english-language-name="Hindi">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/hr.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="hr" english-language-name="Croatian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="hr" english-language-name="Croatian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/hu.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="hu" english-language-name="Hungarian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="hu" english-language-name="Hungarian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/id.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="id" english-language-name="Indonesian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="id" english-language-name="Indonesian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/it.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="it" english-language-name="Italian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="it" english-language-name="Italian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ja.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ja" english-language-name="Japanese">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ja" english-language-name="Japanese">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/kn.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="kn" english-language-name="Kannada">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="kn" english-language-name="Kannada">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ko.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ko" english-language-name="Korean">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ko" english-language-name="Korean">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/la.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="la" english-language-name="Latin">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="la" english-language-name="Latin">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/lt.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="lt" english-language-name="Lithuanian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="lt" english-language-name="Lithuanian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -661,4 +662,4 @@
 <l:l i="26">X</l:l>
 <l:l i="26">x</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/mn.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="mn" english-language-name="Mongolian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="mn" english-language-name="Mongolian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -713,4 +714,4 @@
 <l:l i="610">Я</l:l>
 <l:l i="610">я</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/nl.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nl" english-language-name="Dutch">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nl" english-language-name="Dutch">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/nn.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nn" english-language-name="Nynorsk">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="nn" english-language-name="Nynorsk">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/no.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="no" english-language-name="Norwegian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="no" english-language-name="Norwegian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/or.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="or" english-language-name="Oriya">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="or" english-language-name="Oriya">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/pa.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pa" english-language-name="Punjabi">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pa" english-language-name="Punjabi">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/pl.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pl" english-language-name="Polish">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pl" english-language-name="Polish">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/pt.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt" english-language-name="Portuguese">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt" english-language-name="Portuguese">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/pt_br.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt_br" english-language-name="Portuguese (Brazil)">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="pt_br" english-language-name="Portuguese (Brazil)">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ro.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ro" english-language-name="Romanian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ro" english-language-name="Romanian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ru.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ru" english-language-name="Russian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ru" english-language-name="Russian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -709,4 +710,4 @@
 <l:l i="580">Я</l:l>
 <l:l i="580">я</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/sk.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sk" english-language-name="Slovak">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sk" english-language-name="Slovak">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/sl.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sl" english-language-name="Slovenian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sl" english-language-name="Slovenian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/sq.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sq" english-language-name="Albanian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sq" english-language-name="Albanian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/sr.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sr" english-language-name="Serbian in Cyrillic script">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sr" english-language-name="Serbian in Cyrillic script">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -703,4 +704,4 @@
 <l:l i="56">Z</l:l>
 <l:l i="56">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/sr_Latn.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sr_latn" english-language-name="Serbian in Latin script">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sr_latn" english-language-name="Serbian in Latin script">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -662,4 +663,4 @@
 <l:l i="34">Ž</l:l>
 <l:l i="34">ž</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/stripns.xsl

@@ -20,6 +20,14 @@
      versions of the DocBook stylesheets.
      ******************************************************************** -->
 
+<xsl:import href="../common/common.xsl"/>
+
+<!-- * Get a title for current doc so that we let the user -->
+<!-- * know what document we are processing at this point. -->
+<xsl:variable name="doc.title">
+  <xsl:call-template name="get.doc.title"/>
+</xsl:variable>
+
 <!-- put an xml:base attribute on the root element -->
 <xsl:template match="/*" mode="stripNS">
   <xsl:choose>
@@ -259,11 +267,26 @@
           <xsl:value-of select="NodeInfo:systemId()"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>WARNING: cannot add @xml:base to node </xsl:text>
-            <xsl:text>set root element.  </xsl:text>
-            <xsl:text>Relative paths may not work.</xsl:text>
-          </xsl:message>
+          <xsl:call-template name="log.message">
+            <xsl:with-param name="level">Warn</xsl:with-param>
+            <xsl:with-param name="source" select="$doc.title"/>
+            <xsl:with-param name="context-desc">
+              <xsl:text>no @xml:base</xsl:text>
+            </xsl:with-param>
+            <xsl:with-param name="message">
+              <xsl:text>cannot add @xml:base to node-set root element</xsl:text>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:call-template name="log.message">
+            <xsl:with-param name="level">Warn</xsl:with-param>
+            <xsl:with-param name="source" select="$doc.title"/>
+            <xsl:with-param name="context-desc">
+              <xsl:text>no @xml:base</xsl:text>
+            </xsl:with-param>
+            <xsl:with-param name="message">
+              <xsl:text>relative paths may not work</xsl:text>
+            </xsl:with-param>
+          </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>

docbook-xsl-snapshot/common/sv.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sv" english-language-name="Swedish">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="sv" english-language-name="Swedish">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -647,4 +648,4 @@
 <l:l i="29">Ö</l:l>
 <l:l i="29">ö</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/ta.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ta" english-language-name="Tamil">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="ta" english-language-name="Tamil">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/th.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="th" english-language-name="Thai">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="th" english-language-name="Thai">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/tl.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="tl" english-language-name="Tagalog">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="tl" english-language-name="Tagalog">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/tr.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="tr" english-language-name="Turkish">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="tr" english-language-name="Turkish">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -649,4 +650,4 @@
 <l:l i="29">Z</l:l>
 <l:l i="29">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/uk.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="uk" english-language-name="Ukrainian">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="uk" english-language-name="Ukrainian">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/vi.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="vi" english-language-name="Vietnamese">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="vi" english-language-name="Vietnamese">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/xh.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="xh" english-language-name="Xhosa">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="xh" english-language-name="Xhosa">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/zh_cn.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_cn" english-language-name="Chinese Simplified">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_cn" english-language-name="Chinese Simplified">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -643,4 +644,4 @@
 <l:l i="260">Z</l:l>
 <l:l i="260">z</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/common/zh_tw.xml

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_tw" english-language-name="Chinese (Taiwan)">
+<?xml version="1.0" encoding="utf-8"?>
+<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_tw" english-language-name="Chinese (Taiwan)">
 
 <!-- * This file is generated automatically. -->
 <!-- * To submit changes to this file upstream (to the DocBook Project) -->
@@ -1212,4 +1213,4 @@
 <l:l i="260">Ẕ</l:l>
 <l:l i="260">ẕ</l:l>
 </l:letters>
-</l:l10n>
+</l:l10n>

docbook-xsl-snapshot/fo/docbook.xsl

@@ -117,19 +117,43 @@
 <xsl:variable name="root.elements" select="' appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex '"/>
 
 <xsl:template match="/">
+  <!-- * Get a title for current doc so that we let the user -->
+  <!-- * know what document we are processing at this point. -->
+  <xsl:variable name="doc.title">
+    <xsl:call-template name="get.doc.title"/>
+  </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
          toss the namespace and continue.  Use the docbook5 namespaced
-	 stylesheets for DocBook5 if you don't want to use this feature.-->
+         stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="(function-available('exsl:node-set') or
                      contains(system-property('xsl:vendor'),
                        'Apache Software Foundation'))
                     and (*/self::ng:* or */self::db:*)">
-      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
+      <xsl:call-template name="log.message">
+        <xsl:with-param name="level">Note</xsl:with-param>
+        <xsl:with-param name="source" select="$doc.title"/>
+        <xsl:with-param name="context-desc">
+          <xsl:text>namesp. cut</xsl:text>
+        </xsl:with-param>
+        <xsl:with-param name="message">
+          <xsl:text>stripped namespace before processing</xsl:text>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:variable name="nons">
         <xsl:apply-templates mode="stripNS"/>
       </xsl:variable>
+      <xsl:call-template name="log.message">
+        <xsl:with-param name="level">Note</xsl:with-param>
+        <xsl:with-param name="source" select="$doc.title"/>
+        <xsl:with-param name="context-desc">
+          <xsl:text>namesp. cut</xsl:text>
+        </xsl:with-param>
+        <xsl:with-param name="message">
+          <xsl:text>processing stripped document</xsl:text>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:apply-templates select="exsl:node-set($nons)"/>
     </xsl:when>
     <!-- Can't process unless namespace removed -->

docbook-xsl-snapshot/fo/param.xsl

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="ASCII"?><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 -->
 
@@ -882,4 +883,4 @@ set       toc,title
 <xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
 <xsl:param name="xref.with.number.and.title" select="1"/>
 
-</xsl:stylesheet>
+</xsl:stylesheet>

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

@@ -1,4 +1,7 @@
-<?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">
+<?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 -->
@@ -109,11 +112,16 @@
 <!-- Update this list if new root elements supported -->
 <xsl:variable name="root.elements" select="' appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex '"/>
 
-<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Stripping NS from DocBook 5/NG document.</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Processing stripped document.</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
+<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Note: namesp. cut : processing stripped document</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
+  <!-- * Get a title for current doc so that we let the user -->
+  <!-- * know what document we are processing at this point. -->
+  <xsl:variable name="doc.title">
+    <xsl:call-template name="get.doc.title"/>
+  </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
          toss the namespace and continue.  Use the docbook5 namespaced
-	 stylesheets for DocBook5 if you don't want to use this feature.-->
+         stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="false()"/>
     <!-- Can't process unless namespace removed -->
@@ -272,4 +280,4 @@
 
 <!-- ==================================================================== -->
 
-</xsl:stylesheet>
+</xsl:stylesheet>

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

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
+
 <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-->
@@ -5090,3 +5091,4 @@
 </xsl:template>
 
 </xsl:stylesheet>
+

docbook-xsl-snapshot/lib/lib.xsl

@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
+
 <!-- ********************************************************************
      $Id$
      ********************************************************************
@@ -11,7 +12,8 @@
 
      ******************************************************************** -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:dyn="http://exslt.org/dynamic" xmlns:saxon="http://icl.com/saxon" exclude-result-prefixes="src" version="1.0">
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:dyn="http://exslt.org/dynamic" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0">
 
 <xsl:template name="dot.count">
   <!-- Returns the number of "." characters in a string -->
@@ -310,40 +312,6 @@
     </xsl:otherwise>
   </xsl:choose>
 </xsl: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:template name="str.tokenize.keep.delimiters">
     <xsl:param name="string" select="''"/>
@@ -543,7 +511,7 @@ does not support it.
   <xsl:template name="trim-left">
     <xsl:param name="contents"/>
     <xsl:choose>
-      <xsl:when test="starts-with($contents,'&#xA;') or                       starts-with($contents,'&#xD;') or                       starts-with($contents,' ') or                       starts-with($contents,'&#x9;')">
+      <xsl:when test="starts-with($contents,'&#10;') or                       starts-with($contents,'&#13;') or                       starts-with($contents,' ') or                       starts-with($contents,'&#9;')">
         <xsl:call-template name="trim-left">
           <xsl:with-param name="contents" select="substring($contents, 2)"/>
         </xsl:call-template>
@@ -560,7 +528,7 @@ does not support it.
       <xsl:value-of select="substring($contents, string-length($contents), 1)"/>
     </xsl:variable>
     <xsl:choose>
-      <xsl:when test="($last-char = '&#xA;') or                       ($last-char = '&#xD;') or                       ($last-char = ' ') or                       ($last-char = '&#x9;')">
+      <xsl:when test="($last-char = '&#10;') or                       ($last-char = '&#13;') or                       ($last-char = ' ') or                       ($last-char = '&#9;')">
         <xsl:call-template name="trim-right">
           <xsl:with-param name="contents" select="substring($contents, 1, string-length($contents) - 1)"/>
         </xsl:call-template>
@@ -571,4 +539,4 @@ does not support it.
     </xsl:choose>
   </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>

docbook-xsl-snapshot/profiling/xsl2profile.xsl

@@ -62,15 +62,15 @@
   <xslo:variable name="profiled-content">
     <xslo:choose>
       <xslo:when test="*/self::ng:* or */self::db:*">
-	<xslo:message>Stripping NS from DocBook 5/NG document.</xslo:message>
-	<xslo:variable name="stripped-content">
-	  <xslo:apply-templates select="/" mode="stripNS"/>
-	</xslo:variable>
-	<xslo:message>Processing stripped document.</xslo:message>
-	<xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/>
+        <xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message>
+        <xslo:variable name="stripped-content">
+          <xslo:apply-templates select="/" mode="stripNS"/>
+        </xslo:variable>
+        <xslo:message>Note: namesp. cut : processing stripped document</xslo:message>
+        <xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/>
       </xslo:when>
       <xslo:otherwise>
-	<xslo:apply-templates select="/" mode="profile"/>
+        <xslo:apply-templates select="/" mode="profile"/>
       </xslo:otherwise>
     </xslo:choose>
   </xslo:variable>

docbook-xsl-snapshot/xhtml/admon.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/annotations.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <xsl:template name="add.annotation.links">

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

@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns: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$
@@ -72,11 +75,11 @@ Install those </xsl:text>
     </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 = &#34;&#34;]))))[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 = &quot;&quot;]))))[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 = &#34;&#34;]))),                 '#NUMERIC'                 ))]"/>
+  <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 = &quot;&quot;]))),                 '#NUMERIC'                 ))]"/>
 
-  <xsl:variable name="others" select="$terms[starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &#34;&#34;]))),                 '#NUMERIC'                 )]"/>
+  <xsl:variable name="others" select="$terms[starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))),                 '#NUMERIC'                 )]"/>
 
   <div class="index">
     <xsl:if test="$others">
@@ -91,7 +94,7 @@ Install those </xsl:text>
             <xsl:with-param name="scope" select="$scope"/>
             <xsl:with-param name="role" select="$role"/>
             <xsl:with-param name="type" select="$type"/>
-            <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                         k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &#34;&#34;]))))"/>
+            <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                         k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))"/>
           </xsl:apply-templates>
         </dl>
       </div>
@@ -101,7 +104,7 @@ Install those </xsl:text>
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:with-param name="role" select="$role"/>
       <xsl:with-param name="type" select="$type"/>
-      <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                      k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &#34;&#34;]))))"/>
+      <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                      k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))"/>
     </xsl:apply-templates>
   </div>
 
@@ -112,18 +115,18 @@ Install those </xsl:text>
   <xsl:param name="role" select="''"/>
   <xsl:param name="type" select="''"/>
 
-  <xsl:variable name="key" select="k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &#34;&#34;])))"/>
+  <xsl:variable name="key" select="k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))"/>
 
   <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 = &#34;&#34;])))[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 = &quot;&quot;])))[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 = &#34;&#34;])))[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 = &#34;&#34;]))" lang="{$sort.lang}"/>
+        <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 = &quot;&quot;])))[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 = &quot;&quot;]))" lang="{$sort.lang}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="type" select="$type"/>
@@ -133,4 +136,4 @@ Install those </xsl:text>
   </xsl:if>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>

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

@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns: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$
@@ -63,14 +66,14 @@
     </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 = &#34;&#34;]))))[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 = &quot;&quot;]))))[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">
       <xsl:with-param name="scope" select="$scope"/>
       <xsl:with-param name="role" select="$role"/>
       <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &#34;&#34;])))" data-type="number"/>
+      <xsl:sort select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))" data-type="number"/>
     </xsl:apply-templates>
   </div>
 </xsl:template>
@@ -80,20 +83,20 @@
   <xsl:param name="role" select="''"/>
   <xsl:param name="type" select="''"/>
 
-  <xsl:variable name="key" select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &#34;&#34;])))"/>
+  <xsl:variable name="key" select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))"/>
 
   <xsl:variable name="lang">
     <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 = &#34;&#34;])))[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 = &quot;&quot;])))[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 = &#34;&#34;])))[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 = &#34;&#34;]))" lang="{$lang}"/>
+        <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 = &quot;&quot;])))[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 = &quot;&quot;]))" lang="{$lang}"/>
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
           <xsl:with-param name="type" select="$type"/>
@@ -103,4 +106,4 @@
   </xsl:if>
 </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>

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

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/autotoc.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

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

@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="ASCII"?><!--This file was created automatically by html2xhtml--><!--from the HTML stylesheets.--><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+<?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">
 
 
 <!-- ********************************************************************
@@ -1294,4 +1297,4 @@
 
 <!-- ==================================================================== -->
 
-</xsl:stylesheet>
+</xsl:stylesheet>

docbook-xsl-snapshot/xhtml/biblio.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/block.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/callout.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt" version="1.0">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/changebars.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

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

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML 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="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl cf ng db" version="1.0">
 
 <!-- ********************************************************************
@@ -380,17 +380,40 @@
 </xsl:template>
 
 <xsl:template match="/">
+  <!-- * Get a title for current doc so that we let the user -->
+  <!-- * know what document we are processing at this point. -->
+  <xsl:variable name="doc.title">
+    <xsl:call-template name="get.doc.title"/>
+  </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
          toss the namespace and continue.  Use the docbook5 namespaced
 	 stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
-      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
+      <xsl:call-template name="log.message">
+        <xsl:with-param name="level">Note</xsl:with-param>
+        <xsl:with-param name="source" select="$doc.title"/>
+        <xsl:with-param name="context-desc">
+          <xsl:text>namesp. cut</xsl:text>
+        </xsl:with-param>
+        <xsl:with-param name="message">
+          <xsl:text>stripped namespace before processing</xsl:text>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:variable name="nons">
         <xsl:apply-templates mode="stripNS"/>
       </xsl:variable>
-      <xsl:message>Processing stripped document.</xsl:message>
+      <xsl:call-template name="log.message">
+        <xsl:with-param name="level">Note</xsl:with-param>
+        <xsl:with-param name="source" select="$doc.title"/>
+        <xsl:with-param name="context-desc">
+          <xsl:text>namesp. cut</xsl:text>
+        </xsl:with-param>
+        <xsl:with-param name="message">
+          <xsl:text>processing stripped document</xsl:text>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:apply-templates select="exsl:node-set($nons)"/>
     </xsl:when>
     <!-- Can't process unless namespace removed -->

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

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML 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="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl cf ng db">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/chunk.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/chunker.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:exsl="http://exslt.org/common" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc" extension-element-prefixes="saxon redirect lxslt exsl">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/chunkfast.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML 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="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="cf exsl">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/chunktoc.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/component.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/division.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/docbook.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML 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="http://www.w3.org/1999/xhtml" exclude-result-prefixes="db ng exsl" 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 +92,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>&lt;</xsl:text>
     <xsl:value-of select="name(.)"/>
     <xsl:text>&gt;</xsl:text>
@@ -302,13 +302,27 @@ var popup_</xsl:text>
 </xsl:template>
 
 <xsl:template match="/">
+  <!-- * Get a title for current doc so that we let the user -->
+  <!-- * know what document we are processing at this point. -->
+  <xsl:variable name="doc.title">
+    <xsl:call-template name="get.doc.title"/>
+  </xsl:variable>
   <xsl:choose>
     <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
          toss the namespace and continue.  Use the docbook5 namespaced
-	 stylesheets for DocBook5 if you don't want to use this feature.-->
+         stylesheets for DocBook5 if you don't want to use this feature.-->
     <!-- include extra test for Xalan quirk -->
     <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
-      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
+      <xsl:call-template name="log.message">
+        <xsl:with-param name="level">Note</xsl:with-param>
+        <xsl:with-param name="source" select="$doc.title"/>
+        <xsl:with-param name="context-desc">
+          <xsl:text>namesp. cut</xsl:text>
+        </xsl:with-param>
+        <xsl:with-param name="message">
+          <xsl:text>stripped namespace before processing</xsl:text>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:variable name="nons">
         <xsl:apply-templates mode="stripNS"/>
       </xsl:variable>
@@ -322,7 +336,16 @@ var popup_</xsl:text>
         </xsl:with-param>
       </xsl:call-template>
       -->
-      <xsl:message>Processing stripped document.</xsl:message>
+      <xsl:call-template name="log.message">
+        <xsl:with-param name="level">Note</xsl:with-param>
+        <xsl:with-param name="source" select="$doc.title"/>
+        <xsl:with-param name="context-desc">
+          <xsl:text>namesp. cut</xsl:text>
+        </xsl:with-param>
+        <xsl:with-param name="message">
+          <xsl:text>processing stripped document</xsl:text>
+        </xsl:with-param>
+      </xsl:call-template>
       <xsl:apply-templates select="exsl:node-set($nons)"/>
     </xsl:when>
     <!-- Can't process unless namespace removed -->

docbook-xsl-snapshot/xhtml/ebnf.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <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" exclude-result-prefixes="doc" version="1.0">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/footnote.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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" exclude-result-prefixes="exsl" version="1.0">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/formal.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/glossary.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/graphics.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory" xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics" xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics" xmlns:xtext="xalan://com.nwalsh.xalan.Text" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink stext xtext lxslt simg ximg" extension-element-prefixes="stext xtext" version="1.0">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/highlight.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xslthl="http://xslthl.sf.net" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xslthl" version="1.0">
 
 <!-- ********************************************************************
@@ -18,31 +18,31 @@
 </xsl:template>
 
 <xsl:template match="xslthl:string">
-  <b class="hl-string"><i><span class="ERROR"><xsl:apply-templates/></span></i></b>
+  <b class="hl-string"><i><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></i></b>
 </xsl:template>
 
 <xsl:template match="xslthl:comment">
-  <i class="hl-comment"><span class="ERROR"><xsl:apply-templates/></span></i>
+  <i class="hl-comment"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></i>
 </xsl:template>
 
 <xsl:template match="xslthl:tag">
-  <b class="hl-tag"><span class="ERROR"><xsl:apply-templates/></span></b>
+  <b class="hl-tag"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></b>
 </xsl:template>
 
 <xsl:template match="xslthl:attribute">
-  <span class="hl-attribute"><span class="ERROR"><xsl:apply-templates/></span></span>
+  <span class="hl-attribute"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></span>
 </xsl:template>
 
 <xsl:template match="xslthl:value">
-  <span class="hl-value"><span class="ERROR"><xsl:apply-templates/></span></span>
+  <span class="hl-value"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></span>
 </xsl:template>
 
 <xsl:template match="xslthl:html">
-  <b><i><span class="ERROR"><xsl:apply-templates/></span></i></b>
+  <b><i><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></i></b>
 </xsl:template>
 
 <xsl:template match="xslthl:xslt">
-  <b><span class="ERROR"><xsl:apply-templates/></span></b>
+  <b><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></b>
 </xsl:template>
 
 <xsl:template match="xslthl:section">

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

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--from the HTML stylesheets.-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl set" version="1.0">
 
 <!-- ********************************************************************
@@ -222,7 +222,7 @@
   <xsl:variable name="text" select="translate(., ' ', '&#160;')"/>
 
   <xsl:choose>
-    <xsl:when test="not(contains($text, '&#xA;'))">
+    <xsl:when test="not(contains($text, '&#10;'))">
       <xsl:value-of select="$text"/>
     </xsl:when>
 
@@ -253,7 +253,7 @@
   <xsl:param name="text" select="''"/>
 
   <xsl:choose>
-    <xsl:when test="not(contains($text, '&#xA;'))">
+    <xsl:when test="not(contains($text, '&#10;'))">
       <xsl:value-of select="$text"/>
     </xsl:when>
 

docbook-xsl-snapshot/xhtml/html.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/htmltbl.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************

docbook-xsl-snapshot/xhtml/index.xsl

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="US-ASCII"?>
+<?xml version="1.0" encoding="ASCII"?>
 <!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
+<!--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">
 
 <!-- ********************************************************************