From d335e11e3355ee01f861d631f076889ad850199a Mon Sep 17 00:00:00 2001 From: Ralph Amissah 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/v4/dal_doc_str.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/sisu/v4/dal_doc_str.rb') 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 From fb6abb03ac0cfa136afbe1ca0471c14f9bbb52b4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 31 Jan 2013 18:43:17 -0500 Subject: v4 v3: dal (obj), html, br_page* behavior in html depending on origin of break * markup specified v auto --- lib/sisu/v4/dal_doc_str.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sisu/v4/dal_doc_str.rb') diff --git a/lib/sisu/v4/dal_doc_str.rb b/lib/sisu/v4/dal_doc_str.rb index dafed778..a04ad3ad 100644 --- a/lib/sisu/v4/dal_doc_str.rb +++ b/lib/sisu/v4/dal_doc_str.rb @@ -236,9 +236,9 @@ module SiSU_DAL_DocumentStructureExtract when /^<(?:br)?:(?:pa?r|o(?:bj|---)?)>\s*$/ #[br:par] #[br:obj] SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_obj]) when /^(?:-\\\\-|<:pb>)\s*$/ #[br:pg] - SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page]) + SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page],:markup) when /^(?:=\\\\=|<:pn>)\s*$/ #[br:pgn] - SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new]) + SiSU_DAL_DocumentStructure::ObjectLayout.new.break(Hx[:br_page_new],:markup) else #paragraph image=image_test(t_o) note=endnote_test?(t_o) -- cgit v1.2.3