diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-05-01 18:51:40 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-05-01 18:51:40 -0400 |
| commit | 58d01ddb946f666b2bc70b867314c00b1e78b1e3 (patch) | |
| tree | 6ed99ea64d1ad4b02a1c8f901fb6248af9abfe08 /lib/sisu/current/ao_misc_arrange.rb | |
| parent | debian/changelog (5.8.0-1) (diff) | |
| parent | version & changelog, tag for release (diff) | |
Merge tag 'sisu_6.5.0' into debian/sid
SiSU 6.5.0
Diffstat (limited to 'lib/sisu/current/ao_misc_arrange.rb')
| -rw-r--r-- | lib/sisu/current/ao_misc_arrange.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/sisu/current/ao_misc_arrange.rb b/lib/sisu/current/ao_misc_arrange.rb index e010eaca..d023c44f 100644 --- a/lib/sisu/current/ao_misc_arrange.rb +++ b/lib/sisu/current/ao_misc_arrange.rb @@ -189,7 +189,6 @@ module SiSU_AO_MiscArrangeText end def prepare_text data=@data - data_new=[],[] if data[0] =~ /^#!\s*(?:\/usr\/bin\/env sisu|\/usr\/bin\/sisu)/ # remove bang from top #! (however file is stripped, so will be removed provided no content precedes it) data[0]=data[0].gsub(/^#!\s*\/usr\/bin\/sisu/,''). gsub(/^#!\s*\/usr\/bin\/env sisu/,'') @@ -198,11 +197,10 @@ module SiSU_AO_MiscArrangeText data[0]=data[0].gsub(/^(SiSU\s*[\d.]*)$/,'% \1'). gsub(/^(sisu-[\d.]+)$/,'% \1') end - data.each do |para| + data.each.map do |para| para=conditional_headings(para) - data_new << markup_blocks(para) - end - data_new=data_new.flatten + markup_blocks(para) + end.flatten end end end |