proposed as sisu-0.60.0, see updated CHANGELOG

* parameter reading on first run of file, (initialization of parameters)

* composite files (.ssm) building moved to processing directory, to overcome
  problem of non-writable sisu-source document directories, perhaps also
  cleaner (management of files)

* latex/pdf minor cleaning,
  * caret '^' is latex special character, additional match for escaping
  * clean major headings of markup heading tag with tilde and name
    e.g. '1~meta'

* param / metadata, hash sums now returns has sum and file-name only even for
  sisu-skin

1 files changed, 32 insertions, 25 deletions

diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb
index 82ccc614..7dcc0127 100644
--- a/lib/sisu/v0/hub.rb
+++ b/lib/sisu/v0/hub.rb
@@ -120,6 +120,7 @@ module SiSU
       end
       if not @opt.files.empty?
         @opt.files.each do |fns|
+          env=SiSU_Env::Info_env.new(fns)
           if fns =~ /(?:sisupod(?:\.zip)?|\.ssp)$/
             pod_name=Remote_download.new(fns).pod.name
             tell=SiSU_Screen::Ansi.new(@opt.cmd,pod_name)
@@ -131,7 +132,13 @@ module SiSU
             put=fns.gsub(/(.+)?\._sst$/,'\1.ssm')
             @opt.fns=fns
             if @req !~/(?:urls|remote_put)$/
-              if FileTest.file?(@opt.fns)
+              if @req=~/^dal$/ and FileTest.file?(@opt.fns) and @opt.fns =~ /\.(?:[_-]?sst|ssm)$/
+                if fns =~ /\.ssm$/; require "#{SiSU_lib}/composite"  #pre-processing
+                  SiSU_Assemble::Composite.new(@opt).read
+                  @opt.fns=fns.gsub(/\.ssm$/,'._sst')
+                end
+                SiSU_DAL::Source.new(@opt).read                                         # -m
+              elsif FileTest.file?(env.source_file_with_path)
                 case @opt.fns
                 when /\.(?:[_-]?sst|ssm)$/
                   case @req
@@ -140,31 +147,31 @@ module SiSU
                       SiSU_Assemble::Composite.new(@opt).read
                       @opt.fns=fns.gsub(/\.ssm$/,'._sst')
                     end
-                                            SiSU_DAL::Source.new(@opt).read     # -m
-                  when /^concordance$/;     SiSU_Concordance::Source.new(@opt).read   # -w
-                  when /^share_src$/;       SiSU_Markup::Source.new(@opt).read        # -s
-                  when /^sisupod_make$/;    SiSU_Doc::Source.new(@opt).read           # -S
-                  when /^source_kdissert$/; SiSU_Kdi_source::Source.new(@opt).read    ## -S
-                  when /^digests$/;         SiSU_Digest_view::Source.new(@opt).read   # -N
-                  when /^xml_scaffold$/;    SiSU_XML_scaffold::Source.new(@opt).read  # -T
-                  when /^plaintext$/;       SiSU_Plaintext::Source.new(@opt).read     # -a -A -e -E -f
-                  when /^wikispeak$/;       SiSU_Wikispeak::Source.new(@opt).read     # -g
-                  when /^odf$/;             SiSU_ODF::Source.new(@opt).read           # -o
+                                            SiSU_DAL::Source.new(@opt).read             # -m
+                  when /^concordance$/;     SiSU_Concordance::Source.new(@opt).read     # -w
+                  when /^share_src$/;       SiSU_Markup::Source.new(@opt).read          # -s
+                  when /^sisupod_make$/;    SiSU_Doc::Source.new(@opt).read             # -S
+                  when /^source_kdissert$/; SiSU_Kdi_source::Source.new(@opt).read      ## -S
+                  when /^digests$/;         SiSU_Digest_view::Source.new(@opt).read     # -N
+                  when /^xml_scaffold$/;    SiSU_XML_scaffold::Source.new(@opt).read    # -T
+                  when /^plaintext$/;       SiSU_Plaintext::Source.new(@opt).read       # -a -A -e -E -f
+                  when /^wikispeak$/;       SiSU_Wikispeak::Source.new(@opt).read       # -g
+                  when /^odf$/;             SiSU_ODF::Source.new(@opt).read             # -o
                   when /^xml_md_oai_pmh_dc$/; SiSU_XML_metadata::OAI_PMH.new(@opt).read # -O
-                  when /^texpdf$/;          SiSU_TeX::Source.new(@opt).read           # -p
-                  when /^manpage$/;         SiSU_manpage::Source.new(@opt).read       # -i
-                  when /^texinfo$/;         SiSU_TexInfo::Source.new(@opt).read       # -I
-                  #when /^plaintext_exp$/;   SiSU_Plaintext_exp::Source.new(@opt).read # -j
-                  #when /^manpage_exp$/;     SiSU_manpage_exp::Source.new(@opt).read   # -J
-                  #when /^docbook$/;         SiSU_Docbook::Source.new(@opt).read       # -B
-                  when /^html$/;            SiSU_HTML::Source.new(@opt).read          # -h -H
-                  when /^xml$/;             SiSU_XML_SAX::Source.new(@opt).read       # -x
-                  when /^xml_dom$/;         SiSU_XML_DOM::Source.new(@opt).read       # -X
-                  when /^xhtml$/;           SiSU_XHTML::Source.new(@opt).read         # -b
-                  when /^manifest$/;        SiSU_Manifest::Source.new(@opt).read      # -y
-                  when /^sitemaps$/;        SiSU_Sitemaps::Source.new(@opt).read      # -Y
-                  when /^zap$/;             SiSU_Zap::Source.new(@opt).read           # -Z
-                  when /^dbi$/;             SiSU_DBI::SiSU_SQL.new(@opt).connect      # -D -d
+                  when /^texpdf$/;          SiSU_TeX::Source.new(@opt).read             # -p
+                  when /^manpage$/;         SiSU_manpage::Source.new(@opt).read         # -i
+                  when /^texinfo$/;         SiSU_TexInfo::Source.new(@opt).read         # -I
+                  #when /^plaintext_exp$/;   SiSU_Plaintext_exp::Source.new(@opt).read  # -j
+                  #when /^manpage_exp$/;     SiSU_manpage_exp::Source.new(@opt).read    # -J
+                  #when /^docbook$/;         SiSU_Docbook::Source.new(@opt).read        # -B
+                  when /^html$/;            SiSU_HTML::Source.new(@opt).read            # -h -H
+                  when /^xml$/;             SiSU_XML_SAX::Source.new(@opt).read         # -x
+                  when /^xml_dom$/;         SiSU_XML_DOM::Source.new(@opt).read         # -X
+                  when /^xhtml$/;           SiSU_XHTML::Source.new(@opt).read           # -b
+                  when /^manifest$/;        SiSU_Manifest::Source.new(@opt).read        # -y
+                  when /^sitemaps$/;        SiSU_Sitemaps::Source.new(@opt).read        # -Y
+                  when /^zap$/;             SiSU_Zap::Source.new(@opt).read             # -Z
+                  when /^dbi$/;             SiSU_DBI::SiSU_SQL.new(@opt).connect        # -D -d
                   end
                   @n_do=@n_do+1
                   tell=SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed")