Fix list of block elements and support xhtml

diff --git a/xsl/html/html-rtf.xsl b/xsl/html/html-rtf.xsl
index caad7295259e7787d352e8ddf342fd14f0f72c76..6890b5f9ab27a71a3c1336221d3aaf4329cfa207 100644 (file)
--- a/xsl/html/html-rtf.xsl
+++ b/xsl/html/html-rtf.xsl
@@ -107,8 +107,14 @@
 </xsl:template>
 
 <xsl:template match="p" mode="unwrap.p">
-  <xsl:variable name="blocks" select="div|p|blockquote|table"/>
-
+  <!-- xmlns:html is necessary for the xhtml stylesheet case -->
+  <xsl:variable name="blocks" xmlns:html="http://www.w3.org/1999/xhtml"
+                select="address|blockquote|div|hr|h1|h2|h3|h4|h5|h6
+                        |layer|p|pre|table|dl|menu|ol|ul|form
+                        |html:address|html:blockquote|html:div|html:hr
+                        |html:h1|html:h2|html:h3|html:h4|html:h5|html:h6
+                        |html:layer|html:p|html:pre|html:table|html:dl
+                        |html:menu|html:ol|html:ul|html:form"/>
   <xsl:choose>
     <xsl:when test="$blocks">
       <xsl:call-template name="unwrap.nodes">
@@ -152,8 +158,8 @@
                 and function-available('set:trailing')">
     <xsl:choose>
       <xsl:when test="$blocks">
-        <xsl:variable name="leading" select="set:leading($nodes,$blocks)"/>
-        <xsl:variable name="trailing" select="set:trailing($nodes,$blocks)"/>
+        <xsl:variable name="leading" select="set:leading($nodes,$block)"/>
+        <xsl:variable name="trailing" select="set:trailing($nodes,$block)"/>
 
         <xsl:element name="{local-name($wrap)}" namespace="{namespace-uri($wrap)}">
           <xsl:for-each select="$wrap/@*">