Merge tag 'sisu_4.2.17' into debian/sid

SiSU 4.2.17

5 files changed, 84 insertions, 10 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 49519d02..e8f3ed9b 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,24 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.2.17.orig.tar.xz (2014-01-06:01/1)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.17
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.17-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.17.orig.tar.xz
+  sisu_4.2.17.orig.tar.xz
+  sisu_4.2.17-1.dsc
+
+* bin/sisu
+  * (ensure SiSU_version_dir) fix
+  * sisu version info, yml info also when installed via ruby gem
+  * downstream libs
+
+* fixes
+  * ao_doc_str, nodes, possible parents, correction
+  * epub, url closure decoration
+  * sysenv, qrcode report absent program, minor
+  * html scroll toc, clean links where none, exclude metadata
+
 %% 4.2.16.orig.tar.xz (2013-12-15:49/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.16
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.16-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 119d9194..1db35908 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -3,7 +3,10 @@
   <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v5;hb=HEAD>
 * debian/changelog
   <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
-v5 development branch, opened to insulate stable v4
+v5 markup rule change, document structure rule introduced:
+   * 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
    initial goals:
    * remove/retire "skins"; replace some functionality with headers and/or yml
@@ -23,6 +26,59 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.2.0.orig.tar.xz (2014-01-06:01/1)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.0-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.0.orig.tar.xz
+  sisu_5.2.0.orig.tar.xz
+  sisu_5.2.0-1.dsc
+
+* single document root A~ (recalibrate headings); level D~ possible
+  * :A~ document title, single document root (ln==0)
+  * introduce additional possible heading level, D~
+  * markup rule change: single document root
+  * breaks much downstream code, recalibrate (fix, test, fix & test again)
+    * heading recalibration, code (downstream) changes
+  * v4 & v5 bifurcate (diverge "un-merge-ably")
+
+  Notes, rule imposed: heading level A~ becomes, document title & sole document
+  root. Significant as an expressed rule/principle, it simplifies making certain
+  document formats in particular some xml outputs, however, this has been pretty
+  much the case in practice (most documents have this implicit structure) and
+  will affect the markup of very few documents (for example all markup examples
+  so far provided are this way). This being the case, it is a subtle change,
+  because it will not be noticed (by the user) in a majority of cases. The most
+  significant changes are to internal sisu code: it is not yet enforced by the
+  software (software checks); it has implications for the way document output is
+  created; it has implications for document structure regex matches, that now
+  are attached to levels starting below level A~ (from B~ down) rather than
+  level A. One document affected by single root/title level A~ markup rule and
+  that provides a short test (for a document prepared using document structure
+  regex matches), is the U.N. Convention on Contracts for the International Sale
+  of Goods (CISG) that requires levels A-D & 1, and in previous versions of sisu
+  exceptionally required multiple level A's (using levels A-C & 1)
+
+* vim syntax, updated to allow for possible level D~
+
+* bin/sisu
+  * (ensure SiSU_version_dir) fix
+  * sisu version info, yml info also when installed via ruby gem
+  * downstream libs
+
+* fixes
+  * ao_doc_str, nodes, possible parents, correction
+  * epub, url closure decoration
+  * sysenv, qrcode report absent program, minor
+  * html scroll toc, clean links where none, exclude metadata
+
+* asciidoc, rename AsciiDoc module, & recalibrate headings
+
+* docbook, fictionbook, some tidying
+
+* cosmetic, code case statement
+
+* year updated, code headers
+
 %% 5.1.3.orig.tar.xz (2013-12-15:49/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.3
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.3-1
diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
index a0f17272..bee822db 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -1,7 +1,7 @@
 " SiSU Vim syntax file
 " SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup:     SiSU (sisu-4.2.2)
-" Last Change:     2013-09-02
+" SiSU Markup:     SiSU (sisu-5.2.0)
+" Last Change:     2014-01-06
 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
 "(originally looked at Ruby Vim by Mirko Nasato)
 
@@ -96,7 +96,7 @@ syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 
 "% "Headings:
-syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
+syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-D]\)\~\(\S\+\|[^-]\)" end="$"
 
 "% "Block Group Text:
 " table
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index 86ef1a8e..bd834a2c 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 4.2.16
-:date_stamp: 2013w49/7
-:date: "2013-12-15"
+:version: 4.2.17
+:date_stamp: 2014w01/1
+:date: "2014-01-06"
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index be3c9651..76381139 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.1.3
-:date_stamp: 2013w49/7
-:date: "2013-12-15"
+:version: 5.2.0
+:date_stamp: 2014w01/1
+:date: "2014-01-06"