diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-06-22 10:42:34 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-06-22 10:42:34 -0400 |
| commit | 844dba062a01cd7654fd4710b017b8eeb9e3dfc8 (patch) | |
| tree | a672940ba89e91df1cea5501ef24a363ada981b3 | |
| parent | debian/changelog (5.4.1-1) (diff) | |
| parent | ao, fix bug in previous version (5.4.1) from sloppy cherry pick of v6 (diff) | |
Merge tag 'sisu_5.4.2' into debian/sid
SiSU 5.4.2
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 10 | ||||
| -rw-r--r-- | data/sisu/v5/v/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/v5/ao_doc_str.rb | 4 | ||||
| -rw-r--r-- | rbuild | 2 |
4 files changed, 16 insertions, 6 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 74dd197e..e3cab630 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -31,6 +31,16 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 5.4.2.orig.tar.xz (2014-06-22:24/7) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.2 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.2-1 +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/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index ec9d1cde..a6fa41e7 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.4.1 -:date_stamp: 2014w24/4 -:date: "2014-06-19" +:version: 5.4.2 +:date_stamp: 2014w24/7 +:date: "2014-06-22" 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 @@ -37,7 +37,7 @@ #require 'mkmf' #create_makefile("sisu") #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file) -SiSU_version_next_stable = '5.4.1' +SiSU_version_next_stable = '5.4.2' SiSU_version_next_unstable = '6.0.8' #% rake file SiSU_version_generic_next_stable = '5.4.x' |