aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-06-22 10:36:10 -0400
committerRalph Amissah <ralph@amissah.com>2014-06-22 10:38:37 -0400
commit943cfb453046da6f6bb6753098166a6ec96b4c14 (patch)
tree23fc47cce42ce28461e2ff7942f289a8dcb37953
parentv5: version & changelog (& rakefile) (diff)
ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6sisu_5.4.2
* ao_doc_str (codeblock)
-rw-r--r--data/doc/sisu/CHANGELOG_v53
-rw-r--r--lib/sisu/v5/ao_doc_str.rb4
2 files changed, 5 insertions, 2 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 7cd63393..e3cab630 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.2.orig.tar.xz
sisu_5.4.2.orig.tar.xz
sisu_5.4.2-1.dsc
+* ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6
+ ao_doc_str (codeblock)
+
%% 5.4.1.orig.tar.xz (2014-06-19:24/4)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.1
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.1-1
diff --git a/lib/sisu/v5/ao_doc_str.rb b/lib/sisu/v5/ao_doc_str.rb
index 43fa8e5e..4708a126 100644
--- a/lib/sisu/v5/ao_doc_str.rb
+++ b/lib/sisu/v5/ao_doc_str.rb
@@ -425,8 +425,8 @@ module SiSU_AO_DocumentStructureExtract
@@counter=1
@codeblock_numbered=(t_o =~/^(?:code\{#|```[ ]+code\s[#])/) ? true : false
@num_id[:code_block] +=1
- h={ obj: '', sym: :code_block_open, num: @num_id[:code_block] }
- t_o=SiSU_AO_DocumentStructure::ObjectLayout.new.open_close(h)
+ h={ obj: "group text start #{@num_id[:code_block]}" }
+ t_o=SiSU_AO_DocumentStructure::ObjectComment.new.comment(h)
elsif t_o =~/^(?:poem\{|```[ ]+poem)/
@@flag[:poem]=case t_o
when /^poem\{/ then :curls