Merged r8368 from new-xsl branch.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8370 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

26 files changed, 498 insertions, 513 deletions

diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION b/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION
index 146b24160..665ffa2fc 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION
@@ -2,23 +2,31 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
   xmlns:sf="http://sourceforge.net/"
+  xmlns:dyn="http://exslt.org/dynamic"
+  xmlns:saxon="http://icl.com/saxon"
   exclude-result-prefixes="fm sf"
   version='1.0'>
 
+<xsl:output omit-xml-declaration="yes"/>
+
+<xsl:param name="get"/>
 <xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
+<xsl:param name="Tag" select="concat('V',translate(string(document('')//fm:Version[1]),'.',''))"/>
 <xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/>
+<xsl:param name="sf-relid" select="0"/>
+
 <xsl:param name="DistroName">docbook-xsl</xsl:param>
 <xsl:param name="PreviousRelease">1.72.0</xsl:param>
-<xsl:param name="PreviousReleaseRevision">6553</xsl:param>
+<xsl:param name="PreviousReleaseRevision">6549</xsl:param>
 <xsl:param name="Revision">$Revision$</xsl:param>
 <xsl:param name="VersionFileURL">$URL: https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl/VERSION $</xsl:param>
-<xsl:param name="sf-relid" select="0"/>
+
 <xsl:strip-space elements="fm:*"/>
 
 <fm:project>
   <fm:Project>DocBook</fm:Project>
   <fm:Branch>XSL Stylesheets</fm:Branch>
-  <fm:Version>snapshot_7094</fm:Version>
+  <fm:Version>1.73.2</fm:Version>
 <!--
   <fm:License>MIT/X Consortium License</fm:License>
 -->
@@ -27,8 +35,8 @@
 <!-- * Documentation -->
 <!-- * Code cleanup -->
 <!-- * Minor feature enhancements -->
-Major feature enhancements
-<!-- * Minor bugfixes -->
+<!-- * Major feature enhancements -->
+Minor bugfixes
 <!-- * Major bugfixes -->
 <!-- * Minor security fixes -->
 <!-- * Major security fixes -->
@@ -40,22 +48,36 @@ Major feature enhancements
   <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
   <fm:CVS-URL>http://docbook.svn.sourceforge.net/viewvc/docbook/</fm:CVS-URL>
   <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
-  <fm:Changes>This is a bug-fix release with a few feature enhancements.
+  <fm:Changes>This is a bug-fix update to the 1.73.1 release.
 </fm:Changes>
 </fm:project>
 
 <xsl:template match="/" priority="-100">
-  <xsl:if test="$sf-relid = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>You must specify the sf-relid as a parameter.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:apply-templates select="//fm:project"/>
+  <xsl:choose>
+    <xsl:when test="$get = 'Tag'">
+      <xsl:value-of select="$Tag"/>
+    </xsl:when>
+    <xsl:when test="$get = 'PreviousRelease'">
+      <xsl:value-of select="$PreviousRelease"/>
+    </xsl:when>
+    <xsl:when test="$get = 'PreviousReleaseRevision'">
+      <xsl:value-of select="$PreviousReleaseRevision"/>
+    </xsl:when>
+    <xsl:when test="$get = 'DistroTitle'">
+      <xsl:value-of select="$DistroTitle"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:if test="$sf-relid = 0">
+        <xsl:message terminate="yes">
+         <xsl:text>You must specify the sf-relid as a parameter.</xsl:text>
+        </xsl:message>
+      </xsl:if>
+      <xsl:apply-templates select="//fm:project"/>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template match="fm:project">
-  <xsl:text>&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:text>&#10;</xsl:text>
   <xsl:apply-templates select="fm:Changes" mode="text"/>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml
index a8233d13c..bc2aedf6a 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml
@@ -169,7 +169,7 @@
 <l:gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
 <l:gentext key="unsupported" text="wird nicht unterstützt"/>
 <l:gentext key="xrefto" text="xref auf"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
+<l:gentext key="Authors" text="Autoren"/>
 <l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
 <l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
 <l:gentext key="productioneditor" text="Production Editor" lang="en"/>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl
index 5c3df8815..b76c6b99d 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl
@@ -89,7 +89,7 @@
 <doc:pi name="dbtimestamp" xmlns="">
   <refpurpose>Inserts a date timestamp</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbtimestamp</tag> PI at any point in a
+    <para>Use the <tag class="xmlpi">dbtimestamp</tag> PI at any point in a
       source document to cause a date timestamp (a formatted
       string representing the current date and time) to be
       inserted in output of the document.</para>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl
index 8ecb3d646..13abb7faf 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl
@@ -16,18 +16,8 @@
      See ../README or http://docbook.sf.net/release/xsl/current/ for
      copyright and other information.
 
-     This file contains general templates common to both the HTML and FO
-     versions of the DocBook stylesheets.
      ******************************************************************** -->
 
-<xsl:import href="utility.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>
@@ -267,26 +257,11 @@
           <xsl:value-of select="NodeInfo:systemId()"/>
         </xsl:when>
         <xsl:otherwise>
-          <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: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:otherwise>
       </xsl:choose>
     </xsl:variable>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl
index f6b3a0186..95cf7b37b 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl
@@ -31,7 +31,7 @@
       Stylesheets.</para>
     <note>
       <para>These templates are defined in a separate file from the set
-        of “common” templates because some of the comment templates
+        of “common” templates because some of the common templates
         reference DocBook XSL stylesheet parameters, requiring the
         entire set of parameters to be imported/included in any
         stylesheet that imports/includes the common templates.</para>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl
index 73d57552b..9662ac5e0 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl
@@ -85,7 +85,9 @@
           <fo:list-item-body start-indent="body-start()">
             <xsl:if test="$admon.textlabel != 0 or title or info/title">
               <fo:block xsl:use-attribute-sets="admonition.title.properties">
-                <xsl:apply-templates select="." mode="object.title.markup"/>
+                <xsl:apply-templates select="." mode="object.title.markup">
+		  <xsl:with-param name="allow-anchors" select="1"/>
+		</xsl:apply-templates>
               </fo:block>
             </xsl:if>
             <fo:block xsl:use-attribute-sets="admonition.properties">
@@ -107,7 +109,9 @@
     <xsl:if test="$admon.textlabel != 0 or title or info/title">
       <fo:block keep-with-next.within-column='always'
                 xsl:use-attribute-sets="admonition.title.properties">
-         <xsl:apply-templates select="." mode="object.title.markup"/>
+         <xsl:apply-templates select="." mode="object.title.markup">
+	   <xsl:with-param name="allow-anchors" select="1"/>
+	 </xsl:apply-templates>
       </fo:block>
     </xsl:if>
 
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl
index 88d20979d..3340b322d 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl
@@ -90,7 +90,7 @@
         <!-- FIXME: list in @from is probably not complete -->
         <xsl:number level="any" 
                     from="chapter|appendix|preface|article|refentry|bibliography" 
-                    count="footnote[not(@label)][not(ancestor::table) and not(ancestor::informaltable)]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)][ulink.show != 0]" 
+                    count="footnote[not(@label)][not(ancestor::table) and not(ancestor::informaltable)]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)][$ulink.show != 0]" 
                     format="1"/>
       </xsl:variable>
       <xsl:choose>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl
index 4e94fec5c..c2973762a 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl
@@ -375,9 +375,11 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:when>
-        <xsl:otherwise>
-          <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
-             href="{$filename}"/>
+	<xsl:otherwise>
+	  <xsl:message terminate="yes">
+	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
+	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
+	  </xsl:message>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:when>
@@ -494,9 +496,11 @@
           </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
-          <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
-             href="{$filename}"/>
-        </xsl:otherwise>
+	  <xsl:message terminate="yes">
+	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
+	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
+	  </xsl:message>
+	</xsl:otherwise>
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
@@ -532,6 +536,7 @@
 </xsl:template>
 
 <xsl:template match="textdata">
+  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
   <xsl:variable name="filename">
     <xsl:choose>
       <xsl:when test="@entityref">
@@ -564,16 +569,19 @@
         <xsl:when test="element-available('xtext:insertfile')">
           <xtext:insertfile href="{$filename}"/>
         </xsl:when>
-        <xsl:otherwise>
-          <xsl:message terminate="yes">
-            <xsl:text>No insertfile extension available.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
+	<xsl:otherwise>
+	  <xsl:message terminate="yes">
+	    <xsl:text>Don't know how to insert files with </xsl:text>
+	    <xsl:value-of select="$vendor"/>
+	  </xsl:message>
+	</xsl:otherwise>
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
-      <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
-         href="{$filename}"/>
+      <xsl:message terminate="yes">
+	<xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
+	<xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
+      </xsl:message>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl
index 6156ee9e9..c033afa9a 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns="http://docbook.org/ns/docbook" exclude-result-prefixes="src" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <!-- This file is generated from param.xweb -->
 
@@ -28,7 +28,7 @@
   <xsl:attribute name="hyphenate">false</xsl:attribute>
   <xsl:attribute name="text-align">center</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="admon.graphics.extension" select="'.png'"/>
+<xsl:param name="admon.graphics.extension">.png</xsl:param>
 <xsl:param name="admon.graphics" select="0"/>
 <xsl:param name="admon.graphics.path">images/</xsl:param>
 <xsl:param name="admon.textlabel" select="1"/>
@@ -55,7 +55,7 @@
   <xsl:attribute name="margin-right">0.25in</xsl:attribute>
 </xsl:attribute-set>
 <xsl:param name="alignment">justify</xsl:param>
-<xsl:param name="appendix.autolabel" select="'A'"/>
+<xsl:param name="appendix.autolabel">A</xsl:param>
 <xsl:param name="arbortext.extensions" select="0"/>
 <xsl:attribute-set name="article.appendix.title.properties" use-attribute-sets="section.title.properties                          section.title.level1.properties">
   <xsl:attribute name="margin-left">
@@ -63,16 +63,17 @@
   </xsl:attribute>
 </xsl:attribute-set>
 <xsl:param name="author.othername.in.middle" select="1"/>
-<xsl:param name="autotoc.label.separator" select="'. '"/>
+<xsl:param name="autotoc.label.separator">. </xsl:param>
 <xsl:param name="axf.extensions" select="0"/>
 <xsl:param name="biblioentry.item.separator">. </xsl:param>
 <xsl:attribute-set name="biblioentry.properties" use-attribute-sets="normal.para.spacing">
   <xsl:attribute name="start-indent">0.5in</xsl:attribute>
   <xsl:attribute name="text-indent">-0.5in</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="bibliography.collection" select="'http://docbook.sourceforge.net/release/bibliography/bibliography.xml'"/>
+<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param>
+
 <xsl:param name="bibliography.numbered" select="0"/>
-<xsl:param name="bibliography.style" select="'normal'"/>
+<xsl:param name="bibliography.style">normal</xsl:param>
 <xsl:attribute-set name="blockquote.properties">
 <xsl:attribute name="margin-left">0.5in</xsl:attribute>
 <xsl:attribute name="margin-right">0.5in</xsl:attribute>
@@ -80,13 +81,13 @@
 <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
 <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="body.font.family" select="'serif'"/>
+<xsl:param name="body.font.family">serif</xsl:param>
 <xsl:param name="body.font.master">10</xsl:param>
 <xsl:param name="body.font.size">
  <xsl:value-of select="$body.font.master"/><xsl:text>pt</xsl:text>
 </xsl:param>
-<xsl:param name="body.margin.bottom" select="'0.5in'"/>
-<xsl:param name="body.margin.top" select="'0.5in'"/>
+<xsl:param name="body.margin.bottom">0.5in</xsl:param>
+<xsl:param name="body.margin.top">0.5in</xsl:param>
 <xsl:param name="body.start.indent">
   <xsl:choose>
     <xsl:when test="$fop.extensions != 0">0pt</xsl:when>
@@ -94,35 +95,35 @@
     <xsl:otherwise>4pc</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
-<xsl:param name="body.end.indent" select="'0pt'"/>
+<xsl:param name="body.end.indent">0pt</xsl:param>
 <xsl:param name="bridgehead.in.toc" select="0"/>
-<xsl:param name="callout.defaultcolumn" select="'60'"/>
+<xsl:param name="callout.defaultcolumn">60</xsl:param>
 
-<xsl:param name="callout.graphics.extension" select="'.svg'"/>
-<xsl:param name="callout.graphics" select="'1'"/>
+<xsl:param name="callout.graphics.extension">.svg</xsl:param>
+<xsl:param name="callout.graphics" select="1"/>
 <xsl:param name="callout.icon.size">7pt</xsl:param>
 
-<xsl:param name="callout.graphics.number.limit" select="'30'"/>
-<xsl:param name="callout.graphics.path" select="'images/callouts/'"/>
-<xsl:param name="callout.unicode.font" select="'ZapfDingbats'"/>
+<xsl:param name="callout.graphics.number.limit">30</xsl:param>
+<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
+<xsl:param name="callout.unicode.font">ZapfDingbats</xsl:param>
 <xsl:param name="callout.unicode" select="0"/>
-<xsl:param name="callout.unicode.number.limit" select="'10'"/>
-<xsl:param name="callout.unicode.start.character" select="10102"/>
-<xsl:param name="callouts.extension" select="'1'"/>
+<xsl:param name="callout.unicode.number.limit">10</xsl:param>
+<xsl:param name="callout.unicode.start.character">10102</xsl:param>
+<xsl:param name="callouts.extension" select="1"/>
 <xsl:param name="chapter.autolabel" select="1"/>
-<xsl:param name="collect.xref.targets" select="'no'"/>
+<xsl:param name="collect.xref.targets">no</xsl:param>
 <xsl:param name="column.count.back" select="1"/>
 <xsl:param name="column.count.body" select="1"/>
 <xsl:param name="column.count.front" select="1"/>
-<xsl:param name="column.count.index" select="2"/>
+<xsl:param name="column.count.index">2</xsl:param>
 <xsl:param name="column.count.lot" select="1"/>
 <xsl:param name="column.count.titlepage" select="1"/>
-<xsl:param name="column.gap.back" select="'12pt'"/>
-<xsl:param name="column.gap.body" select="'12pt'"/>
-<xsl:param name="column.gap.front" select="'12pt'"/>
-<xsl:param name="column.gap.index" select="'12pt'"/>
-<xsl:param name="column.gap.lot" select="'12pt'"/>
-<xsl:param name="column.gap.titlepage" select="'12pt'"/>
+<xsl:param name="column.gap.back">12pt</xsl:param>
+<xsl:param name="column.gap.body">12pt</xsl:param>
+<xsl:param name="column.gap.front">12pt</xsl:param>
+<xsl:param name="column.gap.index">12pt</xsl:param>
+<xsl:param name="column.gap.lot">12pt</xsl:param>
+<xsl:param name="column.gap.titlepage">12pt</xsl:param>
 <xsl:attribute-set name="compact.list.item.spacing">
   <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
   <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
@@ -146,24 +147,24 @@
 <xsl:attribute-set name="component.titlepage.properties">
 </xsl:attribute-set>
 <xsl:param name="crop.marks" select="0"/>
-<xsl:param name="crop.mark.width" select="'0.5pt'"/>
-<xsl:param name="crop.mark.offset" select="'24pt'"/>
-<xsl:param name="crop.mark.bleed" select="'6pt'"/>
-<xsl:param name="current.docid" select="''"/> 
+<xsl:param name="crop.mark.width">0.5pt</xsl:param>
+<xsl:param name="crop.mark.offset">24pt</xsl:param>
+<xsl:param name="crop.mark.bleed">6pt</xsl:param>
+<xsl:param name="current.docid"/>
 <xsl:param name="default.float.class">
   <xsl:choose>
     <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when>
     <xsl:otherwise>before</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
-<xsl:param name="default.image.width" select="''"/>
-<xsl:param name="default.table.width" select="''"/>
-<xsl:param name="default.table.frame" select="'all'"/>
-<xsl:param name="default.units" select="'pt'"/>
-<xsl:param name="dingbat.font.family" select="'serif'"/>
+<xsl:param name="default.image.width"/>
+<xsl:param name="default.table.width"/>
+<xsl:param name="default.table.frame">all</xsl:param>
+<xsl:param name="default.units">pt</xsl:param>
+<xsl:param name="dingbat.font.family">serif</xsl:param>
 <xsl:param name="double.sided" select="0"/>
-<xsl:param name="draft.mode" select="'maybe'"/>
-<xsl:param name="draft.watermark.image" select="'http://docbook.sourceforge.net/release/images/draft.png'"/>
+<xsl:param name="draft.mode">maybe</xsl:param>
+<xsl:param name="draft.watermark.image">http://docbook.sourceforge.net/release/images/draft.png</xsl:param>
 
 <xsl:param name="ebnf.assignment">
   <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$monospace.font.family}">
@@ -172,7 +173,7 @@
 </xsl:param>
 
 <xsl:param name="ebnf.statement.terminator"/>
-<xsl:param name="email.delimiters.enabled">1</xsl:param>
+<xsl:param name="email.delimiters.enabled" select="1"/>
 <xsl:attribute-set name="equation.properties" use-attribute-sets="formal.object.properties"/>
 <xsl:attribute-set name="example.properties" use-attribute-sets="formal.object.properties"/>
 <xsl:attribute-set name="figure.properties" use-attribute-sets="formal.object.properties"/>
@@ -186,8 +187,8 @@
   </xsl:attribute>
 </xsl:attribute-set>
 <xsl:param name="footer.rule" select="1"/>
-<xsl:param name="footer.column.widths" select="'1 1 1'"/>
-<xsl:param name="footer.table.height" select="'14pt'"/>
+<xsl:param name="footer.column.widths">1 1 1</xsl:param>
+<xsl:param name="footer.table.height">14pt</xsl:param>
 <xsl:attribute-set name="footer.table.properties">
   <xsl:attribute name="table-layout">fixed</xsl:attribute>
   <xsl:attribute name="width">100%</xsl:attribute>
@@ -196,8 +197,8 @@
 <xsl:param name="footnote.font.size">
  <xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text>
 </xsl:param>
-<xsl:param name="footnote.number.format" select="'1'"/>
-<xsl:param name="footnote.number.symbols" select="''"/>
+<xsl:param name="footnote.number.format">1</xsl:param>
+<xsl:param name="footnote.number.symbols"/>
 <xsl:attribute-set name="footnote.mark.properties">
   <xsl:attribute name="font-size">75%</xsl:attribute>
   <xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -250,7 +251,7 @@ task before
 </xsl:attribute-set>
 <xsl:param name="funcsynopsis.decoration" select="1"/>
 <xsl:param name="funcsynopsis.style">kr</xsl:param>
-<xsl:param name="function.parens">0</xsl:param>
+<xsl:param name="function.parens" select="0"/>
 <xsl:param name="generate.index" select="1"/>
 <xsl:param name="generate.section.toc.level" select="0"/>
 
@@ -272,13 +273,13 @@ reference toc,title
 set       toc,title
 </xsl:param>
 <xsl:param name="glossary.as.blocks" select="0"/>
-<xsl:param name="glossary.collection" select="''"/>
+<xsl:param name="glossary.collection"/>
 <xsl:param name="glossary.sort" select="0"/>
-<xsl:param name="glossentry.show.acronym" select="'no'"/>
+<xsl:param name="glossentry.show.acronym">no</xsl:param>
 <xsl:param name="glosslist.as.blocks" select="0"/>
 <xsl:param name="glossterm.auto.link" select="0"/>
-<xsl:param name="glossterm.separation" select="'0.25in'"/>
-<xsl:param name="glossterm.width" select="'2in'"/>
+<xsl:param name="glossterm.separation">0.25in</xsl:param>
+<xsl:param name="glossterm.width">2in</xsl:param>
 <xsl:param name="graphic.default.extension"/>
 <xsl:attribute-set name="header.content.properties">
   <xsl:attribute name="font-family">
@@ -289,21 +290,21 @@ set       toc,title
   </xsl:attribute>
 </xsl:attribute-set>
 <xsl:param name="header.rule" select="1"/>
-<xsl:param name="header.column.widths" select="'1 1 1'"/>
-<xsl:param name="header.table.height" select="'14pt'"/>
+<xsl:param name="header.column.widths">1 1 1</xsl:param>
+<xsl:param name="header.table.height">14pt</xsl:param>
 <xsl:attribute-set name="header.table.properties">
   <xsl:attribute name="table-layout">fixed</xsl:attribute>
   <xsl:attribute name="width">100%</xsl:attribute>
 </xsl:attribute-set>
 <xsl:param name="headers.on.blank.pages" select="1"/>
-<xsl:param name="highlight.default.language" select="''"/>
+<xsl:param name="highlight.default.language"/>
 <xsl:param name="highlight.source" select="0"/>
 <xsl:param name="hyphenate">true</xsl:param>
 <xsl:param name="hyphenate.verbatim" select="0"/>
-<xsl:param name="hyphenate.verbatim.characters" select="''"/>
+<xsl:param name="hyphenate.verbatim.characters"/>
 <xsl:param name="ignore.image.scaling" select="0"/>
 <xsl:param name="img.src.path"/>
-<xsl:param name="index.method" select="'basic'"/>
+<xsl:param name="index.method">basic</xsl:param>
 <xsl:param name="index.on.role" select="0"/>
 <xsl:param name="index.on.type" select="0"/>
 <xsl:attribute-set name="index.page.number.properties">
@@ -337,28 +338,29 @@ set       toc,title
 <xsl:attribute-set name="index.entry.properties">
   <xsl:attribute name="start-indent">0pt</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="index.number.separator" select="''"/>
-<xsl:param name="index.range.separator" select="''"/>
-<xsl:param name="index.term.separator" select="''"/>
+<xsl:param name="index.number.separator"/>
+<xsl:param name="index.range.separator"/>
+<xsl:param name="index.term.separator"/>
 <xsl:param name="insert.link.page.number">no</xsl:param>
 <xsl:param name="insert.xref.page.number">no</xsl:param>
 <xsl:attribute-set name="itemizedlist.properties" use-attribute-sets="list.block.properties">
 </xsl:attribute-set>
 <xsl:attribute-set name="itemizedlist.label.properties">
 </xsl:attribute-set>
-<xsl:param name="itemizedlist.label.width" select="'1.0em'"/>
+    <xsl:param name="itemizedlist.label.width">1.0em</xsl:param>
+  
 
 <xsl:param name="keep.relative.image.uris" select="0"/>
-<xsl:param name="l10n.gentext.default.language" select="'en'"/>
-<xsl:param name="l10n.gentext.language" select="''"/>
+<xsl:param name="l10n.gentext.default.language">en</xsl:param>
+<xsl:param name="l10n.gentext.language"/>
 <xsl:param name="l10n.gentext.use.xref.language" select="0"/>
 <xsl:param name="l10n.lang.value.rfc.compliant" select="1"/>
-<xsl:param name="label.from.part" select="'0'"/>
-<xsl:param name="line-height" select="'normal'"/>
-<xsl:param name="linenumbering.everyNth" select="'5'"/>
-<xsl:param name="linenumbering.extension" select="'1'"/>
-<xsl:param name="linenumbering.separator" select="' '"/>
-<xsl:param name="linenumbering.width" select="'3'"/>
+<xsl:param name="label.from.part" select="0"/>
+<xsl:param name="line-height">normal</xsl:param>
+<xsl:param name="linenumbering.everyNth">5</xsl:param>
+<xsl:param name="linenumbering.extension" select="1"/>
+<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param>
+<xsl:param name="linenumbering.width">3</xsl:param>
 <xsl:attribute-set name="list.block.properties">
   <xsl:attribute name="provisional-label-separation">0.2em</xsl:attribute>
   <xsl:attribute name="provisional-distance-between-starts">1.5em</xsl:attribute>
@@ -389,12 +391,12 @@ set       toc,title
   <xsl:attribute name="text-align">start</xsl:attribute>
   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="margin.note.float.type" select="'none'"/>
-<xsl:param name="margin.note.width" select="'1in'"/>
-<xsl:param name="marker.section.level" select="2"/>
+<xsl:param name="margin.note.float.type">none</xsl:param>
+<xsl:param name="margin.note.width">1in</xsl:param>
+<xsl:param name="marker.section.level">2</xsl:param>
 <xsl:param name="menuchoice.menu.separator"> &#8594; </xsl:param>
-<xsl:param name="menuchoice.separator" select="'+'"/>
-<xsl:param name="monospace.font.family" select="'monospace'"/>
+<xsl:param name="menuchoice.separator">+</xsl:param>
+<xsl:param name="monospace.font.family">monospace</xsl:param>
 <xsl:attribute-set name="monospace.properties">
   <xsl:attribute name="font-family">
     <xsl:value-of select="$monospace.font.family"/>
@@ -404,25 +406,25 @@ set       toc,title
   <xsl:attribute name="text-align">start</xsl:attribute>
   <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="nominal.table.width" select="'6in'"/>
+<xsl:param name="nominal.table.width">6in</xsl:param>
 <xsl:attribute-set name="normal.para.spacing">
   <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
   <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
   <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="olink.doctitle" select="'no'"/> 
-<xsl:param name="olink.base.uri" select="''"/> 
+<xsl:param name="olink.doctitle">no</xsl:param> 
+<xsl:param name="olink.base.uri"/>
 <xsl:param name="olink.debug" select="0"/>
 <xsl:attribute-set name="olink.properties">
   <xsl:attribute name="show-destination">replace</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="olink.lang.fallback.sequence" select="''"/> 
+<xsl:param name="olink.lang.fallback.sequence"/>
 <xsl:attribute-set name="orderedlist.properties" use-attribute-sets="list.block.properties">
   <xsl:attribute name="provisional-distance-between-starts">2em</xsl:attribute>
 </xsl:attribute-set>
 <xsl:attribute-set name="orderedlist.label.properties">
 </xsl:attribute-set>
-<xsl:param name="orderedlist.label.width" select="'1.2em'"/>
+<xsl:param name="orderedlist.label.width">1.2em</xsl:param>
 <xsl:param name="prefer.internal.olink" select="0"/>
 <xsl:param name="insert.olink.page.number">no</xsl:param>
 <xsl:param name="insert.olink.pdf.frag" select="0"/>
@@ -479,7 +481,7 @@ set       toc,title
     <xsl:otherwise>11in</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
-<xsl:param name="page.margin.bottom" select="'0.5in'"/>
+<xsl:param name="page.margin.bottom">0.5in</xsl:param>
 <xsl:param name="page.margin.inner">
   <xsl:choose>
     <xsl:when test="$double.sided != 0">1.25in</xsl:when>
@@ -492,8 +494,8 @@ set       toc,title
     <xsl:otherwise>1in</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
-<xsl:param name="page.margin.top" select="'0.5in'"/>
-<xsl:param name="page.orientation" select="'portrait'"/>
+<xsl:param name="page.margin.top">0.5in</xsl:param>
+<xsl:param name="page.orientation">portrait</xsl:param>
 <xsl:param name="page.width">
   <xsl:choose>
     <xsl:when test="$page.orientation = 'portrait'">
@@ -545,35 +547,37 @@ set       toc,title
     <xsl:otherwise>8.5in</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
-<xsl:param name="paper.type" select="'USletter'"/>
-<xsl:param name="part.autolabel" select="'I'"/>
+<xsl:param name="paper.type">USletter</xsl:param>
+<xsl:param name="part.autolabel">I</xsl:param>
 <xsl:param name="passivetex.extensions" select="0"/>
 <xsl:attribute-set name="pgwide.properties">
   <xsl:attribute name="start-indent">0pt</xsl:attribute>
 </xsl:attribute-set>
 <xsl:param name="preface.autolabel" select="0"/>
 <xsl:param name="preferred.mediaobject.role"/>
-<xsl:attribute-set name="procedure.properties" use-attribute-sets="formal.object.properties"/>
+<xsl:attribute-set name="procedure.properties" use-attribute-sets="formal.object.properties">
+  <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
+</xsl:attribute-set>
 <xsl:param name="process.empty.source.toc" select="0"/>
 <xsl:param name="process.source.toc" select="0"/>
-<xsl:param name="profile.arch" select="''"/>
-<xsl:param name="profile.audience" select="''"/>
-<xsl:param name="profile.attribute" select="''"/>
-<xsl:param name="profile.condition" select="''"/>
-<xsl:param name="profile.conformance" select="''"/>
-<xsl:param name="profile.lang" select="''"/>
-<xsl:param name="profile.os" select="''"/>
-<xsl:param name="profile.revision" select="''"/>
-<xsl:param name="profile.revisionflag" select="''"/>
-<xsl:param name="profile.role" select="''"/>
-<xsl:param name="profile.security" select="''"/>
-<xsl:param name="profile.separator" select="';'"/>
-<xsl:param name="profile.status" select="''"/>
-<xsl:param name="profile.userlevel" select="''"/>
-<xsl:param name="profile.value" select="''"/>
-<xsl:param name="profile.vendor" select="''"/>
-<xsl:param name="profile.wordsize" select="''"/>
-<xsl:param name="punct.honorific" select="'.'"/>
+<xsl:param name="profile.arch"/>
+<xsl:param name="profile.audience"/>
+<xsl:param name="profile.attribute"/>
+<xsl:param name="profile.condition"/>
+<xsl:param name="profile.conformance"/>
+<xsl:param name="profile.lang"/>
+<xsl:param name="profile.os"/>
+<xsl:param name="profile.revision"/>
+<xsl:param name="profile.revisionflag"/>
+<xsl:param name="profile.role"/>
+<xsl:param name="profile.security"/>
+<xsl:param name="profile.separator">;</xsl:param>
+<xsl:param name="profile.status"/>
+<xsl:param name="profile.userlevel"/>
+<xsl:param name="profile.value"/>
+<xsl:param name="profile.vendor"/>
+<xsl:param name="profile.wordsize"/>
+<xsl:param name="punct.honorific">.</xsl:param>
 <xsl:param name="qanda.defaultlabel">number</xsl:param>
 <xsl:param name="qanda.in.toc" select="0"/>
 <xsl:param name="qanda.nested.in.toc" select="0"/>
@@ -647,10 +651,10 @@ set       toc,title
   <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
 </xsl:attribute-set>
 <xsl:param name="refentry.xref.manvolnum" select="1"/>
-<xsl:param name="reference.autolabel" select="'I'"/>
+  <xsl:param name="reference.autolabel">I</xsl:param>
 <xsl:param name="refclass.suppress" select="0"/>
-<xsl:param name="region.after.extent" select="'0.4in'"/>
-<xsl:param name="region.before.extent" select="'0.4in'"/>
+<xsl:param name="region.after.extent">0.4in</xsl:param>
+<xsl:param name="region.before.extent">0.4in</xsl:param>
 <xsl:attribute-set name="revhistory.table.properties">
 </xsl:attribute-set>
 <xsl:attribute-set name="revhistory.table.cell.properties">
@@ -673,13 +677,13 @@ set       toc,title
   <xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute>
   <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="rootid" select="''"/>
-<xsl:param name="runinhead.default.title.end.punct" select="'.'"/>
-<xsl:param name="runinhead.title.end.punct" select="'.!?:'"/>
-<xsl:param name="sans.font.family" select="'sans-serif'"/>
+<xsl:param name="rootid"/>
+<xsl:param name="runinhead.default.title.end.punct">.</xsl:param>
+<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param>
+<xsl:param name="sans.font.family">sans-serif</xsl:param>
 <xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="section.autolabel.max.depth" select="8"/>
-<xsl:param name="section.container.element" select="'block'"/>
+<xsl:param name="section.autolabel.max.depth">8</xsl:param>
+<xsl:param name="section.container.element">block</xsl:param>
 <xsl:param name="section.label.includes.component.label" select="0"/>
 <xsl:attribute-set name="section.title.level1.properties">
   <xsl:attribute name="font-size">
@@ -750,7 +754,7 @@ set       toc,title
 <xsl:attribute-set name="shade.verbatim.style">
   <xsl:attribute name="background-color">#E0E0E0</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="show.comments">1</xsl:param>
+<xsl:param name="show.comments" select="1"/>
 <xsl:attribute-set name="sidebar.properties" use-attribute-sets="formal.object.properties">
   <xsl:attribute name="border-style">solid</xsl:attribute>
   <xsl:attribute name="border-width">1pt</xsl:attribute>
@@ -773,8 +777,8 @@ set       toc,title
   <xsl:attribute name="text-align">start</xsl:attribute>
   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="sidebar.float.type" select="'none'"/>
-<xsl:param name="sidebar.float.width" select="'1in'"/>
+<xsl:param name="sidebar.float.type">none</xsl:param>
+<xsl:param name="sidebar.float.width">1in</xsl:param>
 <xsl:param name="simplesect.in.toc" select="0"/>
 <xsl:attribute-set name="subscript.properties">
   <xsl:attribute name="font-size">75%</xsl:attribute>
@@ -782,19 +786,19 @@ set       toc,title
 <xsl:attribute-set name="superscript.properties">
   <xsl:attribute name="font-size">75%</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="symbol.font.family" select="'Symbol,ZapfDingbats'"/>
+<xsl:param name="symbol.font.family">Symbol,ZapfDingbats</xsl:param>
 
-<xsl:param name="table.cell.border.color" select="'black'"/>
-<xsl:param name="table.cell.border.style" select="'solid'"/>
-<xsl:param name="table.cell.border.thickness" select="'0.5pt'"/>
+<xsl:param name="table.cell.border.color">black</xsl:param>
+<xsl:param name="table.cell.border.style">solid</xsl:param>
+<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param>
 <xsl:attribute-set name="table.cell.padding">
   <xsl:attribute name="padding-left">2pt</xsl:attribute>
   <xsl:attribute name="padding-right">2pt</xsl:attribute>
   <xsl:attribute name="padding-top">2pt</xsl:attribute>
   <xsl:attribute name="padding-bottom">2pt</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="table.footnote.number.format" select="'a'"/>
-<xsl:param name="table.footnote.number.symbols" select="''"/>
+<xsl:param name="table.footnote.number.format">a</xsl:param>
+<xsl:param name="table.footnote.number.symbols"/>
 <xsl:attribute-set name="table.footnote.properties">
   <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute>
   <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute>
@@ -804,22 +808,22 @@ set       toc,title
   <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute>
 </xsl:attribute-set>
 
-<xsl:param name="table.frame.border.color" select="'black'"/>
-<xsl:param name="table.frame.border.style" select="'solid'"/>
-<xsl:param name="table.frame.border.thickness" select="'0.5pt'"/>
+<xsl:param name="table.frame.border.color">black</xsl:param>
+<xsl:param name="table.frame.border.style">solid</xsl:param>
+<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
 <xsl:attribute-set name="table.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:param name="tablecolumns.extension" select="'1'"/>
+<xsl:param name="tablecolumns.extension" select="1"/>
 <xsl:attribute-set name="table.table.properties">
   <xsl:attribute name="border-before-width.conditionality">retain</xsl:attribute>
   <xsl:attribute name="border-collapse">collapse</xsl:attribute>
 </xsl:attribute-set>
-<xsl:param name="target.database.document" select="''"/>
-<xsl:param name="targets.filename" select="'target.db'"/>
-<xsl:param name="textdata.default.encoding" select="''"/>
-<xsl:param name="tex.math.delims" select="'1'"/>
-<xsl:param name="tex.math.in.alt" select="''"/>
-<xsl:param name="textinsert.extension" select="'1'"/>
-<xsl:param name="title.font.family" select="'sans-serif'"/>
+ <xsl:param name="target.database.document">olinkdb.xml</xsl:param>
+<xsl:param name="targets.filename">target.db</xsl:param>
+<xsl:param name="textdata.default.encoding"/>
+<xsl:param name="tex.math.delims" select="1"/>
+<xsl:param name="tex.math.in.alt"/>
+  <xsl:param name="textinsert.extension" select="1"/>
+<xsl:param name="title.font.family">sans-serif</xsl:param>
 <xsl:param name="title.margin.left">
   <xsl:choose>
     <xsl:when test="$fop.extensions != 0">-4pc</xsl:when>
@@ -827,7 +831,8 @@ set       toc,title
     <xsl:otherwise>0pt</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
-<xsl:param name="toc.indent.width" select="24"/>
+<xsl:param name="toc.indent.width">24</xsl:param>
+<!-- inconsistant point specification? -->
 <xsl:attribute-set name="toc.line.properties">
   <xsl:attribute name="text-align-last">justify</xsl:attribute>
   <xsl:attribute name="text-align">start</xsl:attribute>
@@ -845,10 +850,10 @@ set       toc,title
 <xsl:param name="toc.max.depth">8</xsl:param>
 <xsl:param name="toc.section.depth">2</xsl:param>
 <xsl:param name="ulink.footnotes" select="0"/>
-<xsl:param name="ulink.hyphenate" select="''"/>
-<xsl:param name="ulink.hyphenate.chars" select="'/'"/>
+<xsl:param name="ulink.hyphenate"/>
+<xsl:param name="ulink.hyphenate.chars">/</xsl:param>
 <xsl:param name="ulink.show" select="1"/>
-<xsl:param name="use.extensions" select="'0'"/>
+<xsl:param name="use.extensions" select="0"/>
 <xsl:param name="use.local.olink.style" select="0"/> 
 <xsl:param name="use.role.as.xrefstyle" select="1"/>
 <xsl:param name="use.role.for.mediaobject" select="1"/>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl
index e03e989e2..afcf558d8 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl
@@ -45,7 +45,7 @@
 <doc:pi name="dbfo_background-color" xmlns="">
   <refpurpose>Sets background color for an image</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo background-color</tag> PI before or
+    <para>Use the <tag class="xmlpi">dbfo background-color</tag> PI before or
       after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>,
       <tag>imagedata</tag>, or <tag>videodata</tag> element) as a
       sibling to the element, to set a background color for the
@@ -80,7 +80,7 @@
 <doc:pi name="dbfo_bgcolor" xmlns="">
   <refpurpose>Sets background color on a table row or table cell</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo bgcolor</tag> PI as child of a table row
+    <para>Use the <tag class="xmlpi">dbfo bgcolor</tag> PI as child of a table row
       or cell to set a background color for that table row or cell.</para>
   </refdescription>
   <refsynopsisdiv>
@@ -112,7 +112,7 @@
 <doc:pi name="dbfo_float-type" xmlns="">
   <refpurpose>Specifies float behavior for a sidebar</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo float-type</tag> PI to specify the float
+    <para>Use the <tag class="xmlpi">dbfo float-type</tag> PI to specify the float
       behavior for a <tag>sidebar</tag> (to cause the sidebar to be
       displayed as a marginal note).</para>
   </refdescription>
@@ -152,7 +152,7 @@
 <doc:pi name="dbfo_glossary-presentation" xmlns="">
   <refpurpose>Specifies presentation style for a glossary</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo glossary-presentation</tag> PI as a child of
+    <para>Use the <tag class="xmlpi">dbfo glossary-presentation</tag> PI as a child of
       a <tag>glossary</tag> to control its presentation style.</para>
   </refdescription>
   <refsynopsisdiv>
@@ -191,7 +191,7 @@
 <doc:pi name="dbfo_glosslist-presentation" xmlns="">
   <refpurpose>Specifies presentation style for a glosslist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo glosslist-presentation</tag> PI as a child of
+    <para>Use the <tag class="xmlpi">dbfo glosslist-presentation</tag> PI as a child of
       a <tag>glosslist</tag> to control its presentation style.</para>
   </refdescription>
   <refsynopsisdiv>
@@ -231,7 +231,7 @@
   <refpurpose>Specifies the glossterm width for a glossary or
     glosslist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo glossterm-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbfo glossterm-width</tag> PI as a child of a
       <tag>glossary</tag> or <tag>glosslist</tag> to specify the
       width for output of <tag>glossterm</tag> instances in the
       output.</para>
@@ -270,7 +270,7 @@
   <refpurpose>Specifies “keep” behavior for a table, example,
     figure, or equation</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo keep-together</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbfo keep-together</tag> PI as a child of a
       formal object (<tag>table</tag>, <tag>example</tag>,
       <tag>figure</tag>, or <tag>equation</tag>) or their informal
       equivalents) to specify “keep” behavior for the object (to
@@ -313,7 +313,7 @@
 <doc:pi name="dbfo_label-width" xmlns="">
   <refpurpose>Specifies the label width for a qandaset</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo label-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbfo label-width</tag> PI as a child of a
       <tag>qandaset</tag> to specify the width of labels.</para>
   </refdescription>
   <refsynopsisdiv>
@@ -345,7 +345,7 @@
 <doc:pi name="dbfo_linenumbering.everyNth" xmlns="">
   <refpurpose>Specifies interval for lines numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo linenumbering.everyNth</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbfo linenumbering.everyNth</tag> PI as a child
       of a “verbatim” element – <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> — to specify
       the interval at which lines are numbered.</para>
@@ -383,7 +383,7 @@
 <doc:pi name="dbfo_linenumbering.separator" xmlns="">
   <refpurpose>Specifies separator text for line numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo linenumbering.separator</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbfo linenumbering.separator</tag> PI as a child
       of a “verbatim” element – <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> — to specify
       the separator text output between the line numbers and content.</para>
@@ -420,7 +420,7 @@
 <doc:pi name="dbfo_linenumbering.width" xmlns="">
   <refpurpose>Specifies width for line numbers in verbatims</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo linenumbering.width</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbfo linenumbering.width</tag> PI as a child
       of a “verbatim” element – <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> — to specify
       the width set aside for line numbers.</para>
@@ -458,7 +458,7 @@
   <refpurpose>Specifies presentation style for a variablelist or
     segmentedlist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo list-presentation</tag> PI as a child of
+    <para>Use the <tag class="xmlpi">dbfo list-presentation</tag> PI as a child of
       a <tag>variablelist</tag> or <tag>segmentedlist</tag> to
       control the presentation style for the list (to cause it, for
       example, to be displayed as a table).</para>
@@ -512,7 +512,7 @@
 <doc:pi name="dbfo_list-width" xmlns="">
   <refpurpose>Specifies the width of a horizontal simplelist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo list-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbfo list-width</tag> PI as a child of a
       <tag>simplelist</tag> whose <tag class="attribute">class</tag>
       value is <literal>horizontal</literal>, to specify the width
       of the <tag>simplelist</tag>.</para>
@@ -541,7 +541,7 @@
 <doc:pi name="dbfo_orientation" xmlns="">
   <refpurpose>Specifies the orientation for table row or cell</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo orientation</tag> PI as a child of an
+    <para>Use the <tag class="xmlpi">dbfo orientation</tag> PI as a child of an
       <tag>table</tag> row or cell to specify the orientation
       (rotation) for the row or cell.</para>
   </refdescription>
@@ -570,7 +570,7 @@
 <doc:pi name="dbfo_pgwide" xmlns="">
   <refpurpose>Specifies if an <tag>equation</tag> or <tag>example</tag> goes across full page width</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo pgwide</tag> PI as a child of an
+    <para>Use the <tag class="xmlpi">dbfo pgwide</tag> PI as a child of an
       <tag>equation</tag> or <tag>example</tag> to specify that the
       content should rendered across the full width of the page.</para>
   </refdescription>
@@ -609,7 +609,7 @@
   <refpurpose>Specifies the width for a table <tag>entry</tag> or
     <tag>row</tag></refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo rotated-width</tag> PI as a child of an
+    <para>Use the <tag class="xmlpi">dbfo rotated-width</tag> PI as a child of an
       <tag>entry</tag> or <tag>row</tag> instance to specify the
       width of that the <tag>entry</tag> or <tag>row</tag>; or
       use it higher up in table to cause the width to be inherited
@@ -639,7 +639,7 @@
 <doc:pi name="dbfo_sidebar-width" xmlns="">
   <refpurpose>Specifies the width of a sidebar</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo sidebar-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbfo sidebar-width</tag> PI as a child of a
       <tag>sidebar</tag> to specify the width of the sidebar.</para>
   </refdescription>
   <refsynopsisdiv>
@@ -716,7 +716,7 @@
   <refpurpose>Specifies the width for a table or for revhistory
     output</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo table-width</tag> PI as a child or
+    <para>Use the <tag class="xmlpi">dbfo table-width</tag> PI as a child or
       sibling of a <tag>table</tag>, or as a child of an
       <tag>informaltable</tag>, <tag>entrybl</tag>, or
       <tag>revhistory</tag> instance (which is rendered as a table
@@ -751,7 +751,7 @@
 <doc:pi name="dbfo_term-width" xmlns="">
   <refpurpose>Specifies the term width for a variablelist</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo term-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbfo term-width</tag> PI as a child of a
       <tag>variablelist</tag> to specify the width for
       <tag>term</tag> output.</para>
   </refdescription>
@@ -782,9 +782,9 @@
 </xsl:template>
 
 <doc:pi name="dbfo_toc" xmlns="">
-  <refpurpose>Species whether a TOC should be generated for a qandaset</refpurpose>
+  <refpurpose>Specifies whether a TOC should be generated for a qandaset</refpurpose>
   <refdescription>
-    <para>Use the <tag>dbfo toc</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbfo toc</tag> PI as a child of a
       <tag>qandaset</tag> to specify whether a table of contents
       (TOC) is generated for the <tag>qandaset</tag>.</para>
   </refdescription>
@@ -842,7 +842,7 @@
           <para>The amount of height needed (including units)</para>
         </listitem>
       </varlistentry>
-      <varlistentry><term>space-before"<replaceable>n</replaceable>"</term>
+      <varlistentry><term>space-before="<replaceable>n</replaceable>"</term>
         <listitem>
           <para>The amount of extra vertical space to add (including units)</para>
         </listitem>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl
index 658f3a632..a741c072e 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl
@@ -464,16 +464,11 @@
                 $passivetex.extensions != 0">
     <xsl:attribute name="table-layout">fixed</xsl:attribute>
   </xsl:if>
-
-  <xsl:if test="count(preceding-sibling::tgroup) = 0">
-    <!-- If this is the first tgroup, output the width attribute for the -->
-    <!-- surrounding fo:table. (If this isn't the first tgroup, trying   -->
-    <!-- to output the attribute will cause an error.)                   -->
+ 
     <xsl:attribute name="width">
       <xsl:value-of select="$table.width"/>
     </xsl:attribute>
-  </xsl:if>
-
+ 
   <xsl:choose>
     <xsl:when test="$use.extensions != 0
                     and $tablecolumns.extension != 0">
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl
index c8cde1fb3..20f99a1ec 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl
@@ -10,7 +10,7 @@
      This module implements DTD-independent functions
 
      ******************************************************************** -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:ssb="http://sideshowbarker.net/ns" xmlns:dyn="http://exslt.org/dynamic" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns="http://docbook.org/ns/docbook" exclude-result-prefixes="src" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <xsl:template name="dot.count">
   <!-- Returns the number of "." characters in a string -->
@@ -330,7 +330,7 @@
   <xsl:template name="str.tokenize.keep.delimiters-characters">
     <xsl:param name="string"/>
     <xsl:if test="$string">
-      <ssb:token><xsl:value-of select="substring($string, 1, 1)"/></ssb:token>
+      <ssb:token xmlns:ssb="http://sideshowbarker.net/ns"><xsl:value-of select="substring($string, 1, 1)"/></ssb:token>
       <xsl:call-template name="str.tokenize.keep.delimiters-characters">
         <xsl:with-param name="string" select="substring($string, 2)"/>
       </xsl:call-template>
@@ -342,7 +342,7 @@
     <xsl:variable name="delimiter" select="substring($delimiters, 1, 1)"/>
     <xsl:choose>
       <xsl:when test="not($delimiter)">
-        <ssb:token><xsl:value-of select="$string"/></ssb:token>
+        <ssb:token xmlns:ssb="http://sideshowbarker.net/ns"><xsl:value-of select="$string"/></ssb:token>
       </xsl:when>
       <xsl:when test="contains($string, $delimiter)">
         <xsl:if test="not(starts-with($string, $delimiter))">
@@ -388,63 +388,7 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:template>
-
   
-    <xsl:template name="apply-character-map">
-      <xsl:param name="content"/>
-      <xsl:param name="map.contents"/>
-      <xsl:variable name="replaced_text">
-        <xsl:call-template name="string.subst">
-          <xsl:with-param name="string" select="$content"/>
-          <xsl:with-param name="target" select="$map.contents[1]/@character"/>
-          <xsl:with-param name="replacement" select="$map.contents[1]/@string"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$map.contents[2]">
-          <xsl:call-template name="apply-character-map">
-            <xsl:with-param name="content" select="$replaced_text"/>
-            <xsl:with-param name="map.contents" select="$map.contents[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$replaced_text"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:template>
-
-  
-  <xsl:template name="read-character-map">
-    <xsl:param name="use.subset"/>
-    <xsl:param name="subset.profile"/>
-    <xsl:param name="uri"/>
-    <xsl:choose>
-      <xsl:when test="$use.subset != 0">
-        <!-- use a subset of the character map instead of the full map -->
-        <xsl:choose>
-          <!-- xsltproc and Xalan both support dyn:evaluate() -->
-          <xsl:when test="function-available('dyn:evaluate')">
-            <xsl:copy-of select="document($uri)//*[local-name()='output-character']                                  [dyn:evaluate($subset.profile)]"/>
-          </xsl:when>
-          <!-- Saxon has its own evaluate() & doesn't support dyn:evaluate() -->
-          <xsl:when test="function-available('saxon:evaluate')">
-            <xsl:copy-of select="document($uri)//*[local-name()='output-character']                                  [saxon:evaluate($subset.profile)]"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-Error: To process character-map subsets, you must use an XSLT engine
-that supports the evaluate() XSLT extension function. Your XSLT engine
-does not support it.
-</xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- value of $use.subset is non-zero, so use the full map -->
-        <xsl:copy-of select="document($uri)//*[local-name()='output-character']"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
 <xsl:template name="count.uri.path.depth">
   <xsl:param name="filename" select="''"/>
   <xsl:param name="count" select="0"/>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
index 2c69596ce..84979f629 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
@@ -81,7 +81,7 @@
   </xsl:copy>
 </xsl:template>
 
-<xsl:template match="xsl:template[@name='hhc-main' or @name='hhp-main'] | xsl:variable[@name='raw.help.title']">
+<xsl:template match="xsl:template[@name='hhc-main' or @name='hhp-main' or @name='etoc'] | xsl:variable[@name='raw.help.title']">
   <xsl:copy>
     <xsl:copy-of select="@*"/>
     <xsl:apply-templates mode="correct"/>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/db5strip.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/db5strip.xsl
deleted file mode 100644
index 140dec0e6..000000000
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/db5strip.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets. Do not edit this file.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns: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:import href="docbook.xsl"/>
-
-<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"/>
-
-<xsl:template match="/">
-  <xsl:choose>
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
-      <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-	   toss the namespace and continue. Someday we'll reverse this logic
-	   and add the namespace to documents that don't have one.
-	   But not before the whole stylesheet has been converted to use
-	   namespaces. i.e., don't hold your breath -->
-      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
-      <xsl:apply-templates mode="stripNS"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-	<xsl:text>Cannot strip without exsl:node-set.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl
index 4e8e9e017..85fdd722a 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl
@@ -93,7 +93,7 @@
     <xsl:text>, but no template matches.</xsl:text>
   </xsl:message>
 
-  <span xmlns:saxon="http://icl.com/saxon" class="ERROR">
+  <span style="color: red">
     <xsl:text>&lt;</xsl:text>
     <xsl:value-of select="name(.)"/>
     <xsl:text>&gt;</xsl:text>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
index f906e34b9..b1f57efeb 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
@@ -103,9 +103,7 @@
   <xsl:variable name="content">
     <div class="{$class}">
       <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
+      <xsl:call-template name="anchor"/>
       <xsl:apply-templates/>
   
       <!-- HACK: This doesn't belong inside formal.object; it 
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl
index 0a5e449ec..1663a9ccd 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl
@@ -49,8 +49,11 @@
       <xsl:when test="glossdiv">
         <xsl:apply-templates select="(glossdiv[1]/preceding-sibling::*)"/>
       </xsl:when>
-      <xsl:otherwise>
+      <xsl:when test="glossentry">
         <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates/>
       </xsl:otherwise>
     </xsl:choose>
 
@@ -58,7 +61,7 @@
       <xsl:when test="glossdiv">
         <xsl:apply-templates select="glossdiv"/>
       </xsl:when>
-      <xsl:otherwise>
+      <xsl:when test="glossentry">
         <dl>
           <xsl:choose>
             <xsl:when test="$glossary.sort != 0">
@@ -71,6 +74,9 @@
             </xsl:otherwise>
           </xsl:choose>
         </dl>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- empty glossary -->
       </xsl:otherwise>
     </xsl:choose>
 
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
index 4fa715323..08fdd8849 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
@@ -1076,14 +1076,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 </xsl:template>
 
 <xsl:template match="imageobject">
-  <xsl:choose>
-    <xsl:when xmlns:svg="http://www.w3.org/2000/svg" test="svg:*">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="imagedata"/>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:apply-templates select="imagedata"/>
 </xsl:template>
 
 <xsl:template match="imagedata">
@@ -1094,6 +1087,15 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
   </xsl:variable>
 
   <xsl:choose>
+    <!-- Handle MathML and SVG markup in imagedata -->
+    <xsl:when xmlns:mml="http://www.w3.org/1998/Math/MathML" test="mml:*">
+      <xsl:apply-templates/>
+    </xsl:when>
+    
+    <xsl:when xmlns:svg="http://www.w3.org/2000/svg" test="svg:*">
+      <xsl:apply-templates/>
+    </xsl:when>
+
     <xsl:when test="@format='linespecific'">
       <xsl:choose>
         <xsl:when test="$use.extensions != '0'                         and $textinsert.extension != '0'">
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl
index 0fe3ac08e..27634a0eb 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl
@@ -18,36 +18,35 @@
 </xsl:template>
 
 <xsl:template match="xslthl:string">
-  <b class="hl-string"><i><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></i></b>
+  <b class="hl-string"><i style="color:red"><xsl:apply-templates/></i></b>
 </xsl:template>
 
 <xsl:template match="xslthl:comment">
-  <i class="hl-comment"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></i>
+  <i class="hl-comment" style="color: silver"><xsl:apply-templates/></i>
 </xsl:template>
 
 <xsl:template match="xslthl:tag">
-  <b class="hl-tag"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></b>
+  <b class="hl-tag" style="color: blue"><xsl:apply-templates/></b>
 </xsl:template>
 
 <xsl:template match="xslthl:attribute">
-  <span class="hl-attribute"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></span>
+  <span class="hl-attribute" style="color: blue"><xsl:apply-templates/></span>
 </xsl:template>
 
 <xsl:template match="xslthl:value">
-  <span class="hl-value"><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></span>
+  <span class="hl-value" style="color: blue"><xsl:apply-templates/></span>
 </xsl:template>
 
 <xsl:template match="xslthl:html">
-  <b><i><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></i></b>
+  <b><i style="color: red"><xsl:apply-templates/></i></b>
 </xsl:template>
 
 <xsl:template match="xslthl:xslt">
-  <b><span xmlns:saxon="http://icl.com/saxon" class="ERROR"><xsl:apply-templates/></span></b>
+  <b style="color: blue"><xsl:apply-templates/></b>
 </xsl:template>
 
 <xsl:template match="xslthl:section">
   <b><xsl:apply-templates/></b>
 </xsl:template>
 
-
 </xsl:stylesheet>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
index 4ccc6a775..3751e7182 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
@@ -81,7 +81,7 @@
                   </xsl:attribute>
 
                   <xsl:choose>
-                    <xsl:when test="$node/@xlink.title">
+                    <xsl:when test="$node/@xlink:title">
                       <xsl:attribute name="title">
                         <xsl:value-of select="$node/@xlink:title"/>
                       </xsl:attribute>
@@ -117,7 +117,7 @@
               <xsl:attribute name="href">
                 <xsl:value-of select="$xhref"/>
               </xsl:attribute>
-              <xsl:if test="$node/@xlink.title">
+              <xsl:if test="$node/@xlink:title">
                 <xsl:attribute name="title">
                   <xsl:value-of select="$node/@xlink:title"/>
                 </xsl:attribute>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
index ad241519c..1eee787af 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
@@ -2,7 +2,7 @@
 <!--This file was created automatically by html2xhtml-->
 <!--from the HTML stylesheets.-->
 <!-- This file is generated from param.xweb -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns="http://docbook.org/ns/docbook" exclude-result-prefixes="src" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
 
 <!-- ********************************************************************
      $Id$
@@ -14,7 +14,7 @@
 
      ******************************************************************** -->
 
-<xsl:param name="admon.graphics.extension" select="'.png'"/>
+<xsl:param name="admon.graphics.extension">.png</xsl:param>
 <xsl:param name="admon.graphics" select="0"/>
 <xsl:param name="admon.graphics.path">images/</xsl:param>
 <xsl:param name="admon.style">
@@ -65,63 +65,68 @@ div.annotation-close { position: absolute;
                        right: 2px;
                      }
 </xsl:param>
-<xsl:param name="annotation.js" select="'http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js'"/>
-<xsl:param name="annotation.graphic.open" select="'http://docbook.sourceforge.net/release/images/annot-open.png'"/>
-<xsl:param name="annotation.graphic.close" select="'http://docbook.sourceforge.net/release/images/annot-close.png'"/>
+
+<xsl:param name="annotation.js">
+<xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
+
+<xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
+<xsl:param name="annotation.graphic.close">
+http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param>
 <xsl:param name="annotation.support" select="0"/>
-<xsl:param name="appendix.autolabel" select="'A'"/>
+<xsl:param name="appendix.autolabel">A</xsl:param>
 <xsl:param name="author.othername.in.middle" select="1"/>
-<xsl:param name="autotoc.label.separator" select="'. '"/>
+<xsl:param name="autotoc.label.separator">. </xsl:param>
 <xsl:param name="autotoc.label.in.hyperlink" select="1"/>
-<xsl:param name="base.dir" select="''"/>
+<xsl:param name="base.dir"/>
 <xsl:param name="biblioentry.item.separator">. </xsl:param>
-<xsl:param name="bibliography.collection" select="'http://docbook.sourceforge.net/release/bibliography/bibliography.xml'"/>
+<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param>
+
 <xsl:param name="bibliography.numbered" select="0"/>
-<xsl:param name="bibliography.style" select="'normal'"/>
-<xsl:param name="blurb.on.titlepage.enabled">0</xsl:param>
+<xsl:param name="bibliography.style">normal</xsl:param>
+<xsl:param name="blurb.on.titlepage.enabled" select="0"/>
 <xsl:param name="bridgehead.in.toc" select="0"/>
-<xsl:param name="callout.defaultcolumn" select="'60'"/>
-<xsl:param name="callout.graphics.extension" select="'.png'"/>
+<xsl:param name="callout.defaultcolumn">60</xsl:param>
+<xsl:param name="callout.graphics.extension">.png</xsl:param>
 
-<xsl:param name="callout.graphics" select="'1'"/>
-<xsl:param name="callout.graphics.number.limit" select="'15'"/>
+<xsl:param name="callout.graphics" select="1"/>
+<xsl:param name="callout.graphics.number.limit">15</xsl:param>
 
-<xsl:param name="callout.graphics.path" select="'images/callouts/'"/>
-<xsl:param name="callout.list.table" select="'1'"/>
+<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
+<xsl:param name="callout.list.table" select="1"/>
 <xsl:param name="callout.unicode" select="0"/>
-<xsl:param name="callout.unicode.number.limit" select="'10'"/>
-<xsl:param name="callout.unicode.start.character" select="10102"/>
-<xsl:param name="callouts.extension" select="'1'"/>
+<xsl:param name="callout.unicode.number.limit">10</xsl:param>
+<xsl:param name="callout.unicode.start.character">10102</xsl:param>
+<xsl:param name="callouts.extension" select="1"/>
 <xsl:param name="chapter.autolabel" select="1"/>
 <xsl:param name="chunk.append"/>
 <xsl:param name="chunk.first.sections" select="0"/>
 <xsl:param name="chunk.quietly" select="0"/>
 <xsl:param name="chunk.section.depth" select="1"/>
-<xsl:param name="chunk.toc" select="''"/>
+<xsl:param name="chunk.toc"/>
 <xsl:param name="chunk.tocs.and.lots" select="0"/>
 <xsl:param name="chunk.tocs.and.lots.has.title" select="1"/>
 <xsl:param name="chunk.separate.lots" select="0"/>
-<xsl:param name="citerefentry.link" select="'0'"/>
-<xsl:param name="collect.xref.targets" select="'no'"/>
+<xsl:param name="citerefentry.link" select="0"/>
+<xsl:param name="collect.xref.targets">no</xsl:param>
 <xsl:param name="component.label.includes.part.label" select="0"/>
 <xsl:param name="contrib.inline.enabled">1</xsl:param>
 <xsl:param name="css.decoration" select="1"/>
-<xsl:param name="current.docid" select="''"/> 
+<xsl:param name="current.docid"/>
 <xsl:param name="default.float.class">
   <xsl:choose>
     <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when>
     <xsl:otherwise>before</xsl:otherwise>
   </xsl:choose>
 </xsl:param>
-<xsl:param name="default.image.width" select="''"/>
-<xsl:param name="default.table.width" select="''"/>
-<xsl:param name="default.table.frame" select="'all'"/>
-<xsl:param name="draft.mode" select="'maybe'"/>
-<xsl:param name="draft.watermark.image" select="'http://docbook.sourceforge.net/release/images/draft.png'"/>
-<xsl:param name="ebnf.table.bgcolor" select="'#F5DCB3'"/>
+<xsl:param name="default.image.width"/>
+<xsl:param name="default.table.width"/>
+<xsl:param name="default.table.frame">all</xsl:param>
+<xsl:param name="draft.mode">maybe</xsl:param>
+<xsl:param name="draft.watermark.image">http://docbook.sourceforge.net/release/images/draft.png</xsl:param>
+<xsl:param name="ebnf.table.bgcolor">#F5DCB3</xsl:param>
 <xsl:param name="ebnf.table.border" select="1"/>
 <xsl:param name="ebnf.assignment">
-<code xmlns="http://www.w3.org/1999/xhtml">::=</code>
+<code>::=</code>
 </xsl:param>
 
 <xsl:param name="ebnf.statement.terminator"/>
@@ -131,13 +136,13 @@ div.annotation-close { position: absolute;
 <xsl:param name="eclipse.plugin.id">com.example.help</xsl:param>
 <xsl:param name="eclipse.plugin.provider">Example provider</xsl:param>
 <xsl:param name="editedby.enabled">1</xsl:param>
-<xsl:param name="email.delimiters.enabled">1</xsl:param>
+<xsl:param name="email.delimiters.enabled" select="1"/>
 <xsl:param name="emphasis.propagates.style" select="1"/>
 <xsl:param name="entry.propagates.style" select="1"/>
 <xsl:param name="firstterm.only.link" select="0"/>
 <xsl:param name="footer.rule" select="1"/>
-<xsl:param name="footnote.number.format" select="'1'"/>
-<xsl:param name="footnote.number.symbols" select="''"/>
+<xsl:param name="footnote.number.format">1</xsl:param>
+<xsl:param name="footnote.number.symbols"/>
 <xsl:param name="formal.procedures" select="1"/>
 <xsl:param name="formal.title.placement">
 figure before
@@ -149,8 +154,8 @@ task before
 </xsl:param>
 <xsl:param name="funcsynopsis.decoration" select="1"/>
 <xsl:param name="funcsynopsis.style">kr</xsl:param>
-<xsl:param name="funcsynopsis.tabular.threshold" select="40"/>
-<xsl:param name="function.parens">0</xsl:param>
+<xsl:param name="funcsynopsis.tabular.threshold">40</xsl:param>
+<xsl:param name="function.parens" select="0"/>
 <xsl:param name="generate.id.attributes" select="0"/>
 <xsl:param name="generate.index" select="1"/>
 <xsl:param name="generate.legalnotice.link" select="0"/>
@@ -178,30 +183,30 @@ section   toc
 set       toc,title
 </xsl:param>
 
-<xsl:param name="glossary.collection" select="''"/>
+<xsl:param name="glossary.collection"/>
 <xsl:param name="glossary.sort" select="0"/>
-<xsl:param name="glossentry.show.acronym" select="'no'"/>
+<xsl:param name="glossentry.show.acronym">no</xsl:param>
 <xsl:param name="glossterm.auto.link" select="0"/>
 <xsl:param name="graphic.default.extension"/>
 <xsl:param name="graphicsize.extension" select="1"/>
 <xsl:param name="graphicsize.use.img.src.path" select="0"/>
 <xsl:param name="header.rule" select="1"/>
-<xsl:param name="highlight.default.language" select="''"/>
+<xsl:param name="highlight.default.language"/>
 <xsl:param name="highlight.source" select="0"/>
 <xsl:param name="html.append"/>
 <xsl:param name="html.base"/>
-<xsl:param name="html.cellpadding" select="''"/>
-<xsl:param name="html.cellspacing" select="''"/>
+<xsl:param name="html.cellpadding"/>
+<xsl:param name="html.cellspacing"/>
 <xsl:param name="html.cleanup" select="1"/>
-<xsl:param name="html.ext" select="'.html'"/>
+<xsl:param name="html.ext">.html</xsl:param>
 <xsl:param name="html.extra.head.links" select="0"/>
 <xsl:param name="html.head.legalnotice.link.types">copyright</xsl:param>
 <xsl:param name="html.head.legalnotice.link.multiple" select="1"/>
 <xsl:param name="html.longdesc" select="1"/>
 <xsl:param name="html.longdesc.link" select="$html.longdesc"/>
-<xsl:param name="html.stylesheet" select="''"/>
+<xsl:param name="html.stylesheet"/>
 <xsl:param name="html.stylesheet.type">text/css</xsl:param>
-<xsl:param name="htmlhelp.alias.file" select="'alias.h'"/>
+<xsl:param name="htmlhelp.alias.file">alias.h</xsl:param>
 <xsl:param name="htmlhelp.autolabel" select="0"/>
 <xsl:param name="htmlhelp.button.back" select="1"/>
 <xsl:param name="htmlhelp.button.forward" select="0"/>
@@ -209,10 +214,10 @@ set       toc,title
 <xsl:param name="htmlhelp.button.home" select="0"/>
 <xsl:param name="htmlhelp.button.home.url"/>
 <xsl:param name="htmlhelp.button.jump1" select="0"/>
-<xsl:param name="htmlhelp.button.jump1.title" select="'User1'"/>
+<xsl:param name="htmlhelp.button.jump1.title">User1</xsl:param>
 <xsl:param name="htmlhelp.button.jump1.url"/>
 <xsl:param name="htmlhelp.button.jump2" select="0"/>
-<xsl:param name="htmlhelp.button.jump2.title" select="'User2'"/>
+<xsl:param name="htmlhelp.button.jump2.title">User2</xsl:param>
 <xsl:param name="htmlhelp.button.jump2.url"/>
 <xsl:param name="htmlhelp.button.locate" select="0"/>
 <xsl:param name="htmlhelp.button.next" select="1"/>
@@ -222,75 +227,77 @@ set       toc,title
 <xsl:param name="htmlhelp.button.refresh" select="0"/>
 <xsl:param name="htmlhelp.button.stop" select="0"/>
 <xsl:param name="htmlhelp.button.zoom" select="0"/>
-<xsl:param name="htmlhelp.chm" select="'htmlhelp.chm'"/>
-<xsl:param name="htmlhelp.default.topic" select="''"/>
+<xsl:param name="htmlhelp.chm">htmlhelp.chm</xsl:param>
+<xsl:param name="htmlhelp.default.topic"/>
 <xsl:param name="htmlhelp.display.progress" select="1"/>
-<xsl:param name="htmlhelp.encoding" select="'iso-8859-1'"/>
+<xsl:param name="htmlhelp.encoding">iso-8859-1</xsl:param>
 <xsl:param name="htmlhelp.enhanced.decompilation" select="0"/>
 <xsl:param name="htmlhelp.enumerate.images" select="0"/>
 <xsl:param name="htmlhelp.force.map.and.alias" select="0"/>
 <xsl:param name="htmlhelp.hhc.binary" select="1"/>
 <xsl:param name="htmlhelp.hhc.folders.instead.books" select="1"/>
-<xsl:param name="htmlhelp.hhc" select="'toc.hhc'"/>
-<xsl:param name="htmlhelp.hhc.section.depth" select="5"/>
+<xsl:param name="htmlhelp.hhc">toc.hhc</xsl:param>
+<xsl:param name="htmlhelp.hhc.section.depth">5</xsl:param>
 <xsl:param name="htmlhelp.hhc.show.root" select="1"/>
 <xsl:param name="htmlhelp.hhc.width"/>
-<xsl:param name="htmlhelp.hhk" select="'index.hhk'"/>
-<xsl:param name="htmlhelp.hhp" select="'htmlhelp.hhp'"/>
+<xsl:param name="htmlhelp.hhk">index.hhk</xsl:param>
+<xsl:param name="htmlhelp.hhp">htmlhelp.hhp</xsl:param>
 <xsl:param name="htmlhelp.hhp.tail"/>
-<xsl:param name="htmlhelp.hhp.window" select="'Main'"/>
+<xsl:param name="htmlhelp.hhp.window">Main</xsl:param>
 <xsl:param name="htmlhelp.hhp.windows"/>
-<xsl:param name="htmlhelp.map.file" select="'context.h'"/>
+<xsl:param name="htmlhelp.map.file">context.h</xsl:param>
 <xsl:param name="htmlhelp.only" select="0"/>
 <xsl:param name="htmlhelp.remember.window.position" select="0"/>
 <xsl:param name="htmlhelp.show.advanced.search" select="0"/>
 <xsl:param name="htmlhelp.show.favorities" select="0"/>
 <xsl:param name="htmlhelp.show.menu" select="0"/>
 <xsl:param name="htmlhelp.show.toolbar.text" select="1"/>
-<xsl:param name="htmlhelp.title" select="''"/>
+<xsl:param name="htmlhelp.title"/>
 <xsl:param name="htmlhelp.use.hhk" select="0"/>
 <xsl:param name="htmlhelp.window.geometry"/>
 <xsl:param name="img.src.path"/>
 <xsl:param name="id.warnings" select="0"/>
-<xsl:param name="index.method" select="'basic'"/>
+<xsl:param name="index.method">basic</xsl:param>
 <xsl:param name="index.on.role" select="0"/>
 <xsl:param name="index.on.type" select="0"/>
-<xsl:param name="index.number.separator" select="''"/>
-<xsl:param name="index.term.separator" select="''"/>
-<xsl:param name="index.range.separator" select="''"/>
+<xsl:param name="index.number.separator"/>
+<xsl:param name="index.term.separator"/>
+<xsl:param name="index.range.separator"/>
 <xsl:param name="index.prefer.titleabbrev" select="0"/>
 <xsl:param name="ignore.image.scaling" select="0"/>
-<xsl:param name="inherit.keywords" select="'1'"/>
+<xsl:param name="inherit.keywords" select="1"/>
 <xsl:param name="insert.xref.page.number">no</xsl:param>
+<xsl:param name="javahelp.encoding">iso-8859-1</xsl:param>
 <xsl:param name="keep.relative.image.uris" select="1"/>
 
-<xsl:param name="l10n.gentext.default.language" select="'en'"/>
-<xsl:param name="l10n.gentext.language" select="''"/>
+<xsl:param name="l10n.gentext.default.language">en</xsl:param>
+<xsl:param name="l10n.gentext.language"/>
 <xsl:param name="l10n.gentext.use.xref.language" select="0"/>
 <xsl:param name="l10n.lang.value.rfc.compliant" select="1"/>
-<xsl:param name="label.from.part" select="'0'"/>
-<xsl:param name="linenumbering.everyNth" select="'5'"/>
-<xsl:param name="linenumbering.extension" select="'1'"/>
-<xsl:param name="linenumbering.separator" select="' '"/>
-<xsl:param name="linenumbering.width" select="'3'"/>
+<xsl:param name="label.from.part" select="0"/>
+<xsl:param name="linenumbering.everyNth">5</xsl:param>
+<xsl:param name="linenumbering.extension" select="1"/>
+<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param>
+<xsl:param name="linenumbering.width">3</xsl:param>
 <xsl:param name="link.mailto.url"/>
 <xsl:param name="make.graphic.viewport" select="1"/>
 <xsl:param name="make.single.year.ranges" select="0"/>
 <xsl:param name="make.valid.html" select="1"/>
 <xsl:param name="make.year.ranges" select="0"/>
-<xsl:param name="manifest" select="'HTML.manifest'"/>
+    <xsl:param name="manifest">HTML.manifest</xsl:param>
+    
 <xsl:param name="manifest.in.base.dir" select="0"/>
-<xsl:param name="manual.toc" select="''"/>
+<xsl:param name="manual.toc"/>
 <xsl:param name="menuchoice.menu.separator"> &#8594; </xsl:param>
-<xsl:param name="menuchoice.separator" select="'+'"/>
-<xsl:param name="navig.graphics.extension" select="'.gif'"/>
+<xsl:param name="menuchoice.separator">+</xsl:param>
+<xsl:param name="navig.graphics.extension">.gif</xsl:param>
 <xsl:param name="navig.graphics" select="0"/>
 <xsl:param name="navig.graphics.path">images/</xsl:param>
 <xsl:param name="navig.showtitles">1</xsl:param>
 <xsl:param name="nominal.image.depth" select="4 * $pixels.per.inch"/>
 <xsl:param name="nominal.image.width" select="6 * $pixels.per.inch"/>
-<xsl:param name="nominal.table.width" select="'6in'"/>
-<xsl:param name="olink.base.uri" select="''"/> 
+<xsl:param name="nominal.table.width">6in</xsl:param>
+<xsl:param name="olink.base.uri"/>
 <xsl:param name="olink.debug" select="0"/>
 <xsl:attribute-set name="olink.properties">
   <xsl:attribute name="show-destination">replace</xsl:attribute>
@@ -298,42 +305,42 @@ set       toc,title
 <xsl:param name="insert.olink.page.number">no</xsl:param>
 <xsl:param name="insert.olink.pdf.frag" select="0"/>
 <xsl:param name="prefer.internal.olink" select="0"/>
-<xsl:param name="olink.lang.fallback.sequence" select="''"/> 
-<xsl:param name="olink.doctitle" select="'no'"/> 
-<xsl:param name="olink.fragid" select="'fragid='"/>
-<xsl:param name="olink.outline.ext" select="'.olink'"/>
-<xsl:param name="olink.pubid" select="'pubid='"/>
-<xsl:param name="olink.resolver" select="'/cgi-bin/olink'"/>
-<xsl:param name="olink.sysid" select="'sysid='"/>
-<xsl:param name="abstract.notitle.enabled">0</xsl:param>
+<xsl:param name="olink.lang.fallback.sequence"/>
+<xsl:param name="olink.doctitle">no</xsl:param> 
+<xsl:param name="olink.fragid">fragid=</xsl:param>
+<xsl:param name="olink.outline.ext">.olink</xsl:param>
+<xsl:param name="olink.pubid">pubid</xsl:param>
+  <xsl:param name="olink.resolver">/cgi-bin/olink</xsl:param>
+<xsl:param name="olink.sysid">sysid</xsl:param>
+<xsl:param name="abstract.notitle.enabled" select="0"/>
 <xsl:param name="othercredit.like.author.enabled">0</xsl:param>
 <xsl:param name="para.propagates.style" select="1"/>
-<xsl:param name="part.autolabel" select="'I'"/>
+<xsl:param name="part.autolabel">I</xsl:param>
 <xsl:param name="phrase.propagates.style" select="1"/>
-<xsl:param name="pixels.per.inch" select="90"/>
-<xsl:param name="points.per.em" select="10"/>
+<xsl:param name="pixels.per.inch">90</xsl:param>
+<xsl:param name="points.per.em">10</xsl:param>
 <xsl:param name="preface.autolabel" select="0"/>
 <xsl:param name="preferred.mediaobject.role"/>
 <xsl:param name="process.empty.source.toc" select="0"/>
 <xsl:param name="process.source.toc" select="0"/>
-<xsl:param name="profile.arch" select="''"/>
-<xsl:param name="profile.audience" select="''"/>
-<xsl:param name="profile.attribute" select="''"/>
-<xsl:param name="profile.condition" select="''"/>
-<xsl:param name="profile.conformance" select="''"/>
-<xsl:param name="profile.lang" select="''"/>
-<xsl:param name="profile.os" select="''"/>
-<xsl:param name="profile.revision" select="''"/>
-<xsl:param name="profile.revisionflag" select="''"/>
-<xsl:param name="profile.role" select="''"/>
-<xsl:param name="profile.security" select="''"/>
-<xsl:param name="profile.separator" select="';'"/>
-<xsl:param name="profile.status" select="''"/>
-<xsl:param name="profile.userlevel" select="''"/>
-<xsl:param name="profile.value" select="''"/>
-<xsl:param name="profile.vendor" select="''"/>
-<xsl:param name="profile.wordsize" select="''"/>
-<xsl:param name="punct.honorific" select="'.'"/>
+<xsl:param name="profile.arch"/>
+<xsl:param name="profile.audience"/>
+<xsl:param name="profile.attribute"/>
+<xsl:param name="profile.condition"/>
+<xsl:param name="profile.conformance"/>
+<xsl:param name="profile.lang"/>
+<xsl:param name="profile.os"/>
+<xsl:param name="profile.revision"/>
+<xsl:param name="profile.revisionflag"/>
+<xsl:param name="profile.role"/>
+<xsl:param name="profile.security"/>
+<xsl:param name="profile.separator">;</xsl:param>
+<xsl:param name="profile.status"/>
+<xsl:param name="profile.userlevel"/>
+<xsl:param name="profile.value"/>
+<xsl:param name="profile.vendor"/>
+<xsl:param name="profile.wordsize"/>
+<xsl:param name="punct.honorific">.</xsl:param>
 <xsl:param name="qanda.defaultlabel">number</xsl:param>
 <xsl:param name="qanda.inherit.numeration" select="1"/>
 <xsl:param name="qanda.in.toc" select="0"/>
@@ -341,16 +348,16 @@ set       toc,title
 <xsl:param name="qandadiv.autolabel" select="1"/>
 <xsl:param name="refentry.generate.name" select="1"/>
 <xsl:param name="refentry.generate.title" select="0"/>
-<xsl:param name="refentry.separator" select="'1'"/>
+<xsl:param name="refentry.separator" select="1"/>
 <xsl:param name="refentry.xref.manvolnum" select="1"/>
-<xsl:param name="reference.autolabel" select="'I'"/>
+  <xsl:param name="reference.autolabel">I</xsl:param>
 <xsl:param name="refclass.suppress" select="0"/>
-<xsl:param name="root.filename" select="'index'"/>
-<xsl:param name="rootid" select="''"/>
-<xsl:param name="runinhead.default.title.end.punct" select="'.'"/>
-<xsl:param name="runinhead.title.end.punct" select="'.!?:'"/>
+<xsl:param name="root.filename">index</xsl:param>
+<xsl:param name="rootid"/>
+<xsl:param name="runinhead.default.title.end.punct">.</xsl:param>
+<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param>
 <xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="section.autolabel.max.depth" select="8"/>
+<xsl:param name="section.autolabel.max.depth">8</xsl:param>
 <xsl:param name="section.label.includes.component.label" select="0"/>
 <xsl:param name="segmentedlist.as.table" select="0"/>
 <xsl:param name="shade.verbatim" select="0"/>
@@ -359,39 +366,39 @@ set       toc,title
   <xsl:attribute name="bgcolor">#E0E0E0</xsl:attribute>
 </xsl:attribute-set>
 
-<xsl:param name="show.comments">1</xsl:param>
-<xsl:param name="show.revisionflag">0</xsl:param>
+<xsl:param name="show.comments" select="1"/>
+<xsl:param name="show.revisionflag" select="0"/>
 <xsl:param name="simplesect.in.toc" select="0"/>
-<xsl:param name="spacing.paras" select="'0'"/>
+<xsl:param name="spacing.paras" select="0"/>
 <xsl:param name="suppress.footer.navigation">0</xsl:param>
-<xsl:param name="suppress.header.navigation">0</xsl:param>
-<xsl:param name="suppress.navigation">0</xsl:param>
+<xsl:param name="suppress.header.navigation" select="0"/>
+<xsl:param name="suppress.navigation" select="0"/>
 <xsl:param name="table.borders.with.css" select="0"/>
-<xsl:param name="table.cell.border.color" select="''"/>
+<xsl:param name="table.cell.border.color"/>
 
-<xsl:param name="table.cell.border.style" select="'solid'"/>
-<xsl:param name="table.cell.border.thickness" select="'0.5pt'"/>
-<xsl:param name="table.footnote.number.format" select="'a'"/>
-<xsl:param name="table.footnote.number.symbols" select="''"/>
-<xsl:param name="table.frame.border.color" select="''"/>
+<xsl:param name="table.cell.border.style">solid</xsl:param>
+<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param>
+<xsl:param name="table.footnote.number.format">a</xsl:param>
+<xsl:param name="table.footnote.number.symbols"/>
+<xsl:param name="table.frame.border.color"/>
 
-<xsl:param name="table.frame.border.style" select="'solid'"/>
-<xsl:param name="table.frame.border.thickness" select="'0.5pt'"/>
-<xsl:param name="tablecolumns.extension" select="'1'"/>
-<xsl:param name="target.database.document" select="''"/>
-<xsl:param name="targets.filename" select="'target.db'"/>
-<xsl:param name="textdata.default.encoding" select="''"/>
-<xsl:param name="tex.math.delims" select="'1'"/>
-<xsl:param name="tex.math.file" select="'tex-math-equations.tex'"/>
-<xsl:param name="tex.math.in.alt" select="''"/>
-<xsl:param name="textinsert.extension" select="'1'"/>
+<xsl:param name="table.frame.border.style">solid</xsl:param>
+<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
+<xsl:param name="tablecolumns.extension" select="1"/>
+ <xsl:param name="target.database.document">olinkdb.xml</xsl:param>
+<xsl:param name="targets.filename">target.db</xsl:param>
+<xsl:param name="textdata.default.encoding"/>
+<xsl:param name="tex.math.delims" select="1"/>
+<xsl:param name="tex.math.file">tex-math-equations.tex</xsl:param>
+<xsl:param name="tex.math.in.alt"/>
+  <xsl:param name="textinsert.extension" select="1"/>
 <xsl:param name="toc.list.type">dl</xsl:param>
 <xsl:param name="toc.section.depth">2</xsl:param>
 <xsl:param name="toc.max.depth">8</xsl:param>
-<xsl:param name="ulink.target" select="'_top'"/>
+<xsl:param name="ulink.target">_top</xsl:param>
 <xsl:param name="use.embed.for.svg" select="0"/>
-<xsl:param name="use.extensions" select="'0'"/>
-<xsl:param name="use.id.as.filename" select="'0'"/>
+<xsl:param name="use.extensions" select="0"/>
+<xsl:param name="use.id.as.filename" select="0"/>
 <xsl:param name="use.local.olink.style" select="0"/> 
 <xsl:param name="use.role.as.xrefstyle" select="1"/>
 <xsl:param name="use.role.for.mediaobject" select="1"/>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
index 8b8eb7b17..5bd4d886d 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
@@ -39,7 +39,7 @@
 <doc:pi xmlns="" name="dbhtml_background-color">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color for an image</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml background-color</tag> PI before or
+    <para>Use the <tag class="xmlpi">dbhtml background-color</tag> PI before or
       after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>,
       <tag>imagedata</tag>, or <tag>videodata</tag> element) as a
       sibling to the element, to set a background color for the
@@ -72,7 +72,7 @@
 <doc:pi xmlns="" name="dbhtml_bgcolor">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color on a table row or table cell</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml bgcolor</tag> PI as child of a table row
+    <para>Use the <tag class="xmlpi">dbhtml bgcolor</tag> PI as child of a table row
       or cell to set a background color for that table row or cell.</para>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
@@ -102,7 +102,7 @@
 <doc:pi xmlns="" name="dbhtml_cellpadding">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellpadding in table or qandaset output</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml cellpadding</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml cellpadding</tag> PI as a child of a
       <tag>table</tag> or <tag>qandaset</tag> to specify the value
       for the HTML <literal>cellpadding</literal> attribute in the
       output HTML table.</para>
@@ -138,7 +138,7 @@
 <doc:pi xmlns="" name="dbhtml_cellspacing">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellspacing in table or qandaset output</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml cellspacing</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml cellspacing</tag> PI as a child of a
       <tag>table</tag> or <tag>qandaset</tag> to specify the value
       for the HTML <literal>cellspacing</literal> attribute in the
       output HTML table.</para>
@@ -174,7 +174,7 @@
 <doc:pi xmlns="" name="dbhtml_class">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Set value of the class attribute for a table row</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml class</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml class</tag> PI as a child of a
       <tag>row</tag> to specify a <literal>class</literal>
       attribute and value in the HTML output for that row.</para>
   </refdescription>
@@ -205,7 +205,7 @@
 <doc:pi xmlns="" name="dbhtml_dir">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a directory name in which to write files</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>When chunking output, use the <tag>dbhtml dir</tag> PI
+    <para>When chunking output, use the <tag class="xmlpi">dbhtml dir</tag> PI
       as a child of a chunk source to cause the output of that
       chunk to be written to the specified directory; also, use it
       as a child of a <tag>mediaobject</tag> to specify a
@@ -242,7 +242,7 @@
 <doc:pi xmlns="" name="dbhtml_filename">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a filename for a chunk</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>When chunking output, use the <tag>dbhtml filename</tag>
+    <para>When chunking output, use the <tag class="xmlpi">dbhtml filename</tag>
       PI as a child of a chunk source to specify a filename for
       the output file for that chunk.</para>
   </refdescription>
@@ -276,7 +276,7 @@
 <doc:pi xmlns="" name="dbhtml_funcsynopsis-style">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a funcsynopsis</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml funcsynopsis-style</tag> PI as a child of
+    <para>Use the <tag class="xmlpi">dbhtml funcsynopsis-style</tag> PI as a child of
       a <tag>funcprototype</tag> or anywhere within a funcprototype
       control the presentation style for the <tag>funcsynopsis</tag>
       in output.</para>
@@ -313,7 +313,7 @@
 <doc:pi xmlns="" name="dbhtml_img.src.path">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a path to the location of an image file</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml img.src.path</tag> PI before or
+    <para>Use the <tag class="xmlpi">dbhtml img.src.path</tag> PI before or
       after an image (<tag>graphic</tag>,
       <tag>inlinegraphic</tag>, <tag>imagedata</tag>, or
       <tag>videodata</tag> element) as a sibling to the element,
@@ -352,7 +352,7 @@
 <doc:pi xmlns="" name="dbhtml_label-width">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the label width for a qandaset</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml label-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml label-width</tag> PI as a child of a
       <tag>qandaset</tag> to specify the width of labels.</para>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
@@ -382,7 +382,7 @@
 <doc:pi xmlns="" name="dbhtml_linenumbering.everyNth">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies interval for lines numbers in verbatims</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml linenumbering.everyNth</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml linenumbering.everyNth</tag> PI as a child
       of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
       the interval at which lines are numbered.</para>
@@ -418,7 +418,7 @@
 <doc:pi xmlns="" name="dbhtml_linenumbering.separator">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text for line numbers in verbatims</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml linenumbering.separator</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml linenumbering.separator</tag> PI as a child
       of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
       the separator text output between the line numbers and content.</para>
@@ -453,7 +453,7 @@
 <doc:pi xmlns="" name="dbhtml_linenumbering.width">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies width for line numbers in verbatims</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml linenumbering.width</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml linenumbering.width</tag> PI as a child
       of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
       <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
       the width set aside for line numbers.</para>
@@ -489,7 +489,7 @@
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a variablelist or
     segmentedlist</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml list-presentation</tag> PI as a child of
+    <para>Use the <tag class="xmlpi">dbhtml list-presentation</tag> PI as a child of
       a <tag>variablelist</tag> or <tag>segmentedlist</tag> to
       control the presentation style for the list (to cause it, for
       example, to be displayed as a table).</para>
@@ -536,7 +536,7 @@
 <doc:pi xmlns="" name="dbhtml_list-width">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width of a variablelist or simplelist</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml list-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml list-width</tag> PI as a child of a
       <tag>variablelist</tag> or a <tag>simplelist</tag> presented
       as a table, to specify the output width.</para>
   </refdescription>
@@ -567,7 +567,7 @@
 <doc:pi xmlns="" name="dbhtml_row-height">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the height for a table row</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml row-height</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml row-height</tag> PI as a child of a
       <tag>row</tag> to specify the height of the row.</para>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
@@ -633,7 +633,7 @@
 <doc:pi xmlns="" name="dbhtml_table-summary">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies summary for table, variablelist, segmentedlist, or qandaset output</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml table-summary</tag> PI as a child of
+    <para>Use the <tag class="xmlpi">dbhtml table-summary</tag> PI as a child of
       a <tag>table</tag>, <tag>variablelist</tag>,
       <tag>segmentedlist</tag>, or <tag>qandaset</tag> to specify
       the text for the HTML <literal>summary</literal> attribute
@@ -667,7 +667,7 @@
 <doc:pi xmlns="" name="dbhtml_table-width">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width for a table</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml table-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml table-width</tag> PI as a child of a
       <tag>table</tag> to specify the width of the table in
       output.</para>
   </refdescription>
@@ -701,7 +701,7 @@
 <doc:pi xmlns="" name="dbhtml_term-presentation">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets character formatting for terms in a variablelist</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml term-presentation</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml term-presentation</tag> PI as a child
       of a <tag>variablelist</tag> to set character formatting for
       the <tag>term</tag> output of the list.</para>
   </refdescription>
@@ -742,7 +742,7 @@
 <doc:pi xmlns="" name="dbhtml_term-separator">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text among terms in a varlistentry</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml term-separator</tag> PI as a child
+    <para>Use the <tag class="xmlpi">dbhtml term-separator</tag> PI as a child
       of a <tag>variablelist</tag> to specify the separator text
       among <tag>term</tag> instances.</para>
   </refdescription>
@@ -776,7 +776,7 @@
 <doc:pi xmlns="" name="dbhtml_term-width">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the term width for a variablelist</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml term-width</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml term-width</tag> PI as a child of a
       <tag>variablelist</tag> to specify the width for
       <tag>term</tag> output.</para>
   </refdescription>
@@ -805,9 +805,9 @@
 </xsl:template>
 
 <doc:pi xmlns="" name="dbhtml_toc">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Species whether a TOC should be generated for a qandaset</refpurpose>
+  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies whether a TOC should be generated for a qandaset</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml toc</tag> PI as a child of a
+    <para>Use the <tag class="xmlpi">dbhtml toc</tag> PI as a child of a
       <tag>qandaset</tag> to specify whether a table of contents
       (TOC) is generated for the <tag>qandaset</tag>.</para>
   </refdescription>
@@ -845,12 +845,12 @@
 <doc:pi xmlns="" name="dbcmdlist">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of commands</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbcmdlist</tag> PI as the child of a
-      <tag>refsynopsisdiv</tag> containing multiple
+    <para>Use the <tag class="xmlpi">dbcmdlist</tag> PI as the child of any
+      element (for example, <tag>refsynopsisdiv</tag>) containing multiple
       <tag>cmdsynopsis</tag> instances; a hyperlinked navigational
-      &#8220;command list&#8221; will be generated at the top of the
-      <tag>refsynopsisdiv</tag>, enabling users to quickly jump
-      to to each command synopsis.</para>
+      &#8220;command list&#8221; will be generated at the top of output for that
+      element, enabling users to quickly jump
+      to each command synopsis.</para>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
     <synopsis><tag class="xmlpi">dbcmdlist</tag></synopsis>
@@ -875,11 +875,11 @@
 <doc:pi xmlns="" name="dbfunclist">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of functions</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbfunclist</tag> PI as the child of a
-      <tag>refsynopsisdiv</tag> containing multiple
+    <para>Use the <tag class="xmlpi">dbfunclist</tag> PI as the child of any
+      element (for example, <tag>refsynopsisdiv</tag>) containing multiple
       <tag>funcsynopsis</tag> instances; a hyperlinked
       navigational &#8220;function list&#8221; will be generated at the top of
-      the <tag>refsynopsisdiv</tag>, enabling users to quickly
+      output for that element, enabling users to quickly
       jump to to each function synopsis.</para>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
@@ -905,7 +905,7 @@
 <doc:pi xmlns="" name="dbhtml-include_href">
   <refpurpose xmlns="http://www.w3.org/1999/xhtml">Copies an external well-formed HTML/XML file into current doc</refpurpose>
   <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag>dbhtml-include href</tag> PI anywhere in a
+    <para>Use the <tag class="xmlpi">dbhtml-include href</tag> PI anywhere in a
       document to cause the contents of the file referenced by the
       <code>href</code> pseudo-attribute to be copied/inserted &#8220;as
       is&#8221; into your HTML output at the point in document order
@@ -932,7 +932,7 @@
     </note>
   </refdescription>
   <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml href="<replaceable>URI</replaceable>"</tag></synopsis>
+    <synopsis><tag class="xmlpi">dbhtml-include href="<replaceable>URI</replaceable>"</tag></synopsis>
   </refsynopsisdiv>
   <refparameter xmlns="http://www.w3.org/1999/xhtml">
     <variablelist>
@@ -1149,4 +1149,34 @@
   </xsl:choose>
 </xsl:template>
 
+<!-- There are two templates matching this PI in htmlhelp-common.xsl -->
+<doc:pi xmlns="" name="dbhh">
+  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets topic name and topic id for context-sensitive HTML Help</refpurpose>
+  <refdescription xmlns="http://www.w3.org/1999/xhtml">
+    <para>Use the <tag class="xmlpi">dbhh</tag> PI as a child of components
+      that should be used as targets for context-sensitive help requests.</para>
+  </refdescription>
+  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
+    <synopsis><tag class="xmlpi">dbhh topicname="<replaceable>name</replaceable>" topicid="<replaceable>id</replaceable>"</tag></synopsis>
+  </refsynopsisdiv>
+  <refparameter xmlns="http://www.w3.org/1999/xhtml">
+    <variablelist>
+      <varlistentry><term>topicname="<replaceable>name</replaceable>"</term>
+        <listitem>
+          <para>Specifies a unique string constant that identifies a help topic</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry><term>topicid="<replaceable>id</replaceable>"</term>
+        <listitem>
+          <para>Specifies a unique integer value for the <literal>topicname</literal> string</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refparameter>
+  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
+    <para><link role="tcg" xlink:href="HtmlHelp.html#HHContextHelp">Context-sensitive help</link></para>
+  </refsee>
+</doc:pi>
+
+
 </xsl:stylesheet>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
index 2469b271d..102b387d3 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
@@ -95,7 +95,7 @@
     <xsl:text>, but no template matches.</xsl:text>
   </xsl:message>
 
-  <span xmlns:saxon="http://icl.com/saxon" class="ERROR">
+  <span style="color: red">
     <xsl:text>&lt;</xsl:text>
     <xsl:value-of select="name(.)"/>
     <xsl:text>&gt;</xsl:text>
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
index 4aa2c2c06..3e115ecf6 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
@@ -23,9 +23,17 @@
   <div>
     <xsl:apply-templates select="." mode="class.attribute"/>
     <p>
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
+      <xsl:if test="..//processing-instruction('dbcmdlist')">
+        <!-- * Placing a dbcmdlist PI as a child of a particular element -->
+        <!-- * creates a hyperlinked list of all cmdsynopsis instances -->
+        <!-- * that are descendants of that element; so for any -->
+        <!-- * cmdsynopsis that is a descendant of an element containing -->
+        <!-- * a dbcmdlist PI, we need to output an a@id instance so that -->
+        <!-- * we will have something to link to -->
+        <xsl:call-template name="anchor">
+          <xsl:with-param name="conditional" select="0"/>
+        </xsl:call-template>
+      </xsl:if>
       <xsl:apply-templates/>
     </p>
   </div>
@@ -155,6 +163,17 @@
 </xsl:template>
 
 <xsl:template match="funcsynopsis">
+  <xsl:if test="..//processing-instruction('dbfunclist')">
+    <!-- * Placing a dbfunclist PI as a child of a particular element -->
+    <!-- * creates a hyperlinked list of all funcsynopsis instances that -->
+    <!-- * are descendants of that element; so for any funcsynopsis that is -->
+    <!-- * a descendant of an element containing a dbfunclist PI, we need -->
+    <!-- * to output an a@id instance so that we will have something to -->
+    <!-- * link to -->
+    <xsl:call-template name="anchor">
+      <xsl:with-param name="conditional" select="0"/>
+    </xsl:call-template>
+  </xsl:if>
   <xsl:call-template name="informal.object"/>
 </xsl:template>
 
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
index 908d7ed2a..eb986496a 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
@@ -118,7 +118,7 @@
   <div>
     <xsl:apply-templates select="." mode="class.attribute"/>
     <xsl:call-template name="anchor"/>
-    <xsl:if test="not ($abstract.notitle.enabled = 0)">
+    <xsl:if test="$abstract.notitle.enabled = 0">
       <xsl:call-template name="formal.object.heading">
         <xsl:with-param name="title">
           <xsl:apply-templates select="." mode="title.markup"/>
@@ -126,6 +126,7 @@
       </xsl:call-template>
     </xsl:if>
     <xsl:apply-templates mode="titlepage.mode"/>
+    <xsl:call-template name="process.footnotes"/>
   </div>
 </xsl:template>
 
@@ -515,9 +516,7 @@
       <xsl:variable name="filename">
         <xsl:call-template name="make-relative-filename">
           <xsl:with-param name="base.dir" select="$base.dir"/>
-	  <xsl:with-param name="base.name">
-            <xsl:apply-templates mode="chunk-filename" select="."/>
-	  </xsl:with-param>
+	  <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
         </xsl:call-template>
       </xsl:variable>
 
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
index 3a9dcd8f8..f97991cd3 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
@@ -854,6 +854,7 @@
 <xsl:template match="link" name="link">
   <xsl:param name="linkend" select="@linkend"/>
   <xsl:param name="a.target"/>
+  <xsl:param name="xhref" select="@xlink:href"/>
 
   <xsl:variable name="content">
     <xsl:call-template name="anchor"/>
@@ -900,6 +901,7 @@
     <xsl:with-param name="linkend" select="$linkend"/>
     <xsl:with-param name="content" select="$content"/>
     <xsl:with-param name="a.target" select="$a.target"/>
+    <xsl:with-param name="xhref" select="$xhref"/>
   </xsl:call-template>
 
 </xsl:template>