lib/sisu/*, single libs directory (c&d gone) (7)

* removed lib/sisu/{current,develop} dir branches
  v7 (v5 & v6 retired)
* simplify dir structure, offer single version per snapshot
* have enjoyed carrying stable and development versions v5 & v6
  in a single tarball, may return to this structure

6 files changed, 156 insertions, 23 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index af735e3f..a6d552b9 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -5,20 +5,8 @@ SiSU CHANGELOG    -*- mode: org; -*-
   * debian/changelog
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
 
-v5 stable branch (v6 development branch)
-   markup rule change, document structure rule introduced:
-   [v5 branch to become stable shortly, posted with 5.2.3, 2014-01-20]
-   * single document root == document title == heading level A~
-   * adds possible level D~
-   (from 5.2 on (earlier v5 development branch insulated from v4))
-v4 stable branch supersedes & replaces v3 branch
-   [v4 branch closure imminent, v5 to become stable, posted with 4.2.20,
-   2014-01-20]
-   initial goals:
-   * remove/retire "skins"; replace some functionality with headers and/or yml
-     file (consider header like syntax for document and site appearance info)
-   * bin/sisu $0 make possible to run sisu command on/within project dir tree
-   * bin/sisu $*, hub, make possible to specify dir path for markup files
+v5 branch is removed; it is available in sisu < 5.9.0
+v4 branch is removed; it is available in sisu < 5.3.0
 v3 branch is removed; it is available in sisu < 4.1.0
 v2 branch is removed; it is available in sisu =< 3.3.2
 
@@ -32,7 +20,7 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 * Reverse Chronological:
 
---- HEAD ---
+--- HEAD --- [closed]
 
 ** 5.9.0.orig.tar.xz (2015-04-21:16/2)
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.9.0
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index e260b312..3b167c79 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -5,10 +5,9 @@ SiSU CHANGELOG    -*- mode: org; -*-
   * debian/changelog
   <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
 
-v6 branch for development and testing prior to roll-into v5, to provide v5 with
-   some insulation
-v5 stable branch
-v4 branch is removed; it is available in sisu < 4.2.20
+v6 branch is removed; it is available in sisu =< 6.5.0
+v5 branch is removed; it is available in sisu < 5.9.0
+v4 branch is removed; it is available in sisu < 5.3.0
 v3 branch is removed; it is available in sisu < 4.1.0
 v2 branch is removed; it is available in sisu =< 3.3.2
 
@@ -22,7 +21,7 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 * Reverse Chronological:
 
---- HEAD ---
+--- HEAD --- [closed]
 
 ** 6.5.0.orig.tar.xz (2015-04-21:16/2)
 http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.4.1
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
index 5ffd7d14..080786e2 100644
--- a/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
+++ b/data/doc/sisu/markup-samples/manual/_sisu/sisu_document_make
@@ -3,7 +3,7 @@
  :breaks: new=C; break=1
  :bold: /Debian|Ruby|SiSU/
  :italics: /Linux|GPL|GPLv3|LaTeX|PostgreSQL|SQLite|SQL|Vim|ascii|plaintext|UTF-?8|HTML|XHTML|XML|EPUB|OpenDocument|ODF|ODT|PDF|pgSQL|TeXinfo|YAML|YML|OCN|object citation system|object citation numbering|granular search|Dublin Core/
- :substitute: /${sisu_stable}/,'5.6.2'  /${sisu_dev}/,'6.2.3' /${debian_stable}/,'*{Wheezy}*' /${debian_testing}/,'*{Jessie}*'
+ :substitute: /${sisu_stable}/,'7.0.0'  /${sisu_dev}/,'7.0.0' /${debian_stable}/,'*{Jessie}*' /${debian_testing}/,'*{Stretch}*'
  :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
  :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org
 
diff --git a/data/doc/sisu/markup-samples/manual/_sisu/sisurc.yml b/data/doc/sisu/markup-samples/manual/_sisu/sisurc.yml
new file mode 100644
index 00000000..3cb49894
--- /dev/null
+++ b/data/doc/sisu/markup-samples/manual/_sisu/sisurc.yml
@@ -0,0 +1,148 @@
+# 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:   www.sisudoc.org
+
+#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'
+#  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:      '--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' #'a4,letter,b5,a5,legal'
+  #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:       "**"
+
+permission_set:
+  zap:               true
+  css_modify:        true
+  remote_base_site:  true
+
+program_set:
+  rmagick:           true
+#  wc:           true
+#  editor:       true
+#  postgresql:   true
+#  sqlite:       true
+#  tidy:         true
+#  rexml:        true
+#  pdflatex:     true
+
+#program_select:
+#  editor:              'vim' #'gvim -c :R'
+#  pdf_viewer:          'evince'
+#  web_browser:         'iceweasel'
+#  console_web_browser: 'w3m' #'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://search.sisudoc.org
+#    db:                manual
+#    title:             'SiSU search form (sample)'
+
+#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
deleted file mode 120000
index 53d85905..00000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/v5/sisurc.yml
+++ /dev/null
@@ -1 +0,0 @@
-../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
deleted file mode 120000
index 53d85905..00000000
--- a/data/doc/sisu/markup-samples/manual/_sisu/v6/sisurc.yml
+++ /dev/null
@@ -1 +0,0 @@
-../rc/sisurc_default.yml
\ No newline at end of file