hub, make -t produce plaintext output, (documentation needs update)

2 files changed, 9 insertions, 7 deletions

diff --git a/lib/sisu/v2/help.rb b/lib/sisu/v2/help.rb
index e8698fd0..2ddabdfd 100644
--- a/lib/sisu/v2/help.rb
+++ b/lib/sisu/v2/help.rb
@@ -286,7 +286,9 @@ WOK
 
  #{@cX.ruby}-S#{@cX.off} #{@cX.green}[filename/wildcard]#{@cX.off} produces a sisupod a zipped sisu of the content assocated with the specified sisu markup documnt, i.e. including sisu markup source file, (and associated documents if a master file, or available in multilingual versions), together with related images and skin. The resulting zipped file has a .zip suffix added to the markup source file name by default, though a .ssp suffix is also recognised. The directory structure of the unzipped file is understood by sisu, and sisu commands can be run within it. SiSU commands can be run against a sisupod contained in a local directory, or provided as a url on a remote site. As there is a security issue with skins provided by other users, they are not applied unless the flag --trust or --trusted is added to the command instruction, it is recommended that file that are not your own are treated as untrusted. This provides a convenient way of packing documents files for sending Note: if you wish to send multiple files, it quickly becomes more space efficient to tar and gzip the sisu markup directory, (without the _sisu_processing subdirectory) rather than the individual files for sending). See the -S option without [filename/wildcard]
 
- #{@cX.ruby}-t#{@cX.off} #{@cX.green}[filename/wildcard (*.termsheet.rb)]#{@cX.off} standard form document builder, preprocessing feature
+ #{@cX.ruby}-T#{@cX.off} #{@cX.green}[filename/wildcard (*.termsheet.rb)]#{@cX.off} standard form document builder, preprocessing feature
+
+ #{@cX.ruby}-t#{@cX.off} #{@cX.green}[filename/wildcard]#{@cX.off} produces plaintext with Unix linefeeds. Without markup, (object numbers are omitted), has footnotes at end of each para‐ graph that contains them. Modifier options available: --footnotes (default) or --endnotes and for linefeeds --unix (default) or --msdos
 
  #{@cX.ruby}-U#{@cX.off} #{@cX.green}[filename/wildcard]#{@cX.off} prints url list/map for the available processing flags options and resulting files that could be requested, (can be used to get a list of processing options in relation to a file, together with information on the output that would be produced), -u provides url mapping for those flags requested for processing. The default assumes sisu_webrick is running and provides webrick url mappings where appropriate, but these can be switched to file system paths in sisurc.yml
 
diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb
index 443d0734..db167571 100644
--- a/lib/sisu/v2/hub.rb
+++ b/lib/sisu/v2/hub.rb
@@ -129,8 +129,8 @@ module SiSU
                   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
+                  when /^xml_scaffold$/;    SiSU_XML_scaffold::Source.new(@opt).read    # -k
+                  when /^plaintext$/;       SiSU_Plaintext::Source.new(@opt).read       # -t -a
                  #when /^git$/;             SiSU_Git::Source.new(@opt).read             # -g
                  #when /^wikispeak$/;       SiSU_Wikispeak::Source.new(@opt).read       # -g
                   when /^epub$/;            SiSU_EPUB::Source.new(@opt).read            # -e
@@ -283,7 +283,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
       if @opt.mod.inspect =~/--convert|--to|--from/
         require "#{SiSU_lib}/sst_convert_markup"           # sst_convert_markup.rb
       end
-      if @opt.cmd =~/([AabCcDdeFfgGHhIiJjLMmNnOopQqrRSsTtUuVvwWXxYyZ_0-9])/ \
+      if @opt.cmd =~/([AabCcDdeFfgGHhIiJjkLMmNnOopQqrRSsTtUuVvwWXxYyZ_0-9])/ \
       and @opt.cmd =~/^-/ \
       and @opt.mod.inspect !~/--(?:sitemaps|query|identify)/ \
       or @opt.mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/ #and
@@ -422,7 +422,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
         end
         if @opt.cmd =~/[hHz]/; op('html','html')               #% -h -H -z html css
         end
-        if @opt.cmd =~/a/; op('plaintext','plaintext')         #% -a #-A -f -e -E plaintext -a creates ms-dos type; -A creates unix type, plaintext file
+        if @opt.cmd =~/[at]/; op('plaintext','plaintext')         #% -t -a #-A -f -e -E plaintext -a creates ms-dos type; -A creates unix type, plaintext file
         end
         #if @opt.cmd =~/g/; op('git','git')         #% -g git
         #end
@@ -444,7 +444,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
         end
         if @opt.cmd =~/O/; op('xml_md_oai_pmh_dc','OAI PMH')   #% -O open archive initiative, metadata harvesting
         end
-        if @opt.cmd =~/t/                                      #% -t termsheet/standard form
+        if @opt.cmd =~/T/                                      #% -T termsheet/standard form
           SiSU_Help::Help.new('termsheet').help_request
           @opt.files.each do |fns|
             if FileTest.file?(fns)
@@ -458,7 +458,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/
           end
           Operations.new.counter
         end
-        if @opt.cmd =~/T/; op('xml_scaffold','XML scaffold')                   #% -T temporary tests
+        if @opt.cmd =~/k/; op('xml_scaffold','XML scaffold')                   #% -T temporary tests
         end
         if @opt.cmd =~/p/; op('texpdf','LaTeX pdf')                            #% -p latex/ texpdf
         end