Merge tag 'sisu_4.0.0' into debian/sid

1 files changed, 19 insertions, 9 deletions

diff --git a/conf/sisu/v2/sisurc.yml b/conf/sisu/v4/sisurc.yml
index 86545f32..de2288f9 100644
--- a/conf/sisu/v2/sisurc.yml
+++ b/conf/sisu/v4/sisurc.yml
@@ -49,24 +49,24 @@ 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:      '-NhewpotbxXyYv'            # -m run by default; includes verbose
+  default:      '-NhewpotbxXyYdv'           # -m run by default; includes verbose
   i:            '-Nhewpoty'                 # -m run by default
-  ii:           '-NhewpotbxX'               # -m run by default
-  iii:          '-NhewpotbxXY'              # -m run by default
-  iv:           '-NhewpoabxXYD --update'    # -m run by default
+  ii:           '-NhewpotbxXd'              # -m run by default
+  iii:          '-NhewpotbxXYd'             # -m run by default
+  iv:           '-NhewpotbxXiIYd'           # -m run by default
   v:            '-NhewpotbxXYDv --update'   # -m run by default; includes verbose
-#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 default:
   papersize:    'A4,letter'
-  #texpdf_font:  'Liberation Serif' # 'Liberation Sans' 'Liberation Serif'
+  #language:      'en'
+  #texpdf_font:       'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
+  #texpdf_font_mono:  'Liberation Mono' #'Inconsolata'
   #text_wrap:    78
   #emphasis:     'bold' #make *{emphasis}* 'bold', 'italics' or 'underscore', default if not configured is 'bold'
   #digest:       'sha' #sha is sha256, default is md5
   #multilingual:  false
   #language_file: 2
-  #language:     'English'
-
 #% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
 
 #% settings used by ssh scp
@@ -95,9 +95,19 @@ default:
 #  sqlite:
 #    path:       ~ # './sisu_sqlite.db'
 #    port:       "**"
+
 #html:
 #  quick_ref:         true #default false
 #  seg_title_banner:  true #default false
+#odt:
+#  ocn:               true
+#plaintext:
+#  ocn:               true
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+#output_dir_structure_by: filename
+#output_dir_structure_by: filetype
+output_dir_structure_by: language
 
 permission_set:
   zap:          false
@@ -132,5 +142,5 @@ program_set:
 #    action:          http://search.sisudoc.org
 #    db:              sisu
 #    title:           sample search form
-
 #promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+#omit: minitoc