From d335e11e3355ee01f861d631f076889ad850199a Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 31 Jan 2013 18:28:10 -0500
Subject: v4 v3: dal, on ocn excluded paragraphs (~# -#), hang/indent bullet,
 fix

* [bug reported indirectly by Cory Doctorow (discovered in work with markup)]
---
 lib/sisu/v3/dal_doc_str.rb | 8 ++++----
 lib/sisu/v4/dal_doc_str.rb | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/sisu/v3/dal_doc_str.rb b/lib/sisu/v3/dal_doc_str.rb
index 40fad15e..dafed778 100644
--- a/lib/sisu/v3/dal_doc_str.rb
+++ b/lib/sisu/v3/dal_doc_str.rb
@@ -740,19 +740,19 @@ module SiSU_DAL_DocumentStructureExtract
         elsif dob.obj=~/#{Mx[:pa_non_object_no_heading]}/
           dob.obj=dob.obj.gsub(/#{Mx[:pa_non_object_no_heading]}/,'')
           if dob.is==:para
-            h={ obj: dob.obj, ocn_: false, ocn: nil }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, hang: dob.hang, indent: dob.indent, bullet_: dob.bullet_, tags: dob.tags, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is==:heading
-            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: true }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: true, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         elsif dob.obj=~/#{Mx[:pa_non_object_dummy_heading]}/
           dob.obj=dob.obj.gsub(/#{Mx[:pa_non_object_dummy_heading]}/,'')
           if dob.is==:para
-            h={ obj: dob.obj, ocn_: false, ocn: nil }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, hang: dob.hang, indent: dob.indent, bullet_: dob.bullet_, tags: dob.tags, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is==:heading
-            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: false }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: false, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         else dob
diff --git a/lib/sisu/v4/dal_doc_str.rb b/lib/sisu/v4/dal_doc_str.rb
index 40fad15e..dafed778 100644
--- a/lib/sisu/v4/dal_doc_str.rb
+++ b/lib/sisu/v4/dal_doc_str.rb
@@ -740,19 +740,19 @@ module SiSU_DAL_DocumentStructureExtract
         elsif dob.obj=~/#{Mx[:pa_non_object_no_heading]}/
           dob.obj=dob.obj.gsub(/#{Mx[:pa_non_object_no_heading]}/,'')
           if dob.is==:para
-            h={ obj: dob.obj, ocn_: false, ocn: nil }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, hang: dob.hang, indent: dob.indent, bullet_: dob.bullet_, tags: dob.tags, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is==:heading
-            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: true }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: true, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         elsif dob.obj=~/#{Mx[:pa_non_object_dummy_heading]}/
           dob.obj=dob.obj.gsub(/#{Mx[:pa_non_object_dummy_heading]}/,'')
           if dob.is==:para
-            h={ obj: dob.obj, ocn_: false, ocn: nil }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, hang: dob.hang, indent: dob.indent, bullet_: dob.bullet_, tags: dob.tags, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectPara.new.paragraph(h,dob)
           elsif dob.is==:heading
-            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: false }
+            h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: false, parent: dob.parent }
             dob=SiSU_DAL_DocumentStructure::ObjectHeading.new.heading(h,dob)
           end
         else dob
-- 
cgit v1.2.3