diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-10-11 15:18:40 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-10-11 15:18:40 +0100 |
| commit | 2178c097c3c6264832952d3f1b91cc9b822d43e2 (patch) | |
| tree | 453f68dedc079db930acb00694a5127a47296fd9 /lib | |
| parent | sisu_manual right column, use absolute url paths and some url fixes (diff) | |
shared markup source, composite documents, fix look to processing directory
for: text share source and binary sisupod (make)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v0/share_src.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v0/sisupod_make.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/sisu/v0/share_src.rb b/lib/sisu/v0/share_src.rb index b4b75d48..53e19f1c 100644 --- a/lib/sisu/v0/share_src.rb +++ b/lib/sisu/v0/share_src.rb @@ -78,7 +78,7 @@ module SiSU_Markup unless @opt.fns =~/\.ssm$/; cp(@opt.fns,@output_path) else req=@opt.fns.gsub(/(.+)?\.ssm$/,'\1.composite.sst') - file=@opt.fns.gsub(/(.+)?\.ssm$/,'\1._sst') + file="#{@env.path.composite_file}/#{@opt.fnb}._sst" if FileTest.file?(file); cp(file,"#@output_path/#{req}") else print "did not find #{file} to copy" end diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb index 32811f0f..4f3bf569 100644 --- a/lib/sisu/v0/sisupod_make.rb +++ b/lib/sisu/v0/sisupod_make.rb @@ -157,10 +157,8 @@ 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,'') + file_array=IO.readlines("#{@env.path.composite_file}/#{@opt.fnb}._sst",'') 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 |