diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-01-31 21:41:55 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-01-31 21:41:55 -0500 |
| commit | ee132f1146cbed3266b448e1cea312375c201cf1 (patch) | |
| tree | 37498d07d78fa16e21361ccbefeb2adc0d9e6039 /lib/sisu/v3/dal_doc_str.rb | |
| parent | debian/changelog (4.0.3-1) (diff) | |
| parent | v4 (v3): version & changelog, dates touched (diff) | |
Merge tag 'sisu_4.0.4' into debian/sid
Diffstat (limited to 'lib/sisu/v3/dal_doc_str.rb')
| -rw-r--r-- | lib/sisu/v3/dal_doc_str.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sisu/v3/dal_doc_str.rb b/lib/sisu/v3/dal_doc_str.rb index 40fad15e..a04ad3ad 100644 --- a/lib/sisu/v3/dal_doc_str.rb +++ b/lib/sisu/v3/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) @@ -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 |