summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-09-13 01:25:07 +0000
committerRalph Amissah <ralph@amissah.com>2014-09-13 01:25:07 +0000
commit6e1e2b4db8efc9d6b9d062b28c9809c9794417c4 (patch)
treead1ae86b4eef8e91abf635763d6725fe5a5bd35f
parentv5 v6: se, processing, adjustments to default settings for --act0 to --act9 (diff)
downloadsisu-6e1e2b4db8efc9d6b9d062b28c9809c9794417c4.zip
sisu-6e1e2b4db8efc9d6b9d062b28c9809c9794417c4.tar.xz
sisurc, update samples
* adjustments to default settings for --act0 to --act9 (to match current "se") * removed sisurc examples to organize output by filetype, filename, monolingual, as one word diff output_dir_structure_by: language # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono) # language # (language and filetype directories); # filetype # (filetype directories, filename includes language code); # filetype_mono (or monolingual) # (filetype drectories, no language codes in filenames) # filename # (directory output similar to v1 v2, filename includes language code); # filename_mono # (directory output similar to v1 v2, filename without language code)
-rw-r--r--conf/sisu/rc/sisurc_by_ft.yml160
-rw-r--r--conf/sisu/rc/sisurc_by_lng.yml158
-rw-r--r--conf/sisu/rc/sisurc_default.yml (renamed from conf/sisu/rc/sisurc_by_fn.yml)57
l---------conf/sisu/v5/sisurc.yml2
l---------conf/sisu/v6/sisurc.yml2
-rw-r--r--data/doc/sisu/CHANGELOG_v517
-rw-r--r--data/doc/sisu/CHANGELOG_v617
-rw-r--r--data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml146
-rw-r--r--data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml146
-rw-r--r--data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml146
-rw-r--r--data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml144
-rw-r--r--data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_default.yml (renamed from data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn_monolingual.yml)60
l---------data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml2
l---------data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml2
14 files changed, 99 insertions, 960 deletions
diff --git a/conf/sisu/rc/sisurc_by_ft.yml b/conf/sisu/rc/sisurc_by_ft.yml
deleted file mode 100644
index 3ca98c6..0000000
--- a/conf/sisu/rc/sisurc_by_ft.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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
-# 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'
-## 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 --pg --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:
- 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
-#% lingual: 'multi' | 'mono' (multi default)
-#lingual: mono
-
-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://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://192.168.1.108/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
deleted file mode 100644
index 10705fe..0000000
--- a/conf/sisu/rc/sisurc_by_lng.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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
-# 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'
-## 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 --pg --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:
- 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://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://192.168.1.108/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_fn.yml b/conf/sisu/rc/sisurc_default.yml
index 4137662..790eb31 100644
--- a/conf/sisu/rc/sisurc_by_fn.yml
+++ b/conf/sisu/rc/sisurc_default.yml
@@ -1,4 +1,4 @@
-# Name: SiSU - Simple information Structuring Universe
+# Name: SiSU
# Author: ralph@amissah.com
# Description: Site wide environment defaults set here
# system environment info / resource configuration file, for sisu
@@ -36,6 +36,14 @@ show_output_on: 'filesystem_url'
#texinfo:
# stub: 'texinfo'
+#% output_dir_structure_by:
+# language (language and filetype directories);
+# filetype (filetype directories, language code added to filename includes language code);
+# filetype_mono or monolingual (filetype drectories, no language codes in filenames)
+# filename (directory output similar to original v1 v2, filename includes language code);
+# filename_mono (directory output similar to original v1 v2, filename without language code);
+output_dir_structure_by: language # language filetype filetype_mono filename filename_mono
+
##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
#processing:
# path: '~'
@@ -49,16 +57,16 @@ 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
-# 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'
+# act0: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --verbose'
+# act1: '--manifest --text --html'
+# act2: '--manifest --text --html --epub --pdf'
+# act3: '--manifest --qrcode --text --html --epub --concordance --pdf'
+# act4: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook'
+# act5: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --sqlite'
+# act6: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite'
+# act7: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod'
+# act8: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update'
+# act9: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod'
## 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'
@@ -68,7 +76,7 @@ flag:
#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
default:
- papersize: 'a4,letter'
+ papersize: 'a4,letter' #'a4,letter,b5,a5,legal'
#language: 'en'
#texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
#texpdf_font_mono: 'Liberation Mono' #'Inconsolata'
@@ -114,11 +122,6 @@ default:
#plaintext:
# ocn: true
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filename
-#% lingual: 'multi' | 'mono' (multi default)
-#lingual: mono
-
permission_set:
zap: true
css_modify: true
@@ -135,10 +138,10 @@ program_set:
# pdflatex: true
#program_select:
-# editor: 'vim'
+# editor: 'vim' #'gvim -c :R'
# pdf_viewer: 'evince'
# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# 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'
@@ -147,14 +150,14 @@ program_set:
#search:
# sisu:
-# flag: true
-# action: http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
-# action: http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: sisu
-# title: sample search form
+# flag: true
+# action: http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+# action: http://localhost:8081/cgi-bin/sisu_pgsql.cgi
+# action: http://192.168.1.108/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
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
#omit: minitoc
diff --git a/conf/sisu/v5/sisurc.yml b/conf/sisu/v5/sisurc.yml
index e492f78..53d8590 120000
--- a/conf/sisu/v5/sisurc.yml
+++ b/conf/sisu/v5/sisurc.yml
@@ -1 +1 @@
-../rc/sisurc_by_lng.yml \ No newline at end of file
+../rc/sisurc_default.yml \ No newline at end of file
diff --git a/conf/sisu/v6/sisurc.yml b/conf/sisu/v6/sisurc.yml
index e492f78..53d8590 120000
--- a/conf/sisu/v6/sisurc.yml
+++ b/conf/sisu/v6/sisurc.yml
@@ -1 +1 @@
-../rc/sisurc_by_lng.yml \ No newline at end of file
+../rc/sisurc_default.yml \ No newline at end of file
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 65f048b..cbd764d 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -42,6 +42,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.6.orig.tar.xz
* se, env, lingual: mono / multi, rc settings
+* sisurc, update samples
+ * adjustments to default settings for --act0 to --act9 (to match current "se")
+ * removed sisurc examples to organize output by
+ filetype, filename, monolingual, as one word diff
+ output_dir_structure_by: language
+ # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
+ # language
+ # (language and filetype directories);
+ # filetype
+ # (filetype directories, filename includes language code);
+ # filetype_mono (or monolingual)
+ # (filetype drectories, no language codes in filenames)
+ # filename
+ # (directory output similar to v1 v2, filename includes language code);
+ # filename_mono
+ # (directory output similar to v1 v2, filename without language code);
+
* hub, /tmp processing directory checks
%% 5.6.5.orig.tar.xz (2014-09-05:35/5)
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index f589b73..e1691f2 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -32,6 +32,23 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.7.orig.tar.xz
* se, env, lingual: mono / multi, rc settings
+* sisurc, update samples
+ * adjustments to default settings for --act0 to --act9 (to match current "se")
+ * removed sisurc examples to organize output by
+ filetype, filename, monolingual, as one word diff
+ output_dir_structure_by: language
+ # (language|filetype|(filetype_mono|monolingual)|filename|filename_mono)
+ # language
+ # (language and filetype directories);
+ # filetype
+ # (filetype directories, filename includes language code);
+ # filetype_mono (or monolingual)
+ # (filetype drectories, no language codes in filenames)
+ # filename
+ # (directory output similar to v1 v2, filename includes language code);
+ # filename_mono
+ # (directory output similar to v1 v2, filename without language code);
+
* hub, /tmp processing directory checks
%% 6.2.6.orig.tar.xz (2014-09-05:35/5)
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
deleted file mode 100644
index 09bb2d8..0000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_fn.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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' #url to document root, without dir stub
-# path: '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #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
-# 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
-# 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'
- #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
-#% lingual: 'multi' | 'mono' (multi default)
-#lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-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://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: manual
-# title: sample search form
-
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
-
-#omit: minitoc
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
deleted file mode 100644
index 04cd2a4..0000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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' #url to document root, without dir stub
-# path: '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #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
-# 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
-# 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'
- #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
-#% lingual: 'multi' | 'mono' (multi default)
-#lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-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://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: manual
-# title: sample search form
-
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
-
-#omit: minitoc
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
deleted file mode 100644
index 006eefa..0000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_ft_monolingual.yml
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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' #url to document root, without dir stub
-# path: '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #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
-# 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
-# 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'
- #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
-#% lingual: 'multi' | 'mono' (multi default)
-lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-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://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: manual
-# title: sample search form
-
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
-
-#omit: minitoc
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
deleted file mode 100644
index 9dd3980..0000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/rc/sisurc_by_lng.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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' #url to document root, without dir stub
-# path: '/srv/www' #'/var/www' '/srv/www.sisudoc.org/web' #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
-# 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
-# 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'
- #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
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
-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://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: manual
-# title: sample search form
-
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
-
-#omit: minitoc
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_default.yml
index ca829ac..3cb4989 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_default.yml
@@ -31,13 +31,23 @@
# base_path: ~
# port: '8081'
# user: ~
-# file_links: webserv
+# file_links: www.sisudoc.org
-show_output_on: 'filesystem_url'
+#show_output_on: 'filesystem_url'
#texinfo display output
#texinfo:
# stub: 'texinfo'
+#% output_dir_structure_by:
+# language (language and filetype directories);
+# filetype (filetype directories, language code added to filename includes language code);
+# filetype_mono or monolingual (filetype drectories, no language codes in filenames)
+# filename (directory output similar to original v1 v2, filename includes language code);
+# filename_mono (directory output similar to original v1 v2, filename without language code);
+output_dir_structure_by: language # language filetype filetype_mono filename filename_mono
+#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
+#language_default: 'en'
+
##% processing directories, main path and subdirectories (appended to $HOME), using defaults set in sysenv
#processing:
# path: 'sisu_processing'
@@ -50,20 +60,20 @@ 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
-# 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'
+# act0: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --verbose'
+# act1: '--manifest --text --html'
+# act2: '--manifest --text --html --epub --pdf'
+# act3: '--manifest --qrcode --text --html --epub --concordance --pdf'
+# act4: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook'
+# act5: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --sqlite'
+# act6: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite'
+# act7: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --sqlite --source --sisupod'
+# act8: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update'
+# act9: '--manifest --digest --qrcode --text --html --epub --concordance --pdf --odf --docbook --xhtml --xml-sax --xml-dom --pg --update --source --sisupod'
#% papersize, (LaTeX/pdf) available values: A4, US_letter, book_b5, book_a5, US_legal
default:
- papersize: 'a4,letter'
+ papersize: 'a4,letter' #'a4,letter,b5,a5,legal'
#language: 'en'
#texpdf_font: 'Liberation Sans' # 'Liberation Sans' 'Liberation Serif'
#texpdf_font_mono: 'Liberation Mono' #'Inconsolata'
@@ -99,13 +109,6 @@ db:
# path: ~ # './sisu_sqlite.db'
# port: "**"
-#% output_dir_structure_by: language (language_and_filetype); filetype; or filename (original v1 & v2)
-output_dir_structure_by: filename
-#% lingual: 'multi' | 'mono' (multi default)
-lingual: mono
-#% language_default: lng_lst: %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] ('en' default)
-#language_default: 'en'
-
permission_set:
zap: true
css_modify: true
@@ -122,10 +125,10 @@ program_set:
# pdflatex: true
#program_select:
-# editor: 'vim'
+# editor: 'vim' #'gvim -c :R'
# pdf_viewer: 'evince'
# web_browser: 'iceweasel'
-# console_web_browser: 'links2' #'elinks' #'w3m' #'lynx' #'links'
+# 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'
@@ -134,13 +137,12 @@ program_set:
#search:
# sisu:
-# flag: true
-# action: http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
-# action: http://192.168.1.108/cgi-bin/sisu_pgsql.cgi
-# action: http://search.sisudoc.org
-# db: manual
-# title: sample search form
+# flag: true
+# action: http://www.sisudoc.org/cgi-bin/sisu_v6c_sqlite.cgi
+# action: http://search.sisudoc.org
+# db: manual
+# title: 'SiSU search form (sample)'
-#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
+#promo: sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby
#omit: minitoc
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml b/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
index e492f78..53d8590 120000
--- a/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
@@ -1 +1 @@
-../rc/sisurc_by_lng.yml \ No newline at end of file
+../rc/sisurc_default.yml \ No newline at end of file
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml b/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
index e492f78..53d8590 120000
--- a/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
+++ b/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
@@ -1 +1 @@
-../rc/sisurc_by_lng.yml \ No newline at end of file
+../rc/sisurc_default.yml \ No newline at end of file