diff options
author | Ralph Amissah <ralph@amissah.com> | 2007-10-11 18:13:30 +0100 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2007-10-11 18:13:30 +0100 |
commit | 39bf7a712e5954ca32b2de7b771e2f97660cb87e (patch) | |
tree | 515a2c369cbd7376d73b0be78433d5c29b73640a | |
parent | shared markup source, composite documents, fix look to processing directory (diff) |
sisupod_make, composite file is an exception
-rw-r--r-- | lib/sisu/v0/sisupod_make.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb index 4f3bf569..8e6932f0 100644 --- a/lib/sisu/v0/sisupod_make.rb +++ b/lib/sisu/v0/sisupod_make.rb @@ -157,7 +157,10 @@ module SiSU_Doc @rgx_image=/\{\s*(\S+?\.(?:png|jpg|gif))/ @rgx_skin=/^(?:@skin:|0~skin)\s+(\S+)/ @rgx_doc_import=/^%\s\s*\|(\S+?\.ss[ti])\|@\|\^\|>>ok/ - file_array=IO.readlines("#{@env.path.composite_file}/#{@opt.fnb}._sst",'') + use_file=if @opt.fns =~/(?:\.ssm|\._sst)$/; "#{@env.path.composite_file}/#{@opt.fnb}._sst" + else @opt.fns + end + file_array=IO.readlines(use_file,'') skin,images,doc_import=[],[],[] file_array.each do |f| #% work area if f !~/^%\s/ |