Fix bug 2840768 sidebar without title inserts empty b tag.

diff --git a/xsl/html/block.xsl b/xsl/html/block.xsl
index 93bdf75fea9dcd6ae809359036335e2e9f5bc378..bcc3748ce6a4e2c8e0742a1078feceeeed2a78e7 100644 (file)
--- a/xsl/html/block.xsl
+++ b/xsl/html/block.xsl
@@ -238,13 +238,7 @@
   <div>
     <xsl:call-template name="common.html.attributes"/>
     <xsl:call-template name="anchor"/>
-    <xsl:call-template name="formal.object.heading">
-      <xsl:with-param name="title">
-        <xsl:apply-templates select="." mode="title.markup">
-          <xsl:with-param name="allow-anchors" select="'1'"/>
-        </xsl:apply-templates>
-      </xsl:with-param>
-    </xsl:call-template>
+    <xsl:call-template name="sidebar.titlepage"/>
     <xsl:apply-templates/>
   </div>
 </xsl:template>

diff --git a/xsl/html/titlepage.templates.xml b/xsl/html/titlepage.templates.xml
index 926b3c31f90db66a86c33b6c973217230d67cbb2..cae516026cf28c04f85af7caf37a46aef9072626 100644 (file)
--- a/xsl/html/titlepage.templates.xml
+++ b/xsl/html/titlepage.templates.xml
@@ -1,5 +1,5 @@
 <t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-            xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
+             xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
              xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- ==================================================================== -->
@@ -106,9 +106,9 @@
 <t:titlepage t:element="part" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
     <title
-          t:force="1"
-          t:named-template="division.title"
-          param:node="ancestor-or-self::part[1]"/>
+           t:force="1"
+           t:named-template="division.title"
+           param:node="ancestor-or-self::part[1]"/>
     <subtitle/>
     <corpauthor/>
     <authorgroup/>
@@ -205,8 +205,8 @@
   <t:titlepage-content t:side="recto">
 <!-- uncomment this if you want refentry titlepages
     <title t:force="1"
-          t:named-template="refentry.title"
-          param:node="ancestor-or-self::refentry[1]"/>
+           t:named-template="refentry.title"
+           param:node="ancestor-or-self::refentry[1]"/>
 -->
   </t:titlepage-content>
 
@@ -227,9 +227,9 @@
   <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage">
     <t:titlepage-content t:side="recto">
     <title
-          t:force="1"
-          t:named-template="component.title"
-          param:node="ancestor-or-self::dedication[1]"/>
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::dedication[1]"/>
     <subtitle/>
     </t:titlepage-content>
 
@@ -251,9 +251,9 @@
 <t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage">
     <t:titlepage-content t:side="recto">
     <title
-          t:force="1"
-          t:named-template="component.title"
-          param:node="ancestor-or-self::acknowledgements[1]"/>
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::acknowledgements[1]"/>
     <subtitle/>
     </t:titlepage-content>
 
@@ -590,9 +590,9 @@
 <t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
     <title
-          t:force="1"
-          t:named-template="component.title"
-          param:node="ancestor-or-self::bibliography[1]"/>
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::bibliography[1]"/>
     <subtitle/>
   </t:titlepage-content>
 
@@ -614,9 +614,9 @@
 <t:titlepage t:element="glossary" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
     <title
-          t:force="1"
-          t:named-template="component.title"
-          param:node="ancestor-or-self::glossary[1]"/>
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::glossary[1]"/>
     <subtitle/>
   </t:titlepage-content>
 
@@ -638,9 +638,9 @@
 <t:titlepage t:element="index" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
     <title
-          t:force="1"
-          t:named-template="component.title"
-          param:node="ancestor-or-self::index[1]"/>
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::index[1]"/>
     <subtitle/>
   </t:titlepage-content>
 
@@ -662,9 +662,31 @@
 <t:titlepage t:element="setindex" t:wrapper="div" class="titlepage">
   <t:titlepage-content t:side="recto">
     <title
-          t:force="1"
-          t:named-template="component.title"
-          param:node="ancestor-or-self::setindex[1]"/>
+           t:force="1"
+           t:named-template="component.title"
+           param:node="ancestor-or-self::setindex[1]"/>
+    <subtitle/>
+  </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="sidebar" t:wrapper="div" class="titlepage">
+  <t:titlepage-content t:side="recto">
+    <title
+           t:named-template="formal.object.heading"
+           param:object="ancestor-or-self::sidebar[1]"/>
     <subtitle/>
   </t:titlepage-content>