Adding support for partintros with sect2s, 3s, etc

diff --git a/xsl/epub/bin/spec/epub_regressions_spec.rb b/xsl/epub/bin/spec/epub_regressions_spec.rb
index 2be252200a0e0db996888444449f1f0fbb782ccc..5defca998d46e8f573d7182b8f5e7cab429793c8 100755 (executable)
--- a/xsl/epub/bin/spec/epub_regressions_spec.rb
+++ b/xsl/epub/bin/spec/epub_regressions_spec.rb
@@ -215,6 +215,14 @@ describe DocBook::Epub do
     end  
   end  
 
+  it "should allow sect2s inside partintros" do
+    partintro_epub = DocBook::Epub.new(File.join(@filedir, "partintro.xml"), @tmpdir)
+    partintro_epubfile  = File.join(@tmpdir, "partintro.epub")
+    partintro_epub.render_to_file(partintro_epubfile, $DEBUG)
+    partintro_epubfile.should be_valid_epub  
+  end
+
+
   after(:all) do
     FileUtils.rm_r(@tmpdir, :force => true)
   end  

diff --git a/xsl/epub/bin/spec/files/partintro.xml b/xsl/epub/bin/spec/files/partintro.xml
new file mode 100644 (file)
index 0000000..2801bee
--- /dev/null
+++ b/xsl/epub/bin/spec/files/partintro.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+          "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<part>
+  <title>Partintro with sect2s</title>
+  <partintro>
+    <sect1>
+      <title>A sect1 in a partintro</title>
+      <para>With a little text.</para>
+    <sect2>
+      <title>A sect2 in a sect1 in a partintro</title>
+      <para>With a little text.</para>
+    </sect2>
+    <sect2>
+      <title>A 2nd sect2 in a sect1 in a partintro</title>
+      <para>With a little text.</para>
+    </sect2>
+    </sect1>
+  </partintro>
+  <chapter>
+    <title>Chapter</title>
+    <para>Some test data
+    <indexterm>
+      <primary>First Part</primary>
+    </indexterm></para>
+    <para>Referencing <firstterm>gloss-1</firstterm>.</para>
+    <sect1>
+      <title>A sect1 in a chapter</title>
+      <para>With a little text.</para>
+    </sect1>
+  </chapter>
+
+  <index/>
+</part>
+

diff --git a/xsl/epub/docbook.xsl b/xsl/epub/docbook.xsl
index 60fbb2858d514a9e6e6bd252fba3f6cd6fe394d6..bc889e3f7483efd0b8175f55664464d90defc6ee 100644 (file)
--- a/xsl/epub/docbook.xsl
+++ b/xsl/epub/docbook.xsl
@@ -565,10 +565,10 @@
                                   preceding::glossary|
                                   preceding::section[not(parent::partintro)]|
                                   preceding::sect1[not(parent::partintro)]|
-                                  preceding::sect2|
-                                  preceding::sect3|
-                                  preceding::sect4|
-                                  preceding::sect5|
+                                  preceding::sect2[not(ancestor::partintro)]|
+                                  preceding::sect3[not(ancestor::partintro)]|
+                                  preceding::sect4[not(ancestor::partintro)]|
+                                  preceding::sect5[not(ancestor::partintro)]|
                                   preceding::refentry|
                                   preceding::colophon|
                                   preceding::bibliodiv[title]|