Handle partinfo and simplesect; discard all markup from inside remark

diff --git a/docbook/relaxng/tools/db4-upgrade.xsl b/docbook/relaxng/tools/db4-upgrade.xsl
index 17b67efe502df2318554de21edebae7a40905979..0a282adf2dff7e086c94f359d00a0564b67f0e2e 100644 (file)
--- a/docbook/relaxng/tools/db4-upgrade.xsl
+++ b/docbook/relaxng/tools/db4-upgrade.xsl
@@ -35,12 +35,14 @@
   <xsl:apply-templates select="exsl:node-set($converted)/*" mode="addNS"/>
 </xsl:template>
 
-<xsl:template match="bookinfo|chapterinfo|articleinfo|artheader|appendixinfo|blockinfo
-                     |bibliographyinfo|glossaryinfo|indexinfo|setinfo|setindexinfo
+<xsl:template match="bookinfo|chapterinfo|articleinfo|artheader|appendixinfo
+                    |blockinfo
+                     |bibliographyinfo|glossaryinfo|indexinfo|setinfo
+                    |setindexinfo
                      |sect1info|sect2info|sect3info|sect4info|sect5info
                      |sectioninfo
                      |refsect1info|refsect2info|refsect3info|refsectioninfo
-                    |referenceinfo"
+                    |referenceinfo|partinfo"
               priority="200">
   <info>
     <xsl:call-template name="copy.attributes"/>
@@ -264,7 +266,8 @@
   </xsl:choose>
 </xsl:template>
 
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section" priority="200">
+<xsl:template match="sect1|sect2|sect3|sect4|sect5|section|simplesect"
+             priority="200">
   <section>
     <xsl:call-template name="copy.attributes"/>
 
@@ -440,6 +443,14 @@
   </xsl:message>
 </xsl:template>
 
+<xsl:template match="remark" priority="200">
+  <!-- get rid of any embedded markup -->
+  <remark>
+    <xsl:copy-of select="@*"/>
+    <xsl:value-of select="."/>
+  </remark>
+</xsl:template>
+
 <xsl:template match="biblioentry/contrib
                      |bibliomset/contrib
                      |bibliomixed/contrib" priority="200">