db2html-division: Starting to simplify titles in divisions

4 files changed, 60 insertions, 175 deletions

diff --git a/xslt/docbook/html/db2html-bibliography.xsl b/xslt/docbook/html/db2html-bibliography.xsl
index 84a60602..eaa6f2a6 100644
--- a/xslt/docbook/html/db2html-bibliography.xsl
+++ b/xslt/docbook/html/db2html-bibliography.xsl
@@ -591,30 +591,12 @@ a bibliography entry.
   <xsl:param name="depth_of_chunk">
     <xsl:call-template name="db.chunk.depth-of-chunk"/>
   </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(title) and not(bibliographyinfo/title) and
-                    not(db:title) and not(db:info/db:title)">
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="info" select="bibliographyinfo | db:info"/>
-        <xsl:with-param name="divisions" select="bibliodiv | db:bibliodiv"/>
-        <xsl:with-param name="title_content">
-          <xsl:call-template name="l10n.gettext">
-            <xsl:with-param name="msgid" select="'Bibliography'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="info" select="bibliographyinfo | db:info"/>
-        <xsl:with-param name="divisions" select="bibliodiv | db:bibliodiv"/>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="info" select="bibliographyinfo | db:info"/>
+    <xsl:with-param name="divisions" select="bibliodiv | db:bibliodiv"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = bibliodiv = -->
diff --git a/xslt/docbook/html/db2html-division.xsl b/xslt/docbook/html/db2html-division.xsl
index b157458b..95d914f5 100644
--- a/xslt/docbook/html/db2html-division.xsl
+++ b/xslt/docbook/html/db2html-division.xsl
@@ -94,8 +94,6 @@ $node: The element to render the content of
 $info: The info child element of ${node}
 $title_node: The element containing the title of ${node}
 $subtitle_node: The element containing the subtitle of ${node}
-$title_content: The title for divisions lacking a #{title} tag
-$subtitle_content: The subtitle for divisions lacking a #{subtitle} tag
 $entries: The entry-style child elements
 $divisions: The division-level child elements
 $callback: Whether to process ${node} in %{db2html.division.div.content.mode}
@@ -114,8 +112,6 @@ REMARK: Talk about some of the parameters
              select="($node/title | $info/title | $node/db:title | $info/db:title)[last()]"/>
   <xsl:param name="subtitle_node"
              select="($node/subtitle | $info/subtitle | $node/db:subtitle | $info/db:subtitle)[last()]"/>
-  <xsl:param name="title_content"/>
-  <xsl:param name="subtitle_content"/>
   <xsl:param name="entries" select="/false"/>
   <xsl:param name="divisions" select="/false"/>
   <xsl:param name="callback" select="false()"/>
@@ -173,8 +169,6 @@ REMARK: Talk about some of the parameters
       <xsl:with-param name="title_node" select="$title_node"/>
       <xsl:with-param name="subtitle_node" select="$subtitle_node"/>
       <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-      <xsl:with-param name="title_content" select="$title_content"/>
-      <xsl:with-param name="subtitle_content" select="$subtitle_content"/>
     </xsl:call-template>
     <div class="region">
     <xsl:choose>
@@ -245,8 +239,6 @@ $node: The element containing the title.
 $title_node: The #{title} element to render.
 $subtitle_node: The #{subtitle} element to render.
 $depth: The depth of ${node} in the containing output.
-$title_content: An optional string containing the title.
-$subtitle_content: An optional string containing the subtitle.
 
 REMARK: Talk about the different kinds of title blocks
 -->
@@ -259,8 +251,6 @@ REMARK: Talk about the different kinds of title blocks
       <xsl:with-param name="node" select="$node"/>
     </xsl:call-template>
   </xsl:param>
-  <xsl:param name="title_content"/>
-  <xsl:param name="subtitle_content"/>
 
   <xsl:variable name="title_h">
     <xsl:choose>
@@ -294,27 +284,22 @@ REMARK: Talk about the different kinds of title blocks
         </xsl:call-template>
       </xsl:if>
       <xsl:choose>
-        <xsl:when test="$title_content">
-          <xsl:value-of select="$title_content"/>
+        <xsl:when test="$title_node">
+          <xsl:apply-templates select="$title_node/node()"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:apply-templates select="$title_node/node()"/>
+          <xsl:call-template name="db.title">
+            <xsl:with-param name="node" select="$node"/>
+          </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:element>
-    <xsl:if test="$subtitle_node or $subtitle_content">
+    <xsl:if test="$subtitle_node">
       <xsl:element name="{$subtitle_h}" namespace="{$html.namespace}">
         <xsl:attribute name="class">
           <xsl:text>subtitle</xsl:text>
         </xsl:attribute>
-        <xsl:choose>
-          <xsl:when test="$subtitle_content">
-            <xsl:value-of select="$subtitle_content"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="$subtitle_node/node()"/>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:apply-templates select="$subtitle_node/node()"/>
       </xsl:element>
     </xsl:if>
   </div>
@@ -518,6 +503,7 @@ the division. By default it is called by the %{html.footer.mode} implementation.
     <xsl:with-param name="divisions" select="
                     appendix | bibliography | glossary | index      | lot |
                     refentry | sect1        | section  | simplesect | toc |
+                    colophon | db:colophon |
                     db:appendix   | db:bibliography | db:glossary | db:index |
                     db:refentry   | db:sect1        | db:section  |
                     db:simplesect | db:toc "/>
@@ -547,13 +533,6 @@ the division. By default it is called by the %{html.footer.mode} implementation.
                     db:part             | db:preface  | db:reference |
                     db:toc"/>
     <xsl:with-param name="info" select="bookinfo | db:info"/>
-    <!-- Unlike other elements in DocBook, title comes before bookinfo -->
-    <xsl:with-param name="title_node"
-                    select="(title    | bookinfo/title |
-                             db:title | db:info/db:title)[1]"/>
-    <xsl:with-param name="subtitle_node"
-                    select="(subtitle    | bookinfo/subtitle |
-                             db:subtitle | db:info/db:subtitle)[1]"/>
     <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
     <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
     <xsl:with-param name="autotoc_depth" select="2"/>
@@ -581,6 +560,21 @@ the division. By default it is called by the %{html.footer.mode} implementation.
   </xsl:call-template>
 </xsl:template>
 
+<!-- = colophon = -->
+<xsl:template match="colophon | db:colophon">
+  <xsl:param name="depth_in_chunk">
+    <xsl:call-template name="db.chunk.depth-in-chunk"/>
+  </xsl:param>
+  <xsl:param name="depth_of_chunk">
+    <xsl:call-template name="db.chunk.depth-of-chunk"/>
+  </xsl:param>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="info" select="db:info"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
+</xsl:template>
+
 <!-- = dedication = -->
 <xsl:template match="dedication | db:dedication">
   <xsl:param name="depth_in_chunk">
@@ -589,26 +583,11 @@ the division. By default it is called by the %{html.footer.mode} implementation.
   <xsl:param name="depth_of_chunk">
     <xsl:call-template name="db.chunk.depth-of-chunk"/>
   </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(title) and not(db:title) and not(db:info/db:title)">
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="title_content">
-          <xsl:call-template name="l10n.gettext">
-            <xsl:with-param name="msgid" select="'Dedication'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="info" select="db:info"/>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="info" select="db:info"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = glossary = -->
@@ -619,31 +598,13 @@ the division. By default it is called by the %{html.footer.mode} implementation.
   <xsl:param name="depth_of_chunk">
     <xsl:call-template name="db.chunk.depth-of-chunk"/>
   </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(title) and not(glossaryinfo/title) and not(db:title) and not(db:info/db:title)">
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="entries" select="glossentry | db:glossentry"/>
-        <xsl:with-param name="divisions" select="glossdiv | bibliography | db:glossdiv | db:bibliography"/>
-        <xsl:with-param name="title_content">
-          <xsl:call-template name="l10n.gettext">
-            <xsl:with-param name="msgid" select="'Glossary'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="info" select="glossaryinfo | db:info"/>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="entries" select="glossentry | db:glossentry"/>
-        <xsl:with-param name="divisions" select="glossdiv | bibliography | db:glossdiv | db:bibliography"/>
-        <xsl:with-param name="info" select="glossaryinfo | db:info"/>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="entries" select="glossentry | db:glossentry"/>
+    <xsl:with-param name="divisions" select="glossdiv | bibliography | db:glossdiv | db:bibliography"/>
+    <xsl:with-param name="info" select="glossaryinfo | db:info"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = glossdiv = -->
@@ -675,7 +636,7 @@ the division. By default it is called by the %{html.footer.mode} implementation.
     <xsl:with-param name="divisions" select="
                     appendix | article   | bibliography | chapter |
                     glossary | index     | lot          | preface |
-                    refentry | reference | toc          |
+                    refentry | reference | toc          | db:colophon |
                     db:appendix  | db:article   | db:bibliography |
                     db:chapter   | db:glossary  | db:index        |
                     db:preface   | db:refentry  | db:reference    |
diff --git a/xslt/docbook/html/db2html-index.xsl b/xslt/docbook/html/db2html-index.xsl
index 59ea2dc0..be13973b 100644
--- a/xslt/docbook/html/db2html-index.xsl
+++ b/xslt/docbook/html/db2html-index.xsl
@@ -129,32 +129,13 @@ indexterm (autoidx)
   <xsl:param name="depth_of_chunk">
     <xsl:call-template name="db.chunk.depth-of-chunk"/>
   </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(title) and not(indexinfo/title) and not(db:title) and
-                    not(db:info/db:title)">
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="info" select="indexinfo | db:info"/>
-        <xsl:with-param name="divisions" select="indexdiv | db:indexdiv"/>
-        <xsl:with-param name="entries" select="indexentry | db:indexentry"/>
-        <xsl:with-param name="title_content">
-          <xsl:call-template name="l10n.gettext">
-            <xsl:with-param name="msgid" select="'Index'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="info" select="indexinfo | db:info"/>
-        <xsl:with-param name="divisions" select="indexdiv | db:indexdiv"/>
-        <xsl:with-param name="entries" select="indexentry | db:indexentry"/>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="info" select="indexinfo | db:info"/>
+    <xsl:with-param name="divisions" select="indexdiv | db:indexdiv"/>
+    <xsl:with-param name="entries" select="indexentry | db:indexentry"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = setindex = -->
@@ -165,32 +146,13 @@ indexterm (autoidx)
   <xsl:param name="depth_of_chunk">
     <xsl:call-template name="db.chunk.depth-of-chunk"/>
   </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(title) and not(setindexinfo/title) and not(db:title) and
-                    not(db:info/db:title)">
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="info" select="setindexinfo | db:info"/>
-        <xsl:with-param name="divisions" select="indexdiv | db:indexdiv"/>
-        <xsl:with-param name="entries" select="indexentry | db:indexentry"/>
-        <xsl:with-param name="title_content">
-          <xsl:call-template name="l10n.gettext">
-            <xsl:with-param name="msgid" select="'Index'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="info" select="setindexinfo | db:info"/>
-        <xsl:with-param name="divisions" select="indexdiv | db:indexdiv"/>
-        <xsl:with-param name="entries" select="indexentry | db:indexentry"/>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="info" select="setindexinfo | db:info"/>
+    <xsl:with-param name="divisions" select="indexdiv | db:indexdiv"/>
+    <xsl:with-param name="entries" select="indexentry | db:indexentry"/>
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!--#% l10n.format.mode -->
diff --git a/xslt/docbook/html/db2html-refentry.xsl b/xslt/docbook/html/db2html-refentry.xsl
index c09ac223..912369ba 100644
--- a/xslt/docbook/html/db2html-refentry.xsl
+++ b/xslt/docbook/html/db2html-refentry.xsl
@@ -51,11 +51,6 @@ REMARK: Describe this module. Talk about refenty and friends
     <xsl:call-template name="db.chunk.depth-of-chunk"/>
   </xsl:param>
   <xsl:call-template name="db2html.division.div">
-    <xsl:with-param name="title_content">
-      <xsl:call-template name="db.title">
-        <xsl:with-param name="node" select="."/>
-      </xsl:call-template>
-    </xsl:with-param>
     <xsl:with-param name="divisions"
                     select="refsynopsisdiv | refsection | refsect1 |
                             db:refsynopsisdiv | db:refsection | db:refsect1"/>
@@ -209,25 +204,10 @@ REMARK: Describe this module. Talk about refenty and friends
   <xsl:param name="depth_of_chunk">
     <xsl:call-template name="db.chunk.depth-of-chunk"/>
   </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(title) and not(db:title)">
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="title_content">
-          <xsl:call-template name="l10n.gettext">
-            <xsl:with-param name="msgid" select="'Synopsis'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="db2html.division.div">
-        <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
-        <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:call-template name="db2html.division.div">
+    <xsl:with-param name="depth_in_chunk" select="$depth_in_chunk"/>
+    <xsl:with-param name="depth_of_chunk" select="$depth_of_chunk"/>
+  </xsl:call-template>
 </xsl:template>
 
 </xsl:stylesheet>