diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-05-25 10:06:59 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-05-25 10:06:59 -0400 |
| commit | dcb004beebc9551e19e8380702aaa7c38224d787 (patch) | |
| tree | 786d575295c7f7a1536ba9ba954043d475fd8a49 /lib/sisu/v5/composite.rb | |
| parent | debian/changelog (5.3.6-1) (diff) | |
| parent | v5: merge v6 to v5, version bump to 5.4.*, reason adds structure check (diff) | |
Merge tag 'sisu_5.4.0' into debian/sid
SiSU 5.4.0
Diffstat (limited to 'lib/sisu/v5/composite.rb')
| -rw-r--r-- | lib/sisu/v5/composite.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/sisu/v5/composite.rb b/lib/sisu/v5/composite.rb index adc88e52..9f722799 100644 --- a/lib/sisu/v5/composite.rb +++ b/lib/sisu/v5/composite.rb @@ -166,10 +166,7 @@ module SiSU_Assemble tuned_file,imagedir=[],[] SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Composite Document',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").grey_title_hi unless @opt.act[:quiet][:set]==:on data.each do |para| - if para =~/^<<\s+(\S+?\.ss[it])$/ \ - or para =~/^<<\{(\S+?\.ss[it])\}$/ \ - or para =~/^(?:<<\s*)\|(\S+?)\|@\|.+?\|(?:req(?:quire)?\b|\s*\})?/ \ - or para =~/^r\{(.+?)\}/ #depreciated + if para =~/^<<\s+(\S+?\.ss[it])$/ loadfile=$1.strip src_ssm=@opt.fns.sub(/\.ssm\.sst/,'.ssm') if (@opt.act[:verbose][:set]==:on \ @@ -201,7 +198,8 @@ module SiSU_Assemble file[:prepared] else cX=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set]).cX - STDERR.puts "\t #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires an invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}" + STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfile}"} + $process_document = :skip; break #remove this line to continue processing documents that have missing include files para end else tuned_file << para @@ -256,7 +254,8 @@ module SiSU_Assemble @ssm << loadfile else cX=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set]).cX - STDERR.puts "\t #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires an invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}" + STDERR.puts %{SKIPPED processing file: [#{@opt.lng}] "#{@opt.fns}" it requires an invalid or non-existent file: "#{loadfile}"} + $process_document = :skip; break #remove this line to continue processing documents that have missing include files para end end |