Remove a nesting of <p> inside <p> for refclass (made XHTML* invalid, made HTML silly)

diff --git a/xsl/epub/bin/spec/epub_regressions_spec.rb b/xsl/epub/bin/spec/epub_regressions_spec.rb
index cc679ddffd9f4420ab962283ac952ea037d5f00e..7260384198cc1fbcce35e0fc98c922216d61448e 100755 (executable)
--- a/xsl/epub/bin/spec/epub_regressions_spec.rb
+++ b/xsl/epub/bin/spec/epub_regressions_spec.rb
@@ -116,6 +116,13 @@ describe DocBook::Epub do
     blockquotepre_epubfile.should be_valid_epub  
   end
 
+  it "should render refentry/refclass without duplicating <p>s" do
+    refclass_epub = DocBook::Epub.new(File.join(@filedir, "refclass.xml"), @tmpdir)
+    refclass_epubfile  = File.join(@tmpdir, "refclassepub.epub")
+    refclass_epub.render_to_file(refclass_epubfile, $DEBUG)
+    refclass_epubfile.should be_valid_epub  
+  end
+
   after(:all) do
     FileUtils.rm_r(@tmpdir, :force => true)
   end  

diff --git a/xsl/epub/bin/spec/files/refclass.xml b/xsl/epub/bin/spec/files/refclass.xml
new file mode 100644 (file)
index 0000000..6340d7d
--- /dev/null
+++ b/xsl/epub/bin/spec/files/refclass.xml
@@ -0,0 +1,17 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<refentry id="siehe_auch-id522">
+  <refnamediv>
+    <refname>XSLTProcessor</refname>
+    <refpurpose>Transformiert XML mit XSLT-Stylesheets</refpurpose>
+    <refclass>Firefox 1.0, Safari 2.01, Opera 9</refclass>
+    <refclass>Object &#x2192; XSLTProcessor</refclass>
+  </refnamediv>
+  <refsect1 id="konstruktor-id22">
+    <title>Konstruktor</title>
+    <programlisting id="I_programlisting_d1e98549" format="linespecific">new XSLTProcessor( )</programlisting>
+  </refsect1>
+  <refsect1 id="methoden-id48">
+    <title>Methoden</title>
+    <para/>
+  </refsect1>
+</refentry>

diff --git a/xsl/html/refentry.xsl b/xsl/html/refentry.xsl
index ebff78ff98cc7fb66552b1eca1070e746a93a160..7be57c606513c72ff41af72532975ec81693f44b 100644 (file)
--- a/xsl/html/refentry.xsl
+++ b/xsl/html/refentry.xsl
@@ -196,15 +196,13 @@
 
 <xsl:template match="refclass">
   <xsl:if test="$refclass.suppress = 0">
-  <p>
-    <b>
-      <xsl:if test="@role">
-        <xsl:value-of select="@role"/>
-        <xsl:text>: </xsl:text>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </b>
-  </p>
+  <b>
+    <xsl:if test="@role">
+      <xsl:value-of select="@role"/>
+      <xsl:text>: </xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </b>
   </xsl:if>
 </xsl:template>