OASIS Mailing List ArchivesView the OASIS mailing list archive below
or browse/search using MarkMail.

 


Help: OASIS Mailing Lists Help | MarkMail Help

docbook-apps message

[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]


Subject: Namespace issues with titlepage templates in slides


Hi all,

 

I've tried using the stylesheets in slides directory; it seems that they are improperly declaring the namespaces for wrapping elements. Hence, in the output the respective elements (fo:block and div) are declared without a namespace, which leads to empty title pages in both XHTML and PDF outputs.

 

Adding a namespace is possible either by passing a parameter to the stylesheet (<xsl:param name="ns"/>). The titlepage.xsl stylesheet tries to guess the namespace for wrapping elements by looking if any elements in the input are declared in the XSL-FO or XHTML namespace. The templates for slides do not contain any elements in the target namespace, though.

 

This issue, however, shows that the titlepage.xsl is not not fully namespace aware. First, it shouldn't "autoguess" the namespace for t:wrapper - instead, it should just discover the namespace referred to by the t:wrapper attribute. Same with t:element - this is especially important, as that element may be in a non-DocBook namespace; for example, "DocBook slides" format declares elements in a separate namespace (dbs:slides, dbs:foil, etc.). Current titlepage.xsl cannot deal with template XML where DocBook elements are in non-default namespace - it outputs XPath expressions such as "d:d:title".

 

Also, it looks like some of the templates for the titlepages abuse the namespaces: for example, xhtml/titlepage.templates.xml declares default namespace as XHTML (xmlns="http://www.w3.org/1999/xhtml") but contains both DocBook elements (<title/>, <corpauthor/>, ...) as well as XHTML elements (<hr/>) in the default namespace.

 

Attached patches deal with these issues:

 

- titlepage.xsl.diff (patch for titlepage generation stylesheet):

* New attribute on t:templates: t:copy-namespaces; contains the list of

namespace prefixes to copy from the template to the resulting stylesheet

(currently, titlepage.xsl just copies exsl: and d: prefixes from the

titlepage.xsl itself); this results in appropriate namespace prefix being

defined at the top of the resulting stylesheet rather than on every

element.

* New template, output.wrapper, outputs the wrapper element with the

namespace as defined in the template - no "guessing" needed. The 'ns'

parameter is no longer needed and is thus removed. Also, template for

attributes in "copy.literal.atts" mode is no longer needed - also

removed.

* Move common code for "document.order" and "stylesheet.order" templates

into common templates, t.element.info and t.element.altinfo. Make these

new templates also namespace-aware (e.g., if the element is in non-DocBook

namespace, it does not make sense to check for DocBook-specific 'altinfo'

names such as <artheader/>

* New template, t.element.name, to be used in place of references to

@t:element where this name is used to generate mode and attribute set

names (strips namespace from @t:element)

* Use local-name(.) instead of name(.) where d: prefix is output to the

resulting stylesheet (otherwise, if DocBook elements are in non-default

namespace in the template, stylesheet contains XPaths such as "d:d:title")

* Generalize param:node template to support other XPath axes (but still,

only at the beginning of an _expression_) and recognize elements in a

namespace following axis specifier, if any. By default, only param:node

is handled - but new attribute, @t:xpath-fixup, allows to apply this

behavior to other param:* attributes (e.g., HTML templates also contain

param:object which expects to be run through the same fixup).

* Output a message and fail if t:titlepage-content contains any elements in

non-DocBook namespace. This will indicate when customizations would need

to be updated with proper namespace specifications.

 

- templates-namespace.diff (patch for templates in the DocBook XSL outputs):

* epub3, html, xhtml, webhelp: add DocBook namespace with d: prefix, to

separate from output namespace; declare XPath fixup to apply to

param:object

* fo: define default namespace to be DocBook; copy fo: namespace prefix

definition to output; declare XPath fixup to apply to param:title

(previously, this hack was hardcoded in the titlepage.xsl - but this

template is the only one which uses param:title)

* slides/fo: declare namespaces for DocBook, DocBook slides, copy namespaces

for DocBook slides and XSL-FO; specify which (DocBook/DocBook slides)

namespace applies to which element.

* slides/xhtml: declare namespaces for DocBook, DocBook slides, copy

namespace for DocBook slides; specify DocBook namespace on elements.

 

- generated.diff (diff for stylesheets generated with the above changes)

* except for slides/fo and slides/xhtml; the changes are movement of the

namespace declarations from individual elements to the stylesheet. The

addition of the d:docinfo appears even if I regenerate stylesheets from

templates in the unmodified sources. What is this <docinfo/>, by the way?

It is not declared in the DocBook 4.x or 5.x schemas.

 

Regards,

Alexey.

Index: epub3/titlepage.templates.xml
===================================================================
--- epub3/titlepage.templates.xml	(working copy)
+++ epub3/titlepage.templates.xml	(working copy)
@@ -1,25 +1,26 @@
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0";
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
+             xmlns:d="http://docbook.org/ns/docbook";
              xmlns="http://www.w3.org/1999/xhtml";
              xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="article" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:article" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -38,21 +39,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="set" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:set" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -71,24 +72,24 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:book" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <isbn/>
-    <issn/>
-    <biblioid/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:isbn/>
+    <d:issn/>
+    <d:biblioid/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -107,24 +108,24 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="part" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:part" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="division.title"
-           param:node="ancestor-or-self::part[1]"/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+           param:node="ancestor-or-self::d:part[1]"/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -140,21 +141,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="partintro" t:wrapper="div">
+<t:titlepage t:element="d:partintro" t:wrapper="div">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -172,21 +173,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="reference" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:reference" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -205,12 +206,12 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:refentry" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
 <!-- uncomment this if you want refentry titlepages
-    <title t:force="1"
+    <d:title t:force="1"
            t:named-template="refentry.title"
-           param:node="ancestor-or-self::refentry[1]"/>
+           param:node="ancestor-or-self::d:refentry[1]"/>
 -->
   </t:titlepage-content>
 
@@ -228,14 +229,14 @@
 
 <!-- ==================================================================== -->
 
-  <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
-    <t:titlepage-content t:side="recto">
-    <title
+<t:titlepage t:element="d:dedication" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::dedication[1]"/>
-    <subtitle/>
-    </t:titlepage-content>
+           param:node="ancestor-or-self::d:dedication[1]"/>
+    <d:subtitle/>
+  </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
   </t:titlepage-content>
@@ -252,13 +253,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:acknowledgements" t:wrapper="div" class="titlepage">
     <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::acknowledgements[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:acknowledgements[1]"/>
+    <d:subtitle/>
     </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -276,21 +277,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="preface" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:preface" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -308,21 +309,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:chapter" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -340,21 +341,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:appendix" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -372,21 +373,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="section" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:section" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -403,21 +404,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect1" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -434,21 +435,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect2" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -465,21 +466,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect3" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -496,21 +497,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect4" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -527,21 +528,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect5" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -558,21 +559,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:simplesect" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -591,13 +592,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:bibliography" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::bibliography[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:bibliography[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -615,13 +616,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:glossary" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::glossary[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:glossary[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -639,13 +640,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="index" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:index" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::index[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:index[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -663,13 +664,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:setindex" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::setindex[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:setindex[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -686,12 +687,13 @@
 </t:titlepage>
 
 <!-- ==================================================================== -->
-<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sidebar" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:named-template="formal.object.heading"
-           param:object="ancestor-or-self::sidebar[1]"/>
-    <subtitle/>
+           t:xpath-fixup="object"
+           param:object="ancestor-or-self::d:sidebar[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
Index: fo/titlepage.templates.xml
===================================================================
--- fo/titlepage.templates.xml	(working copy)
+++ fo/titlepage.templates.xml	(working copy)
@@ -13,9 +13,11 @@
 <!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
 ]>
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0";
-	     xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
              xmlns:fo="http://www.w3.org/1999/XSL/Format";
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+             xmlns="http://docbook.org/ns/docbook";
+             t:copy-namespaces="fo">
 
 <!-- ********************************************************************
      $Id: titlepage.templates.xml 9722 2013-02-01 19:44:13Z bobstayton $
@@ -1036,6 +1038,7 @@
     <t:titlepage-content t:side="recto">
       <title t:force="1"
 	     t:named-template="indexdiv.title"
+	     t:xpath-fixup="title"
 	     param:title="title"/>
       <subtitle
 		font-family="{$title.fontset}"/>
Index: html/titlepage.templates.xml
===================================================================
--- html/titlepage.templates.xml	(working copy)
+++ html/titlepage.templates.xml	(working copy)
@@ -1,24 +1,26 @@
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0";
+             xmlns:d="http://docbook.org/ns/docbook";
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+             t:missing-namespace-fatal="no">
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="article" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:article" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -37,21 +39,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="set" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:set" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -70,21 +72,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:book" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -103,24 +105,24 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="part" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:part" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="division.title"
-           param:node="ancestor-or-self::part[1]"/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+           param:node="ancestor-or-self::d:part[1]"/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -136,21 +138,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="partintro" t:wrapper="div">
+<t:titlepage t:element="d:partintro" t:wrapper="div">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -168,21 +170,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="reference" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:reference" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -201,12 +203,12 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:refentry" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
 <!-- uncomment this if you want refentry titlepages
-    <title t:force="1"
+    <d:title t:force="1"
            t:named-template="refentry.title"
-           param:node="ancestor-or-self::refentry[1]"/>
+           param:node="ancestor-or-self::d:refentry[1]"/>
 -->
   </t:titlepage-content>
 
@@ -224,13 +226,13 @@
 
 <!-- ==================================================================== -->
 
-  <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
-    <t:titlepage-content t:side="recto">
-    <title
+<t:titlepage t:element="d:dedication" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::dedication[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:dedication[1]"/>
+    <d:subtitle/>
     </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -248,13 +250,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:acknowledgements" t:wrapper="div" class="titlepage">
     <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::acknowledgements[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:acknowledgements[1]"/>
+    <d:subtitle/>
     </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -272,21 +274,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="preface" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:preface" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -304,21 +306,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:chapter" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -334,21 +336,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="topic" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:topic" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -366,21 +368,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:appendix" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -398,21 +400,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="section" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:section" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -429,21 +431,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect1" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -460,21 +462,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect2" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -491,21 +493,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect3" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -522,21 +524,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect4" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -553,21 +555,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect5" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -584,21 +586,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:simplesect" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -617,13 +619,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:bibliography" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::bibliography[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:bibliography[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -641,13 +643,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:glossary" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::glossary[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:glossary[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -665,13 +667,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="index" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:index" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::index[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:index[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -689,13 +691,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:setindex" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::setindex[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:setindex[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -712,12 +714,13 @@
 </t:titlepage>
 
 <!-- ==================================================================== -->
-<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sidebar" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:named-template="formal.object.heading"
-           param:object="ancestor-or-self::sidebar[1]"/>
-    <subtitle/>
+           t:xpath-fixup="object"
+           param:object="ancestor-or-self::d:sidebar[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
Index: slides/fo/plain-titlepage.xml
===================================================================
--- slides/fo/plain-titlepage.xml	(working copy)
+++ slides/fo/plain-titlepage.xml	(working copy)
@@ -1,36 +1,25 @@
-<!DOCTYPE t:templates [
-<!ENTITY hsize0 "10pt">
-<!ENTITY hsize1 "12pt">
-<!ENTITY hsize2 "14.4pt">
-<!ENTITY hsize3 "17.28pt">
-<!ENTITY hsize4 "20.736pt">
-<!ENTITY hsize5 "24.8832pt">
-<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
-<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
-<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
-<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
-<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
-<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
-]>
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0";
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
+             xmlns:d="http://docbook.org/ns/docbook";
+             xmlns:dbs="http://docbook.org/ns/docbook-slides";
              xmlns:fo="http://www.w3.org/1999/XSL/Format";
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+             t:copy-namespaces="dbs fo">
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="slides" t:wrapper="fo:block">
+<t:titlepage t:element="dbs:slides" t:wrapper="fo:block">
   <t:titlepage-content t:side="recto">
-      <title t:named-template="presentation.title"
+    <d:title t:named-template="presentation.title"
 	     xsl:use-attribute-sets="slides.titlepage.title.properties"/>
 
-    <subtitle xsl:use-attribute-sets="slides.titlepage.subtitle.properties"/>
+    <d:subtitle xsl:use-attribute-sets="slides.titlepage.subtitle.properties"/>
 
-    <corpauthor xsl:use-attribute-sets="slides.titlepage.corpauthor.properties"/>
-    <authorgroup xsl:use-attribute-sets="slides.titlepage.authorgroup.properties"/>
-    <author xsl:use-attribute-sets="slides.titlepage.author.properties"/>
+    <d:corpauthor xsl:use-attribute-sets="slides.titlepage.corpauthor.properties"/>
+    <d:authorgroup xsl:use-attribute-sets="slides.titlepage.authorgroup.properties"/>
+    <d:author xsl:use-attribute-sets="slides.titlepage.author.properties"/>
 
-    <pubdate xsl:use-attribute-sets="slides.titlepage.pubdate.properties"/>
+    <d:pubdate xsl:use-attribute-sets="slides.titlepage.pubdate.properties"/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
Index: slides/xhtml/plain-titlepage.xml
===================================================================
--- slides/xhtml/plain-titlepage.xml	(working copy)
+++ slides/xhtml/plain-titlepage.xml	(working copy)
@@ -1,14 +1,18 @@
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0";
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+             xmlns:d="http://docbook.org/ns/docbook";
+             xmlns:dbs="http://docbook.org/ns/docbook-slides";
+             xmlns="http://www.w3.org/1999/xhtml";
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+             t:copy-namespaces="dbs">
 
-<t:titlepage t:element="slides" t:wrapper="div" class="slide cover title">
+<t:titlepage t:element="dbs:slides" t:wrapper="div" class="slide cover title">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
Index: webhelp/xsl/titlepage.templates.xml
===================================================================
--- webhelp/xsl/titlepage.templates.xml	(working copy)
+++ webhelp/xsl/titlepage.templates.xml	(working copy)
@@ -1,23 +1,25 @@
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0";
+             xmlns:d="http://docbook.org/ns/docbook";
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+             xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+             t:missing-namespace-fatal="no">
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="article" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:article" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -37,20 +39,20 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="set" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:set" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -70,20 +72,20 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:book" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -103,23 +105,23 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="part" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:part" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="division.title"
-           param:node="ancestor-or-self::part[1]"/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+           param:node="ancestor-or-self::d:part[1]"/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -136,20 +138,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="partintro" t:wrapper="div">
+<t:titlepage t:element="d:partintro" t:wrapper="div">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -168,20 +170,20 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="reference" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:reference" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -201,12 +203,12 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:refentry" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
 <!-- uncomment this if you want refentry titlepages
-    <title t:force="1"
+    <d:title t:force="1"
            t:named-template="refentry.title"
-           param:node="ancestor-or-self::refentry[1]"/>
+           param:node="ancestor-or-self::d:refentry[1]"/>
 -->
   </t:titlepage-content>
 
@@ -224,13 +226,13 @@
 
 <!-- ==================================================================== -->
 
-  <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
-    <t:titlepage-content t:side="recto">
-    <title
+<t:titlepage t:element="d:dedication" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::dedication[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:dedication[1]"/>
+    <d:subtitle/>
     </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -248,14 +250,14 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage">
-    <t:titlepage-content t:side="recto">
-    <title
+<t:titlepage t:element="d:acknowledgements" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::acknowledgements[1]"/>
-    <subtitle/>
-    </t:titlepage-content>
+           param:node="ancestor-or-self::d:acknowledgements[1]"/>
+    <d:subtitle/>
+  </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
   </t:titlepage-content>
@@ -272,20 +274,20 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="preface" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:preface" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -304,20 +306,20 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:chapter" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -334,20 +336,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="topic" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:topic" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -366,20 +368,20 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:appendix" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -398,20 +400,20 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="section" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:section" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -429,20 +431,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect1" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -460,20 +462,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect2" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -491,20 +493,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect3" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -522,20 +524,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect4" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -553,20 +555,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect5" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -584,20 +586,20 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:simplesect" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
     
   </t:titlepage-content>
 
@@ -617,13 +619,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:bibliography" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::bibliography[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:bibliography[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -641,13 +643,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:glossary" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::glossary[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:glossary[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -665,13 +667,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="index" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:index" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::index[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:index[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -689,13 +691,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:setindex" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::setindex[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:setindex[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -712,12 +714,13 @@
 </t:titlepage>
 
 <!-- ==================================================================== -->
-<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sidebar" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:named-template="formal.object.heading"
-           param:object="ancestor-or-self::sidebar[1]"/>
-    <subtitle/>
+           t:xpath-fixup="object"
+           param:object="ancestor-or-self::d:sidebar[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
Index: xhtml/titlepage.templates.xml
===================================================================
--- xhtml/titlepage.templates.xml	(working copy)
+++ xhtml/titlepage.templates.xml	(working copy)
@@ -1,25 +1,26 @@
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0";
              xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param";
+             xmlns:d="http://docbook.org/ns/docbook";
              xmlns="http://www.w3.org/1999/xhtml";
              xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="article" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:article" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -38,21 +39,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="set" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:set" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -71,21 +72,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:book" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -104,24 +105,24 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="part" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:part" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="division.title"
-           param:node="ancestor-or-self::part[1]"/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+           param:node="ancestor-or-self::d:part[1]"/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -137,21 +138,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="partintro" t:wrapper="div">
+<t:titlepage t:element="d:partintro" t:wrapper="div">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -169,21 +170,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="reference" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:reference" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -202,12 +203,12 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:refentry" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
 <!-- uncomment this if you want refentry titlepages
-    <title t:force="1"
+    <d:title t:force="1"
            t:named-template="refentry.title"
-           param:node="ancestor-or-self::refentry[1]"/>
+           param:node="ancestor-or-self::d:refentry[1]"/>
 -->
   </t:titlepage-content>
 
@@ -225,14 +226,14 @@
 
 <!-- ==================================================================== -->
 
-  <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
-    <t:titlepage-content t:side="recto">
-    <title
+<t:titlepage t:element="d:dedication" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::dedication[1]"/>
-    <subtitle/>
-    </t:titlepage-content>
+           param:node="ancestor-or-self::d:dedication[1]"/>
+    <d:subtitle/>
+  </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
   </t:titlepage-content>
@@ -249,14 +250,14 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage">
-    <t:titlepage-content t:side="recto">
-    <title
+<t:titlepage t:element="d:acknowledgements" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::acknowledgements[1]"/>
-    <subtitle/>
-    </t:titlepage-content>
+           param:node="ancestor-or-self::d:acknowledgements[1]"/>
+    <d:subtitle/>
+  </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
   </t:titlepage-content>
@@ -273,21 +274,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="preface" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:preface" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -305,21 +306,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:chapter" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -335,21 +336,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="topic" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:topic" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -367,21 +368,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:appendix" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -399,21 +400,21 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="section" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:section" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -430,21 +431,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect1" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -461,21 +462,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect2" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -492,21 +493,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect3" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -523,21 +524,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect4" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -554,21 +555,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sect5" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -585,21 +586,21 @@
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:simplesect" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title/>
-    <subtitle/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
+    <d:title/>
+    <d:subtitle/>
+    <d:corpauthor/>
+    <d:authorgroup/>
+    <d:author/>
+    <d:othercredit/>
+    <d:releaseinfo/>
+    <d:copyright/>
+    <d:legalnotice/>
+    <d:pubdate/>
+    <d:revision/>
+    <d:revhistory/>
+    <d:abstract/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -618,13 +619,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:bibliography" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::bibliography[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:bibliography[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -642,13 +643,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:glossary" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::glossary[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:glossary[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -666,13 +667,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="index" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:index" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::index[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:index[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -690,13 +691,13 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:setindex" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:force="1"
            t:named-template="component.title"
-           param:node="ancestor-or-self::setindex[1]"/>
-    <subtitle/>
+           param:node="ancestor-or-self::d:setindex[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
@@ -713,12 +714,13 @@
 </t:titlepage>
 
 <!-- ==================================================================== -->
-<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage">
+<t:titlepage t:element="d:sidebar" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
-    <title
+    <d:title
            t:named-template="formal.object.heading"
-           param:object="ancestor-or-self::sidebar[1]"/>
-    <subtitle/>
+           t:xpath-fixup="object"
+           param:object="ancestor-or-self::d:sidebar[1]"/>
+    <d:subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content t:side="verso">
Index: epub3/titlepage.templates.xsl
===================================================================
--- epub3/titlepage.templates.xsl	(working copy)
+++ epub3/titlepage.templates.xsl	(working copy)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:d="http://docbook.org/ns/docbook";
-xmlns:exsl="http://exslt.org/common"; version="1.0" exclude-result-prefixes="exsl d">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; xmlns:d="http://docbook.org/ns/docbook"; xmlns="http://www.w3.org/1999/xhtml"; version="1.0" exclude-result-prefixes="exsl d">
 
-<!-- This stylesheet was created by template/titlepage.xsl-->
+<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
 
 <xsl:template name="article.titlepage.recto">
   <xsl:choose>
@@ -74,7 +73,7 @@
 <xsl:template name="article.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="article.titlepage.separator"><hr xmlns="http://www.w3.org/1999/xhtml"/>
+<xsl:template name="article.titlepage.separator"><hr/>
 </xsl:template>
 
 <xsl:template name="article.titlepage.before.recto">
@@ -84,7 +83,7 @@
 </xsl:template>
 
 <xsl:template name="article.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="article.titlepage.before.recto"/>
       <xsl:call-template name="article.titlepage.recto"/>
@@ -132,79 +131,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="article.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<div xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -261,7 +260,7 @@
 <xsl:template name="set.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="set.titlepage.separator"><hr xmlns="http://www.w3.org/1999/xhtml"/>
+<xsl:template name="set.titlepage.separator"><hr/>
 </xsl:template>
 
 <xsl:template name="set.titlepage.before.recto">
@@ -271,7 +270,7 @@
 </xsl:template>
 
 <xsl:template name="set.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="set.titlepage.before.recto"/>
       <xsl:call-template name="set.titlepage.recto"/>
@@ -319,79 +318,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="set.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<div xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -454,7 +453,7 @@
 <xsl:template name="book.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="book.titlepage.separator"><hr xmlns="http://www.w3.org/1999/xhtml"/>
+<xsl:template name="book.titlepage.separator"><hr/>
 </xsl:template>
 
 <xsl:template name="book.titlepage.before.recto">
@@ -464,7 +463,7 @@
 </xsl:template>
 
 <xsl:template name="book.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="book.titlepage.before.recto"/>
       <xsl:call-template name="book.titlepage.recto"/>
@@ -512,103 +511,103 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:isbn" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:issn" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:biblioid" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="book.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<div xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template name="part.titlepage.recto">
-  <div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+  <div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:call-template name="division.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:part[1]"/>
 </xsl:call-template></div>
@@ -675,7 +674,7 @@
 </xsl:template>
 
 <xsl:template name="part.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="part.titlepage.before.recto"/>
       <xsl:call-template name="part.titlepage.recto"/>
@@ -723,73 +722,73 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="part.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<div xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -873,7 +872,7 @@
 </xsl:template>
 
 <xsl:template name="partintro.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml";>
+  <div>
     <xsl:variable name="recto.content">
       <xsl:call-template name="partintro.titlepage.before.recto"/>
       <xsl:call-template name="partintro.titlepage.recto"/>
@@ -921,79 +920,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="partintro.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -1067,7 +1066,7 @@
 <xsl:template name="reference.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="reference.titlepage.separator"><hr xmlns="http://www.w3.org/1999/xhtml"/>
+<xsl:template name="reference.titlepage.separator"><hr/>
 </xsl:template>
 
 <xsl:template name="reference.titlepage.before.recto">
@@ -1077,7 +1076,7 @@
 </xsl:template>
 
 <xsl:template name="reference.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="reference.titlepage.before.recto"/>
       <xsl:call-template name="reference.titlepage.recto"/>
@@ -1125,79 +1124,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="reference.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<div xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -1218,7 +1217,7 @@
 </xsl:template>
 
 <xsl:template name="refentry.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="refentry.titlepage.before.recto"/>
       <xsl:call-template name="refentry.titlepage.recto"/>
@@ -1266,7 +1265,7 @@
 </xsl:template>
 
 <xsl:template name="dedication.titlepage.recto">
-  <div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="dedication.titlepage.recto.style">
+  <div xsl:use-attribute-sets="dedication.titlepage.recto.style">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:dedication[1]"/>
 </xsl:call-template></div>
@@ -1300,7 +1299,7 @@
 </xsl:template>
 
 <xsl:template name="dedication.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="dedication.titlepage.before.recto"/>
       <xsl:call-template name="dedication.titlepage.recto"/>
@@ -1348,13 +1347,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="dedication.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="dedication.titlepage.recto.style">
+<div xsl:use-attribute-sets="dedication.titlepage.recto.style">
 <xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template name="acknowledgements.titlepage.recto">
-  <div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
+  <div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:acknowledgements[1]"/>
 </xsl:call-template></div>
@@ -1388,7 +1387,7 @@
 </xsl:template>
 
 <xsl:template name="acknowledgements.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="acknowledgements.titlepage.before.recto"/>
       <xsl:call-template name="acknowledgements.titlepage.recto"/>
@@ -1436,7 +1435,7 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="acknowledgements.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
+<div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
 <xsl:apply-templates select="." mode="acknowledgements.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -1520,7 +1519,7 @@
 </xsl:template>
 
 <xsl:template name="preface.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="preface.titlepage.before.recto"/>
       <xsl:call-template name="preface.titlepage.recto"/>
@@ -1568,79 +1567,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="preface.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<div xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -1724,7 +1723,7 @@
 </xsl:template>
 
 <xsl:template name="chapter.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="chapter.titlepage.before.recto"/>
       <xsl:call-template name="chapter.titlepage.recto"/>
@@ -1772,79 +1771,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="chapter.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -1928,7 +1927,7 @@
 </xsl:template>
 
 <xsl:template name="appendix.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="appendix.titlepage.before.recto"/>
       <xsl:call-template name="appendix.titlepage.recto"/>
@@ -1976,79 +1975,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="appendix.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -2105,7 +2104,7 @@
 <xsl:template name="section.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="section.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr xmlns="http://www.w3.org/1999/xhtml"/></xsl:if>
+<xsl:template name="section.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
 </xsl:template>
 
 <xsl:template name="section.titlepage.before.recto">
@@ -2115,7 +2114,7 @@
 </xsl:template>
 
 <xsl:template name="section.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="section.titlepage.before.recto"/>
       <xsl:call-template name="section.titlepage.recto"/>
@@ -2163,79 +2162,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="section.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<div xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -2292,7 +2291,7 @@
 <xsl:template name="sect1.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="sect1.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr xmlns="http://www.w3.org/1999/xhtml"/></xsl:if>
+<xsl:template name="sect1.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
 </xsl:template>
 
 <xsl:template name="sect1.titlepage.before.recto">
@@ -2302,7 +2301,7 @@
 </xsl:template>
 
 <xsl:template name="sect1.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect1.titlepage.before.recto"/>
       <xsl:call-template name="sect1.titlepage.recto"/>
@@ -2350,79 +2349,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect1.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -2479,7 +2478,7 @@
 <xsl:template name="sect2.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="sect2.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr xmlns="http://www.w3.org/1999/xhtml"/></xsl:if>
+<xsl:template name="sect2.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
 </xsl:template>
 
 <xsl:template name="sect2.titlepage.before.recto">
@@ -2489,7 +2488,7 @@
 </xsl:template>
 
 <xsl:template name="sect2.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect2.titlepage.before.recto"/>
       <xsl:call-template name="sect2.titlepage.recto"/>
@@ -2537,79 +2536,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect2.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -2666,7 +2665,7 @@
 <xsl:template name="sect3.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="sect3.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr xmlns="http://www.w3.org/1999/xhtml"/></xsl:if>
+<xsl:template name="sect3.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
 </xsl:template>
 
 <xsl:template name="sect3.titlepage.before.recto">
@@ -2676,7 +2675,7 @@
 </xsl:template>
 
 <xsl:template name="sect3.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect3.titlepage.before.recto"/>
       <xsl:call-template name="sect3.titlepage.recto"/>
@@ -2724,79 +2723,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect3.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -2853,7 +2852,7 @@
 <xsl:template name="sect4.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="sect4.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr xmlns="http://www.w3.org/1999/xhtml"/></xsl:if>
+<xsl:template name="sect4.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
 </xsl:template>
 
 <xsl:template name="sect4.titlepage.before.recto">
@@ -2863,7 +2862,7 @@
 </xsl:template>
 
 <xsl:template name="sect4.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect4.titlepage.before.recto"/>
       <xsl:call-template name="sect4.titlepage.recto"/>
@@ -2911,79 +2910,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect4.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -3040,7 +3039,7 @@
 <xsl:template name="sect5.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="sect5.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr xmlns="http://www.w3.org/1999/xhtml"/></xsl:if>
+<xsl:template name="sect5.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
 </xsl:template>
 
 <xsl:template name="sect5.titlepage.before.recto">
@@ -3050,7 +3049,7 @@
 </xsl:template>
 
 <xsl:template name="sect5.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect5.titlepage.before.recto"/>
       <xsl:call-template name="sect5.titlepage.recto"/>
@@ -3098,79 +3097,79 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect5.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -3244,7 +3243,7 @@
 <xsl:template name="simplesect.titlepage.verso">
 </xsl:template>
 
-<xsl:template name="simplesect.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr xmlns="http://www.w3.org/1999/xhtml"/></xsl:if>
+<xsl:template name="simplesect.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
 </xsl:template>
 
 <xsl:template name="simplesect.titlepage.before.recto">
@@ -3254,7 +3253,7 @@
 </xsl:template>
 
 <xsl:template name="simplesect.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="simplesect.titlepage.before.recto"/>
       <xsl:call-template name="simplesect.titlepage.recto"/>
@@ -3302,85 +3301,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:author" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="simplesect.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template name="bibliography.titlepage.recto">
-  <div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+  <div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:bibliography[1]"/>
 </xsl:call-template></div>
@@ -3414,7 +3413,7 @@
 </xsl:template>
 
 <xsl:template name="bibliography.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="bibliography.titlepage.before.recto"/>
       <xsl:call-template name="bibliography.titlepage.recto"/>
@@ -3462,13 +3461,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="bibliography.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
 <xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template name="glossary.titlepage.recto">
-  <div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="glossary.titlepage.recto.style">
+  <div xsl:use-attribute-sets="glossary.titlepage.recto.style">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:glossary[1]"/>
 </xsl:call-template></div>
@@ -3502,7 +3501,7 @@
 </xsl:template>
 
 <xsl:template name="glossary.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="glossary.titlepage.before.recto"/>
       <xsl:call-template name="glossary.titlepage.recto"/>
@@ -3550,13 +3549,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="glossary.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<div xsl:use-attribute-sets="glossary.titlepage.recto.style">
 <xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template name="index.titlepage.recto">
-  <div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="index.titlepage.recto.style">
+  <div xsl:use-attribute-sets="index.titlepage.recto.style">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:index[1]"/>
 </xsl:call-template></div>
@@ -3590,7 +3589,7 @@
 </xsl:template>
 
 <xsl:template name="index.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="index.titlepage.before.recto"/>
       <xsl:call-template name="index.titlepage.recto"/>
@@ -3638,13 +3637,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="index.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="index.titlepage.recto.style">
+<div xsl:use-attribute-sets="index.titlepage.recto.style">
 <xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
 <xsl:template name="setindex.titlepage.recto">
-  <div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="setindex.titlepage.recto.style">
+  <div xsl:use-attribute-sets="setindex.titlepage.recto.style">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:setindex[1]"/>
 </xsl:call-template></div>
@@ -3678,7 +3677,7 @@
 </xsl:template>
 
 <xsl:template name="setindex.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="setindex.titlepage.before.recto"/>
       <xsl:call-template name="setindex.titlepage.recto"/>
@@ -3726,7 +3725,7 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="setindex.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="setindex.titlepage.recto.style">
+<div xsl:use-attribute-sets="setindex.titlepage.recto.style">
 <xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
 </div>
 </xsl:template>
@@ -3777,7 +3776,7 @@
 </xsl:template>
 
 <xsl:template name="sidebar.titlepage">
-  <div xmlns="http://www.w3.org/1999/xhtml"; class="titlepage">
+  <div class="titlepage">
     <xsl:variable name="recto.content">
       <xsl:call-template name="sidebar.titlepage.before.recto"/>
       <xsl:call-template name="sidebar.titlepage.recto"/>
@@ -3825,7 +3824,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sidebar.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sidebar.titlepage.recto.style">
+<div xsl:use-attribute-sets="sidebar.titlepage.recto.style">
 <xsl:call-template name="formal.object.heading">
 <xsl:with-param name="object" select="ancestor-or-self::d:sidebar[1]"/>
 </xsl:call-template>
@@ -3833,7 +3832,7 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sidebar.titlepage.recto.auto.mode">
-<div xmlns="http://www.w3.org/1999/xhtml"; xsl:use-attribute-sets="sidebar.titlepage.recto.style">
+<div xsl:use-attribute-sets="sidebar.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
 </div>
 </xsl:template>
Index: fo/titlepage.templates.xsl
===================================================================
--- fo/titlepage.templates.xsl	(working copy)
+++ fo/titlepage.templates.xsl	(working copy)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:d="http://docbook.org/ns/docbook";
-xmlns:exsl="http://exslt.org/common"; version="1.0" exclude-result-prefixes="exsl d">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; xmlns:d="http://docbook.org/ns/docbook"; xmlns="http://docbook.org/ns/docbook"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; version="1.0" exclude-result-prefixes="exsl d">
 
-<!-- This stylesheet was created by template/titlepage.xsl-->
+<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
 
 <xsl:template name="article.titlepage.recto">
   <xsl:choose>
@@ -87,7 +86,7 @@
 </xsl:template>
 
 <xsl:template name="article.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; font-family="{$title.fontset}">
+  <fo:block font-family="{$title.fontset}">
     <xsl:variable name="recto.content">
       <xsl:call-template name="article.titlepage.before.recto"/>
       <xsl:call-template name="article.titlepage.recto"/>
@@ -135,7 +134,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:article[1]"/>
 </xsl:call-template>
@@ -143,79 +142,79 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="article.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="article.titlepage.recto.style">
 <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -284,7 +283,7 @@
 </xsl:template>
 
 <xsl:template name="set.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="set.titlepage.before.recto"/>
       <xsl:call-template name="set.titlepage.recto"/>
@@ -332,7 +331,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="division.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:set[1]"/>
 </xsl:call-template>
@@ -340,79 +339,79 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="set.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="set.titlepage.recto.style">
 <xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -485,17 +484,17 @@
   <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:legalnotice"/>
 </xsl:template>
 
-<xsl:template name="book.titlepage.separator"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; break-after="page"/>
+<xsl:template name="book.titlepage.separator"><fo:block break-after="page"/>
 </xsl:template>
 
 <xsl:template name="book.titlepage.before.recto">
 </xsl:template>
 
-<xsl:template name="book.titlepage.before.verso"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; break-after="page"/>
+<xsl:template name="book.titlepage.before.verso"><fo:block break-after="page"/>
 </xsl:template>
 
 <xsl:template name="book.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="book.titlepage.before.recto"/>
       <xsl:call-template name="book.titlepage.recto"/>
@@ -543,7 +542,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="division.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:book[1]"/>
 </xsl:call-template>
@@ -551,93 +550,93 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" keep-with-next.within-column="always" space-before="2in">
+<fo:block xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" keep-with-next.within-column="always" space-before="2in">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.recto.style" space-before="2in">
+<fo:block xsl:use-attribute-sets="book.titlepage.recto.style" space-before="2in">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" space-before="10.8pt" keep-with-next.within-column="always">
+<fo:block xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" space-before="10.8pt" keep-with-next.within-column="always">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="book.titlepage.recto.style">
 <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:title" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style" font-size="14.4pt" font-weight="bold" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style" font-size="14.4pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="book.verso.title">
 </xsl:call-template>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style">
 <xsl:call-template name="verso.authorgroup">
 </xsl:call-template>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style" space-before="1em">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style" space-before="1em">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="book.titlepage.verso.style" font-size="8pt">
+<fo:block xsl:use-attribute-sets="book.titlepage.verso.style" font-size="8pt">
 <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
 </fo:block>
 </xsl:template>
@@ -691,7 +690,7 @@
 </xsl:template>
 
 <xsl:template name="part.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="part.titlepage.before.recto"/>
       <xsl:call-template name="part.titlepage.recto"/>
@@ -739,7 +738,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="division.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:part[1]"/>
 </xsl:call-template>
@@ -747,13 +746,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="part.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="part.titlepage.recto.style">
 <xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -840,7 +839,7 @@
 </xsl:template>
 
 <xsl:template name="partintro.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="partintro.titlepage.before.recto"/>
       <xsl:call-template name="partintro.titlepage.recto"/>
@@ -888,85 +887,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="24.8832pt" font-weight="bold" space-before="1em" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="24.8832pt" font-weight="bold" space-before="1em" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="14.4pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="14.4pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="partintro.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="partintro.titlepage.recto.style">
 <xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -1053,7 +1052,7 @@
 </xsl:template>
 
 <xsl:template name="reference.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="reference.titlepage.before.recto"/>
       <xsl:call-template name="reference.titlepage.recto"/>
@@ -1101,7 +1100,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="division.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:reference[1]"/>
 </xsl:call-template>
@@ -1109,79 +1108,79 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="reference.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="reference.titlepage.recto.style">
 <xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -1220,7 +1219,7 @@
 </xsl:template>
 
 <xsl:template name="refsynopsisdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="refsynopsisdiv.titlepage.before.recto"/>
       <xsl:call-template name="refsynopsisdiv.titlepage.recto"/>
@@ -1268,13 +1267,13 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="refsynopsisdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="refsynopsisdiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="refsynopsisdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style">
 <xsl:apply-templates select="." mode="refsynopsisdiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -1313,7 +1312,7 @@
 </xsl:template>
 
 <xsl:template name="refsection.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="refsection.titlepage.before.recto"/>
       <xsl:call-template name="refsection.titlepage.recto"/>
@@ -1361,13 +1360,13 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="refsection.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsection.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="refsection.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="refsection.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="refsection.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsection.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="refsection.titlepage.recto.style">
 <xsl:apply-templates select="." mode="refsection.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -1406,7 +1405,7 @@
 </xsl:template>
 
 <xsl:template name="refsect1.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="refsect1.titlepage.before.recto"/>
       <xsl:call-template name="refsect1.titlepage.recto"/>
@@ -1454,13 +1453,13 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="refsect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsect1.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="refsect1.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="refsect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="refsect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="refsect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="refsect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -1499,7 +1498,7 @@
 </xsl:template>
 
 <xsl:template name="refsect2.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="refsect2.titlepage.before.recto"/>
       <xsl:call-template name="refsect2.titlepage.recto"/>
@@ -1547,13 +1546,13 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="refsect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsect2.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="refsect2.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="refsect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="refsect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="refsect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="refsect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -1592,7 +1591,7 @@
 </xsl:template>
 
 <xsl:template name="refsect3.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="refsect3.titlepage.before.recto"/>
       <xsl:call-template name="refsect3.titlepage.recto"/>
@@ -1640,19 +1639,19 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="refsect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsect3.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="refsect3.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="refsect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="refsect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="refsect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="refsect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="refsect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="dedication.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="dedication.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="dedication.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:dedication[1]"/>
 </xsl:call-template></fo:block>
@@ -1689,7 +1688,7 @@
 </xsl:template>
 
 <xsl:template name="dedication.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="dedication.titlepage.before.recto"/>
       <xsl:call-template name="dedication.titlepage.recto"/>
@@ -1737,19 +1736,19 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="dedication.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="dedication.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="dedication.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="dedication.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="dedication.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="dedication.titlepage.recto.style">
 <xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="acknowledgements.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="acknowledgements.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="acknowledgements.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:acknowledgements[1]"/>
 </xsl:call-template></fo:block>
@@ -1786,7 +1785,7 @@
 </xsl:template>
 
 <xsl:template name="acknowledgements.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="acknowledgements.titlepage.before.recto"/>
       <xsl:call-template name="acknowledgements.titlepage.recto"/>
@@ -1834,19 +1833,19 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="acknowledgements.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="acknowledgements.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="acknowledgements.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="acknowledgements.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="acknowledgements.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="acknowledgements.titlepage.recto.style">
 <xsl:apply-templates select="." mode="acknowledgements.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="preface.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:preface[1]"/>
 </xsl:call-template></fo:block>
@@ -1916,7 +1915,7 @@
 </xsl:template>
 
 <xsl:template name="preface.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="preface.titlepage.before.recto"/>
       <xsl:call-template name="preface.titlepage.recto"/>
@@ -1964,79 +1963,79 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="preface.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="preface.titlepage.recto.style">
 <xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -2123,7 +2122,7 @@
 </xsl:template>
 
 <xsl:template name="chapter.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; font-family="{$title.fontset}">
+  <fo:block font-family="{$title.fontset}">
     <xsl:variable name="recto.content">
       <xsl:call-template name="chapter.titlepage.before.recto"/>
       <xsl:call-template name="chapter.titlepage.recto"/>
@@ -2171,7 +2170,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style" font-size="24.8832pt" font-weight="bold">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style" font-size="24.8832pt" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:chapter[1]"/>
 </xsl:call-template>
@@ -2179,79 +2178,79 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" font-style="italic" font-size="14.4pt" font-weight="bold">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" font-style="italic" font-size="14.4pt" font-weight="bold">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="chapter.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style">
 <xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -2338,7 +2337,7 @@
 </xsl:template>
 
 <xsl:template name="appendix.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="appendix.titlepage.before.recto"/>
       <xsl:call-template name="appendix.titlepage.recto"/>
@@ -2386,7 +2385,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-weight="bold" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:appendix[1]"/>
 </xsl:call-template>
@@ -2394,79 +2393,79 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="appendix.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="appendix.titlepage.recto.style">
 <xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -2535,7 +2534,7 @@
 </xsl:template>
 
 <xsl:template name="section.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="section.titlepage.before.recto"/>
       <xsl:call-template name="section.titlepage.recto"/>
@@ -2583,85 +2582,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="section.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="section.titlepage.recto.style">
 <xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -2730,7 +2729,7 @@
 </xsl:template>
 
 <xsl:template name="sect1.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect1.titlepage.before.recto"/>
       <xsl:call-template name="sect1.titlepage.recto"/>
@@ -2778,85 +2777,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect1.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect1.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -2925,7 +2924,7 @@
 </xsl:template>
 
 <xsl:template name="sect2.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect2.titlepage.before.recto"/>
       <xsl:call-template name="sect2.titlepage.recto"/>
@@ -2973,85 +2972,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect2.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect2.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -3120,7 +3119,7 @@
 </xsl:template>
 
 <xsl:template name="sect3.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect3.titlepage.before.recto"/>
       <xsl:call-template name="sect3.titlepage.recto"/>
@@ -3168,85 +3167,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect3.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect3.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -3315,7 +3314,7 @@
 </xsl:template>
 
 <xsl:template name="sect4.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect4.titlepage.before.recto"/>
       <xsl:call-template name="sect4.titlepage.recto"/>
@@ -3363,85 +3362,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect4.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect4.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -3510,7 +3509,7 @@
 </xsl:template>
 
 <xsl:template name="sect5.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="sect5.titlepage.before.recto"/>
       <xsl:call-template name="sect5.titlepage.recto"/>
@@ -3558,85 +3557,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sect5.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sect5.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -3723,7 +3722,7 @@
 </xsl:template>
 
 <xsl:template name="simplesect.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="simplesect.titlepage.before.recto"/>
       <xsl:call-template name="simplesect.titlepage.recto"/>
@@ -3771,85 +3770,85 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="simplesect.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="simplesect.titlepage.recto.style">
 <xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -3859,6 +3858,9 @@
     <xsl:when test="d:topicinfo/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:title"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:title">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:title"/>
+    </xsl:when>
     <xsl:when test="d:info/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:title"/>
     </xsl:when>
@@ -3871,6 +3873,9 @@
     <xsl:when test="d:topicinfo/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:subtitle"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:subtitle">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/>
+    </xsl:when>
     <xsl:when test="d:info/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:subtitle"/>
     </xsl:when>
@@ -3894,7 +3899,7 @@
 </xsl:template>
 
 <xsl:template name="topic.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="topic.titlepage.before.recto"/>
       <xsl:call-template name="topic.titlepage.recto"/>
@@ -3942,19 +3947,19 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="topic.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="topic.titlepage.recto.style" font-weight="bold" font-size="17.28pt" space-before="1em" space-after="1em" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="topic.titlepage.recto.style" font-weight="bold" font-size="17.28pt" space-before="1em" space-after="1em" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="topic.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="topic.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="topic.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="topic.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="topic.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="bibliography.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="bibliography.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="bibliography.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:bibliography[1]"/>
 </xsl:call-template></fo:block>
@@ -3991,7 +3996,7 @@
 </xsl:template>
 
 <xsl:template name="bibliography.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="bibliography.titlepage.before.recto"/>
       <xsl:call-template name="bibliography.titlepage.recto"/>
@@ -4039,13 +4044,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="bibliography.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="bibliography.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="bibliography.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="bibliography.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="bibliography.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="bibliography.titlepage.recto.style">
 <xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -4099,7 +4104,7 @@
 </xsl:template>
 
 <xsl:template name="bibliodiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="bibliodiv.titlepage.before.recto"/>
       <xsl:call-template name="bibliodiv.titlepage.recto"/>
@@ -4147,7 +4152,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="bibliodiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
+<fo:block xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:bibliodiv[1]"/>
 </xsl:call-template>
@@ -4155,19 +4160,19 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="bibliodiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="bibliodiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="bibliodiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="bibliodiv.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="bibliodiv.titlepage.recto.style">
 <xsl:apply-templates select="." mode="bibliodiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="glossary.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="glossary.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="glossary.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:glossary[1]"/>
 </xsl:call-template></fo:block>
@@ -4204,7 +4209,7 @@
 </xsl:template>
 
 <xsl:template name="glossary.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="glossary.titlepage.before.recto"/>
       <xsl:call-template name="glossary.titlepage.recto"/>
@@ -4252,13 +4257,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="glossary.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="glossary.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="glossary.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="glossary.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="glossary.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="glossary.titlepage.recto.style">
 <xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -4312,7 +4317,7 @@
 </xsl:template>
 
 <xsl:template name="glossdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="glossdiv.titlepage.before.recto"/>
       <xsl:call-template name="glossdiv.titlepage.recto"/>
@@ -4360,7 +4365,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="glossdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="glossdiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
+<fo:block xsl:use-attribute-sets="glossdiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:glossdiv[1]"/>
 </xsl:call-template>
@@ -4368,19 +4373,19 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="glossdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="glossdiv.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="glossdiv.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="glossdiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="glossdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="glossdiv.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="glossdiv.titlepage.recto.style">
 <xsl:apply-templates select="." mode="glossdiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="index.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="index.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="index.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:index[1]"/>
 <xsl:with-param name="pagewide" select="1"/>
@@ -4418,7 +4423,7 @@
 </xsl:template>
 
 <xsl:template name="index.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="index.titlepage.before.recto"/>
       <xsl:call-template name="index.titlepage.recto"/>
@@ -4466,19 +4471,19 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="index.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="index.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="index.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="index.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="index.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="index.titlepage.recto.style">
 <xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="indexdiv.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="indexdiv.titlepage.recto.style">
+  <fo:block xsl:use-attribute-sets="indexdiv.titlepage.recto.style">
 <xsl:call-template name="indexdiv.title">
 <xsl:with-param name="title" select="d:title"/>
 </xsl:call-template></fo:block>
@@ -4515,7 +4520,7 @@
 </xsl:template>
 
 <xsl:template name="indexdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="indexdiv.titlepage.before.recto"/>
       <xsl:call-template name="indexdiv.titlepage.recto"/>
@@ -4563,19 +4568,19 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="indexdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="indexdiv.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="indexdiv.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="indexdiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="indexdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="indexdiv.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="indexdiv.titlepage.recto.style">
 <xsl:apply-templates select="." mode="indexdiv.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="setindex.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="setindex.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="setindex.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:setindex[1]"/>
 <xsl:with-param name="pagewide" select="1"/>
@@ -4613,7 +4618,7 @@
 </xsl:template>
 
 <xsl:template name="setindex.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="setindex.titlepage.before.recto"/>
       <xsl:call-template name="setindex.titlepage.recto"/>
@@ -4661,19 +4666,19 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="setindex.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="setindex.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="setindex.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="setindex.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="setindex.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="setindex.titlepage.recto.style">
 <xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="colophon.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="colophon.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
+  <fo:block xsl:use-attribute-sets="colophon.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:colophon[1]"/>
 </xsl:call-template></fo:block>
@@ -4710,7 +4715,7 @@
 </xsl:template>
 
 <xsl:template name="colophon.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="colophon.titlepage.before.recto"/>
       <xsl:call-template name="colophon.titlepage.recto"/>
@@ -4758,13 +4763,13 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="colophon.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="colophon.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="colophon.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="colophon.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="colophon.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="colophon.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="colophon.titlepage.recto.style">
 <xsl:apply-templates select="." mode="colophon.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -4818,7 +4823,7 @@
 </xsl:template>
 
 <xsl:template name="sidebar.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="sidebar.titlepage.before.recto"/>
       <xsl:call-template name="sidebar.titlepage.recto"/>
@@ -4866,19 +4871,19 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="sidebar.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}" font-weight="bold">
+<fo:block xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}" font-weight="bold">
 <xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="sidebar.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}">
+<fo:block xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}">
 <xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="sidebar.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="sidebar.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="sidebar.titlepage.recto.style">
 <xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
@@ -4965,7 +4970,7 @@
 </xsl:template>
 
 <xsl:template name="qandaset.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; font-family="{$title.fontset}">
+  <fo:block font-family="{$title.fontset}">
     <xsl:variable name="recto.content">
       <xsl:call-template name="qandaset.titlepage.before.recto"/>
       <xsl:call-template name="qandaset.titlepage.recto"/>
@@ -5013,7 +5018,7 @@
 </xsl:template>
 
 <xsl:template match="d:title" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
 <xsl:call-template name="component.title">
 <xsl:with-param name="node" select="ancestor-or-self::d:qandaset[1]"/>
 </xsl:call-template>
@@ -5021,85 +5026,85 @@
 </xsl:template>
 
 <xsl:template match="d:subtitle" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:corpauthor" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:authorgroup" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:author" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:othercredit" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:releaseinfo" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:copyright" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:legalnotice" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:pubdate" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revision" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:revhistory" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:abstract" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template match="d:itermset" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="qandaset.titlepage.recto.style">
+<fo:block xsl:use-attribute-sets="qandaset.titlepage.recto.style">
 <xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
 </fo:block>
 </xsl:template>
 
 <xsl:template name="table.of.contents.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'TableofContents'"/>
 </xsl:call-template></fo:block>
@@ -5118,7 +5123,7 @@
 </xsl:template>
 
 <xsl:template name="table.of.contents.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="table.of.contents.titlepage.before.recto"/>
       <xsl:call-template name="table.of.contents.titlepage.recto"/>
@@ -5166,7 +5171,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.tables.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofTables'"/>
 </xsl:call-template></fo:block>
@@ -5185,7 +5190,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.tables.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="list.of.tables.titlepage.before.recto"/>
       <xsl:call-template name="list.of.tables.titlepage.recto"/>
@@ -5233,7 +5238,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.figures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofFigures'"/>
 </xsl:call-template></fo:block>
@@ -5252,7 +5257,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.figures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="list.of.figures.titlepage.before.recto"/>
       <xsl:call-template name="list.of.figures.titlepage.recto"/>
@@ -5300,7 +5305,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.examples.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofExamples'"/>
 </xsl:call-template></fo:block>
@@ -5319,7 +5324,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.examples.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="list.of.examples.titlepage.before.recto"/>
       <xsl:call-template name="list.of.examples.titlepage.recto"/>
@@ -5367,7 +5372,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.equations.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofEquations'"/>
 </xsl:call-template></fo:block>
@@ -5386,7 +5391,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.equations.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="list.of.equations.titlepage.before.recto"/>
       <xsl:call-template name="list.of.equations.titlepage.recto"/>
@@ -5434,7 +5439,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.procedures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofProcedures'"/>
 </xsl:call-template></fo:block>
@@ -5453,7 +5458,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.procedures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="list.of.procedures.titlepage.before.recto"/>
       <xsl:call-template name="list.of.procedures.titlepage.recto"/>
@@ -5501,7 +5506,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.unknowns.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofUnknown'"/>
 </xsl:call-template></fo:block>
@@ -5520,7 +5525,7 @@
 </xsl:template>
 
 <xsl:template name="list.of.unknowns.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="list.of.unknowns.titlepage.before.recto"/>
       <xsl:call-template name="list.of.unknowns.titlepage.recto"/>
@@ -5568,7 +5573,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.tables.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="component.list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="component.list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofTables'"/>
 </xsl:call-template></fo:block>
@@ -5587,7 +5592,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.tables.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="component.list.of.tables.titlepage.before.recto"/>
       <xsl:call-template name="component.list.of.tables.titlepage.recto"/>
@@ -5635,7 +5640,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.figures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="component.list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="component.list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofFigures'"/>
 </xsl:call-template></fo:block>
@@ -5654,7 +5659,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.figures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="component.list.of.figures.titlepage.before.recto"/>
       <xsl:call-template name="component.list.of.figures.titlepage.recto"/>
@@ -5702,7 +5707,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.examples.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="component.list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="component.list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofExamples'"/>
 </xsl:call-template></fo:block>
@@ -5721,7 +5726,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.examples.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="component.list.of.examples.titlepage.before.recto"/>
       <xsl:call-template name="component.list.of.examples.titlepage.recto"/>
@@ -5769,7 +5774,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.equations.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="component.list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="component.list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofEquations'"/>
 </xsl:call-template></fo:block>
@@ -5788,7 +5793,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.equations.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="component.list.of.equations.titlepage.before.recto"/>
       <xsl:call-template name="component.list.of.equations.titlepage.recto"/>
@@ -5836,7 +5841,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.procedures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="component.list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="component.list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofProcedures'"/>
 </xsl:call-template></fo:block>
@@ -5855,7 +5860,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.procedures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="component.list.of.procedures.titlepage.before.recto"/>
       <xsl:call-template name="component.list.of.procedures.titlepage.recto"/>
@@ -5903,7 +5908,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.unknowns.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"; xsl:use-attribute-sets="component.list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
+  <fo:block xsl:use-attribute-sets="component.list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1em" space-before.maximum="1em" space-after="0.5em" margin-left="{$title.margin.left}" font-size="12pt" font-weight="bold" font-family="{$title.fontset}">
 <xsl:call-template name="gentext">
 <xsl:with-param name="key" select="'ListofUnknown'"/>
 </xsl:call-template></fo:block>
@@ -5922,7 +5927,7 @@
 </xsl:template>
 
 <xsl:template name="component.list.of.unknowns.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="component.list.of.unknowns.titlepage.before.recto"/>
       <xsl:call-template name="component.list.of.unknowns.titlepage.recto"/>
Index: html/titlepage.templates.xsl
===================================================================
--- html/titlepage.templates.xsl	(working copy)
+++ html/titlepage.templates.xsl	(working copy)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:d="http://docbook.org/ns/docbook";
-xmlns:exsl="http://exslt.org/common"; version="1.0" exclude-result-prefixes="exsl d">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; xmlns:d="http://docbook.org/ns/docbook"; version="1.0" exclude-result-prefixes="exsl d">
 
-<!-- This stylesheet was created by template/titlepage.xsl-->
+<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
 
 <xsl:template name="article.titlepage.recto">
   <xsl:choose>
@@ -1830,6 +1829,9 @@
     <xsl:when test="d:topicinfo/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:title"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:title">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:title"/>
+    </xsl:when>
     <xsl:when test="d:info/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:title"/>
     </xsl:when>
@@ -1842,6 +1844,9 @@
     <xsl:when test="d:topicinfo/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:subtitle"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:subtitle">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/>
+    </xsl:when>
     <xsl:when test="d:info/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:subtitle"/>
     </xsl:when>
@@ -1851,26 +1856,37 @@
   </xsl:choose>
 
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:corpauthor"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:authorgroup"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:author"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:author"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:author"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:othercredit"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:othercredit"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:releaseinfo"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:copyright"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:copyright"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:legalnotice"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:pubdate"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:pubdate"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:revision"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:revision"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:revhistory"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:revhistory"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:abstract"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:abstract"/>
 </xsl:template>
 
Index: slides/fo/plain-titlepage.xsl
===================================================================
--- slides/fo/plain-titlepage.xsl	(working copy)
+++ slides/fo/plain-titlepage.xsl	(working copy)
@@ -1,52 +1,52 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; version="1.0" exclude-result-prefixes="exsl">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; xmlns:d="http://docbook.org/ns/docbook"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:dbs="http://docbook.org/ns/docbook-slides"; version="1.0" exclude-result-prefixes="exsl d">
 
-<!-- This stylesheet was created by template/titlepage.xsl-->
+<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
 
 <xsl:template name="slides.titlepage.recto">
   <xsl:choose>
-    <xsl:when test="slidesinfo/title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/title"/>
+    <xsl:when test="dbs:slidesinfo/d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:title"/>
     </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/title"/>
+    <xsl:when test="d:docinfo/d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:title"/>
     </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/title"/>
+    <xsl:when test="d:info/d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:title"/>
     </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="title"/>
+    <xsl:when test="d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:title"/>
     </xsl:when>
   </xsl:choose>
 
   <xsl:choose>
-    <xsl:when test="slidesinfo/subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/subtitle"/>
+    <xsl:when test="dbs:slidesinfo/d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:subtitle"/>
     </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    <xsl:when test="d:docinfo/d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/>
     </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/subtitle"/>
+    <xsl:when test="d:info/d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:subtitle"/>
     </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="subtitle"/>
+    <xsl:when test="d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:subtitle"/>
     </xsl:when>
   </xsl:choose>
 
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/corpauthor"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/authorgroup"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/author"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/pubdate"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/pubdate"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:corpauthor"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:authorgroup"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:author"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:author"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:author"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:pubdate"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:pubdate"/>
 </xsl:template>
 
 <xsl:template name="slides.titlepage.verso">
@@ -62,7 +62,7 @@
 </xsl:template>
 
 <xsl:template name="slides.titlepage">
-  <block>
+  <fo:block>
     <xsl:variable name="recto.content">
       <xsl:call-template name="slides.titlepage.before.recto"/>
       <xsl:call-template name="slides.titlepage.recto"/>
@@ -76,7 +76,7 @@
       </xsl:choose>
     </xsl:variable>
     <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <block><xsl:copy-of select="$recto.content"/></block>
+      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
     </xsl:if>
     <xsl:variable name="verso.content">
       <xsl:call-template name="slides.titlepage.before.verso"/>
@@ -91,10 +91,10 @@
       </xsl:choose>
     </xsl:variable>
     <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <block><xsl:copy-of select="$verso.content"/></block>
+      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
     </xsl:if>
     <xsl:call-template name="slides.titlepage.separator"/>
-  </block>
+  </fo:block>
 </xsl:template>
 
 <xsl:template match="*" mode="slides.titlepage.recto.mode">
@@ -109,41 +109,41 @@
   <xsl:apply-templates select="." mode="titlepage.mode"/>
 </xsl:template>
 
-<xsl:template match="title" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.title.properties">
+<xsl:template match="d:title" mode="slides.titlepage.recto.auto.mode">
+<fo:block xsl:use-attribute-sets="slides.titlepage.title.properties">
 <xsl:call-template name="presentation.title">
 </xsl:call-template>
-</block>
+</fo:block>
 </xsl:template>
 
-<xsl:template match="subtitle" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.subtitle.properties">
+<xsl:template match="d:subtitle" mode="slides.titlepage.recto.auto.mode">
+<fo:block xsl:use-attribute-sets="slides.titlepage.subtitle.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
-<xsl:template match="corpauthor" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.corpauthor.properties">
+<xsl:template match="d:corpauthor" mode="slides.titlepage.recto.auto.mode">
+<fo:block xsl:use-attribute-sets="slides.titlepage.corpauthor.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
-<xsl:template match="authorgroup" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.authorgroup.properties">
+<xsl:template match="d:authorgroup" mode="slides.titlepage.recto.auto.mode">
+<fo:block xsl:use-attribute-sets="slides.titlepage.authorgroup.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
-<xsl:template match="author" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.author.properties">
+<xsl:template match="d:author" mode="slides.titlepage.recto.auto.mode">
+<fo:block xsl:use-attribute-sets="slides.titlepage.author.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
-<xsl:template match="pubdate" mode="slides.titlepage.recto.auto.mode">
-<block xsl:use-attribute-sets="slides.titlepage.pubdate.properties">
+<xsl:template match="d:pubdate" mode="slides.titlepage.recto.auto.mode">
+<fo:block xsl:use-attribute-sets="slides.titlepage.pubdate.properties">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
-</block>
+</fo:block>
 </xsl:template>
 
 </xsl:stylesheet>
Index: slides/xhtml/plain-titlepage.xsl
===================================================================
--- slides/xhtml/plain-titlepage.xsl	(working copy)
+++ slides/xhtml/plain-titlepage.xsl	(working copy)
@@ -1,49 +1,49 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; version="1.0" exclude-result-prefixes="exsl">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; xmlns:d="http://docbook.org/ns/docbook"; xmlns="http://www.w3.org/1999/xhtml"; xmlns:dbs="http://docbook.org/ns/docbook-slides"; version="1.0" exclude-result-prefixes="exsl d">
 
-<!-- This stylesheet was created by template/titlepage.xsl-->
+<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
 
 <xsl:template name="slides.titlepage.recto">
   <xsl:choose>
-    <xsl:when test="slidesinfo/title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/title"/>
+    <xsl:when test="dbs:slidesinfo/d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:title"/>
     </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/title"/>
+    <xsl:when test="d:docinfo/d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:title"/>
     </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/title"/>
+    <xsl:when test="d:info/d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:title"/>
     </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="title"/>
+    <xsl:when test="d:title">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:title"/>
     </xsl:when>
   </xsl:choose>
 
   <xsl:choose>
-    <xsl:when test="slidesinfo/subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/subtitle"/>
+    <xsl:when test="dbs:slidesinfo/d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:subtitle"/>
     </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
+    <xsl:when test="d:docinfo/d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/>
     </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/subtitle"/>
+    <xsl:when test="d:info/d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:subtitle"/>
     </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="subtitle"/>
+    <xsl:when test="d:subtitle">
+      <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:subtitle"/>
     </xsl:when>
   </xsl:choose>
 
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/corpauthor"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/authorgroup"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="slidesinfo/author"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="info/author"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:corpauthor"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:authorgroup"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="dbs:slidesinfo/d:author"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:docinfo/d:author"/>
+  <xsl:apply-templates mode="slides.titlepage.recto.auto.mode" select="d:info/d:author"/>
 </xsl:template>
 
 <xsl:template name="slides.titlepage.verso">
@@ -106,31 +106,31 @@
   <xsl:apply-templates select="." mode="titlepage.mode"/>
 </xsl:template>
 
-<xsl:template match="title" mode="slides.titlepage.recto.auto.mode">
+<xsl:template match="d:title" mode="slides.titlepage.recto.auto.mode">
 <div xsl:use-attribute-sets="slides.titlepage.recto.style">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
-<xsl:template match="subtitle" mode="slides.titlepage.recto.auto.mode">
+<xsl:template match="d:subtitle" mode="slides.titlepage.recto.auto.mode">
 <div xsl:use-attribute-sets="slides.titlepage.recto.style">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
-<xsl:template match="corpauthor" mode="slides.titlepage.recto.auto.mode">
+<xsl:template match="d:corpauthor" mode="slides.titlepage.recto.auto.mode">
 <div xsl:use-attribute-sets="slides.titlepage.recto.style">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
-<xsl:template match="authorgroup" mode="slides.titlepage.recto.auto.mode">
+<xsl:template match="d:authorgroup" mode="slides.titlepage.recto.auto.mode">
 <div xsl:use-attribute-sets="slides.titlepage.recto.style">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
 </div>
 </xsl:template>
 
-<xsl:template match="author" mode="slides.titlepage.recto.auto.mode">
+<xsl:template match="d:author" mode="slides.titlepage.recto.auto.mode">
 <div xsl:use-attribute-sets="slides.titlepage.recto.style">
 <xsl:apply-templates select="." mode="slides.titlepage.recto.mode"/>
 </div>
Index: webhelp/xsl/titlepage.templates.xsl
===================================================================
--- webhelp/xsl/titlepage.templates.xsl	(working copy)
+++ webhelp/xsl/titlepage.templates.xsl	(working copy)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:d="http://docbook.org/ns/docbook";
-xmlns:exsl="http://exslt.org/common"; version="1.0" exclude-result-prefixes="exsl d">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; xmlns:d="http://docbook.org/ns/docbook"; version="1.0" exclude-result-prefixes="exsl d">
 
-<!-- This stylesheet was created by template/titlepage.xsl-->
+<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
 
 <xsl:template name="article.titlepage.recto">
   <xsl:choose>
@@ -1760,6 +1759,9 @@
     <xsl:when test="d:topicinfo/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:title"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:title">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:title"/>
+    </xsl:when>
     <xsl:when test="d:info/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:title"/>
     </xsl:when>
@@ -1772,6 +1774,9 @@
     <xsl:when test="d:topicinfo/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:subtitle"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:subtitle">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/>
+    </xsl:when>
     <xsl:when test="d:info/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:subtitle"/>
     </xsl:when>
@@ -1781,24 +1786,34 @@
   </xsl:choose>
 
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:corpauthor"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:authorgroup"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:author"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:author"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:author"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:othercredit"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:othercredit"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:releaseinfo"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:copyright"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:copyright"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:legalnotice"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:pubdate"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:pubdate"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:revision"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:revision"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:revhistory"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:revhistory"/>
 </xsl:template>
 
Index: xhtml/titlepage.templates.xsl
===================================================================
--- xhtml/titlepage.templates.xsl	(working copy)
+++ xhtml/titlepage.templates.xsl	(working copy)
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:d="http://docbook.org/ns/docbook";
-xmlns:exsl="http://exslt.org/common"; xmlns="http://www.w3.org/1999/xhtml"; version="1.0" exclude-result-prefixes="exsl d">
+<?xml version="1.0"?>
 
-<!-- This stylesheet was created by template/titlepage.xsl-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:exsl="http://exslt.org/common"; xmlns:d="http://docbook.org/ns/docbook"; xmlns="http://www.w3.org/1999/xhtml"; version="1.0" exclude-result-prefixes="exsl d">
 
+<!-- This stylesheet was created by template/titlepage.xsl; do not edit it by hand. -->
+
 <xsl:template name="article.titlepage.recto">
   <xsl:choose>
     <xsl:when test="d:articleinfo/d:title">
@@ -1831,6 +1829,9 @@
     <xsl:when test="d:topicinfo/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:title"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:title">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:title"/>
+    </xsl:when>
     <xsl:when test="d:info/d:title">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:title"/>
     </xsl:when>
@@ -1843,6 +1844,9 @@
     <xsl:when test="d:topicinfo/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:subtitle"/>
     </xsl:when>
+    <xsl:when test="d:docinfo/d:subtitle">
+      <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/>
+    </xsl:when>
     <xsl:when test="d:info/d:subtitle">
       <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:subtitle"/>
     </xsl:when>
@@ -1852,26 +1856,37 @@
   </xsl:choose>
 
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:corpauthor"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:authorgroup"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:author"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:author"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:author"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:othercredit"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:othercredit"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:releaseinfo"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:copyright"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:copyright"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:legalnotice"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:pubdate"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:pubdate"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:revision"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:revision"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:revhistory"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:revhistory"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:topicinfo/d:abstract"/>
+  <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/>
   <xsl:apply-templates mode="topic.titlepage.recto.auto.mode" select="d:info/d:abstract"/>
 </xsl:template>
 
@@ -4003,3 +4018,4 @@
 </xsl:template>
 
 </xsl:stylesheet>
+
Index: template/titlepage.xsl
===================================================================
--- template/titlepage.xsl	(working copy)
+++ template/titlepage.xsl	(working copy)
@@ -21,15 +21,6 @@
 
 <!-- ==================================================================== -->
 
-<!-- Namespace for wrapper elements. Please set it for XHTML. -->
-<xsl:param name="ns">
-  <!-- Guess correct setting for cases where parameter is not supplied -->
-  <xsl:choose>
-    <xsl:when test="//*[namespace-uri() = 'http://www.w3.org/1999/XSL/Format']">http://www.w3.org/1999/XSL/Format</xsl:when>
-    <xsl:when test="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']">http://www.w3.org/1999/xhtml</xsl:when>
-  </xsl:choose>
-</xsl:param>
-
 <xsl:template match="/">
   <xsl:text>&#x0a;</xsl:text>
   <xsl:apply-templates/>
@@ -73,7 +64,215 @@
 <xsl:strip-space elements="xsl:* t:*"/>
 
 <!-- ==================================================================== -->
+  
+<doc:template name="get.namespace.prefix">
+<refpurpose>Obtain namespace prefix for an element identified by a string containing qualified name</refpurpose>
+<refdescription>
+<para>This template interprets a string containing a qualified name of an element
+and returns the namespace prefix, if any.</para>
+<para>Element name could be an XPath expression starting with the element name; this
+template will first determine if the occurrence of a colon is preceded by a valid
+NCName, assuming only ASCII characters.</para>
+</refdescription>
+</doc:template>
+  
+<xsl:template name="get.namespace.prefix">
+  <xsl:param name="element.name"/>
+  
+  <xsl:if test="contains($element.name, ':') and
+    translate(substring-before($element.name, ':'),
+    'ABCDEFGGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789','') = ''">
+    <xsl:value-of select="substring-before($element.name, ':')"/>
+  </xsl:if>
+</xsl:template>
+  
+<doc:template name="get.namespace.uri">
+<refpurpose>Obtain URI for an element identified by a string containing qualified name</refpurpose>
+<refdescription>
+<para>This template interprets a string containing a qualified name of an element
+and returns the namespace URI for that element, looking for namespace prefixes
+starting from a reference node.</para>
+</refdescription>
+</doc:template>
+  
+<xsl:template name="get.namespace.uri">
+  <xsl:param name="element.name"/>
+  <xsl:param name="reference.node" select="."/>
+  <xsl:param name="missing.namespace.fatal" select="not(/t:templates/@t:missing-namespace-fatal = 'no')"/>
+  
+  <xsl:variable name="ns.prefix">
+    <xsl:call-template name="get.namespace.prefix">
+      <xsl:with-param name="element.name" select="$element.name"/>
+    </xsl:call-template>
+  </xsl:variable>
 
+  <xsl:choose>
+    <xsl:when test="$reference.node/ancestor-or-self::*/namespace::*[local-name(.) = $ns.prefix]">
+      <xsl:value-of select="$reference.node/ancestor-or-self::*/namespace::*[local-name(.) = $ns.prefix]"/>
+    </xsl:when>
+    <xsl:when test="$missing.namespace.fatal">
+      <xsl:message terminate="yes">
+        <xsl:text>Namespace '</xsl:text>
+        <xsl:value-of select="$ns.prefix"/>
+        <xsl:text>' not defined for t:element="</xsl:text>
+        <xsl:value-of select="$element.name"/>
+        <xsl:text>"</xsl:text>
+      </xsl:message>
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+  
+<doc:template name="t.element.name">
+<refpurpose>Output the name for root element</refpurpose>
+
+<refdescription>
+<para>This template outputs the name for the t:element of the current
+titlepage template. Currently, it outputs the name as unqualified name.
+If it ever results in a conflict between DocBook element name and some
+extension (such as DocBook slides, or something else), it could be
+customized to output a namespace-specific prefix.</para>
+</refdescription>
+</doc:template>
+  
+<xsl:template name="t.element.name">
+  <xsl:param name="a" select="ancestor-or-self::t:titlepage/@t:element"/>
+  <xsl:choose>
+    <xsl:when test="contains($a, ':')">
+      <xsl:value-of select="substring-after($a, ':')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$a"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<doc:template name="t.element.info">
+<refpurpose>Output qualified name for meta-information element</refpurpose>
+<refdescription>
+<para>This template appends 'info' to the element name to produce the name
+for *info container element; then outputs a properly qualified name.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template name="t.element.info">
+  <xsl:variable name="ns.uri">
+    <xsl:call-template name="get.namespace.uri">
+      <xsl:with-param name="element.name" select="ancestor::t:titlepage/@t:element"/>
+      <xsl:with-param name="reference.node" select="ancestor::t:titlepage"/>
+    </xsl:call-template>
+  </xsl:variable>
+  
+  <xsl:choose>
+    <xsl:when test="$ns.uri = 'http://docbook.org/ns/docbook'">
+      <xsl:variable name="local.name">
+        <xsl:choose>
+          <xsl:when test="contains(ancestor::t:titlepage/@t:element, ':')">
+            <xsl:value-of select="substring-after(ancestor::t:titlepage/@t:element, ':')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:value-of select="concat('d:', $local.name, 'info')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <!--
+        The name is already qualified. Template document must specify the prefix in
+        the t:templates/@copy-namespaces. We could verify it here, but let's not
+        overcomplicate the templates. Assume it follows DocBook4 naming convention,
+        *info.
+      -->
+      <xsl:value-of select="concat(ancestor::t:titlepage/@t:element, 'info')"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<doc:template name="t.element.altinfo">
+<refpurpose>Output alternative qualified name for meta-information element</refpurpose>
+<refdescription>
+<para>This template handles elements that have historically had containers with different
+names.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template name="t.element.altinfo">
+  <xsl:variable name="ns.uri">
+    <xsl:call-template name="get.namespace.uri">
+      <xsl:with-param name="element.name" select="ancestor::t:titlepage/@t:element"/>
+      <xsl:with-param name="reference.node" select="ancestor::t:titlepage"/>
+    </xsl:call-template>
+  </xsl:variable>
+  
+  <xsl:choose>
+    <xsl:when test="$ns.uri = 'http://docbook.org/ns/docbook'">
+      <xsl:variable name="local.name">
+        <xsl:choose>
+          <xsl:when test="contains(ancestor::t:titlepage/@t:element, ':')">
+            <xsl:value-of select="substring-after(ancestor::t:titlepage/@t:element, ':')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+
+      <xsl:choose>
+        <xsl:when test="$local.name='article'">d:artheader</xsl:when>
+        <xsl:when test="$local.name='qandaset'">d:blockinfo</xsl:when>
+        <xsl:when test="$local.name='section'"></xsl:when>
+        <xsl:when test="$local.name='sect1'"></xsl:when>
+        <xsl:when test="$local.name='sect2'"></xsl:when>
+        <xsl:when test="$local.name='sect3'"></xsl:when>
+        <xsl:when test="$local.name='sect4'"></xsl:when>
+        <xsl:when test="$local.name='sect5'"></xsl:when>
+        <xsl:when test="$local.name='book'"></xsl:when>
+        <xsl:when test="$local.name='set'"></xsl:when>
+        <xsl:otherwise>d:docinfo</xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>d:docinfo</xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+  <doc:template name="output.wrapper">
+<refpurpose>Output the wrapper element</refpurpose>
+
+<refdescription>
+<para>This template locates the namespace for the defined wrapper element
+and output it within that namespace. The content of the element is passed
+via the content argument.</para>
+<para>The attribute sets to use for the wrapper element and the element to
+copy non-template attributes from are also passed as arguments.</para>
+</refdescription>
+</doc:template>
+
+<xsl:template name="output.wrapper">
+  <xsl:param name="wrapper" select="ancestor-or-self::t:titlepage[@t:wrapper]"/>
+  <xsl:param name="attr.copy.from" select="."/>
+  <xsl:param name="attr.sets" select="''"/>
+  <xsl:param name="content"/>
+  
+  <xsl:variable name="ns.uri">
+    <xsl:call-template name="get.namespace.uri">
+      <xsl:with-param name="element.name" select="$wrapper/@t:wrapper"/>
+      <xsl:with-param name="reference.node" select="$wrapper"></xsl:with-param>
+    </xsl:call-template>
+  </xsl:variable>
+  
+  <xsl:element name="{$wrapper/@t:wrapper}" namespace="{$ns.uri}">
+    <xsl:if test="$attr.sets != ''">
+      <xsl:attribute name="xsl:use-attribute-sets"><xsl:value-of select="$attr.sets"/></xsl:attribute>
+    </xsl:if>
+    <xsl:for-each select="$attr.copy.from/@*">
+      <xsl:if test="not(starts-with(namespace-uri(.), 'http://nwalsh.com/docbook/xsl/template/1.0'))">
+        <xsl:copy/>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:copy-of select="$content"/>
+  </xsl:element>
+</xsl:template>
+
 <doc:template match="t:templates" xmlns="" id="templates">
 <refpurpose>Construct a stylesheet for the templates provided</refpurpose>
 
@@ -85,6 +284,11 @@
 <para>If the <literal>t:templates</literal> element has a
 <literal>base-stylesheet</literal> attribute, an
 <literal>xsl:import</literal> statement is constructed for it.</para>
+
+<para>If the <literal>t:templates</literal> element has a
+<literal>copy-namespaces</literal> attribute, it is interpreted as a
+space-separated list of namespace prefixes to be copied from the template
+to the resulting stylesheet. Default namespace is always copied.</para>
 </refdescription>
 </doc:template>
 
@@ -99,6 +303,14 @@
       <xsl:copy/>
     </xsl:for-each>
 
+    <!-- Two spaces at the beginning of $copied.ns so that the default namespace will be copied -->
+    <xsl:variable name="copied.ns" select="concat('  ',@t:copy-namespaces,' ')"/>
+    <xsl:for-each select="namespace::*">
+      <xsl:if test="contains($copied.ns,concat(' ',local-name(.),' '))">
+        <xsl:copy/>
+      </xsl:if>
+    </xsl:for-each>
+
     <xsl:attribute name="version">1.0</xsl:attribute>
     <xsl:attribute name="exclude-result-prefixes">exsl d</xsl:attribute>
 
@@ -196,148 +408,151 @@
   <!-- process the children to make the templates for the content,
        separator, and before elements -->
   <xsl:apply-templates/>
-
+  
   <!-- output the title page template -->
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="@t:element"/>
+      <xsl:call-template name="t.element.name"/>
       <xsl:text>.titlepage</xsl:text>
     </xsl:attribute>
     <xsl:text>&#xA;  </xsl:text>
-    <xsl:element name="{@t:wrapper}" namespace="{$ns}">
-      <xsl:apply-templates select="@*" mode="copy.literal.atts"/>
-      <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:variable">
-        <xsl:attribute name="name">recto.content</xsl:attribute>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="xsl:call-template">
-          <xsl:attribute name="name">
-            <xsl:value-of select="@t:element"/>
-            <xsl:text>.titlepage.before.recto</xsl:text>
-          </xsl:attribute>
+    <xsl:call-template name="output.wrapper">
+      <xsl:with-param name="content">
+        <xsl:text>&#xA;    </xsl:text>
+        <xsl:element name="xsl:variable">
+          <xsl:attribute name="name">recto.content</xsl:attribute>
+          <xsl:text>&#xA;      </xsl:text>
+          <xsl:element name="xsl:call-template">
+            <xsl:attribute name="name">
+              <xsl:call-template name="t.element.name"/>
+              <xsl:text>.titlepage.before.recto</xsl:text>
+            </xsl:attribute>
+          </xsl:element>
+          <xsl:text>&#xA;      </xsl:text>
+          <xsl:element name="xsl:call-template">
+            <xsl:attribute name="name">
+              <xsl:call-template name="t.element.name"/>
+              <xsl:text>.titlepage.recto</xsl:text>
+            </xsl:attribute>
+          </xsl:element>
+          <xsl:text>&#xA;    </xsl:text>
         </xsl:element>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="xsl:call-template">
-          <xsl:attribute name="name">
-            <xsl:value-of select="@t:element"/>
-            <xsl:text>.titlepage.recto</xsl:text>
-          </xsl:attribute>
-        </xsl:element>
         <xsl:text>&#xA;    </xsl:text>
-      </xsl:element>
-      <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:variable">
-        <xsl:attribute name="name">recto.elements.count</xsl:attribute>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="xsl:choose">
-          <xsl:text>&#xA;        </xsl:text>
-          <xsl:element name="xsl:when">
-            <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
-            <xsl:element name="xsl:value-of">
-              <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
+        <xsl:element name="xsl:variable">
+          <xsl:attribute name="name">recto.elements.count</xsl:attribute>
+          <xsl:text>&#xA;      </xsl:text>
+          <xsl:element name="xsl:choose">
+            <xsl:text>&#xA;        </xsl:text>
+            <xsl:element name="xsl:when">
+              <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
+              <xsl:element name="xsl:value-of">
+                <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
+              </xsl:element>
             </xsl:element>
-          </xsl:element>
-          <xsl:text>&#xA;        </xsl:text>
-          <xsl:element name="xsl:when">
-            <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
-            <xsl:text>&#xA;          </xsl:text>
-            <xsl:comment>Xalan quirk</xsl:comment>
-            <xsl:element name="xsl:value-of">
-              <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
+            <xsl:text>&#xA;        </xsl:text>
+            <xsl:element name="xsl:when">
+              <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
+              <xsl:text>&#xA;          </xsl:text>
+              <xsl:comment>Xalan quirk</xsl:comment>
+              <xsl:element name="xsl:value-of">
+                <xsl:attribute name="select">count(exsl:node-set($recto.content)/*)</xsl:attribute>
+              </xsl:element>
             </xsl:element>
+            <xsl:text>&#xA;        </xsl:text>
+            <xsl:element name="xsl:otherwise">
+              <xsl:text>1</xsl:text>
+            </xsl:element>
+            <xsl:text>&#xA;      </xsl:text>
           </xsl:element>
-          <xsl:text>&#xA;        </xsl:text>
-          <xsl:element name="xsl:otherwise">
-            <xsl:text>1</xsl:text>
-          </xsl:element>
+          <xsl:text>&#xA;    </xsl:text>
+        </xsl:element>
+        <xsl:text>&#xA;    </xsl:text>
+        <xsl:element name="xsl:if">
+          <xsl:attribute name="test">(normalize-space($recto.content) != '') or ($recto.elements.count > 0)</xsl:attribute>
           <xsl:text>&#xA;      </xsl:text>
+          <xsl:call-template name="output.wrapper">
+            <xsl:with-param name="attr.copy.from" select="t:titlepage-content[@t:side='recto']"/>
+            <xsl:with-param name="content">
+              <xsl:element name="xsl:copy-of">
+                <xsl:attribute name="select">$recto.content</xsl:attribute>
+              </xsl:element>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:text>&#xA;    </xsl:text>
         </xsl:element>
         <xsl:text>&#xA;    </xsl:text>
-      </xsl:element>
-      <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:if">
-        <xsl:attribute name="test">(normalize-space($recto.content) != '') or ($recto.elements.count > 0)</xsl:attribute>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="{@t:wrapper}" namespace="{$ns}">
-          <xsl:apply-templates select="t:titlepage-content[@t:side='recto']/@*"
-                               mode="copy.literal.atts"/>
-          <xsl:element name="xsl:copy-of">
-            <xsl:attribute name="select">$recto.content</xsl:attribute>
+        <xsl:element name="xsl:variable">
+          <xsl:attribute name="name">verso.content</xsl:attribute>
+          <xsl:text>&#xA;      </xsl:text>
+          <xsl:element name="xsl:call-template">
+            <xsl:attribute name="name">
+              <xsl:call-template name="t.element.name"/>
+              <xsl:text>.titlepage.before.verso</xsl:text>
+            </xsl:attribute>
           </xsl:element>
+          <xsl:text>&#xA;      </xsl:text>
+          <xsl:element name="xsl:call-template">
+            <xsl:attribute name="name">
+              <xsl:call-template name="t.element.name"/>
+              <xsl:text>.titlepage.verso</xsl:text>
+            </xsl:attribute>
+          </xsl:element>
+          <xsl:text>&#xA;    </xsl:text>
         </xsl:element>
         <xsl:text>&#xA;    </xsl:text>
-      </xsl:element>
-      <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:variable">
-        <xsl:attribute name="name">verso.content</xsl:attribute>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="xsl:call-template">
-          <xsl:attribute name="name">
-            <xsl:value-of select="@t:element"/>
-            <xsl:text>.titlepage.before.verso</xsl:text>
-          </xsl:attribute>
-        </xsl:element>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="xsl:call-template">
-          <xsl:attribute name="name">
-            <xsl:value-of select="@t:element"/>
-            <xsl:text>.titlepage.verso</xsl:text>
-          </xsl:attribute>
-        </xsl:element>
-        <xsl:text>&#xA;    </xsl:text>
-      </xsl:element>
-      <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:variable">
-        <xsl:attribute name="name">verso.elements.count</xsl:attribute>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="xsl:choose">
-          <xsl:text>&#xA;        </xsl:text>
-          <xsl:element name="xsl:when">
-            <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
-            <xsl:element name="xsl:value-of">
-              <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
+        <xsl:element name="xsl:variable">
+          <xsl:attribute name="name">verso.elements.count</xsl:attribute>
+          <xsl:text>&#xA;      </xsl:text>
+          <xsl:element name="xsl:choose">
+            <xsl:text>&#xA;        </xsl:text>
+            <xsl:element name="xsl:when">
+              <xsl:attribute name="test">function-available('exsl:node-set')</xsl:attribute>
+              <xsl:element name="xsl:value-of">
+                <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
+              </xsl:element>
             </xsl:element>
-          </xsl:element>
-          <xsl:text>&#xA;        </xsl:text>
-          <xsl:element name="xsl:when">
-            <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
-            <xsl:text>&#xA;          </xsl:text>
-            <xsl:comment>Xalan quirk</xsl:comment>
-            <xsl:element name="xsl:value-of">
-              <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
+            <xsl:text>&#xA;        </xsl:text>
+            <xsl:element name="xsl:when">
+              <xsl:attribute name="test">contains(system-property('xsl:vendor'), 'Apache Software Foundation')</xsl:attribute>
+              <xsl:text>&#xA;          </xsl:text>
+              <xsl:comment>Xalan quirk</xsl:comment>
+              <xsl:element name="xsl:value-of">
+                <xsl:attribute name="select">count(exsl:node-set($verso.content)/*)</xsl:attribute>
+              </xsl:element>
             </xsl:element>
+            <xsl:text>&#xA;        </xsl:text>
+            <xsl:element name="xsl:otherwise">
+              <xsl:text>1</xsl:text>
+            </xsl:element>
+            <xsl:text>&#xA;      </xsl:text>
           </xsl:element>
-          <xsl:text>&#xA;        </xsl:text>
-          <xsl:element name="xsl:otherwise">
-            <xsl:text>1</xsl:text>
-          </xsl:element>
+          <xsl:text>&#xA;    </xsl:text>
+        </xsl:element>
+        <xsl:text>&#xA;    </xsl:text>
+        <xsl:element name="xsl:if">
+          <xsl:attribute name="test">(normalize-space($verso.content) != '') or ($verso.elements.count > 0)</xsl:attribute>
           <xsl:text>&#xA;      </xsl:text>
+          <xsl:call-template name="output.wrapper">
+            <xsl:with-param name="attr.copy.from" select="t:titlepage-content[@t:side='verso']"/>
+            <xsl:with-param name="content">
+              <xsl:element name="xsl:copy-of">
+                <xsl:attribute name="select">$verso.content</xsl:attribute>
+              </xsl:element>
+            </xsl:with-param>
+          </xsl:call-template>
+          <xsl:text>&#xA;    </xsl:text>
         </xsl:element>
         <xsl:text>&#xA;    </xsl:text>
-      </xsl:element>
-      <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:if">
-        <xsl:attribute name="test">(normalize-space($verso.content) != '') or ($verso.elements.count > 0)</xsl:attribute>
-        <xsl:text>&#xA;      </xsl:text>
-        <xsl:element name="{@t:wrapper}" namespace="{$ns}">
-          <xsl:apply-templates select="t:titlepage-content[@t:side='verso']/@*"
-                               mode="copy.literal.atts"/>
-          <xsl:element name="xsl:copy-of">
-            <xsl:attribute name="select">$verso.content</xsl:attribute>
-          </xsl:element>
+        <xsl:element name="xsl:call-template">
+          <xsl:attribute name="name">
+            <xsl:call-template name="t.element.name"/>
+            <xsl:text>.titlepage.separator</xsl:text>
+          </xsl:attribute>
         </xsl:element>
-        <xsl:text>&#xA;    </xsl:text>
-      </xsl:element>
-      <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:call-template">
-        <xsl:attribute name="name">
-          <xsl:value-of select="@t:element"/>
-          <xsl:text>.titlepage.separator</xsl:text>
-        </xsl:attribute>
-      </xsl:element>
-      <xsl:text>&#xA;  </xsl:text>
-    </xsl:element>
+        <xsl:text>&#xA;  </xsl:text>
+      </xsl:with-param>
+    </xsl:call-template>
     <xsl:text>&#xA;</xsl:text>
   </xsl:element>
 
@@ -353,7 +568,7 @@
     <xsl:element name="xsl:template">
       <xsl:attribute name="match">*</xsl:attribute>
       <xsl:attribute name="mode">
-        <xsl:value-of select="@t:element"/>
+        <xsl:call-template name="t.element.name"/>
         <xsl:text>.titlepage.recto.mode</xsl:text>
       </xsl:attribute>
       <xsl:text>&#xA;  </xsl:text>
@@ -373,7 +588,7 @@
     <xsl:element name="xsl:template">
       <xsl:attribute name="match">*</xsl:attribute>
       <xsl:attribute name="mode">
-        <xsl:value-of select="@t:element"/>
+        <xsl:call-template name="t.element.name"/>
         <xsl:text>.titlepage.verso.mode</xsl:text>
       </xsl:attribute>
       <xsl:text>&#xA;  </xsl:text>
@@ -400,95 +615,69 @@
       <xsl:text>&#xA;&#xA;</xsl:text>
       <xsl:element name="xsl:template">
         <xsl:attribute name="match">
-          <xsl:value-of select="concat('d:', name(.))"/>
+          <xsl:value-of select="concat('d:', local-name(.))"/>
         </xsl:attribute>
         <xsl:attribute name="mode">
-          <xsl:value-of select="../../@t:element"/>
+          <xsl:call-template name="t.element.name"/>
           <xsl:text>.titlepage.</xsl:text>
           <xsl:value-of select="../@t:side"/>
           <xsl:text>.auto.mode</xsl:text>
         </xsl:attribute>
         <xsl:text>&#xA;</xsl:text>
-        <xsl:element name="{../../@t:wrapper}" namespace="{$ns}">
-          <xsl:attribute name="xsl:use-attribute-sets">
-            <xsl:value-of select="../../@t:element"/>
+        <xsl:call-template name="output.wrapper">
+          <xsl:with-param name="attr.sets">
+            <xsl:call-template name="t.element.name"/>
             <xsl:text>.titlepage.</xsl:text>
             <xsl:value-of select="../@t:side"/>
             <xsl:text>.style</xsl:text>
-          </xsl:attribute>
-          <xsl:for-each select="@*">
-            <xsl:if test="not(starts-with(namespace-uri(.),
-                                'http://nwalsh.com/docbook/xsl/template/1.0'))">
-              <xsl:attribute name="{name(.)}" namespace="{namespace-uri(.)}">
-                <xsl:value-of select="."/>
-              </xsl:attribute>
-            </xsl:if>
-          </xsl:for-each>
-          <xsl:text>&#xA;</xsl:text>
-
-          <xsl:choose>
-            <xsl:when test="@t:named-template">
-              <xsl:element name="xsl:call-template">
-                <xsl:attribute name="name">
-                  <xsl:value-of select="@t:named-template"/>
-                </xsl:attribute>
-                <xsl:for-each select="@*">
-                  <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
-                    <xsl:text>&#xA;</xsl:text>
-                    <xsl:element name="xsl:with-param">
-                      <xsl:attribute name="name">
-                        <xsl:value-of select="local-name(.)"/>
-                      </xsl:attribute>
-                      <xsl:attribute name="select">
-                        <xsl:call-template name="param.node"/>
-                      </xsl:attribute>
-                    </xsl:element>
-                  </xsl:if>
-                </xsl:for-each>
-                <xsl:text>&#xA;</xsl:text>
-              </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:element name="xsl:apply-templates">
-                <xsl:attribute name="select">.</xsl:attribute>
-                <xsl:attribute name="mode">
-                  <xsl:value-of select="../../@t:element"/>
-                  <xsl:text>.titlepage.</xsl:text>
-                  <xsl:value-of select="../@t:side"/>
-                  <xsl:text>.mode</xsl:text>
-                </xsl:attribute>
-              </xsl:element>
-            </xsl:otherwise>
-          </xsl:choose>
-
-          <xsl:text>&#xA;</xsl:text>
-        </xsl:element>
+          </xsl:with-param>
+          <xsl:with-param name="content">
+            <xsl:text>&#xA;</xsl:text>
+            
+            <xsl:choose>
+              <xsl:when test="@t:named-template">
+                <xsl:element name="xsl:call-template">
+                  <xsl:attribute name="name">
+                    <xsl:value-of select="@t:named-template"/>
+                  </xsl:attribute>
+                  <xsl:for-each select="@*">
+                    <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
+                      <xsl:text>&#xA;</xsl:text>
+                      <xsl:element name="xsl:with-param">
+                        <xsl:attribute name="name">
+                          <xsl:value-of select="local-name(.)"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="select">
+                          <xsl:call-template name="param"/>
+                        </xsl:attribute>
+                      </xsl:element>
+                    </xsl:if>
+                  </xsl:for-each>
+                  <xsl:text>&#xA;</xsl:text>
+                </xsl:element>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:element name="xsl:apply-templates">
+                  <xsl:attribute name="select">.</xsl:attribute>
+                  <xsl:attribute name="mode">
+                    <xsl:call-template name="t.element.name"/>
+                    <xsl:text>.titlepage.</xsl:text>
+                    <xsl:value-of select="../@t:side"/>
+                    <xsl:text>.mode</xsl:text>
+                  </xsl:attribute>
+                </xsl:element>
+              </xsl:otherwise>
+            </xsl:choose>
+            
+            <xsl:text>&#xA;</xsl:text>
+          </xsl:with-param>
+        </xsl:call-template>
         <xsl:text>&#xA;</xsl:text>
       </xsl:element>
     </xsl:if>
   </xsl:for-each>
 </xsl:template>
 
-<doc:template match="@*" mode="copy.literal.atts" xmlns=""
-              id="attr_star_in_copy.literal.atts">
-<refpurpose>Copy t:titlepage attributes</refpurpose>
-
-<refdescription>
-<para>This template copies all of the <quote>other</quote> attributes
-from a <literal>t:titlepage</literal> element onto the specified
-wrapper.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template match="@*" mode="copy.literal.atts">
-  <xsl:if test="not(starts-with(namespace-uri(.),
-                                'http://nwalsh.com/docbook/xsl/template/1.0'))">
-    <xsl:attribute name="{name(.)}">
-      <xsl:value-of select="."/>
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
 <!-- ==================================================================== -->
 
 <doc:template match="t:titlepage-content" id="titlepage-content">
@@ -529,9 +718,8 @@
 </para>
 
 <para>The content of a <literal>t:titlepage-content</literal> element is
-a list of element names. These names should be unqualified.  They identify
-the elements in the source document that should appear on the title page.
-</para>
+a list of element names.  They identify the elements in the source document
+that should appear on the title page.</para>
 
 <para>Each element may have a single attribute:
 <sgmltag class="attribute">predicate</sgmltag>. The value of this
@@ -584,6 +772,13 @@
 </doc:template>
 
 <xsl:template match="t:titlepage-content">
+
+  <xsl:if test="*[namespace-uri(.) != 'http://docbook.org/ns/docbook']">
+    <xsl:message terminate="yes">
+      <xsl:text>t:titlepage-content contains elements in non-DocBook namespace</xsl:text>
+    </xsl:message>
+  </xsl:if>
+
   <xsl:variable name="side">
     <xsl:choose>
       <xsl:when test="@t:side='recto' or @t:side='verso'">
@@ -606,7 +801,7 @@
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="../@t:element"/>
+    <xsl:call-template name="t.element.name"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -615,7 +810,7 @@
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="../@t:element"/>
+      <xsl:call-template name="t.element.name"/>
       <xsl:text>.titlepage.</xsl:text>
       <xsl:value-of select="$side"/>
     </xsl:attribute>
@@ -663,7 +858,7 @@
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="../@t:element"/>
+      <xsl:call-template name="t.element.name"/>
       <xsl:text>.titlepage.separator</xsl:text>
     </xsl:attribute>
 
@@ -688,7 +883,7 @@
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="../@t:element"/>
+      <xsl:call-template name="t.element.name"/>
       <xsl:text>.titlepage.before.</xsl:text>
       <xsl:value-of select="@t:side"/>
     </xsl:attribute>
@@ -710,7 +905,7 @@
 </doc:template>
 
 <xsl:template match="*" mode="copy">
-  <xsl:element name="{name(.)}">
+  <xsl:element name="{name(.)}" namespace="{namespace-uri(.)}">
     <xsl:apply-templates select="@*" mode="copy"/>
     <xsl:apply-templates mode="copy"/>
   </xsl:element>
@@ -758,31 +953,11 @@
 
 <xsl:template match="*" mode="document.order">
   <xsl:variable name="docinfo">
-    <xsl:text>d:</xsl:text>
-    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
-    <xsl:text>info</xsl:text>
+    <xsl:call-template name="t.element.info"/>
   </xsl:variable>
 
   <xsl:variable name="altinfo">
-    <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage/@t:element='article'">
-        <xsl:text>d:</xsl:text>
-        <xsl:text>artheader</xsl:text>
-      </xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='qandaset'">
-        <xsl:text>d:</xsl:text>
-        <xsl:text>blockinfo</xsl:text>
-      </xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='section'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect1'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect2'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect3'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect4'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect5'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='book'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='set'"></xsl:when>
-      <xsl:otherwise>d:docinfo</xsl:otherwise>
-    </xsl:choose>
+    <xsl:call-template name="t.element.altinfo"/>
   </xsl:variable>
 
   <xsl:variable name="side">
@@ -797,7 +972,7 @@
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
+    <xsl:call-template name="t.element.name"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -810,7 +985,7 @@
   <xsl:value-of select="$docinfo"/>
   <xsl:text>/</xsl:text>
   <xsl:text>d:</xsl:text>
-  <xsl:value-of select="name(.)"/>
+  <xsl:value-of select="local-name(.)"/>
   <xsl:if test="@t:predicate">
     <xsl:value-of select="@t:predicate"/>
   </xsl:if>
@@ -820,7 +995,7 @@
     <xsl:value-of select="$altinfo"/>
     <xsl:text>/</xsl:text>
     <xsl:text>d:</xsl:text>
-    <xsl:value-of select="name(.)"/>
+    <xsl:value-of select="local-name(.)"/>
     <xsl:if test="@t:predicate">
       <xsl:value-of select="@t:predicate"/>
     </xsl:if>
@@ -830,7 +1005,7 @@
   <xsl:text>|d:info</xsl:text>
   <xsl:text>/</xsl:text>
   <xsl:text>d:</xsl:text>
-  <xsl:value-of select="name(.)"/>
+  <xsl:value-of select="local-name(.)"/>
   <xsl:if test="@t:predicate">
     <xsl:value-of select="@t:predicate"/>
   </xsl:if>
@@ -840,7 +1015,7 @@
                 or local-name(.) = 'titleabbrev'">
     <xsl:text>|</xsl:text>
     <xsl:text>d:</xsl:text>
-    <xsl:value-of select="name(.)"/>
+    <xsl:value-of select="local-name(.)"/>
     <xsl:if test="@t:predicate">
       <xsl:value-of select="@t:predicate"/>
     </xsl:if>
@@ -849,54 +1024,29 @@
 
 <!-- ==================================================================== -->
 
-<doc:template match="*" mode="document.order" xmlns="" id="star_in_document.order">
+<doc:template match="*" mode="stylesheet.order" xmlns="" id="star_in_stylesheet.order">
 <refpurpose>Create rules to process titlepage elements in stylesheet order</refpurpose>
 
 <refdescription>
 <para>This template is called to process all of the children of the
 <literal>t:titlepage-content</literal> element. It creates the set
-of <literal>xsl:apply-templates</literal> elements necessary
+of <literal>xsl:apply-templates</literal> elements necessary to
 process each of those elements in the title page.</para>
 
 <para>Note that this template automatically handles the case where
 some DocBook elements, like title and subtitle, can occur both inside
 the *info elements where metadata is usually stored and outside.
 </para>
-
-<para>It also automatically calculates the name for the *info container
-and handles elements that have historically had containers with different
-names.</para>
-
 </refdescription>
 </doc:template>
-
+  
 <xsl:template match="*" mode="stylesheet.order">
   <xsl:variable name="docinfo">
-    <xsl:text>d:</xsl:text>
-    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
-    <xsl:text>info</xsl:text>
+    <xsl:call-template name="t.element.info"/>
   </xsl:variable>
 
   <xsl:variable name="altinfo">
-    <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage/@t:element='article'">
-        <xsl:text>d:</xsl:text>
-        <xsl:text>artheader</xsl:text>
-      </xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='qandaset'">
-        <xsl:text>d:</xsl:text>
-        <xsl:text>blockinfo</xsl:text>
-      </xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='section'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect1'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect2'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect3'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect4'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='sect5'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='book'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@t:element='set'"></xsl:when>
-      <xsl:otherwise>d:docinfo</xsl:otherwise>
-    </xsl:choose>
+    <xsl:call-template name="t.element.altinfo"/>
   </xsl:variable>
 
   <xsl:variable name="side">
@@ -909,7 +1059,7 @@
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
+    <xsl:call-template name="t.element.name"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -921,42 +1071,36 @@
     <xsl:when test="@t:force and @t:force != '0'">
       <xsl:choose>
         <xsl:when test="@t:named-template">
-          <xsl:element name="{../../@t:wrapper}" namespace="{$ns}">
-            <xsl:attribute name="xsl:use-attribute-sets">
-              <xsl:value-of select="../../@t:element"/>
+          <xsl:call-template name="output.wrapper">
+            <xsl:with-param name="attr.sets">
+              <xsl:call-template name="t.element.name"/>
               <xsl:text>.titlepage.</xsl:text>
               <xsl:value-of select="../@t:side"/>
               <xsl:text>.style</xsl:text>
-            </xsl:attribute>
-            <xsl:for-each select="@*">
-              <xsl:if test="not(starts-with(namespace-uri(.),
-                                  'http://nwalsh.com/docbook/xsl/template/1.0'))">
-                <xsl:attribute name="{name(.)}" namespace="{namespace-uri(.)}">
-                  <xsl:value-of select="."/>
+            </xsl:with-param>
+            <xsl:with-param name="content">
+              <xsl:text>&#xA;</xsl:text>
+              <xsl:element name="xsl:call-template">
+                <xsl:attribute name="name">
+                  <xsl:value-of select="@t:named-template"/>
                 </xsl:attribute>
-              </xsl:if>
-            </xsl:for-each>
-            <xsl:text>&#xA;</xsl:text>
-            <xsl:element name="xsl:call-template">
-              <xsl:attribute name="name">
-                <xsl:value-of select="@t:named-template"/>
-              </xsl:attribute>
-              <xsl:for-each select="@*">
-                <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
-                  <xsl:text>&#xA;</xsl:text>
-                  <xsl:element name="xsl:with-param">
-                    <xsl:attribute name="name">
-                      <xsl:value-of select="local-name(.)"/>
-                    </xsl:attribute>
-                    <xsl:attribute name="select">
-                      <xsl:call-template name="param.node"/>
-                    </xsl:attribute>
-                  </xsl:element>
-                </xsl:if>
-              </xsl:for-each>
-              <xsl:text>&#xA;</xsl:text>
-            </xsl:element>
-          </xsl:element>
+                <xsl:for-each select="@*">
+                  <xsl:if test="namespace-uri(.)='http://nwalsh.com/docbook/xsl/template/1.0/param'">
+                    <xsl:text>&#xA;</xsl:text>
+                    <xsl:element name="xsl:with-param">
+                      <xsl:attribute name="name">
+                        <xsl:value-of select="local-name(.)"/>
+                      </xsl:attribute>
+                      <xsl:attribute name="select">
+                        <xsl:call-template name="param"/>
+                      </xsl:attribute>
+                    </xsl:element>
+                  </xsl:if>
+                </xsl:for-each>
+                <xsl:text>&#xA;</xsl:text>
+              </xsl:element>
+            </xsl:with-param>
+          </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
           <xsl:message terminate="yes">
@@ -979,7 +1123,7 @@
                 <xsl:value-of select="$docinfo"/>
                 <xsl:text>/</xsl:text>
                 <xsl:text>d:</xsl:text>
-                <xsl:value-of select="name(.)"/>
+                <xsl:value-of select="local-name(.)"/>
               </xsl:attribute>
               <xsl:text>&#xA;      </xsl:text>
               <xsl:element name="xsl:apply-templates">
@@ -990,7 +1134,7 @@
                   <xsl:value-of select="$docinfo"/>
                   <xsl:text>/</xsl:text>
                   <xsl:text>d:</xsl:text>
-                  <xsl:value-of select="name(.)"/>
+                  <xsl:value-of select="local-name(.)"/>
                   <xsl:if test="@t:predicate">
                     <xsl:value-of select="@t:predicate"/>
                   </xsl:if>
@@ -1006,7 +1150,7 @@
                   <xsl:value-of select="$altinfo"/>
                   <xsl:text>/</xsl:text>
                   <xsl:text>d:</xsl:text>
-                  <xsl:value-of select="name(.)"/>
+                  <xsl:value-of select="local-name(.)"/>
                 </xsl:attribute>
                 <xsl:text>&#xA;      </xsl:text>
                 <xsl:element name="xsl:apply-templates">
@@ -1017,7 +1161,7 @@
                     <xsl:value-of select="$altinfo"/>
                     <xsl:text>/</xsl:text>
                     <xsl:text>d:</xsl:text>
-                    <xsl:value-of select="name(.)"/>
+                    <xsl:value-of select="local-name(.)"/>
                     <xsl:if test="@t:predicate">
                       <xsl:value-of select="@t:predicate"/>
                     </xsl:if>
@@ -1034,7 +1178,7 @@
                 <xsl:value-of select="'d:info'"/>
                 <xsl:text>/</xsl:text>
                 <xsl:text>d:</xsl:text>
-                <xsl:value-of select="name(.)"/>
+                <xsl:value-of select="local-name(.)"/>
               </xsl:attribute>
               <xsl:text>&#xA;      </xsl:text>
               <xsl:element name="xsl:apply-templates">
@@ -1045,7 +1189,7 @@
                   <xsl:value-of select="'d:info'"/>
                   <xsl:text>/</xsl:text>
                   <xsl:text>d:</xsl:text>
-                  <xsl:value-of select="name(.)"/>
+                  <xsl:value-of select="local-name(.)"/>
                   <xsl:if test="@t:predicate">
                     <xsl:value-of select="@t:predicate"/>
                   </xsl:if>
@@ -1058,7 +1202,7 @@
             <xsl:element name="xsl:when">
               <xsl:attribute name="test">
                 <xsl:text>d:</xsl:text>
-                <xsl:value-of select="name(.)"/>
+                <xsl:value-of select="local-name(.)"/>
               </xsl:attribute>
               <xsl:text>&#xA;      </xsl:text>
               <xsl:element name="xsl:apply-templates">
@@ -1067,7 +1211,7 @@
                 </xsl:attribute>
                 <xsl:attribute name="select">
                   <xsl:text>d:</xsl:text>
-                  <xsl:value-of select="name(.)"/>
+                  <xsl:value-of select="local-name(.)"/>
                   <xsl:if test="@t:predicate">
                     <xsl:value-of select="@t:predicate"/>
                   </xsl:if>
@@ -1090,7 +1234,7 @@
               <xsl:value-of select="$docinfo"/>
               <xsl:text>/</xsl:text>
               <xsl:text>d:</xsl:text>
-              <xsl:value-of select="name(.)"/>
+              <xsl:value-of select="local-name(.)"/>
               <xsl:if test="@t:predicate">
                 <xsl:value-of select="@t:predicate"/>
               </xsl:if>
@@ -1108,7 +1252,7 @@
                 <xsl:value-of select="$altinfo"/>
                 <xsl:text>/</xsl:text>
                 <xsl:text>d:</xsl:text>
-                <xsl:value-of select="name(.)"/>
+                <xsl:value-of select="local-name(.)"/>
                 <xsl:if test="@t:predicate">
                   <xsl:value-of select="@t:predicate"/>
                 </xsl:if>
@@ -1126,7 +1270,7 @@
               <xsl:value-of select="'d:info'"/>
               <xsl:text>/</xsl:text>
               <xsl:text>d:</xsl:text>
-              <xsl:value-of select="name(.)"/>
+              <xsl:value-of select="local-name(.)"/>
               <xsl:if test="@t:predicate">
                 <xsl:value-of select="@t:predicate"/>
               </xsl:if>
@@ -1163,7 +1307,7 @@
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
+    <xsl:call-template name="t.element.name"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -1179,7 +1323,7 @@
         <xsl:element name="xsl:template">
           <xsl:attribute name="match">
             <xsl:text>d:</xsl:text>
-            <xsl:value-of select="name(.)"/>
+            <xsl:value-of select="local-name(.)"/>
           </xsl:attribute>
           <xsl:attribute name="mode">
             <xsl:value-of select="$mode"/>
@@ -1216,7 +1360,7 @@
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
+    <xsl:call-template name="t.element.name"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -1225,7 +1369,7 @@
   <xsl:element name="xsl:apply-templates">
     <xsl:attribute name="select">
       <xsl:text>d:</xsl:text>
-      <xsl:value-of select="name(.)"/>
+      <xsl:value-of select="local-name(.)"/>
     </xsl:attribute>
     <xsl:attribute name="mode">
       <xsl:value-of select="$mode"/>
@@ -1254,7 +1398,7 @@
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
+    <xsl:call-template name="t.element.name"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -1318,38 +1462,96 @@
         <xsl:with-param name="orlist">
           <xsl:value-of select="$orlist"/>
           <xsl:if test="not($orlist='')">|</xsl:if>
-          <xsl:value-of select="concat('d:', name($elements[position()=$count]))"/>
+          <xsl:value-of select="concat('d:', local-name($elements[position()=$count]))"/>
         </xsl:with-param>
       </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
-<xsl:template name="param.node">
+<doc:template name="param">
+<refpurpose>Modifies namespace for DocBook elements in XPath parameters</refpurpose>
+<refdescription>
+<para>Inserts proper DocBook namespace into the XPath expression. Currently,
+it is limited to XPath axes and elements at the beginning of an expression.</para>
+</refdescription>
+</doc:template>
+  
+<xsl:template name="param">
   <xsl:param name="value" select="string(.)"/>
-
+  
+  <xsl:variable name="fixup.names">
+    <xsl:choose>
+      <xsl:when test="parent::*/@t:xpath-fixup">
+        <xsl:value-of select="concat(' ', parent::*/@t:xpath-fixup,' ')"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="' node '"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  
   <xsl:choose>
-    <xsl:when test="local-name(.) = 'title'">
+    <xsl:when test="contains($fixup.names, concat(' ', local-name(.), ' '))">
+      <xsl:variable name="axis" select="substring-before($value, '::')"/>
       <xsl:choose>
-        <xsl:when test="$value = 'title'">
-          <xsl:text>d:title</xsl:text>
-        </xsl:when>
+        <!-- Is it an element axis? -->
+        <xsl:when test="$axis = ''"/>
+        <xsl:when test="$axis = 'ancestor'"/>
+        <xsl:when test="$axis = 'ancestor-or-self'"/>
+        <xsl:when test="$axis = 'child'"/>
+        <xsl:when test="$axis = 'descendant'"/>
+        <xsl:when test="$axis = 'descendant-or-self'"/>
+        <xsl:when test="$axis = 'following'"/>
+        <xsl:when test="$axis = 'following-sibling'"/>
+        <xsl:when test="$axis = 'parent'"/>
+        <xsl:when test="$axis = 'preceding'"/>
+        <xsl:when test="$axis = 'preceding-sibling'"/>
+        <xsl:when test="$axis = 'self'"/>
         <xsl:otherwise>
-          <xsl:value-of select="$value"/>
+          <xsl:message terminate="yes">
+            <xsl:text>Cannot parse XPath: </xsl:text>
+            <xsl:value-of select="$value"/>
+          </xsl:message>
         </xsl:otherwise>
       </xsl:choose>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'node'">
+      <xsl:variable name="rest.1">
+        <xsl:choose>
+          <xsl:when test="$axis = ''"><xsl:value-of select="$value"/></xsl:when>
+          <xsl:otherwise><xsl:value-of select="substring-after($value, '::')"/></xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      <xsl:variable name="ns.prefix">
+        <xsl:call-template name="get.namespace.prefix">
+          <xsl:with-param name="element.name" select="$rest.1"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:variable name="ns.uri">
+        <xsl:call-template name="get.namespace.uri">
+          <xsl:with-param name="element.name" select="$rest.1"/>
+        </xsl:call-template>
+      </xsl:variable>
+      <xsl:variable name="rest.2">
+        <xsl:choose>
+          <xsl:when test="$ns.prefix = ''">
+            <xsl:value-of select="$rest.1"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="substring-after($rest.1, ':')"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
+      
+      <xsl:if test="$axis != ''">
+        <xsl:value-of select="concat($axis, '::')"/>
+      </xsl:if>
       <xsl:choose>
-        <xsl:when test="starts-with($value, 'ancestor-or-self::')">
-          <xsl:variable name="new">
-            <xsl:text>ancestor-or-self::d:</xsl:text>
-            <xsl:value-of select="substring-after($value, 'ancestor-or-self::')"/>
-          </xsl:variable>
-          <xsl:value-of select="$new"/>
+        <xsl:when test="$ns.uri = 'http://docbook.org/ns/docbook'">
+          <xsl:text>d:</xsl:text>
+          <xsl:value-of select="$rest.2"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="$value"/>
+          <xsl:value-of select="$rest.1"/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:when>


[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]