diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 3 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v4 | 3 | ||||
| -rw-r--r-- | lib/sisu/v3/dal_doc_str.rb | 8 | ||||
| -rw-r--r-- | lib/sisu/v4/dal_doc_str.rb | 8 |
4 files changed, 14 insertions, 8 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index da68e7c4..0a8e960b 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -35,6 +35,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.7.orig.tar.xz sisu_3.3.7.orig.tar.xz sisu_3.3.7-1.dsc +* v3: dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix + [bug reported indirectly by Cory Doctorow (discovered in work with markup)] + %% 3.3.6.orig.tar.xz (2013-01-27:03/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.6 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.6.orig.tar.xz diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 1ddf47ec..759c1bdc 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -27,6 +27,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.4.orig.tar.xz * v4: param_make, :cover_image: regex, less finicky match of image & details [bug reported by Mikael Böök] +* v4: dal, on ocn excluded paragraphs (~# -#), hang/indent bullet, fix + [bug reported indirectly by Cory Doctorow (discovered in work with markup)] + %% 4.0.3.orig.tar.xz (2013-01-27:03/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.3 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.3-1 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 |