aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--conf/sisu/rc/sisurc_by_fn.yml144
-rw-r--r--conf/sisu/rc/sisurc_by_ft.yml144
-rw-r--r--conf/sisu/rc/sisurc_by_lng.yml144
l---------[-rw-r--r--]conf/sisu/v3/sisurc.yml147
l---------[-rw-r--r--]conf/sisu/v4/sisurc.yml147
-rw-r--r--data/doc/sisu/CHANGELOG_v411
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_fn.yml133
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_ft.yml133
-rw-r--r--data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_lng.yml133
l---------[-rw-r--r--]data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml135
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml133
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml133
-rw-r--r--data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml133
l---------[-rw-r--r--]data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml135
-rw-r--r--data/doc/sisu/sisu_user_txt/configuration.txt2
-rw-r--r--data/sisu/v4/v/version.yml6
-rw-r--r--lib/sisu/v4/cgi_pgsql.rb11
-rw-r--r--lib/sisu/v4/cgi_sql_common.rb4
18 files changed, 1256 insertions, 572 deletions
diff --git a/conf/sisu/rc/sisurc_by_fn.yml b/conf/sisu/rc/sisurc_by_fn.yml
new file mode 100644
index 00000000..fca18fd2
--- /dev/null
+++ b/conf/sisu/rc/sisurc_by_fn.yml
@@ -0,0 +1,144 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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/lib/cgi-bin'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#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) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'A4,letter'
+ #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
+#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#% sql database info, postgresql and sqlite
+#db:
+# share_source: false # boolean, default is false
+# postgresql:
+# port: # '[port (default is 5432)]'
+# host: # '[if not localhost, provide host tcp/ip address or domain name]''
+# user: # '[(if different from user) provide username]'
+# password: # '[password if required]'
+# 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
+
+permission_set:
+ zap: true
+ css_modify: true
+# remote_base_site: true
+
+program_set:
+ rmagick: false
+# wc: true
+# editor: true
+# postgresql: true
+# sqlite: true
+# tidy: true
+# rexml: true
+# pdflatex: true
+
+#program_select:
+# editor: 'vim'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+#omit: minitoc
diff --git a/conf/sisu/rc/sisurc_by_ft.yml b/conf/sisu/rc/sisurc_by_ft.yml
new file mode 100644
index 00000000..d3c250f7
--- /dev/null
+++ b/conf/sisu/rc/sisurc_by_ft.yml
@@ -0,0 +1,144 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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/lib/cgi-bin'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#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) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'A4,letter'
+ #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
+#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#% sql database info, postgresql and sqlite
+#db:
+# share_source: false # boolean, default is false
+# postgresql:
+# port: # '[port (default is 5432)]'
+# host: # '[if not localhost, provide host tcp/ip address or domain name]''
+# user: # '[(if different from user) provide username]'
+# password: # '[password if required]'
+# 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: filetype
+
+permission_set:
+ zap: true
+ css_modify: true
+# remote_base_site: true
+
+program_set:
+ rmagick: false
+# wc: true
+# editor: true
+# postgresql: true
+# sqlite: true
+# tidy: true
+# rexml: true
+# pdflatex: true
+
+#program_select:
+# editor: 'vim'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+#omit: minitoc
diff --git a/conf/sisu/rc/sisurc_by_lng.yml b/conf/sisu/rc/sisurc_by_lng.yml
new file mode 100644
index 00000000..9b5a4e09
--- /dev/null
+++ b/conf/sisu/rc/sisurc_by_lng.yml
@@ -0,0 +1,144 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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/lib/cgi-bin'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#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: '-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
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'a4,letter'
+ #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
+#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#% sql database info, postgresql and sqlite
+#db:
+# share_source: false # boolean, default is false
+# postgresql:
+# port: # '[port (default is 5432)]'
+# host: # '[if not localhost, provide host tcp/ip address or domain name]''
+# user: # '[(if different from user) provide username]'
+# password: # '[password if required]'
+# 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: language
+
+permission_set:
+ zap: true
+ css_modify: true
+# remote_base_site: true
+
+program_set:
+ rmagick: false
+# wc: true
+# editor: true
+# postgresql: true
+# sqlite: true
+# tidy: true
+# rexml: true
+# pdflatex: true
+
+#program_select:
+# editor: 'vim'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+#omit: minitoc
diff --git a/conf/sisu/v3/sisurc.yml b/conf/sisu/v3/sisurc.yml
index de2288f9..e492f789 100644..120000
--- a/conf/sisu/v3/sisurc.yml
+++ b/conf/sisu/v3/sisurc.yml
@@ -1,146 +1 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph@Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-# url_root: 'http://www.your.url' #without dir stub
-# path: '/var/www' #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/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#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: '-NhewpotbxXyYdv' # -m run by default; includes verbose
- i: '-Nhewpoty' # -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
-default:
- papersize: 'A4,letter'
- #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
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-# port: '8081'
-
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# 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
- css_modify: false
-# remote_base_site: true
-
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-
-#program_select:
-# editor: 'vim'
-# pdf_viewer: 'evince'
-# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# odf_viewer: 'lowriter' #'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
-# info_viewer: 'pinfo -f'
-# man: 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
-#omit: minitoc
+../rc/sisurc_by_lng.yml \ No newline at end of file
diff --git a/conf/sisu/v4/sisurc.yml b/conf/sisu/v4/sisurc.yml
index de2288f9..e492f789 100644..120000
--- a/conf/sisu/v4/sisurc.yml
+++ b/conf/sisu/v4/sisurc.yml
@@ -1,146 +1 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph@Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-# url_root: 'http://www.your.url' #without dir stub
-# path: '/var/www' #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/lib/cgi-bin'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-
-##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
-#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: '-NhewpotbxXyYdv' # -m run by default; includes verbose
- i: '-Nhewpoty' # -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
-default:
- papersize: 'A4,letter'
- #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
-#% markup, make *{emphasis}* 'bold' or 'italics', default if not configured is 'bold'
-
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-# port: '8081'
-
-#% sql database info, postgresql and sqlite
-#db:
-# share_source: false # boolean, default is false
-# postgresql:
-# port: # '[port (default is 5432)]'
-# host: # '[if not localhost, provide host tcp/ip address or domain name]''
-# user: # '[(if different from user) provide username]'
-# password: # '[password if required]'
-# 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
- css_modify: false
-# remote_base_site: true
-
-program_set:
- rmagick: false
-# wc: true
-# editor: true
-# postgresql: true
-# sqlite: true
-# tidy: true
-# rexml: true
-# pdflatex: true
-
-#program_select:
-# editor: 'vim'
-# pdf_viewer: 'evince'
-# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# odf_viewer: 'lowriter' #'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
-# info_viewer: 'pinfo -f'
-# man: 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
-#omit: minitoc
+../rc/sisurc_by_lng.yml \ No newline at end of file
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 6a528e28..8c4a9dd1 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -21,6 +21,17 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 4.0.20.orig.tar.xz (2013-04-11:14/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.20
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.20-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.20.orig.tar.xz
+ sisu_4.0.20.orig.tar.xz
+ sisu_4.0.20-1.dsc
+
+* v4: sisurc.yml, reorganize configuration files
+
+* v4: cgi sample search form, minor
+
%% 4.0.19.orig.tar.xz (2013-04-08:14/1)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.19
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.19-1
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_fn.yml
new file mode 100644
index 00000000..34d4a662
--- /dev/null
+++ b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_fn.yml
@@ -0,0 +1,133 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+# file_links: webserv
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#processing:
+# path: '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: '-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
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'a4,letter'
+ #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
+ #language: 'English'
+ #emphasis: 'italics'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#sql database info, postgresql and sqlite
+db:
+ postgresql:
+ port: '5432' # '5432'
+ #host: # '[if not localhost, provide host tcp/ip address or domain name]''
+ #user: # '[(if different from user) provide username]'
+ #password: # '[password if required]'
+# sqlite:
+# path: ~ # './sisu_sqlite.db'
+# port: "**"
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: filename
+
+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'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_ft.yml
new file mode 100644
index 00000000..57440498
--- /dev/null
+++ b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_ft.yml
@@ -0,0 +1,133 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+# file_links: webserv
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#processing:
+# path: '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: '-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
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'a4,letter'
+ #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
+ #language: 'English'
+ #emphasis: 'italics'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#sql database info, postgresql and sqlite
+db:
+ postgresql:
+ port: '5432' # '5432'
+ #host: # '[if not localhost, provide host tcp/ip address or domain name]''
+ #user: # '[(if different from user) provide username]'
+ #password: # '[password if required]'
+# sqlite:
+# path: ~ # './sisu_sqlite.db'
+# port: "**"
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: filetype
+
+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'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_lng.yml
new file mode 100644
index 00000000..c9da8898
--- /dev/null
+++ b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/rc/sisurc_by_lng.yml
@@ -0,0 +1,133 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+# file_links: webserv
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#processing:
+# path: '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: '-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
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'a4,letter'
+ #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
+ #language: 'English'
+ #emphasis: 'italics'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#sql database info, postgresql and sqlite
+db:
+ postgresql:
+ port: '5432' # '5432'
+ #host: # '[if not localhost, provide host tcp/ip address or domain name]''
+ #user: # '[(if different from user) provide username]'
+ #password: # '[password if required]'
+# sqlite:
+# path: ~ # './sisu_sqlite.db'
+# port: "**"
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: language
+
+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'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml
index 6d11656d..e492f789 100644..120000
--- a/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml
+++ b/data/doc/sisu/markup-samples/v3/sisu_manual/_sisu/v3/sisurc.yml
@@ -1,134 +1 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph@Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-# url_root: 'http://www.your.url' #without dir stub
-# path: '/var/www' #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'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-# file_links: webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-
-#% processing directories, main path and subdirectories
-#processing:
-# path: '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: '-NhewpotbxXyYv' # -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: '-NhewpotbxXiIY' # -m run by default
-# v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose
-
-#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible
-default:
- papersize: 'a4,letter'
- language_file: 2
- #digest: 'sha' #sha is sha256, default is md5
- #language: 'English'
- #emphasis: 'italics'
-
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-# port: '8081'
-
-#sql database info, postgresql and sqlite
-db:
- postgresql:
- port: '5432' # '5432'
- #host: # '[if not localhost, provide host tcp/ip address or domain name]''
- #user: # '[(if different from user) provide username]'
- #password: # '[password if required]'
- sqlite:
- user: 'ralph'
- path: ~ # './sisu_sqlite.db'
- port: "**"
- multi: true
-# single: 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: 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'
-# pdf_viewer: 'evince'
-# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# odf_viewer: 'lowriter' #'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
-# info_viewer: 'pinfo -f'
-# man: 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+../rc/sisurc_by_lng.yml \ No newline at end of file
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml
new file mode 100644
index 00000000..34d4a662
--- /dev/null
+++ b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_fn.yml
@@ -0,0 +1,133 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+# file_links: webserv
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#processing:
+# path: '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: '-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
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'a4,letter'
+ #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
+ #language: 'English'
+ #emphasis: 'italics'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#sql database info, postgresql and sqlite
+db:
+ postgresql:
+ port: '5432' # '5432'
+ #host: # '[if not localhost, provide host tcp/ip address or domain name]''
+ #user: # '[(if different from user) provide username]'
+ #password: # '[password if required]'
+# sqlite:
+# path: ~ # './sisu_sqlite.db'
+# port: "**"
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: filename
+
+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'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml
new file mode 100644
index 00000000..57440498
--- /dev/null
+++ b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_ft.yml
@@ -0,0 +1,133 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+# file_links: webserv
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#processing:
+# path: '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: '-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
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'a4,letter'
+ #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
+ #language: 'English'
+ #emphasis: 'italics'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#sql database info, postgresql and sqlite
+db:
+ postgresql:
+ port: '5432' # '5432'
+ #host: # '[if not localhost, provide host tcp/ip address or domain name]''
+ #user: # '[(if different from user) provide username]'
+ #password: # '[password if required]'
+# sqlite:
+# path: ~ # './sisu_sqlite.db'
+# port: "**"
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: filetype
+
+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'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml
new file mode 100644
index 00000000..c9da8898
--- /dev/null
+++ b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/rc/sisurc_by_lng.yml
@@ -0,0 +1,133 @@
+# Name: SiSU - Simple information Structuring Universe
+# Author: ralph@amissah.com
+# Description: Site wide environment defaults set here
+# system environment info / resource configuration file, for sisu
+# License: GPL v3 or later
+# site environment configuration file
+# this file should be configured and live in
+# /etc/sisu #per environment settings, overridden by:
+# ~/.sisu #per user settings, overridden by:
+# ./_sisu #per local markup directory settings
+#% #image source directory, main path and subdirectories
+#image:
+# path: 'sisu_working'
+# public: '_sisu/image'
+# #all: 'image'
+#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
+#webserv:
+# url_root: 'http://www.your.url' #without dir stub
+# path: '/var/www' #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'
+# feed: 'feed'
+# sqlite: 'sisu/sqlite'
+# webrick_url: true
+#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
+#show_output_on: 'local:8111'
+#webserv_cgi:
+# host: localhost
+# base_path: ~
+# port: '8081'
+# user: ~
+# file_links: webserv
+
+show_output_on: 'filesystem_url'
+#texinfo display output
+#texinfo:
+# stub: 'texinfo'
+
+##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
+#processing:
+# path: '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: '-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
+
+#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
+default:
+ papersize: 'a4,letter'
+ #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
+ #language: 'English'
+ #emphasis: 'italics'
+
+#% settings used by ssh scp
+#remote:
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+# -
+# user: '[usrname]'
+# host: '[remote.hostname]'
+# path: '.' #no trailing slash eg 'sisu/www'
+
+#% webrick information
+#webrick:
+# port: '8081'
+
+#sql database info, postgresql and sqlite
+db:
+ postgresql:
+ port: '5432' # '5432'
+ #host: # '[if not localhost, provide host tcp/ip address or domain name]''
+ #user: # '[(if different from user) provide username]'
+ #password: # '[password if required]'
+# sqlite:
+# path: ~ # './sisu_sqlite.db'
+# port: "**"
+
+#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
+output_dir_structure_by: language
+
+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'
+# pdf_viewer: 'evince'
+# web_browser: 'iceweasel'
+# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# odf_viewer: 'lowriter' #'oowriter' #'abiword'
+# xml_viewer: 'xml-viewer'
+# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
+# info_viewer: 'pinfo -f'
+# man: 'man' #'groff -man -Tascii' # 'nroff -man'
+
+#search:
+# sisu:
+# flag: true
+## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://search.sisudoc.org
+# db: sisu
+# title: sample search form
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
diff --git a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml
index 6d11656d..e492f789 100644..120000
--- a/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml
+++ b/data/doc/sisu/markup-samples/v4/sisu_manual/_sisu/v4/sisurc.yml
@@ -1,134 +1 @@
-# Name: SiSU - Simple information Structuring Universe
-# Author: Ralph@Amissah.com
-# Description: Site wide envionment defaults set here
-# system environment info / resource configuration file, for sisu
-# License: GPL v3 or later
-# site environment configuration file
-# this file should be configured and live in
-# /etc/sisu #per environment settings, overridden by:
-# ~/.sisu #per user settings, overridden by:
-# ./_sisu #per local markup directory settings
-#% #image source directory, main path and subdirectories
-#image:
-# path: 'sisu_working'
-# public: '_sisu/image'
-# #all: 'image'
-#% presentation/web directory, main path and subdirectories (most subdirectories are created automatically based on markup directory name)
-#webserv:
-# url_root: 'http://www.your.url' #without dir stub
-# path: '/var/www' #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'
-# feed: 'feed'
-# sqlite: 'sisu/sqlite'
-# webrick_url: true
-#show_output_on: 'filesystem' #for -v and -u url information, alternatives: 'filesystem','webserver','remote_webserver','local:8111','localhost','localhost:8080','webrick','path'
-#show_output_on: 'local:8111'
-#webserv_cgi:
-# host: localhost
-# base_path: ~
-# port: '8081'
-# user: ~
-# file_links: webserv
-
-show_output_on: 'filesystem_url'
-#texinfo display output
-#texinfo:
-# stub: 'texinfo'
-
-#% processing directories, main path and subdirectories
-#processing:
-# path: '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: '-NhewpotbxXyYv' # -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: '-NhewpotbxXiIY' # -m run by default
-# v: '-NhewpotbxXYDv --update' # -m run by default; includes verbose
-
-#% papersize, (LaTeX/pdf) current values A4, US_letter, book_b5, book_a5, US_legal, easily extensible
-default:
- papersize: 'a4,letter'
- language_file: 2
- #digest: 'sha' #sha is sha256, default is md5
- #language: 'English'
- #emphasis: 'italics'
-
-#% settings used by ssh scp
-#remote:
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-# -
-# user: '[usrname]'
-# host: '[remote.hostname]'
-# path: '.' #no trailing slash eg 'sisu/www'
-
-#% webrick information
-#webrick:
-# port: '8081'
-
-#sql database info, postgresql and sqlite
-db:
- postgresql:
- port: '5432' # '5432'
- #host: # '[if not localhost, provide host tcp/ip address or domain name]''
- #user: # '[(if different from user) provide username]'
- #password: # '[password if required]'
- sqlite:
- user: 'ralph'
- path: ~ # './sisu_sqlite.db'
- port: "**"
- multi: true
-# single: 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: 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'
-# pdf_viewer: 'evince'
-# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
-# odf_viewer: 'lowriter' #'oowriter' #'abiword'
-# xml_viewer: 'xml-viewer'
-# epub_viewer: 'ebook-viewer' #'calibre' #'fbreader' #'okular'
-# info_viewer: 'pinfo -f'
-# man: 'man' #'groff -man -Tascii' # 'nroff -man'
-
-#search:
-# sisu:
-# flag: true
-## action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+../rc/sisurc_by_lng.yml \ No newline at end of file
diff --git a/data/doc/sisu/sisu_user_txt/configuration.txt b/data/doc/sisu/sisu_user_txt/configuration.txt
index 1f122d56..6b93902a 100644
--- a/data/doc/sisu/sisu_user_txt/configuration.txt
+++ b/data/doc/sisu/sisu_user_txt/configuration.txt
@@ -3,6 +3,4 @@
configuration_sisurc.txt
-configuration_skin.txt
-
configuration_css.txt
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index b3493aa7..e493e313 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 4.0.19
-:date_stamp: 2013w14/1
-:date: "2013-04-08"
+:version: 4.0.20
+:date_stamp: 2013w14/4
+:date: "2013-04-11"
:project: SiSU
diff --git a/lib/sisu/v4/cgi_pgsql.rb b/lib/sisu/v4/cgi_pgsql.rb
index 36f9782b..d621d187 100644
--- a/lib/sisu/v4/cgi_pgsql.rb
+++ b/lib/sisu/v4/cgi_pgsql.rb
@@ -77,6 +77,11 @@ module SiSU_CGI_PgSQL
and defined? @rc['webserv']['url_root'] =~/\S+/
@name_of[:host_url_docs]=@rc['webserv']['url_root']
end
+ @name_of[:output_dir_structure]=if defined? @rc['output_dir_structure_by'] \
+ and defined? @rc['output_dir_structure_by'] =~/(language|filetype|filename)/
+ @rc['output_dir_structure_by']
+ else 'language'
+ end
if defined? @rc['search'] \
and defined? @rc['search']['sisu'] \
and defined? @rc['search']['sisu']['action'] \
@@ -115,12 +120,8 @@ module SiSU_CGI_PgSQL
serve.each do |x|
f1 << %{ <option value="#{Db[:name_prefix]}#{x}">#{x}</option>\n} unless x =~/apache|sisu\/image/ #check
end
- f2 << %{ selected_db=case cgi['db']\n}
- serve.each do |x|
- f2 << %{ when /#{Db[:name_prefix]}#{x}/; '<option value="#{Db[:name_prefix]}#{x}">#{x}</option>'\n} unless x =~/apache|sisu\/image/ #check
- end
end
- f2 << " end\n"
+ f2 << %q{ selected_db=%{<option value="#{@db_name_prefix}#{@stub}">#{@stub}</option>}} + "\n"
if FileTest.writable?('.')
output=File.open(@cgi_file_name,'w')
output << header0 << header1 << header_desc << header2 << f1 << buttons1 << buttons1_pgsql << buttons2 << search_request << search_statement << search_statement_common << search_query1 << @common.pages << search_query2 << @common.tail << @common.main1 << f2 << dbi_connect << @common.main2 << @common.dir_structure << @common.main3
diff --git a/lib/sisu/v4/cgi_sql_common.rb b/lib/sisu/v4/cgi_sql_common.rb
index 058d04ec..f7aab470 100644
--- a/lib/sisu/v4/cgi_sql_common.rb
+++ b/lib/sisu/v4/cgi_sql_common.rb
@@ -650,8 +650,8 @@ module SiSU_CGI_SQL
begin # all code goes in begin section
@search={ text: [], endnotes: [] }
q=CGI.new
- @db=if cgi['db'] =~/\S+/
- @stub=/#{@db_name_prefix}(\S+)/.match(cgi['db'])[1]
+ @db=if cgi['db'] =~ /#{@db_name_prefix}(\S+)/
+ @stub=$1
cgi['db']
else
@stub=@stub_default