diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-11 18:14:55 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-11 18:14:55 +0100 |
| commit | a498f0f58b9891f2e06a037701c927bebfbc1e2d (patch) | |
| tree | 3e2ba6f26ed0afb9a511f515a04ba610b4a29abc /lib/sisu/v0/sisupod_make.rb | |
| parent | Merge branch 'upstream' into debian/sid (diff) | |
| parent | changelog bring forward release; sisu_manual, small things (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v0/sisupod_make.rb')
| -rw-r--r-- | lib/sisu/v0/sisupod_make.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb index 32811f0f..8e6932f0 100644 --- a/lib/sisu/v0/sisupod_make.rb +++ b/lib/sisu/v0/sisupod_make.rb @@ -157,10 +157,11 @@ 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(@opt.fns,'') + 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=[],[],[] - #skin_dir=SiSU_Env::Info_skin.new.select - #skin << [skin_dir.gsub(/.+?\/(skin_\S+?)\.rb/,'\1')] file_array.each do |f| #% work area if f !~/^%\s/ skin << f.scan(@rgx_skin).uniq.flatten if f =~@rgx_skin |