v4: 4.0.0 new branch & version & changelog "opened"

5 files changed, 73 insertions, 17 deletions

diff --git a/data/doc/sisu/CHANGELOG_v1 b/data/doc/sisu/CHANGELOG_v1
index 4af76649..611d5c97 100644
--- a/data/doc/sisu/CHANGELOG_v1
+++ b/data/doc/sisu/CHANGELOG_v1
@@ -1,4 +1,7 @@
 %% SiSU version 1
+v1 branch is legacy: v2 branch supersedes & replaces it
+v1 sisu pretty mature in operation and syntax
+v1 branch removed from sisu 3.0 available in sisu =< 2.7
 
 * homepage at: <http://www.jus.uio.no/sisu>
 * <http://www.jus.uio.no/sisu/SiSU/download>
@@ -12,8 +15,6 @@ Reverse Chronological:
 
 %% Legacy Branch, Reference
 
-%% v1 branch removed from sisu 3.0 available in < sisu 2.8 (2.7 and below)
-
 %% 1.0.4.orig.tar.gz (2010-02-17:07/3) [2010-07-07]
 http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.3.orig.tar.gz
   sisu_1.0.3.orig.tar.gz
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index ba0af469..1404f6d2 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -1,4 +1,10 @@
 %% SiSU version 2
+v2 branch is legacy: v3 branch supersedes & replaces it
+v2 branch supersedes & replaces v1 branch
+v2 introduces new processing middle layer (document abstraction);
+   markup same except for minor changes to document headers;
+   epub output introduced
+v2 branch removed from sisu 4.0; it is available in sisu =< 3.3.2
 
 * homepage at: <http://www.jus.uio.no/sisu>
 * <http://www.jus.uio.no/sisu/SiSU/download>
@@ -8,9 +14,24 @@
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
 * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
 
-Reverse Chronological:
+%% Legacy Branch, Reference
 
-%% STABLE Branch
+* new middle layer (document abstraction) that uses ruby objects to
+  represent data (instead of strings)
+
+* downstream libraries updated to use v2 middle layer
+
+* sisu markup, changes to headers (metadata), input otherwise unchanged
+
+* output much the same as for version 1 with some tweaks
+  * search, sql table structure changed for version 2, incompatible
+  * internal linking of documents is once again supported
+  * LaTeX/pdf book indexes link within the pdf text rather than to HTML
+    version of document
+
+* EPUB output introduced using -e flag
+
+%% Reverse Chronological:
 
 %% 2.9.12 (2012-02-14:07/2) [see 3.1.14.orig.tar.xz]
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.14
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 261c1042..a42f334b 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -1,4 +1,8 @@
 %% SiSU version 3
+v3 branch is legacy: v4 branch supersedes & replaces it
+v3 branch supersedes & replaces v2 branch
+v3 introduces alternative (configurable) output structures
+v1 branch is removed; it is available in sisu =< 2.7
 
 * homepage at: <http://www.jus.uio.no/sisu>
 * <http://www.jus.uio.no/sisu/SiSU/download>
@@ -8,6 +12,8 @@
 * data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
 * CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
 
+%% Legacy Branch, Reference
+
   Version 3 introduced output directory structures nad filenames more
   compatible with mobile devices and other non-web use and more
   internationalisation possibilities.
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
new file mode 100644
index 00000000..c46b5484
--- /dev/null
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -0,0 +1,26 @@
+%% SiSU version 4
+v4 branch supersedes & replaces v3 branch
+   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
+v2 branch is removed; it is available in sisu =< 3.3.2
+
+* homepage at: <http://www.jus.uio.no/sisu>
+* <http://www.jus.uio.no/sisu/SiSU/download>
+* <http://www.jus.uio.no/sisu/SiSU/changelog>
+* <http://sisudoc.org/sisu/sisu_manual>
+* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
+
+%% Reverse Chronological:
+
+%% 4.0.0.orig.tar.xz (2012-10-03:40/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.0-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.0.orig.tar.xz
+  sisu_4.0.0.orig.tar.xz
+  sisu_4.0.0-1.dsc
+  sisu_4.0.0-1.debian.tar.gz
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml
index 433c6967..6d11656d 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/v2/sisurc.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/v4/sisurc.yml
@@ -49,12 +49,12 @@ show_output_on: 'filesystem_url'
 #% flag - set (non-default) processing flag shortcuts -1, -2 etc. (here adding colour and verbosity as default)
 flag:
   color:        true                        # making colour default -c is toggle, and will now toggle colour off
-  default:      '-NhewpotbxXyYv'            # -m run by default; includes verbose
-  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
+#  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:
@@ -83,11 +83,9 @@ default:
 db:
   postgresql:
     port:       '5432' # '5432'
-   #user:       'tst' # '[provide username]'
-   #host:       'sisudoc.org'
-   #user:       'ralph'
-   ##port:       '5433'
-   #port:       '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'
@@ -95,13 +93,18 @@ db:
     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:       false
+  rmagick:           true
 #  wc:           true
 #  editor:       true
 #  postgresql:   true
@@ -128,5 +131,4 @@ program_set:
 #    action:          http://search.sisudoc.org
 #    db:              sisu
 #    title:           sample search form
-
 #promo:               sisu_search_libre, sisu_icon, sisu, open_society, fsf, ruby