From: Bob Stayton <bobs@sagehill.net>
Date: Sun, 25 Sep 2005 01:55:26 +0000 (+0000)
Subject: Fixed bug [ 1256277 ] sidebarinfo not supported, so now sidebarinfo
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0549940fe468416bff5fdbcc29773ad2c9f929a1;p=docbook-dsssl

Fixed bug [ 1256277 ] sidebarinfo not supported, so now sidebarinfo
is supported.
---

diff --git a/xsl/fo/block.xsl b/xsl/fo/block.xsl
index dd2137e1a..1fd1efcb1 100644
--- a/xsl/fo/block.xsl
+++ b/xsl/fo/block.xsl
@@ -259,12 +259,9 @@
     <xsl:otherwise>
       <xsl:variable name="content">
         <fo:block xsl:use-attribute-sets="sidebar.properties">
-          <xsl:if test="./title">
-            <fo:block xsl:use-attribute-sets="sidebar.title.properties">
-              <xsl:apply-templates select="./title" mode="sidebar.title.mode"/>
-            </fo:block>
-          </xsl:if>
-          <xsl:apply-templates/>
+	  <xsl:call-template name="sidebar.titlepage"/>
+          <xsl:apply-templates select="node()[not(title) and
+	                                 not(sidebarinfo)]"/>
         </fo:block>
       </xsl:variable>
     
@@ -322,11 +319,13 @@
 
 </xsl:template>
 
-<xsl:template match="sidebar/title">
-</xsl:template>
+<xsl:template match="sidebar/title|sidebarinfo"/>
 
-<xsl:template match="sidebar/title" mode="sidebar.title.mode">
-  <xsl:apply-templates/>
+<xsl:template match="sidebar/title|sidebarinfo|title"
+              mode="titlepage.mode" priority="1">
+  <fo:block xsl:use-attribute-sets="sidebar.title.properties">
+    <xsl:apply-templates/>
+  </fo:block>
 </xsl:template>
 
 <xsl:template name="margin.note">