SIGNIFICANT changes to the titlepage template setup. See RELEASE-NOTES.

diff --git a/xsl/fo/titlepage.templates.xml b/xsl/fo/titlepage.templates.xml
index 9282c8d0cf3540ecb676ca7335a00a4e3acfaf0c..3523f6dcc02f2238cfafbb41349b469367cbc809 100644 (file)
--- a/xsl/fo/titlepage.templates.xml
+++ b/xsl/fo/titlepage.templates.xml
@@ -29,60 +29,72 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="article" wrapper="fo:block">
-  <t:titlepage-content side="recto">
-      <title named-template="component.title"
-            param:node="ancestor-or-self::article[1]"
-            fo:text-align="center"
-            fo:keep-with-next="always"
-            fo:font-size="&hsize5;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
-    <subtitle fo:font-family="{$title.font.family}"
-             fo:text-align="center"/>
-    <corpauthor fo:text-align="center"/>
-    <authorgroup fo:text-align="center"/>
-    <author fo:text-align="center"
-            fo:font-size="&hsize2;"
-            fo:font-weight="bold"/>
-    <othercredit fo:text-align="center"/>
-    <releaseinfo fo:text-align="center"/>
-    <copyright fo:text-align="center"/>
-    <legalnotice/>
-    <pubdate fo:text-align="center"/>
-    <revision fo:text-align="center"/>
-    <revhistory/>
-    <abstract/>
+<t:titlepage t:element="article" t:wrapper="fo:block"
+             font-family="{$title.font.family}">
+
+  <t:titlepage-content t:side="recto"
+             text-align="center">
+
+    <title t:named-template="component.title"
+          param:node="ancestor-or-self::article[1]"
+          keep-with-next="always"
+          font-size="&hsize5;"
+          font-weight="bold"/>
+
+    <subtitle/>
+
+    <corpauthor space-before="0.5em"
+                font-size="&hsize2;"/>
+    <authorgroup space-before="0.5em"
+                 font-size="&hsize2;"/>
+    <author space-before="0.5em"
+            font-size="&hsize2;"/>
+
+    <othercredit space-before="0.5em"/>
+    <releaseinfo space-before="0.5em"/>
+    <copyright space-before="0.5em"/>
+    <legalnotice text-align="start"
+                 margin-left="0.5in"
+                 margin-right="0.5in"
+                 font-family="{$body.font.family}"/>
+    <pubdate space-before="0.5em"/>
+    <revision space-before="0.5em"/>
+    <revhistory space-before="0.5em"/>
+    <abstract space-before="0.5em"
+             text-align="start"
+             margin-left="0.5in"
+              margin-right="0.5in"
+              font-family="{$body.font.family}"/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="set" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="set" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
       <title
-            named-template="division.title"
+            t:named-template="division.title"
             param:node="ancestor-or-self::set[1]"
-            fo:text-align="center"
-            fo:font-size="&hsize5;"
-            fo:space-before="&hsize5space;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+            text-align="center"
+            font-size="&hsize5;"
+            space-before="&hsize5space;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"
-             fo:text-align="center"/>
+             font-family="{$title.font.family}"
+             text-align="center"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -96,121 +108,121 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="book" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="book" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            named-template="division.title"
+            t:named-template="division.title"
             param:node="ancestor-or-self::book[1]"
-            fo:text-align="center"
-            fo:font-size="&hsize5;"
-            fo:space-before="&hsize5space;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+            text-align="center"
+            font-size="&hsize5;"
+            space-before="&hsize5space;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
       <subtitle
-               fo:text-align="center"
-               fo:font-size="&hsize4;"
-               fo:space-before="&hsize4space;"
-               fo:font-family="{$title.font.family}"/>
-      <corpauthor fo:font-size="&hsize3;"
-                 fo:keep-with-next="always"
-                 fo:space-before="2in"/>
-      <authorgroup fo:space-before="2in"/>
-      <author fo:font-size="&hsize3;"
-             fo:space-before="&hsize2space;"
-             fo:keep-with-next="always"/>
+               text-align="center"
+               font-size="&hsize4;"
+               space-before="&hsize4space;"
+               font-family="{$title.font.family}"/>
+      <corpauthor font-size="&hsize3;"
+                 keep-with-next="always"
+                 space-before="2in"/>
+      <authorgroup space-before="2in"/>
+      <author font-size="&hsize3;"
+             space-before="&hsize2space;"
+             keep-with-next="always"/>
     </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
       <title
-            named-template="book.verso.title"
-            fo:font-size="&hsize2;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+            t:named-template="book.verso.title"
+            font-size="&hsize2;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
       <corpauthor/>
-      <authorgroup named-template="verso.authorgroup"/>
+      <authorgroup t:named-template="verso.authorgroup"/>
       <author/>
       <othercredit/>
-      <pubdate fo:space-before="1em"/>
+      <pubdate space-before="1em"/>
       <copyright/>
       <abstract/>
-      <legalnotice fo:font-size="8pt"/>
+      <legalnotice font-size="8pt"/>
   </t:titlepage-content>
 
   <t:titlepage-separator>
       <fo:block break-after="page"/>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
       <fo:block break-after="page"/>
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="part" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="part" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
       <title
-            named-template="division.title"
+            t:named-template="division.title"
             param:node="ancestor-or-self::part[1]"
-            fo:text-align="center"
-            fo:font-size="&hsize5;"
-            fo:space-before="&hsize5space;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+            text-align="center"
+            font-size="&hsize5;"
+            space-before="&hsize5space;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     <subtitle
-             fo:text-align="center"
-             fo:font-size="&hsize4;"
-             fo:space-before="&hsize4space;"
-             fo:font-weight='bold'
-             fo:font-style='italic'
-             fo:font-family="{$title.font.family}"/>
+             text-align="center"
+             font-size="&hsize4;"
+             space-before="&hsize4space;"
+             font-weight='bold'
+             font-style='italic'
+             font-family="{$title.font.family}"/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="partintro" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="partintro" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:text-align="center"
-          fo:font-size="&hsize5;"
-          fo:font-weight="bold"
-          fo:space-before="1em"
-          fo:font-family="{$title.font.family}"/>
+          text-align="center"
+          font-size="&hsize5;"
+          font-weight="bold"
+          space-before="1em"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:text-align="center"
-             fo:font-size="&hsize2;"
-             fo:font-weight="bold"
-             fo:font-style="italic"
-             fo:font-family="{$title.font.family}"/>
+             text-align="center"
+             font-size="&hsize2;"
+             font-weight="bold"
+             font-style="italic"
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -224,34 +236,34 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="reference" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="reference" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
       <title
-            named-template="division.title"
+            t:named-template="division.title"
             param:node="ancestor-or-self::reference[1]"
-            fo:text-align="center"
-            fo:font-size="&hsize5;"
-            fo:space-before="&hsize5space;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+            text-align="center"
+            font-size="&hsize5;"
+            space-before="&hsize5space;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"
-             fo:text-align="center"/>
+             font-family="{$title.font.family}"
+             text-align="center"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -265,167 +277,167 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="refsynopsisdiv" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="refsynopsisdiv" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:font-family="{$title.font.family}"/>
+          font-family="{$title.font.family}"/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="refsection" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="refsection" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:font-family="{$title.font.family}"/>
+          font-family="{$title.font.family}"/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="refsect1" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="refsect1" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:font-family="{$title.font.family}"/>
+          font-family="{$title.font.family}"/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="refsect2" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="refsect2" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:font-family="{$title.font.family}"/>
+          font-family="{$title.font.family}"/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="refsect3" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="refsect3" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:font-family="{$title.font.family}"/>
+          font-family="{$title.font.family}"/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="dedication" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="dedication" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="component.title"
+            t:force="1"
+            t:named-template="component.title"
             param:node="ancestor-or-self::dedication[1]"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-family="{$title.font.family}"
-            fo:font-weight="bold"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="preface" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="preface" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="component.title"
+            t:force="1"
+            t:named-template="component.title"
             param:node="ancestor-or-self::preface[1]"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-family="{$title.font.family}"
-            fo:font-weight="bold"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
       <corpauthor/>
       <authorgroup/>
       <author/>
@@ -439,40 +451,46 @@
       <abstract/>
     </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="chapter" wrapper="fo:block">
-    <t:titlepage-content side="recto">
-      <title
-            named-template="component.title"
+  <t:titlepage t:element="chapter" t:wrapper="fo:block"
+               font-family="{$title.font.family}">
+    <t:titlepage-content t:side="recto" margin-left="{$title.margin.left}">
+      <title t:named-template="component.title"
             param:node="ancestor-or-self::chapter[1]"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
-      <subtitle
-               fo:space-before="0.5em"
-               fo:margin-left="{$title.margin.left}"
-               fo:font-style="italic"
-               fo:font-size="&hsize2;"
-               fo:font-weight="bold"
-               fo:font-family="{$title.font.family}"/>
-      <corpauthor/>
-      <authorgroup/>
-      <author/>
+            font-size="&hsize5;"
+            font-weight="bold"/>
+
+      <subtitle space-before="0.5em"
+               font-style="italic"
+               font-size="&hsize2;"
+               font-weight="bold"/>
+
+      <corpauthor  space-before="0.5em"
+                  space-after="0.5em"
+                   font-size="&hsize2;"/>
+
+      <authorgroup space-before="0.5em"
+                  space-after="0.5em"
+                   font-size="&hsize2;"/>
+
+      <author      space-before="0.5em"
+                  space-after="0.5em"
+                   font-size="&hsize2;"/>
+
       <othercredit/>
       <releaseinfo/>
       <copyright/>
@@ -483,32 +501,32 @@
       <abstract/>
     </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="appendix" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="appendix" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            named-template="component.title"
+            t:named-template="component.title"
             param:node="ancestor-or-self::appendix[1]"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
       <corpauthor/>
       <authorgroup/>
       <author/>
@@ -522,28 +540,28 @@
       <abstract/>
     </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="section" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="section" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:margin-left="{$title.margin.left}"
-          fo:font-family="{$title.font.family}"/>
+          margin-left="{$title.margin.left}"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"/>
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -557,26 +575,26 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect1" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect1" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:margin-left="{$title.margin.left}"
-          fo:font-family="{$title.font.family}"/>
+          margin-left="{$title.margin.left}"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"/>
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -590,26 +608,26 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect2" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect2" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:margin-left="{$title.margin.left}"
-          fo:font-family="{$title.font.family}"/>
+          margin-left="{$title.margin.left}"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"/>
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -623,26 +641,26 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect3" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect3" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:margin-left="{$title.margin.left}"
-          fo:font-family="{$title.font.family}"/>
+          margin-left="{$title.margin.left}"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"/>
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -656,26 +674,26 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect4" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect4" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:margin-left="{$title.margin.left}"
-          fo:font-family="{$title.font.family}"/>
+          margin-left="{$title.margin.left}"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"/>
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -689,26 +707,26 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect5" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect5" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:margin-left="{$title.margin.left}"
-          fo:font-family="{$title.font.family}"/>
+          margin-left="{$title.margin.left}"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"/>
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -722,26 +740,26 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="simplesect" wrapper="fo:block">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="simplesect" t:wrapper="fo:block">
+  <t:titlepage-content t:side="recto">
     <title
-          fo:margin-left="{$title.margin.left}"
-          fo:font-family="{$title.font.family}"/>
+          margin-left="{$title.margin.left}"
+          font-family="{$title.font.family}"/>
     <subtitle
-             fo:font-family="{$title.font.family}"/>
+             font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -755,368 +773,450 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="bibliography" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="bibliography" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="component.title"
+            t:force="1"
+            t:named-template="component.title"
             param:node="ancestor-or-self::bibliography[1]"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-family="{$title.font.family}"
-            fo:font-weight="bold"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
+      <subtitle
+               font-family="{$title.font.family}"/>
+    </t:titlepage-content>
+
+    <t:titlepage-content t:side="verso">
+    </t:titlepage-content>
+
+    <t:titlepage-separator>
+    </t:titlepage-separator>
+
+    <t:titlepage-before t:side="recto">
+    </t:titlepage-before>
+
+    <t:titlepage-before t:side="verso">
+    </t:titlepage-before>
+  </t:titlepage>
+
+<!-- ==================================================================== -->
+
+  <t:titlepage t:element="bibliodiv" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
+      <title t:named-template="component.title"
+            param:node="ancestor-or-self::bibliodiv[1]"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize4;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="glossary" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="glossary" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="component.title"
+            t:force="1"
+            t:named-template="component.title"
             param:node="ancestor-or-self::glossary[1]"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-family="{$title.font.family}"
-            fo:font-weight="bold"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="index" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="glossdiv" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
+      <title t:named-template="component.title"
+            param:node="ancestor-or-self::glossdiv[1]"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize4;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
+      <subtitle
+               font-family="{$title.font.family}"/>
+    </t:titlepage-content>
+
+    <t:titlepage-content t:side="verso">
+    </t:titlepage-content>
+
+    <t:titlepage-separator>
+    </t:titlepage-separator>
+
+    <t:titlepage-before t:side="recto">
+    </t:titlepage-before>
+
+    <t:titlepage-before t:side="verso">
+    </t:titlepage-before>
+  </t:titlepage>
+
+<!-- ==================================================================== -->
+
+  <t:titlepage t:element="index" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="component.title"
+            t:force="1"
+            t:named-template="component.title"
             param:node="ancestor-or-self::index[1]"
              param:pagewide="1"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-family="{$title.font.family}"
-            fo:font-weight="bold"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
+      <subtitle
+               font-family="{$title.font.family}"/>
+    </t:titlepage-content>
+
+    <t:titlepage-content t:side="verso">
+    </t:titlepage-content>
+
+    <t:titlepage-separator>
+    </t:titlepage-separator>
+
+    <t:titlepage-before t:side="recto">
+    </t:titlepage-before>
+
+    <t:titlepage-before t:side="verso">
+    </t:titlepage-before>
+  </t:titlepage>
+
+<!-- ==================================================================== -->
+
+  <!-- The indexdiv.title template is used so that manual and -->
+  <!-- automatically generated indexdiv titles get the same -->
+  <!-- formatting. -->
+
+  <t:titlepage t:element="indexdiv" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
+      <title t:force="1"
+            t:named-template="indexdiv.title"
+            param:title="title"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="setindex" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="setindex" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="component.title"
+            t:force="1"
+            t:named-template="component.title"
             param:node="ancestor-or-self::setindex[1]"
              param:pagewide="1"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-family="{$title.font.family}"
-            fo:font-weight="bold"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="colophon" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="colophon" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="component.title"
+            t:force="1"
+            t:named-template="component.title"
             param:node="ancestor-or-self::colophon[1]"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize5;"
-            fo:font-family="{$title.font.family}"
-            fo:font-weight="bold"/>
+            margin-left="{$title.margin.left}"
+            font-size="&hsize5;"
+            font-family="{$title.font.family}"
+            font-weight="bold"/>
       <subtitle
-               fo:font-family="{$title.font.family}"/>
+               font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="table.of.contents" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="table.of.contents" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="gentext"
+            t:force="1"
+            t:named-template="gentext"
             param:key="'TableofContents'"
-             fo:space-before.minimum="1em"
-             fo:space-before.optimum="1.5em"
-             fo:space-before.maximum="2em"
-            fo:space-after="0.5em"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize3;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+             space-before.minimum="1em"
+             space-before.optimum="1.5em"
+             space-before.maximum="2em"
+            space-after="0.5em"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize3;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
-  <t:titlepage element="list.of.tables" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="list.of.tables" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="gentext"
+            t:force="1"
+            t:named-template="gentext"
             param:key="'ListofTables'"
-             fo:space-before.minimum="1em"
-             fo:space-before.optimum="1.5em"
-             fo:space-before.maximum="2em"
-            fo:space-after="0.5em"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize3;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+             space-before.minimum="1em"
+             space-before.optimum="1.5em"
+             space-before.maximum="2em"
+            space-after="0.5em"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize3;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
-  <t:titlepage element="list.of.figures" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="list.of.figures" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="gentext"
+            t:force="1"
+            t:named-template="gentext"
             param:key="'ListofFigures'"
-             fo:space-before.minimum="1em"
-             fo:space-before.optimum="1.5em"
-             fo:space-before.maximum="2em"
-            fo:space-after="0.5em"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize3;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+             space-before.minimum="1em"
+             space-before.optimum="1.5em"
+             space-before.maximum="2em"
+            space-after="0.5em"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize3;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
-  <t:titlepage element="list.of.examples" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="list.of.examples" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="gentext"
+            t:force="1"
+            t:named-template="gentext"
             param:key="'ListofExamples'"
-             fo:space-before.minimum="1em"
-             fo:space-before.optimum="1.5em"
-             fo:space-before.maximum="2em"
-            fo:space-after="0.5em"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize3;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+             space-before.minimum="1em"
+             space-before.optimum="1.5em"
+             space-before.maximum="2em"
+            space-after="0.5em"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize3;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
-  <t:titlepage element="list.of.equations" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="list.of.equations" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="gentext"
+            t:force="1"
+            t:named-template="gentext"
             param:key="'ListofEquations'"
-             fo:space-before.minimum="1em"
-             fo:space-before.optimum="1.5em"
-             fo:space-before.maximum="2em"
-            fo:space-after="0.5em"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize3;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+             space-before.minimum="1em"
+             space-before.optimum="1.5em"
+             space-before.maximum="2em"
+            space-after="0.5em"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize3;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
-  <t:titlepage element="list.of.procedures" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="list.of.procedures" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="gentext"
+            t:force="1"
+            t:named-template="gentext"
             param:key="'ListofProcedures'"
-             fo:space-before.minimum="1em"
-             fo:space-before.optimum="1.5em"
-             fo:space-before.maximum="2em"
-            fo:space-after="0.5em"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize3;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+             space-before.minimum="1em"
+             space-before.optimum="1.5em"
+             space-before.maximum="2em"
+            space-after="0.5em"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize3;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 
-  <t:titlepage element="list.of.unknowns" wrapper="fo:block">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="list.of.unknowns" t:wrapper="fo:block">
+    <t:titlepage-content t:side="recto">
       <title
-            force="1"
-            named-template="gentext"
+            t:force="1"
+            t:named-template="gentext"
             param:key="'ListofUnknown'"
-             fo:space-before.minimum="1em"
-             fo:space-before.optimum="1.5em"
-             fo:space-before.maximum="2em"
-            fo:space-after="0.5em"
-            fo:margin-left="{$title.margin.left}"
-            fo:font-size="&hsize3;"
-            fo:font-weight="bold"
-            fo:font-family="{$title.font.family}"/>
+             space-before.minimum="1em"
+             space-before.optimum="1.5em"
+             space-before.maximum="2em"
+            space-after="0.5em"
+            margin-left="{$title.margin.left}"
+            font-size="&hsize3;"
+            font-weight="bold"
+            font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
-    <t:titlepage-content side="verso">
+    <t:titlepage-content t:side="verso">
     </t:titlepage-content>
 
     <t:titlepage-separator>
     </t:titlepage-separator>
 
-    <t:titlepage-before side="recto">
+    <t:titlepage-before t:side="recto">
     </t:titlepage-before>
 
-    <t:titlepage-before side="verso">
+    <t:titlepage-before t:side="verso">
     </t:titlepage-before>
   </t:titlepage>
 

diff --git a/xsl/html/titlepage.templates.xml b/xsl/html/titlepage.templates.xml
index 5174601960d59f6747726447ec93625cc037d469..42c94524a588524cd580ba12166e6bdddc33d860 100644 (file)
--- a/xsl/html/titlepage.templates.xml
+++ b/xsl/html/titlepage.templates.xml
@@ -4,8 +4,8 @@
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="article" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="article" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -21,24 +21,24 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <hr/>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="set" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="set" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -54,24 +54,24 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <hr/>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="book" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="book" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -87,24 +87,24 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <hr/>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="part" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="part" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -120,21 +120,21 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="partintro" wrapper="div">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="partintro" t:wrapper="div">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -150,23 +150,23 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="reference" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="reference" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -182,71 +182,71 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <hr/>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="refentry" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
 <!-- uncomment this if you want refentry titlepages
-    <title force="1"
-          named-template="refentry.title"
+    <title t:force="1"
+          t:named-template="refentry.title"
           param:node="ancestor-or-self::refentry[1]"/>
 -->
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator/>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-  <t:titlepage element="dedication" wrapper="div" class="titlepage">
-    <t:titlepage-content side="recto">
+  <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
+    <t:titlepage-content t:side="recto">
     <title
-          force="1"
-          named-template="component.title"
+          t:force="1"
+          t:named-template="component.title"
           param:node="ancestor-or-self::dedication[1]"/>
     <subtitle/>
     </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="preface" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="preface" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -262,23 +262,23 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="chapter" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -294,23 +294,23 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="appendix" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -326,23 +326,23 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="section" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="section" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -358,22 +358,22 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect1" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -389,22 +389,22 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect2" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -420,22 +420,22 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect3" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -451,22 +451,22 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect4" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -482,22 +482,22 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="sect5" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -513,22 +513,22 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
-<t:titlepage element="simplesect" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title/>
     <subtitle/>
     <corpauthor/>
@@ -544,113 +544,113 @@
     <abstract/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
     <xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="bibliography" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title
-          force="1"
-          named-template="component.title"
+          t:force="1"
+          t:named-template="component.title"
           param:node="ancestor-or-self::bibliography[1]"/>
     <subtitle/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="glossary" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title
-          force="1"
-          named-template="component.title"
+          t:force="1"
+          t:named-template="component.title"
           param:node="ancestor-or-self::glossary[1]"/>
     <subtitle/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="index" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="index" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title
-          force="1"
-          named-template="component.title"
+          t:force="1"
+          t:named-template="component.title"
           param:node="ancestor-or-self::index[1]"/>
     <subtitle/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 
 <!-- ==================================================================== -->
 
-<t:titlepage element="setindex" wrapper="div" class="titlepage">
-  <t:titlepage-content side="recto">
+<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
     <title
-          force="1"
-          named-template="component.title"
+          t:force="1"
+          t:named-template="component.title"
           param:node="ancestor-or-self::setindex[1]"/>
     <subtitle/>
   </t:titlepage-content>
 
-  <t:titlepage-content side="verso">
+  <t:titlepage-content t:side="verso">
   </t:titlepage-content>
 
   <t:titlepage-separator>
   </t:titlepage-separator>
 
-  <t:titlepage-before side="recto">
+  <t:titlepage-before t:side="recto">
   </t:titlepage-before>
 
-  <t:titlepage-before side="verso">
+  <t:titlepage-before t:side="verso">
   </t:titlepage-before>
 </t:titlepage>
 

diff --git a/xsl/template/titlepage.xsl b/xsl/template/titlepage.xsl
index 8ae895ba0773cd82cc73a99bb261eb974920d921..4c8f6f9510b85c8cb57fe9cfb61554f534d3c254 100644 (file)
--- a/xsl/template/titlepage.xsl
+++ b/xsl/template/titlepage.xsl
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
                 xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
                 xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 exclude-result-prefixes="doc t param"
                 version='1.0'>
 
@@ -83,11 +83,11 @@ set of templates. This template creates an appropriate
       <xsl:text>do not edit it by hand. </xsl:text>
     </xsl:comment>
 
-    <xsl:if test="@base-stylesheet">
+    <xsl:if test="@t:base-stylesheet">
       <xsl:text>&#xA;&#xA;</xsl:text>
       <xsl:element name="xsl:import">
         <xsl:attribute name="href">
-          <xsl:value-of select="@base-stylesheet"/>
+          <xsl:value-of select="@t:base-stylesheet"/>
         </xsl:attribute>
       </xsl:element>
     </xsl:if>
@@ -175,44 +175,56 @@ and <quote>verso</quote> sides of the title page.</para>
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="@element"/>
+      <xsl:value-of select="@t:element"/>
       <xsl:text>.titlepage</xsl:text>
     </xsl:attribute>
     <xsl:text>&#xA;  </xsl:text>
-    <xsl:element name="{@wrapper}">
+    <xsl:element name="{@t:wrapper}">
       <xsl:apply-templates select="@*" mode="copy.literal.atts"/>
       <xsl:text>&#xA;    </xsl:text>
-      <xsl:element name="xsl:call-template">
-        <xsl:attribute name="name">
-          <xsl:value-of select="@element"/>
-          <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:value-of select="@element"/>
-          <xsl:text>.titlepage.recto</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="@element"/>
-          <xsl:text>.titlepage.before.verso</xsl:text>
-        </xsl:attribute>
+      <xsl:element name="{@t:wrapper}">
+        <xsl:apply-templates select="t:titlepage-content[@t:side='recto']/@*"
+                             mode="copy.literal.atts"/>
+        <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: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:call-template">
-        <xsl:attribute name="name">
-          <xsl:value-of select="@element"/>
-          <xsl:text>.titlepage.verso</xsl:text>
-        </xsl:attribute>
+      <xsl:element name="{@t:wrapper}">
+        <xsl:apply-templates select="t:titlepage-content[@t:side='verso']/@*"
+                             mode="copy.literal.atts"/>
+        <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:call-template">
         <xsl:attribute name="name">
-          <xsl:value-of select="@element"/>
+          <xsl:value-of select="@t:element"/>
           <xsl:text>.titlepage.separator</xsl:text>
         </xsl:attribute>
       </xsl:element>
@@ -227,13 +239,13 @@ and <quote>verso</quote> sides of the title page.</para>
        will totally override the rules that would otherwise be imported.)
        -->
 
-  <xsl:if test="not(../@base-stylesheet)">
+  <xsl:if test="not(../@t:base-stylesheet)">
     <!-- output a default rule for the recto-modes elements -->
     <xsl:text>&#xA;&#xA;</xsl:text>
     <xsl:element name="xsl:template">
       <xsl:attribute name="match">*</xsl:attribute>
       <xsl:attribute name="mode">
-        <xsl:value-of select="@element"/>
+        <xsl:value-of select="@t:element"/>
         <xsl:text>.titlepage.recto.mode</xsl:text>
       </xsl:attribute>
       <xsl:text>&#xA;  </xsl:text>
@@ -253,7 +265,7 @@ and <quote>verso</quote> sides of the title page.</para>
     <xsl:element name="xsl:template">
       <xsl:attribute name="match">*</xsl:attribute>
       <xsl:attribute name="mode">
-        <xsl:value-of select="@element"/>
+        <xsl:value-of select="@t:element"/>
         <xsl:text>.titlepage.verso.mode</xsl:text>
       </xsl:attribute>
       <xsl:text>&#xA;  </xsl:text>
@@ -274,8 +286,8 @@ and <quote>verso</quote> sides of the title page.</para>
   <!-- to be off, or has already been output, don't output it.      -->
   <xsl:for-each select="t:titlepage-content/*">
     <xsl:variable name="thisnode" select="."/>
-    <xsl:if test="(not(@suppress-template) or @suppress-template='0')
-                  and (not(@force) or @force='0')
+    <xsl:if test="(not(@t:suppress-template) or @t:suppress-template='0')
+                  and (not(@t:force) or @t:force='0')
                   and (not(preceding-sibling::*[name(.)=name($thisnode)]))">
       <xsl:text>&#xA;&#xA;</xsl:text>
       <xsl:element name="xsl:template">
@@ -283,22 +295,23 @@ and <quote>verso</quote> sides of the title page.</para>
           <xsl:value-of select="name(.)"/>
         </xsl:attribute>
         <xsl:attribute name="mode">
-          <xsl:value-of select="../../@element"/>
+          <xsl:value-of select="../../@t:element"/>
           <xsl:text>.titlepage.</xsl:text>
-          <xsl:value-of select="../@side"/>
+          <xsl:value-of select="../@t:side"/>
           <xsl:text>.auto.mode</xsl:text>
         </xsl:attribute>
         <xsl:text>&#xA;</xsl:text>
-        <xsl:element name="{../../@wrapper}">
+        <xsl:element name="{../../@t:wrapper}">
           <xsl:attribute name="xsl:use-attribute-sets">
-            <xsl:value-of select="../../@element"/>
+            <xsl:value-of select="../../@t:element"/>
             <xsl:text>.titlepage.</xsl:text>
-            <xsl:value-of select="../@side"/>
+            <xsl:value-of select="../@t:side"/>
             <xsl:text>.style</xsl:text>
           </xsl:attribute>
           <xsl:for-each select="@*">
-            <xsl:if test="namespace-uri(.)='http://www.w3.org/1999/XSL/Format'">
-              <xsl:attribute name="{local-name(.)}">
+            <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>
@@ -306,10 +319,10 @@ and <quote>verso</quote> sides of the title page.</para>
           <xsl:text>&#xA;</xsl:text>
 
           <xsl:choose>
-            <xsl:when test="@named-template">
+            <xsl:when test="@t:named-template">
               <xsl:element name="xsl:call-template">
                 <xsl:attribute name="name">
-                  <xsl:value-of select="@named-template"/>
+                  <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'">
@@ -331,9 +344,9 @@ and <quote>verso</quote> sides of the title page.</para>
               <xsl:element name="xsl:apply-templates">
                 <xsl:attribute name="select">.</xsl:attribute>
                 <xsl:attribute name="mode">
-                  <xsl:value-of select="../../@element"/>
+                  <xsl:value-of select="../../@t:element"/>
                   <xsl:text>.titlepage.</xsl:text>
-                  <xsl:value-of select="../@side"/>
+                  <xsl:value-of select="../@t:side"/>
                   <xsl:text>.mode</xsl:text>
                 </xsl:attribute>
               </xsl:element>
@@ -359,15 +372,12 @@ wrapper.</para>
 </doc:template>
 
 <xsl:template match="@*" mode="copy.literal.atts">
-  <xsl:choose>
-    <xsl:when test="name(.) = 'element'"></xsl:when>
-    <xsl:when test="name(.) = 'wrapper'"></xsl:when>
-    <xsl:otherwise>
-      <xsl:attribute name="{name(.)}">
-        <xsl:value-of select="."/>
-      </xsl:attribute>
-    </xsl:otherwise>
-  </xsl:choose>
+  <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>
 
 <!-- ==================================================================== -->
@@ -467,19 +477,19 @@ you'll have to construct the templates by hand.</para>
 <xsl:template match="t:titlepage-content">
   <xsl:variable name="side">
     <xsl:choose>
-      <xsl:when test="@side='recto' or @side='verso'">
-        <xsl:value-of select="@side"/>
+      <xsl:when test="@t:side='recto' or @t:side='verso'">
+        <xsl:value-of select="@t:side"/>
       </xsl:when>
-      <xsl:when test="@side">
+      <xsl:when test="@t:side">
         <xsl:message terminate="yes">
-          <xsl:text>Illegal value specified for @side </xsl:text>
+          <xsl:text>Illegal value specified for @t:side </xsl:text>
           <xsl:text>on t:titlepage-content: </xsl:text>
-          <xsl:value-of select="@side"/>
+          <xsl:value-of select="@t:side"/>
         </xsl:message>
       </xsl:when>
       <xsl:otherwise>
         <xsl:message terminate="yes">
-          <xsl:text>The @side attribute is required on </xsl:text>
+          <xsl:text>The @t:side attribute is required on </xsl:text>
           <xsl:text>t:titlepage-content.</xsl:text>
         </xsl:message>
       </xsl:otherwise>
@@ -487,7 +497,7 @@ you'll have to construct the templates by hand.</para>
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="../@element"/>
+    <xsl:value-of select="../@t:element"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -496,7 +506,7 @@ you'll have to construct the templates by hand.</para>
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="../@element"/>
+      <xsl:value-of select="../@t:element"/>
       <xsl:text>.titlepage.</xsl:text>
       <xsl:value-of select="$side"/>
     </xsl:attribute>
@@ -505,7 +515,7 @@ you'll have to construct the templates by hand.</para>
       <!-- if document order is selected, make a huge select statement
            on a single xsl:apply-templates to pick out the right elements
            for the title page. -->
-      <xsl:when test="@order='document'">
+      <xsl:when test="@t:order='document'">
         <xsl:if test="count(child::*)&gt;0">
           <xsl:element name="xsl:apply-templates">
             <xsl:attribute name="mode">
@@ -544,7 +554,7 @@ element.</para>
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="../@element"/>
+      <xsl:value-of select="../@t:element"/>
       <xsl:text>.titlepage.separator</xsl:text>
     </xsl:attribute>
 
@@ -569,9 +579,9 @@ side.</para>
   <xsl:text>&#xA;&#xA;</xsl:text>
   <xsl:element name="xsl:template">
     <xsl:attribute name="name">
-      <xsl:value-of select="../@element"/>
+      <xsl:value-of select="../@t:element"/>
       <xsl:text>.titlepage.before.</xsl:text>
-      <xsl:value-of select="@side"/>
+      <xsl:value-of select="@t:side"/>
     </xsl:attribute>
 
     <xsl:apply-templates mode="copy"/>
@@ -639,31 +649,31 @@ names.</para>
 
 <xsl:template match="*" mode="document.order">
   <xsl:variable name="docinfo">
-    <xsl:value-of select="ancestor::t:titlepage/@element"/>
+    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
     <xsl:text>info</xsl:text>
   </xsl:variable>
 
   <xsl:variable name="altinfo">
     <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage/@element='article'">
+      <xsl:when test="ancestor::t:titlepage/@t:element='article'">
         <xsl:text>artheader</xsl:text>
       </xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='section'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect1'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect2'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect3'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect4'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect5'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='book'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='set'"></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>docinfo</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
 
   <xsl:variable name="side">
     <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage-content/@side">
-        <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+      <xsl:when test="ancestor::t:titlepage-content/@t:side">
+        <xsl:value-of select="ancestor::t:titlepage-content/@t:side"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:text>recto</xsl:text>
@@ -672,7 +682,7 @@ names.</para>
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@element"/>
+    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -685,8 +695,8 @@ names.</para>
   <xsl:value-of select="$docinfo"/>
   <xsl:text>/</xsl:text>
   <xsl:value-of select="name(.)"/>
-  <xsl:if test="@predicate">
-    <xsl:value-of select="@predicate"/>
+  <xsl:if test="@t:predicate">
+    <xsl:value-of select="@t:predicate"/>
   </xsl:if>
 
   <xsl:if test="$altinfo != ''">
@@ -694,8 +704,8 @@ names.</para>
     <xsl:value-of select="$altinfo"/>
     <xsl:text>/</xsl:text>
     <xsl:value-of select="name(.)"/>
-    <xsl:if test="@predicate">
-      <xsl:value-of select="@predicate"/>
+    <xsl:if test="@t:predicate">
+      <xsl:value-of select="@t:predicate"/>
     </xsl:if>
   </xsl:if>
 
@@ -704,8 +714,8 @@ names.</para>
                 or local-name(.) = 'titleabbrev'">
     <xsl:text>|</xsl:text>
     <xsl:value-of select="name(.)"/>
-    <xsl:if test="@predicate">
-      <xsl:value-of select="@predicate"/>
+    <xsl:if test="@t:predicate">
+      <xsl:value-of select="@t:predicate"/>
     </xsl:if>
   </xsl:if>
 </xsl:template>
@@ -735,38 +745,38 @@ names.</para>
 
 <xsl:template match="*" mode="stylesheet.order">
   <xsl:variable name="docinfo">
-    <xsl:value-of select="ancestor::t:titlepage/@element"/>
+    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
     <xsl:text>info</xsl:text>
   </xsl:variable>
 
   <xsl:variable name="altinfo">
     <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage/@element='article'">
+      <xsl:when test="ancestor::t:titlepage/@t:element='article'">
         <xsl:text>artheader</xsl:text>
       </xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='section'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect1'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect2'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect3'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect4'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='sect5'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='book'"></xsl:when>
-      <xsl:when test="ancestor::t:titlepage/@element='set'"></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>docinfo</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
 
   <xsl:variable name="side">
     <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage-content/@side">
-        <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+      <xsl:when test="ancestor::t:titlepage-content/@t:side">
+        <xsl:value-of select="ancestor::t:titlepage-content/@t:side"/>
       </xsl:when>
       <xsl:otherwise>recto</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@element"/>
+    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -775,19 +785,20 @@ names.</para>
   <xsl:text>&#xA;  </xsl:text>
 
   <xsl:choose>
-    <xsl:when test="@force and @force != '0'">
+    <xsl:when test="@t:force and @t:force != '0'">
       <xsl:choose>
-        <xsl:when test="@named-template">
-          <xsl:element name="{../../@wrapper}">
+        <xsl:when test="@t:named-template">
+          <xsl:element name="{../../@t:wrapper}">
             <xsl:attribute name="xsl:use-attribute-sets">
-              <xsl:value-of select="../../@element"/>
+              <xsl:value-of select="../../@t:element"/>
               <xsl:text>.titlepage.</xsl:text>
-              <xsl:value-of select="../@side"/>
+              <xsl:value-of select="../@t:side"/>
               <xsl:text>.style</xsl:text>
             </xsl:attribute>
             <xsl:for-each select="@*">
-              <xsl:if test="namespace-uri(.)='http://www.w3.org/1999/XSL/Format'">
-                <xsl:attribute name="{local-name(.)}">
+              <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>
@@ -795,7 +806,7 @@ names.</para>
             <xsl:text>&#xA;</xsl:text>
             <xsl:element name="xsl:call-template">
               <xsl:attribute name="name">
-                <xsl:value-of select="@named-template"/>
+                <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'">
@@ -845,8 +856,8 @@ names.</para>
                   <xsl:value-of select="$docinfo"/>
                   <xsl:text>/</xsl:text>
                   <xsl:value-of select="name(.)"/>
-                  <xsl:if test="@predicate">
-                    <xsl:value-of select="@predicate"/>
+                  <xsl:if test="@t:predicate">
+                    <xsl:value-of select="@t:predicate"/>
                   </xsl:if>
                 </xsl:attribute>
               </xsl:element>
@@ -870,8 +881,8 @@ names.</para>
                     <xsl:value-of select="$altinfo"/>
                     <xsl:text>/</xsl:text>
                     <xsl:value-of select="name(.)"/>
-                    <xsl:if test="@predicate">
-                      <xsl:value-of select="@predicate"/>
+                    <xsl:if test="@t:predicate">
+                      <xsl:value-of select="@t:predicate"/>
                     </xsl:if>
                   </xsl:attribute>
                 </xsl:element>
@@ -891,8 +902,8 @@ names.</para>
                 </xsl:attribute>
                 <xsl:attribute name="select">
                   <xsl:value-of select="name(.)"/>
-                  <xsl:if test="@predicate">
-                    <xsl:value-of select="@predicate"/>
+                  <xsl:if test="@t:predicate">
+                    <xsl:value-of select="@t:predicate"/>
                   </xsl:if>
                 </xsl:attribute>
               </xsl:element>
@@ -913,8 +924,8 @@ names.</para>
               <xsl:value-of select="$docinfo"/>
               <xsl:text>/</xsl:text>
               <xsl:value-of select="name(.)"/>
-              <xsl:if test="@predicate">
-                <xsl:value-of select="@predicate"/>
+              <xsl:if test="@t:predicate">
+                <xsl:value-of select="@t:predicate"/>
               </xsl:if>
             </xsl:attribute>
           </xsl:element>
@@ -930,8 +941,8 @@ names.</para>
                 <xsl:value-of select="$altinfo"/>
                 <xsl:text>/</xsl:text>
                 <xsl:value-of select="name(.)"/>
-                <xsl:if test="@predicate">
-                  <xsl:value-of select="@predicate"/>
+                <xsl:if test="@t:predicate">
+                  <xsl:value-of select="@t:predicate"/>
                 </xsl:if>
               </xsl:attribute>
             </xsl:element>
@@ -958,15 +969,15 @@ processing. At present, that's just <literal>t:or</literal> elements.
 <xsl:template match="*" mode="titlepage.specialrules">
   <xsl:variable name="side">
     <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage-content/@side">
-        <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+      <xsl:when test="ancestor::t:titlepage-content/@t:side">
+        <xsl:value-of select="ancestor::t:titlepage-content/@t:side"/>
       </xsl:when>
       <xsl:otherwise>recto</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@element"/>
+    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -1009,15 +1020,15 @@ template elements.
 <xsl:template match="*" mode="titlepage.subrules">
   <xsl:variable name="side">
     <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage-content/@side">
-        <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+      <xsl:when test="ancestor::t:titlepage-content/@t:side">
+        <xsl:value-of select="ancestor::t:titlepage-content/@t:side"/>
       </xsl:when>
       <xsl:otherwise>recto</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@element"/>
+    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>
@@ -1046,15 +1057,15 @@ template elements.
 <xsl:template match="t:or">
   <xsl:variable name="side">
     <xsl:choose>
-      <xsl:when test="ancestor::t:titlepage-content/@side">
-        <xsl:value-of select="ancestor::t:titlepage-content/@side"/>
+      <xsl:when test="ancestor::t:titlepage-content/@t:side">
+        <xsl:value-of select="ancestor::t:titlepage-content/@t:side"/>
       </xsl:when>
       <xsl:otherwise>recto</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
 
   <xsl:variable name="mode">
-    <xsl:value-of select="ancestor::t:titlepage/@element"/>
+    <xsl:value-of select="ancestor::t:titlepage/@t:element"/>
     <xsl:text>.titlepage.</xsl:text>
     <xsl:value-of select="$side"/>
     <xsl:text>.auto.mode</xsl:text>