From 0ec06db262b3ae933667cb4f71681d763985074f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 22 Jul 2014 21:50:52 -0400 Subject: v5 v6: sysenv, processing shortcuts, options, adjust * (further refinement necessary) --- lib/sisu/v5/options.rb | 4 ++-- lib/sisu/v5/se_processing.rb | 18 ++++++++++++------ lib/sisu/v6/options.rb | 4 ++-- lib/sisu/v6/se_processing.rb | 18 ++++++++++++------ 4 files changed, 28 insertions(+), 16 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb index 7da84b04..e90fe668 100644 --- a/lib/sisu/v5/options.rb +++ b/lib/sisu/v5/options.rb @@ -550,7 +550,7 @@ module SiSU_Commandline when /^--(?:xml-sax)$/ then c=c+'x' when /^--(?:xml-dom)$/ then c=c+'X' when /^--(?:images)$/ then c=c+'j' - when /^--(?:hash-digests)$/ then c=c+'N' + when /^--(?:digests?|hash-digests)$/ then c=c+'N' when /^--(?:po4a|pot?)$/ then c=c+'P' when /^--(?:termsheet)$/ then c=c+'T' when /^--(?:manifest)$/ then c=c+'y' @@ -1107,7 +1107,7 @@ module SiSU_Commandline ? { bool: true, set: :on } : { bool: false, set: :na } act[:hash_digests]=(cmd =~/N/ \ - || mod.inspect =~/"--hash-digests"/) \ + || mod.inspect =~/"--digests?"|"--hash-digests"/) \ ? { bool: true, set: :on } : { bool: false, set: :na } act[:pdf_font_size]=if mod.inspect =~/"--(?:pdf-)?font-?size[=-](\d{1,2})(?:pt)?"/ diff --git a/lib/sisu/v5/se_processing.rb b/lib/sisu/v5/se_processing.rb index ec688a70..0a035ce8 100644 --- a/lib/sisu/v5/se_processing.rb +++ b/lib/sisu/v5/se_processing.rb @@ -478,42 +478,48 @@ module SiSU_Info_Processing_Flag if defined? @rc['flag']['default'] \ and @rc['flag']['default'].is_a?(String) @rc['flag']['default'] - else '-NQhewpotbxXdyYv' + else #'-NQhewpotbxXdyYv' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' end end def cf_1 #processing flag shortcuts if defined? @rc['flag']['i'] \ and @rc['flag']['i'].is_a?(String) @rc['flag']['i'] - else '-Qhewpoty' + else #'-Qhewpoty' + '--digest --qrcode --text --html --epub --concordance --pdf --manifest' end end def cf_2 #processing flag shortcuts if defined? @rc['flag']['ii'] \ and @rc['flag']['ii'].is_a?(String) @rc['flag']['ii'] - else '-NQhewpotbxXdy' + else #'-NQhewpotbxXdy' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' end end def cf_3 #processing flag shortcuts if defined? @rc['flag']['iii'] \ and @rc['flag']['iii'].is_a?(String) @rc['flag']['iii'] - else '-NQhewpotbxXdyY' + else #'-NQhewpotbxXdyY' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' end end def cf_4 #processing flag shortcuts if defined? @rc['flag']['iv'] \ and @rc['flag']['iv'].is_a?(String) @rc['flag']['iv'] - else '-NQhewpotbxXdDyY --update' + else #'-NQhewpotbxXdDyY --update' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' end end def cf_5 #processing flag shortcuts if defined? @rc['flag']['v'] \ and @rc['flag']['v'].is_a?(String) @rc['flag']['v'] - else '-NQhewpotbxXdDyYv --update' + else #'-NQhewpotbxXdyYsS' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --sisupod --source' end end end diff --git a/lib/sisu/v6/options.rb b/lib/sisu/v6/options.rb index 232481c8..c71372e0 100644 --- a/lib/sisu/v6/options.rb +++ b/lib/sisu/v6/options.rb @@ -550,7 +550,7 @@ module SiSU_Commandline when /^--(?:xml-sax)$/ then c=c+'x' when /^--(?:xml-dom)$/ then c=c+'X' when /^--(?:images)$/ then c=c+'j' - when /^--(?:hash-digests)$/ then c=c+'N' + when /^--(?:digests?|hash-digests)$/ then c=c+'N' when /^--(?:po4a|pot?)$/ then c=c+'P' when /^--(?:termsheet)$/ then c=c+'T' when /^--(?:manifest)$/ then c=c+'y' @@ -1107,7 +1107,7 @@ module SiSU_Commandline ? { bool: true, set: :on } : { bool: false, set: :na } act[:hash_digests]=(cmd =~/N/ \ - || mod.inspect =~/"--hash-digests"/) \ + || mod.inspect =~/"--digests?"|"--hash-digests"/) \ ? { bool: true, set: :on } : { bool: false, set: :na } act[:pdf_font_size]=if mod.inspect =~/"--(?:pdf-)?font-?size[=-](\d{1,2})(?:pt)?"/ diff --git a/lib/sisu/v6/se_processing.rb b/lib/sisu/v6/se_processing.rb index feea40c4..46bed123 100644 --- a/lib/sisu/v6/se_processing.rb +++ b/lib/sisu/v6/se_processing.rb @@ -478,42 +478,48 @@ module SiSU_Info_Processing_Flag if defined? @rc['flag']['default'] \ and @rc['flag']['default'].is_a?(String) @rc['flag']['default'] - else '-NQhewpotbxXdyYv' + else #'-NQhewpotbxXdyYv' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' end end def cf_1 #processing flag shortcuts if defined? @rc['flag']['i'] \ and @rc['flag']['i'].is_a?(String) @rc['flag']['i'] - else '-Qhewpoty' + else #'-Qhewpoty' + '--digest --qrcode --text --html --epub --concordance --pdf --manifest' end end def cf_2 #processing flag shortcuts if defined? @rc['flag']['ii'] \ and @rc['flag']['ii'].is_a?(String) @rc['flag']['ii'] - else '-NQhewpotbxXdy' + else #'-NQhewpotbxXdy' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' end end def cf_3 #processing flag shortcuts if defined? @rc['flag']['iii'] \ and @rc['flag']['iii'].is_a?(String) @rc['flag']['iii'] - else '-NQhewpotbxXdyY' + else #'-NQhewpotbxXdyY' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' end end def cf_4 #processing flag shortcuts if defined? @rc['flag']['iv'] \ and @rc['flag']['iv'].is_a?(String) @rc['flag']['iv'] - else '-NQhewpotbxXdDyY --update' + else #'-NQhewpotbxXdDyY --update' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' end end def cf_5 #processing flag shortcuts if defined? @rc['flag']['v'] \ and @rc['flag']['v'].is_a?(String) @rc['flag']['v'] - else '-NQhewpotbxXdDyYv --update' + else #'-NQhewpotbxXdyYsS' + '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --sisupod --source' end end end -- cgit v1.2.3