Further tinkering with sidebar handling. Think I got it right this

time. (re)closes bug 1541793. Thanks to Mauritz Jeanson.

diff --git a/xsl/common/titles.xsl b/xsl/common/titles.xsl
index 1ba7dd2169568e43e75a24c567f9dbbd4bf8fbba..9150d34cd021f0fa0fb4516aa5f5e8577f6fa674 100644 (file)
--- a/xsl/common/titles.xsl
+++ b/xsl/common/titles.xsl
@@ -382,6 +382,14 @@ title of the element. This does not include the label.
   </xsl:apply-templates>
 </xsl:template>
 
+<xsl:template match="sidebar" mode="title.markup">
+  <xsl:param name="allow-anchors" select="0"/>
+  <xsl:apply-templates select="(info/title|sidebarinfo/title|title)[1]"
+                       mode="title.markup">
+    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+  </xsl:apply-templates>
+</xsl:template>
+
 <xsl:template match="abstract" mode="title.markup">
   <xsl:param name="allow-anchors" select="0"/>
   <xsl:choose>

diff --git a/xsl/html/block.xsl b/xsl/html/block.xsl
index 0d8fd94f6dfa085b5089da6ff177e8174008c46e..003bfa0a68759c0a296e844396a736df41dd004f 100644 (file)
--- a/xsl/html/block.xsl
+++ b/xsl/html/block.xsl
@@ -213,6 +213,8 @@
 <xsl:template match="abstract/title|sidebar/title">
 </xsl:template>
 
+<xsl:template match="sidebar/sidebarinfo"/>
+
 <!-- ==================================================================== -->
 
 <xsl:template match="msgset">