diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:06:57 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:06:57 -0400 |
| commit | 335008e55553da03b630b1ac4b158c9c43b49e07 (patch) | |
| tree | 6f69383ecce32e068d1a4378e698cb97cbbcd092 | |
| parent | v4 v5: version & changelog (diff) | |
v5: "general code cleaning" fix
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 2 | ||||
| -rw-r--r-- | lib/sisu/v5/dal_doc_str.rb | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 4948e622..6c88b44e 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.6.orig.tar.xz sisu_5.0.6.orig.tar.xz sisu_5.0.6-1.dsc +* "general code cleaning" fix + %% 5.0.5.orig.tar.xz (2013-06-22:24/6) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.5 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.5-1 diff --git a/lib/sisu/v5/dal_doc_str.rb b/lib/sisu/v5/dal_doc_str.rb index 971f9f67..70c2e61f 100644 --- a/lib/sisu/v5/dal_doc_str.rb +++ b/lib/sisu/v5/dal_doc_str.rb @@ -452,17 +452,19 @@ module SiSU_DAL_DocumentStructureExtract and t_o !~/^(?:\}(?:verse|code|alt|group|block)|(?:verse|code|alt|group|block)\{)/ # fix logic sub_array=t_o.dup @line_mode=sub_array.scan(/.+/) - type='poem' if @@flag['poem'] - t_o=SiSU_DAL_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join - poem=t_o.split(/\n\n/) - poem.each do |v| - v=v.gsub(/\n/m,"#{Mx[:br_nl]}\n") - obj,tags=extract_tags(v) - h={ obj: obj, tags: tags } - t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.verse(h) - tuned_file << t_o + type=if @@flag['poem'] + t_o=SiSU_DAL_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join + poem=t_o.split(/\n\n/) + poem.each do |v| + v=v.gsub(/\n/m,"#{Mx[:br_nl]}\n") + obj,tags=extract_tags(v) + h={ obj: obj, tags: tags } + t_o=SiSU_DAL_DocumentStructure::ObjectBlockTxt.new.verse(h) + tuned_file << t_o + end + 'poem' + else 'group' end - else 'group' end @verse_count+=1 if @@flag['poem'] end |