Merge tag 'sisu-markup-samples_7.1.0' into debian/sid

SiSU markup samples 7.1.0

4 files changed, 50 insertions, 314 deletions

diff --git a/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn.www.yml b/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn.www.yml
deleted file mode 100644
index 7a0939e..0000000
--- a/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn.www.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-# Name: SiSU
-# Author: ralph@amissah.com
-# Description: site or directory wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-#   this file should be configured and live in
-#      /etc/sisu     #per environment settings, overridden by:
-#      ~/.sisu       #per user settings, overridden by:
-#     ./_sisu/config #per local directory settings
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
-# url_root:     'http://www.sisudoc.org' #without directory stub (name of subdirectory containing markup)
-  path:         '~/sisu_www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-#  #path:         './tested' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-#  #images:       'sisu/image'
-#  #man:          'man'
-#  #cgi:          '/usr/local/lib/sisu-cgi'
-##show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-webserv_cgi:
-#  host:         localhost
-#  base_path:    ~
-#  port:         '8081'
-#  user:         ~
-#  file_links:   webserv #  www.sisudoc.org
-  file_links:    www.sisudoc.org
-#show_output_on: 'filesystem_url'
-#% processing directories, main path and subdirectories
-processing:
-# path:         '~'
-##  dir:         '_sisu_processing~'
-##  metaverse:    'metaverse'
-##  tune:         'tune'
-##  latex:        'tex'
-##  texinfo:      'texinfo'
-##  concord_max:  400000
-#% 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:      '-NQhewpotbxXyYv'           # includes verbose; -m would in any event be run by default
-# i:            '-NQhewpoty'                # -m run by default
-# ii:           '-NQhewpotbxXy'             # -m run by default
-# iii:          '-NQhewpotbxXyY'            # -m run by default
-# iv:           '-NQhewpotbxXYDy  --update' # -m run by default
-# v:            '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default
-#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible
-default:
-  papersize:    'a4,letter' #'a4,letter,b5,a5,legal'
-  language_file: 2
-#  #texpdf_font:       'Liberation Sans'
-#  #texpdf_font_sans:  'Liberation Sans'
-#  #texpdf_font_serif: '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'
-#  #language:      'fr'
-#  #language:      'en'
-#  digest:       'sha' #sha is sha256, default is md5
-#% settings used by ssh scp
-#remote:
-# user:         'ralph'
-# host:         'www.???.org'
-# host:         '192.168.1.108'
-# path:         '/srv/sisudoc/www'
-# path:         '/srv/www'
-#  #user:         'ralph'
-#  #host:         'sisudoc.org'
-#  #path:         '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#% sql database info, postgresql
-#db:
-#  engine:
-#    default:    'postgresql'
-## share_source:  true
-#  postgresql:
-#    port:       '5432' # '5432'
-#    user:       'ralph' # '[provide username]'
-#    #host:       'sisudoc.org'
-#
-#% 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
-#
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-##will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-##ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-##on value true system defaults used, to change, e.g. editor specify
-#permission_set:
-#  zap:               true
-#  css_modify:        true
-#  remote_base_site:  true
-#program_set:
-#  rmagick:           true
-#  wc:                true
-#  editor:            true
-#  postgresql:        true
-#  sqlite:            true
-#  tidy:              true
-#  rexml:             true
-#  pdflatex:          true
-#program_select:
-#  editor:            'vim' #'gvim -c :R'
-#  pdf_viewer:        'evince'
-#  web_browser:       'iceweasel'
-#  console_web_browser: 'links2'
-#  epub_viewer:       'ebook-viewer' #'calibre' 'fbreader'
-#  odf_viewer:        'lowriter'
-#  xml_viewer:        'xml-viewer'
-#search:
-#  sisu:
-#    flag:            true
-#    action:          http://search.sisudoc.org
-#    db:              sisu
-#    title:           'SiSU search form (sample)'
-#html:
-#  minitoc:           true
-#manifest:
-#  minitoc:           true
diff --git a/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn_search.srv.yml b/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn_search.srv.yml
deleted file mode 100644
index cf88ee3..0000000
--- a/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn_search.srv.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-# Name: SiSU
-# Author: ralph@amissah.com
-# Description: site or directory wide environment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-#   this file should be configured and live in
-#      /etc/sisu     #per environment settings, overridden by:
-#      ~/.sisu       #per user settings, overridden by:
-#     ./_sisu/config #per local directory settings
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-webserv:
-# url_root:     'http://192.168.1.108' #without dir stub, e.g. this dir would map to http://www.jus.uio.no/sisu
-  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
-  path:         '/srv/www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-# path:         '~/sisu_www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-#  #path:         './tested' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
-#  #images:       'sisu/image'
-#  #man:          'man'
-#  #cgi:          '/usr/local/lib/sisu-cgi'
-##show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-webserv_cgi:
-#  host:         localhost
-#  base_path:    ~
-#  port:         '8081'
-#  user:         ~
-#  file_links:   webserv #  www.sisudoc.org
-# file_links:    192.168.1.108
-  file_links:    www.sisudoc.org
-#show_output_on: 'filesystem_url'
-#% processing directories, main path and subdirectories
-processing:
-# path:         '~'
-##  dir:         '_sisu_processing~'
-##  metaverse:    'metaverse'
-##  tune:         'tune'
-##  latex:        'tex'
-##  texinfo:      'texinfo'
-##  concord_max:  400000
-#% 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:      '-NQhewpotbxXyYv'           # includes verbose; -m would in any event be run by default
-# i:            '-NQhewpoty'                # -m run by default
-# ii:           '-NQhewpotbxXy'             # -m run by default
-# iii:          '-NQhewpotbxXyY'            # -m run by default
-# iv:           '-NQhewpotbxXYDy  --update' # -m run by default
-# v:            '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default
-#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible
-default:
-  papersize:    'a4,letter' #'a4,letter,b5,a5,legal'
-  language_file: 2
-#  #texpdf_font:       'Liberation Sans'
-#  #texpdf_font_sans:  'Liberation Sans'
-#  #texpdf_font_serif: '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'
-#  #language:      'fr'
-#  #language:      'en'
-#  digest:       'sha' #sha is sha256, default is md5
-#% settings used by ssh scp
-remote:
-  user:         'ralph'
-  host:         'www.sisudoc.org'
-  path:         '/srv/www'
-# host:         '192.168.1.108'
-# host:         '88.198.193.70'
-# path:         '/srv/sisudoc/www'
-#  #user:         'ralph'
-#  #host:         'sisudoc.org'
-#  #path:         '.' #no trailing slash eg 'sisu/www'
-#% webrick information
-#% sql database info, postgresql
-#db:
-#  engine:
-#    default:    'postgresql'
-## share_source:  true
-#  postgresql:
-#    port:       '5432' # '5432'
-#    user:       'ralph' # '[provide username]'
-#    #host:       'sisudoc.org'
-#
-#% 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
-#
-#% possible values ~, true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'.
-##will only ignore if value set to false, absence or nil will not remove program as should operate without rc file
-##ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
-##on value true system defaults used, to change, e.g. editor specify
-#permission_set:
-#  zap:               true
-#  css_modify:        true
-#  remote_base_site:  true
-#program_set:
-#  rmagick:           true
-#  wc:                true
-#  editor:            true
-#  postgresql:        true
-#  sqlite:            true
-#  tidy:              true
-#  rexml:             true
-#  pdflatex:          true
-#program_select:
-#  editor:            'vim' #'gvim -c :R'
-#  pdf_viewer:        'evince'
-#  web_browser:       'iceweasel'
-#  console_web_browser: 'links2'
-#  epub_viewer:       'ebook-viewer' #'calibre' 'fbreader'
-#  odf_viewer:        'lowriter'
-#  xml_viewer:        'xml-viewer'
-search:
-  sisu:
-    flag:            true
-    action:          http://www.sisudoc.org/cgi-bin/sisu_samples_fn.cgi
-    db:              markup_samples.sisu_fn
-#   action:          http://www.sisudoc.org/cgi-bin/sisu_pgsql.cgi
-#   action:          http://search.sisudoc.org
-#   action:          http://localhost:8081/cgi-bin/sisu_sqlite.cgi
-#   action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-#   db:              sisu
-    title:           'SiSU search form (sample)'
-#search:
-#  sisu:
-#    flag:            true
-#    action:          http://search.sisudoc.org
-#    db:              sisu
-#    title:           'SiSU search form (sample)'
-#html:
-#  minitoc:           true
-#manifest:
-#  minitoc:           true
diff --git a/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn_search.www.yml b/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn_search.www.yml
index 30c317b..ef13b4c 100644
--- a/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn_search.www.yml
+++ b/data/samples/by/samples_by_filename/_sisu/rc/sisurc_fn_search.www.yml
@@ -9,9 +9,8 @@
 #     ./_sisu/config #per local directory settings
 #% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
 webserv:
-# url_root:     'http://192.168.1.108' #without dir stub, e.g. this dir would map to http://www.jus.uio.no/sisu
-  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
-  path:         '~/sisu_www' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
+#  url_root:     'http://www.sisudoc.org' #without dir stub, e.g. this dir would map to http://www.sisudoc.org/samples
+#  path:         '~/sisu_www' # /srv/www #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
 #  #path:         './tested' #either (i) / [full path from root] or (ii) ~/ [home] or (iii) ./ [pwd] or (iv) will be made from home
 #  #images:       'sisu/image'
 #  #man:          'man'
@@ -22,14 +21,12 @@ webserv_cgi:
 #  base_path:    ~
 #  port:         '8081'
 #  user:         ~
-#  file_links:   webserv #  www.sisudoc.org
-# file_links:    192.168.1.108
-  file_links:    www.sisudoc.org
+#  file_links:   www.sisudoc.org
 #show_output_on: 'filesystem_url'
 #% processing directories, main path and subdirectories
 processing:
-# path:         '~'
-##  dir:         '_sisu_processing~'
+# path:          '~'
+#  dir:          '_sisu_processing~'
 ##  metaverse:    'metaverse'
 ##  tune:         'tune'
 ##  latex:        'tex'
@@ -37,17 +34,22 @@ processing:
 ##  concord_max:  400000
 #% 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:      '-NQhewpotbxXyYv'           # includes verbose; -m would in any event be run by default
-# i:            '-NQhewpoty'                # -m run by default
-# ii:           '-NQhewpotbxXy'             # -m run by default
-# iii:          '-NQhewpotbxXyY'            # -m run by default
-# iv:           '-NQhewpotbxXYDy  --update' # -m run by default
-# v:            '-NQhewpotbxXYDyv --update' # includes verbose; -m run by default
-#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible
+  color:        true                        # making colour default -c is toggle, and will now toggle colour off
+#  act0:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest --verbose'
+#  act1:      '--digest --text --html --manifest'
+#  act2:      '--digest --text --html --epub --pdf --manifest'
+#  act3:      '--digest --qrcode --text --html --epub --concordance --pdf --manifest'
+#  act4:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --manifest'
+#  act5:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --sqlite --manifest'
+#  act6:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --manifest'
+#  act7:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod --manifest'
+#  act8:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --manifest'
+#  act9:      '--digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod --manifest'
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
 default:
   papersize:    'a4,letter' #'a4,letter,b5,a5,legal'
-  language_file: 2
+#  language_file: 2
 #  #texpdf_font:       'Liberation Sans'
 #  #texpdf_font_sans:  'Liberation Sans'
 #  #texpdf_font_serif: 'Liberation Serif'
@@ -58,16 +60,10 @@ default:
 #  #language:      'en'
 #  digest:       'sha' #sha is sha256, default is md5
 #% settings used by ssh scp
-remote:
-  user:         'ralph'
-  host:         'www.sisudoc.org'
-  path:         '/srv/www'
-# host:         '192.168.1.108'
-# host:         '88.198.193.70'
-# path:         '/srv/sisudoc/www'
-#  #user:         'ralph'
-#  #host:         'sisudoc.org'
-#  #path:         '.' #no trailing slash eg 'sisu/www'
+#remote:
+#  user:         'ralph'
+#  host:         'www.sisudoc.org'
+#  path:         '/srv/www' # '/srv/sisudoc/web' # '.' #no trailing slash eg 'sisu/www'
 #% webrick information
 #% sql database info, postgresql
 #db:
@@ -89,43 +85,34 @@ output_dir_structure_by: filename
 ##ie in case of ~ will ignore and use hard coded defaults within program), true, false, or command instruction e.g. editor: 'gvim -c :R -c :S'
 ##on value true system defaults used, to change, e.g. editor specify
 #permission_set:
-#  zap:               true
-#  css_modify:        true
-#  remote_base_site:  true
+#  zap:                 true
+#  css_modify:          true
+#  remote_base_site:    true
 #program_set:
-#  rmagick:           true
-#  wc:                true
-#  editor:            true
-#  postgresql:        true
-#  sqlite:            true
-#  tidy:              true
-#  rexml:             true
-#  pdflatex:          true
+#  rmagick:             true
+#  wc:                  true
+#  editor:              true
+#  postgresql:          true
+#  sqlite:              true
+#  tidy:                true
+#  rexml:               true
+#  pdflatex:            true
 #program_select:
-#  editor:            'vim' #'gvim -c :R'
-#  pdf_viewer:        'evince'
-#  web_browser:       'iceweasel'
-#  console_web_browser: 'links2'
-#  epub_viewer:       'ebook-viewer' #'calibre' 'fbreader'
-#  odf_viewer:        'lowriter'
-#  xml_viewer:        'xml-viewer'
-search:
-  sisu:
-    flag:            true
-    action:          http://www.sisudoc.org/cgi-bin/sisu_fn_pgsql.cgi
-    db:              markup_samples.sisu_fn
-#   action:          http://search.sisudoc.org
-#   action:          http://localhost:8081/cgi-bin/sisu_sqlite.cgi
-#   action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-#   db:              sisu
-    title:           'SiSU search form (sample)'
+#  editor:              'vim' #'gvim -c :R'
+#  pdf_viewer:          'evince'
+#  web_browser:         'iceweasel'
+#  console_web_browser: 'w3m' #'links2' #'elinks' #'w3m' #'lynx' #'links'
+#  odf_viewer:          'lowriter' #'oowriter' #'abiword'
+#  xml_viewer:          'xml-viewer'
+#  epub_viewer:         'ebook-viewer' #'calibre' #'fbreader' #'okular'
 #search:
 #  sisu:
 #    flag:            true
-#    action:          http://search.sisudoc.org
-#    db:              sisu
-#    title:           'SiSU search form (sample)'
+#    action:          http://www.sisudoc.org/cgi-bin/sisu_fn.cgi
+##   action:          http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+#    db:              samples_by_filename
+#    title:             'SiSU search form (sample)'
 #html:
-#  minitoc:           true
+#  minitoc:             true
 #manifest:
-#  minitoc:           true
+#  minitoc:             true
diff --git a/data/samples/by/samples_by_filename/_sisu/sisu_document_make b/data/samples/by/samples_by_filename/_sisu/sisu_document_make
index 85e583e..254408d 100644
--- a/data/samples/by/samples_by_filename/_sisu/sisu_document_make
+++ b/data/samples/by/samples_by_filename/_sisu/sisu_document_make
@@ -1,9 +1,9 @@
 @make:
  :breaks: break=1
- :home_button_text: {SiSU}http://sisudoc.org; {sources / git}http://sources.sisudoc.org/
-% :footer: {SiSU}http://sisudoc.org; {sources / git}http://sources.sisudoc.org/
+ :home_button_text: {SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/gitweb/
+% :footer: {SiSU}http://sisudoc.org; {sources / git}http://git.sisudoc.org/gitweb/
 % :home_button_image: {sisu.png }http://sisudoc.org
 
 @links:+
  {SiSU}http://sisudoc.org
- {sources / git}http://sources.sisudoc.org/
+ {sources / git}http://git.sisudoc.org/gitweb/