shared markup source, composite documents, fix look to processing directory

for: text share source and binary sisupod (make)

3 files changed, 6 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8752c861..9b387f0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.61.0.orig.tar.gz
     --no-ocn), in html objects are still named, (i.e. will still work with
     searches though the meaning of the numbers returned is obscured)
 
+  * shared markup source, composite documents, fix look to processing directory
+    * text: share source
+    * binary: sisupod (make)
+
   * processing flag shortcuts,
     * sisurc.yml reduced -1 outputs [to -hwpoyv] (minimum output used in
       dynamic building of some documents)
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