Reworked titlepage template processing to support use of more interesting

predicates.

Note: in previous versions, at most one title, subtitle, or titleabbrev
element would be processed for each title page. In the new design, if you
have multiple title, subtitle, or titleabbrev elements inside an info
wrapper (you shouldn't!), they will all be processed.

diff --git a/xsl/fo/titlepage.templates.xml b/xsl/fo/titlepage.templates.xml
index f479b22bbe859bb723088327481456d6cc6d319f..92fefe6234432ccd244f8e3cd7baf87efa2a49dd 100644 (file)
--- a/xsl/fo/titlepage.templates.xml
+++ b/xsl/fo/titlepage.templates.xml
@@ -21,7 +21,7 @@
 
 <t:titlepage element="article" wrapper="fo:block">
   <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             named-template="component.title"
             param:node="ancestor-or-self::article[1]"
             fo:margin-left="-4pc"
@@ -29,7 +29,7 @@
             fo:font-size="&hsize5;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -60,14 +60,14 @@
 
 <t:titlepage element="set" wrapper="fo:block">
   <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             named-template="division.title"
             param:node="ancestor-or-self::set[1]"
             fo:font-size="&hsize5;"
             fo:space-before="&hsize5space;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -98,14 +98,14 @@
 
   <t:titlepage element="book" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             named-template="division.title"
             param:node="ancestor-or-self::book[1]"
             fo:font-size="&hsize5;"
             fo:space-before="&hsize5space;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:font-size="&hsize4;"
                fo:space-before="&hsize4space;"
                fo:font-family="{$title.font.family}"/>
@@ -119,7 +119,7 @@
     </t:titlepage-content>
 
   <t:titlepage-content side="verso">
-      <title predicate="[1]"
+      <title
             fo:font-size="&hsize2;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
@@ -148,14 +148,14 @@
 
 <t:titlepage element="part" wrapper="fo:block">
   <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             named-template="division.title"
             param:node="ancestor-or-self::part[1]"
             fo:font-size="&hsize5;"
             fo:space-before="&hsize5space;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-size="&hsize4;"
              fo:space-before="&hsize4space;"
              fo:font-weight='bold'
@@ -178,13 +178,13 @@
 
 <t:titlepage element="partintro" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:font-size="&hsize3;"
           fo:font-weight="bold"
           fo:margin-left="-4pc"
           fo:space-before="1em"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-size="&hsize2;"
              fo:font-weight="bold"
              fo:font-style="italic"
@@ -218,14 +218,14 @@
 
 <t:titlepage element="reference" wrapper="fo:block">
   <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             named-template="division.title"
             param:node="ancestor-or-self::reference[1]"
             fo:font-size="&hsize5;"
             fo:space-before="&hsize5space;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -256,7 +256,7 @@
 
   <t:titlepage element="dedication" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="component.title"
             param:node="ancestor-or-self::dedication[1]"
@@ -264,7 +264,7 @@
             fo:font-size="&hsize3;"
             fo:font-family="{$title.font.family}"
             fo:font-weight="bold"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
@@ -285,7 +285,7 @@
 
   <t:titlepage element="preface" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="component.title"
             param:node="ancestor-or-self::preface[1]"
@@ -293,7 +293,7 @@
             fo:font-size="&hsize3;"
             fo:font-family="{$title.font.family}"
             fo:font-weight="bold"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:font-family="{$title.font.family}"/>
       <corpauthor/>
       <authorgroup/>
@@ -324,14 +324,14 @@
 
   <t:titlepage element="chapter" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             named-template="component.title"
             param:node="ancestor-or-self::chapter[1]"
             fo:margin-left="-4pc"
             fo:font-size="&hsize3;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:space-before="0.5em"
                fo:margin-left="-4pc"
                fo:font-style="italic"
@@ -367,14 +367,14 @@
 
   <t:titlepage element="appendix" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             named-template="component.title"
             param:node="ancestor-or-self::appendix[1]"
             fo:margin-left="-4pc"
             fo:font-size="&hsize3;"
             fo:font-weight="bold"
             fo:font-family="{$title.font.family}"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:font-family="{$title.font.family}"/>
       <corpauthor/>
       <authorgroup/>
@@ -405,10 +405,10 @@
 
 <t:titlepage element="section" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:margin-left="-4pc"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -437,10 +437,10 @@
 
 <t:titlepage element="sect1" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:margin-left="-4pc"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -469,10 +469,10 @@
 
 <t:titlepage element="sect2" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:margin-left="-4pc"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -501,10 +501,10 @@
 
 <t:titlepage element="sect3" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:margin-left="-4pc"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -533,10 +533,10 @@
 
 <t:titlepage element="sect4" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:margin-left="-4pc"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -565,10 +565,10 @@
 
 <t:titlepage element="sect5" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:margin-left="-4pc"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -597,10 +597,10 @@
 
 <t:titlepage element="simplesect" wrapper="fo:block">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           fo:margin-left="-4pc"
           fo:font-family="{$title.font.family}"/>
-    <subtitle predicate="[1]"
+    <subtitle
              fo:font-family="{$title.font.family}"/>
     <corpauthor/>
     <authorgroup/>
@@ -631,7 +631,7 @@
 
   <t:titlepage element="bibliography" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="component.title"
             param:node="ancestor-or-self::bibliography[1]"
@@ -639,7 +639,7 @@
             fo:font-size="&hsize3;"
             fo:font-family="{$title.font.family}"
             fo:font-weight="bold"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
@@ -660,7 +660,7 @@
 
   <t:titlepage element="glossary" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="component.title"
             param:node="ancestor-or-self::glossary[1]"
@@ -668,7 +668,7 @@
             fo:font-size="&hsize3;"
             fo:font-family="{$title.font.family}"
             fo:font-weight="bold"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
@@ -689,7 +689,7 @@
 
   <t:titlepage element="index" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="component.title"
             param:node="ancestor-or-self::index[1]"
@@ -697,7 +697,7 @@
             fo:font-size="&hsize3;"
             fo:font-family="{$title.font.family}"
             fo:font-weight="bold"/>
-      <subtitle predicate="[1]"
+      <subtitle
                fo:font-family="{$title.font.family}"/>
     </t:titlepage-content>
 
@@ -718,7 +718,7 @@
 
   <t:titlepage element="table.of.contents" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="gentext"
             param:key="'TableofContents'"
@@ -744,7 +744,7 @@
 
   <t:titlepage element="list.of.tables" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="gentext"
             param:key="'ListofTables'"
@@ -770,7 +770,7 @@
 
   <t:titlepage element="list.of.figures" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="gentext"
             param:key="'ListofFigures'"
@@ -796,7 +796,7 @@
 
   <t:titlepage element="list.of.examples" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="gentext"
             param:key="'ListofExamples'"
@@ -822,7 +822,7 @@
 
   <t:titlepage element="list.of.equations" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="gentext"
             param:key="'ListofEquations'"
@@ -848,7 +848,7 @@
 
   <t:titlepage element="list.of.unknowns" wrapper="fo:block">
     <t:titlepage-content side="recto">
-      <title predicate="[1]"
+      <title
             force="1"
             named-template="gentext"
             param:key="'ListofUnknown'"

diff --git a/xsl/html/titlepage.templates.xml b/xsl/html/titlepage.templates.xml
index 5c01447f020ee903bc52420f47e14ca82e182784..f872e895242471eb9a45586cca1ec99267cf72db 100644 (file)
--- a/xsl/html/titlepage.templates.xml
+++ b/xsl/html/titlepage.templates.xml
@@ -6,8 +6,8 @@
 
 <t:titlepage element="article" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -38,8 +38,8 @@
 
 <t:titlepage element="set" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -70,8 +70,8 @@
 
 <t:titlepage element="book" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -102,8 +102,8 @@
 
 <t:titlepage element="part" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -131,8 +131,8 @@
 
 <t:titlepage element="partintro" wrapper="div">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -162,8 +162,8 @@
 
 <t:titlepage element="reference" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -194,11 +194,11 @@
 
   <t:titlepage element="dedication" wrapper="div" class="titlepage">
     <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           force="1"
           named-template="component.title"
           param:node="ancestor-or-self::dedication[1]"/>
-    <subtitle predicate="[1]"/>
+    <subtitle/>
     </t:titlepage-content>
 
   <t:titlepage-content side="verso">
@@ -218,8 +218,8 @@
 
 <t:titlepage element="preface" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -249,8 +249,8 @@
 
 <t:titlepage element="chapter" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -280,8 +280,8 @@
 
 <t:titlepage element="appendix" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -311,8 +311,8 @@
 
 <t:titlepage element="section" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -341,8 +341,8 @@
 
 <t:titlepage element="sect1" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -371,8 +371,8 @@
 
 <t:titlepage element="sect2" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -401,8 +401,8 @@
 
 <t:titlepage element="sect3" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -431,8 +431,8 @@
 
 <t:titlepage element="sect4" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -461,8 +461,8 @@
 
 <t:titlepage element="sect5" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -491,8 +491,8 @@
 
 <t:titlepage element="simplesect" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"/>
-    <subtitle predicate="[1]"/>
+    <title/>
+    <subtitle/>
     <corpauthor/>
     <authorgroup/>
     <author/>
@@ -523,11 +523,11 @@
 
 <t:titlepage element="bibliography" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           force="1"
           named-template="component.title"
           param:node="ancestor-or-self::bibliography[1]"/>
-    <subtitle predicate="[1]"/>
+    <subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content side="verso">
@@ -547,11 +547,11 @@
 
 <t:titlepage element="glossary" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           force="1"
           named-template="component.title"
           param:node="ancestor-or-self::glossary[1]"/>
-    <subtitle predicate="[1]"/>
+    <subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content side="verso">
@@ -571,11 +571,11 @@
 
 <t:titlepage element="index" wrapper="div" class="titlepage">
   <t:titlepage-content side="recto">
-    <title predicate="[1]"
+    <title
           force="1"
           named-template="component.title"
           param:node="ancestor-or-self::index[1]"/>
-    <subtitle predicate="[1]"/>
+    <subtitle/>
   </t:titlepage-content>
 
   <t:titlepage-content side="verso">

diff --git a/xsl/template/titlepage.xsl b/xsl/template/titlepage.xsl
index 6b08fcff14cd9dd7a6d0beeb766e30ffc8726c1c..200fb382f95d432b19214517d77f0d0f9392d19e 100644 (file)
--- a/xsl/template/titlepage.xsl
+++ b/xsl/template/titlepage.xsl
@@ -269,11 +269,14 @@ and <quote>verso</quote> sides of the title page.</para>
     </xsl:element>
   </xsl:if>
 
-  <!-- output default templates for each of the elements listed in -->
-  <!-- the titlepage-content -->
+  <!-- output default templates for each of the elements listed in  -->
+  <!-- the titlepage-content. If a template is suppressed or forced -->
+  <!-- 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')">
+                  and (not(@force) or @force='0')
+                  and (not(preceding-sibling::*[name(.)=name($thisnode)]))">
       <xsl:text>&#xA;&#xA;</xsl:text>
       <xsl:element name="xsl:template">
         <xsl:attribute name="match">
@@ -679,31 +682,31 @@ names.</para>
     <xsl:text>|</xsl:text>
   </xsl:if>
 
-  <xsl:if test="@predicate">
-    <xsl:text>(</xsl:text>
-  </xsl:if>
-
   <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>
 
   <xsl:if test="$altinfo != ''">
     <xsl:text>|</xsl:text>
     <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>
   </xsl:if>
 
-  <xsl:if test="name(.) = 'title'
-                or name(.) = 'subtitle'
-                or name(.) = 'titleabbrev'">
+  <xsl:if test="local-name(.) = 'title'
+                or local-name(.) = 'subtitle'
+                or local-name(.) = 'titleabbrev'">
     <xsl:text>|</xsl:text>
     <xsl:value-of select="name(.)"/>
-  </xsl:if>
-
-  <xsl:if test="@predicate">
-    <xsl:text>)</xsl:text>
-    <xsl:value-of select="@predicate"/>
+    <xsl:if test="@predicate">
+      <xsl:value-of select="@predicate"/>
+    </xsl:if>
   </xsl:if>
 </xsl:template>
 
@@ -819,39 +822,122 @@ names.</para>
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:element name="xsl:apply-templates">
-        <xsl:attribute name="mode">
-          <xsl:value-of select="$mode"/>
-        </xsl:attribute>
-        <xsl:attribute name="select">
-          <xsl:if test="@predicate">
-            <xsl:text>(</xsl:text>
-          </xsl:if>
 
-          <xsl:value-of select="$docinfo"/>
-          <xsl:text>/</xsl:text>
-          <xsl:value-of select="name(.)"/>
+      <xsl:choose>
+        <xsl:when test="local-name(.) = 'title'
+                        or local-name(.) = 'subtitle'
+                        or local-name(.) = 'titleabbrev'">
+          <!-- the title, subtitle, and titleabbrev elements are special -->
+          <xsl:element name="xsl:choose">
+            <xsl:text>&#xA;    </xsl:text>
+            <xsl:element name="xsl:when">
+              <xsl:attribute name="test">
+                <xsl:value-of select="$docinfo"/>
+                <xsl:text>/</xsl:text>
+                <xsl:value-of select="name(.)"/>
+              </xsl:attribute>
+              <xsl:text>&#xA;      </xsl:text>
+              <xsl:element name="xsl:apply-templates">
+                <xsl:attribute name="mode">
+                  <xsl:value-of select="$mode"/>
+                </xsl:attribute>
+                <xsl:attribute name="select">
+                  <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>
+                </xsl:attribute>
+              </xsl:element>
+              <xsl:text>&#xA;    </xsl:text>
+            </xsl:element>
 
-          <xsl:if test="$altinfo != ''">
-            <xsl:text>|</xsl:text>
-            <xsl:value-of select="$altinfo"/>
-            <xsl:text>/</xsl:text>
-            <xsl:value-of select="name(.)"/>
-          </xsl:if>
+            <xsl:if test="$altinfo != ''">
+              <xsl:text>&#xA;    </xsl:text>
+              <xsl:element name="xsl:when">
+                <xsl:attribute name="test">
+                  <xsl:value-of select="$altinfo"/>
+                  <xsl:text>/</xsl:text>
+                  <xsl:value-of select="name(.)"/>
+                </xsl:attribute>
+                <xsl:text>&#xA;      </xsl:text>
+                <xsl:element name="xsl:apply-templates">
+                  <xsl:attribute name="mode">
+                    <xsl:value-of select="$mode"/>
+                  </xsl:attribute>
+                  <xsl:attribute name="select">
+                    <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>
+                  </xsl:attribute>
+                </xsl:element>
+                <xsl:text>&#xA;    </xsl:text>
+              </xsl:element>
+            </xsl:if>
 
-          <xsl:if test="name(.) = 'title'
-                        or name(.) = 'subtitle'
-                        or name(.) = 'titleabbrev'">
-            <xsl:text>|</xsl:text>
-            <xsl:value-of select="name(.)"/>
-          </xsl:if>
+            <xsl:text>&#xA;    </xsl:text>
+            <xsl:element name="xsl:when">
+              <xsl:attribute name="test">
+                <xsl:value-of select="name(.)"/>
+              </xsl:attribute>
+              <xsl:text>&#xA;      </xsl:text>
+              <xsl:element name="xsl:apply-templates">
+                <xsl:attribute name="mode">
+                  <xsl:value-of select="$mode"/>
+                </xsl:attribute>
+                <xsl:attribute name="select">
+                  <xsl:value-of select="name(.)"/>
+                  <xsl:if test="@predicate">
+                    <xsl:value-of select="@predicate"/>
+                  </xsl:if>
+                </xsl:attribute>
+              </xsl:element>
+              <xsl:text>&#xA;    </xsl:text>
+            </xsl:element>
+            <xsl:text>&#xA;  </xsl:text>
+          </xsl:element>
+          <xsl:text>&#xA;</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+
+          <!-- first take care of the $docinfo version -->
+          <xsl:element name="xsl:apply-templates">
+            <xsl:attribute name="mode">
+              <xsl:value-of select="$mode"/>
+            </xsl:attribute>
+            <xsl:attribute name="select">
+              <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>
+            </xsl:attribute>
+          </xsl:element>
 
-          <xsl:if test="@predicate">
-            <xsl:text>)</xsl:text>
-            <xsl:value-of select="@predicate"/>
+          <!-- then take care of the $altinfo version -->
+          <xsl:if test="$altinfo != ''">
+            <xsl:text>&#xA;  </xsl:text>
+            <xsl:element name="xsl:apply-templates">
+              <xsl:attribute name="mode">
+                <xsl:value-of select="$mode"/>
+              </xsl:attribute>
+              <xsl:attribute name="select">
+                <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>
+              </xsl:attribute>
+            </xsl:element>
           </xsl:if>
-        </xsl:attribute>
-      </xsl:element>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>