diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-06-22 01:18:03 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-06-22 01:18:03 -0400 |
commit | 6bf6c320b8ad2cb5aa588575565af70b437aa322 (patch) | |
tree | b2c92c4b75de5c9dcbfb6639e56aac38cf545e67 /lib/sisu/v5/composite.rb | |
parent | debian/changelog (4.1.4-1) (diff) | |
parent | v5: general code cleaning (diff) |
Merge tag 'sisu_4.1.5' into debian/sid
SiSU 4.1.5
Diffstat (limited to 'lib/sisu/v5/composite.rb')
-rw-r--r-- | lib/sisu/v5/composite.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sisu/v5/composite.rb b/lib/sisu/v5/composite.rb index c1cfb127..452d6576 100644 --- a/lib/sisu/v5/composite.rb +++ b/lib/sisu/v5/composite.rb @@ -164,7 +164,7 @@ module SiSU_Assemble data=@fns_array tuned_file,imagedir=[],[] SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").grey_title_hi unless @opt.cmd =~/q/ - para=data.each do |para| + data.each do |para| if para =~/^<<\s+(\S+?\.ss[it])$/ \ or para =~/^<<\{(\S+?\.ss[it])\}$/ \ or para =~/^(?:<<\s*)\|(\S+?)\|@\|.+?\|(?:req(?:quire)?\b|\s*\})?/ \ @@ -218,7 +218,7 @@ module SiSU_Assemble begin @opt.fns=@opt.fns.gsub(/\.ssm\.sst$/,'.ssm') #FIX earlier, hub @fns_array=IO.readlines(@opt.fns,'') - files=insertions? + insertions? rescue SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error do __LINE__.to_s + ':' + __FILE__ @@ -228,10 +228,10 @@ module SiSU_Assemble end def insertions? data=@fns_array - tuned_file,imagedir=[],[] + tuned_file=[] SiSU_Screen::Ansi.new(@opt.cmd,'Composite Document',@opt.fno).grey_title_hi unless @opt.cmd =~/q/ @ssm=[@opt.fns] - para=data.each do |para| + data.each do |para| if para =~/^<<\s+(\S+?\.ss[it])$/ loadfile=$1.strip SiSU_Screen::Ansi.new(@opt.cmd,'loading:',loadfile).txt_grey if @opt.cmd =~/[MVv]/ |