From 998aa4d3098bd54de4295d45903b823c0ebd7076 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Sun, 16 Oct 2005 22:17:27 +0000
Subject: [PATCH] Handle sidebar and simplesect correctly

---
 docbook/relaxng/tools/db4-upgrade.xsl | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/docbook/relaxng/tools/db4-upgrade.xsl b/docbook/relaxng/tools/db4-upgrade.xsl
index 0f088ddf6..0f249d390 100644
--- a/docbook/relaxng/tools/db4-upgrade.xsl
+++ b/docbook/relaxng/tools/db4-upgrade.xsl
@@ -217,7 +217,8 @@
                      |caution|important|note|warning|tip
                      |bibliodiv|glossarydiv|indexdiv
 		     |orderedlist|itemizedlist|variablelist|procedure
-		     |task|tasksummary|taskprerequisites|taskrelated"
+		     |task|tasksummary|taskprerequisites|taskrelated
+		     |sidebar"
 	      priority="200">
   <xsl:choose>
     <xsl:when test="blockinfo">
@@ -273,7 +274,7 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section|simplesect"
+<xsl:template match="sect1|sect2|sect3|sect4|sect5|section"
 	      priority="200">
   <section>
     <xsl:call-template name="copy.attributes"/>
@@ -289,6 +290,22 @@
   </section>
 </xsl:template>
 
+<xsl:template match="simplesect"
+	      priority="200">
+  <simplesect>
+    <xsl:call-template name="copy.attributes"/>
+
+    <xsl:if test="not(sect1info|sect2info|sect3info|sect4info|sect5info|sectioninfo)">
+      <info>
+        <xsl:apply-templates select="title" mode="copy"/>
+        <xsl:apply-templates select="titleabbrev" mode="copy"/>
+        <xsl:apply-templates select="subtitle" mode="copy"/>
+      </info>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </simplesect>
+</xsl:template>
+
 <xsl:template match="refsect1|refsect2|refsect3|refsection" priority="200">
   <refsection>
     <xsl:call-template name="copy.attributes"/>
-- 
2.40.0