diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-07-22 21:50:52 -0400 | 
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-07-22 21:50:57 -0400 | 
| commit | 0ec06db262b3ae933667cb4f71681d763985074f (patch) | |
| tree | 577ac7983a023f6eecee5bd07ec69d1025552b68 | |
| parent | v5 v6: sysenv, revert to use of stub_pwd to correct hub post processing behavior (diff) | |
v5 v6: sysenv, processing shortcuts, options, adjust
* (further refinement necessary)
| -rw-r--r-- | conf/sisu/rc/sisurc_by_fn.yml | 12 | ||||
| -rw-r--r-- | conf/sisu/rc/sisurc_by_ft.yml | 12 | ||||
| -rw-r--r-- | conf/sisu/rc/sisurc_by_lng.yml | 12 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v5 | 1 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v6 | 1 | ||||
| -rw-r--r-- | data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml | 12 | ||||
| -rw-r--r-- | data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml | 12 | ||||
| -rw-r--r-- | data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml | 12 | ||||
| -rw-r--r-- | data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml | 12 | ||||
| -rw-r--r-- | data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml | 12 | ||||
| -rw-r--r-- | lib/sisu/v5/options.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v5/se_processing.rb | 18 | ||||
| -rw-r--r-- | lib/sisu/v6/options.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v6/se_processing.rb | 18 | 
14 files changed, 78 insertions, 64 deletions
| diff --git a/conf/sisu/rc/sisurc_by_fn.yml b/conf/sisu/rc/sisurc_by_fn.yml index ce9a9109..2e48b7de 100644 --- a/conf/sisu/rc/sisurc_by_fn.yml +++ b/conf/sisu/rc/sisurc_by_fn.yml @@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: diff --git a/conf/sisu/rc/sisurc_by_ft.yml b/conf/sisu/rc/sisurc_by_ft.yml index 3afdbdc6..09be296a 100644 --- a/conf/sisu/rc/sisurc_by_ft.yml +++ b/conf/sisu/rc/sisurc_by_ft.yml @@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: diff --git a/conf/sisu/rc/sisurc_by_lng.yml b/conf/sisu/rc/sisurc_by_lng.yml index 9b5a4e09..18bfc313 100644 --- a/conf/sisu/rc/sisurc_by_lng.yml +++ b/conf/sisu/rc/sisurc_by_lng.yml @@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 839981e1..c9416620 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -54,6 +54,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.2.orig.tar.xz    * break up file, multiple se_* files    * revert to use of stub_pwd (instead of new base_markup_dir_stub introduced in      5.5.1) to bring back correct hub (post) processing behavior +  * processing shortcuts, options, adjust (refinement necessary)  %% 5.5.1.orig.tar.xz (2014-07-15:28/2)  http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.1 diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6 index 8d0465b4..e41a12e0 100644 --- a/data/doc/sisu/CHANGELOG_v6 +++ b/data/doc/sisu/CHANGELOG_v6 @@ -44,6 +44,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.2.orig.tar.xz    * break up file, multiple se_* files    * revert to use of stub_pwd (instead of new base_markup_dir_stub introduced in      6.1.1) to bring back correct hub (post) processing behavior +  * processing shortcuts, options, adjust (refinement necessary)  %% 6.1.1.orig.tar.xz (2014-07-15:28/2)  http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.1 diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml index 7f78f367..1f0a7981 100644 --- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml +++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml @@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml index b3c49ca1..432885f6 100644 --- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml +++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml @@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml index 26fff9a0..8a9f13d8 100644 --- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml +++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml @@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml index adf144d5..752dbd66 100644 --- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml +++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml @@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: diff --git a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml index 9b60f8c9..364532df 100644 --- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml +++ b/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml @@ -50,12 +50,12 @@ show_output_on: 'filesystem_url'  #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)  flag:    color:        true                        # making colour default -c is toggle, and will now toggle colour off -# default:      '-NQdhewpotbxXyYv'            # includes verbose; -m would in any event be run by default -# i:            '-NQdhewpoty'                 # -m run by default -# ii:           '-NQdhewpotbxXy'              # -m run by default -# iii:          '-NQdhewpotbxXyY'             # -m run by default -# iv:           '-NQhewpotbxXYDy  --update'  # -m run by default -# v:            '-NQhewpotbxXYDyv --update'  # includes verbose; -m run by default +#  default:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose' +#  i:            '--digest --qrcode --text --html --epub --concordance --pdf --manifest' +#  ii:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --manifest' +#  iii:          '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest' +#  iv:           '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --postresql --update --manifest' +#  v:            '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'  #% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal  default: 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 | 
