Merge tag 'sisu_5.4.3' into debian/sid

SiSU 5.4.3

6 files changed, 76 insertions, 15 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index e3cab630..ec8eb24f 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,45 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.4.3.orig.tar.xz (2014-07-01:26/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.3-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.3.orig.tar.xz
+  sisu_5.4.3.orig.tar.xz
+  sisu_5.4.3-1.dsc
+
+* ao,
+  * code cosmetic rearrangement
+  * book index, strip white spaces around terms
+    (fix uppercase first character where spaces used)
+  * quote block, insert text indent markup, exclude book index
+  * doc objects, layout group open & close identify is_for
+  * segment numbering, fixed width, leading zeros (for alphanumeric sorting)
+
+* code cosmetic rearrangement
+  * ao*, param, hub, options, composite
+
+* sysenv, developer _CONSTRUCTION_ZONE warning modified
+
+* merge what was sisu_6.0.8 into v5
+  * ao,
+    * syntax, able optionally to indicate the language syntax of a code block
+    * syntax, introduce box text block/group
+    * syntax, introduce tics quotes markup (blockquote equivalent)
+  * docbook,
+    * ocn & footnote numbers (as xml comments)
+    * metadata header (docinfo)
+    * quotes (blockquote)
+    * tables
+    * images
+    * code block
+  * vim syntax, add
+    * code block, language syntax, optional
+    * box block
+    * quote block
+
+* epub, a fix, double check
+
 %% 5.4.2.orig.tar.xz (2014-06-22:24/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.2
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.2-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 4d324faa..ada19da7 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,28 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.0.9.orig.tar.xz (2014-07-01:26/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.9
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.9-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.9.orig.tar.xz
+  sisu_6.0.9.orig.tar.xz
+  sisu_6.0.9-1.dsc
+
+* ao,
+  * code cosmetic rearrangement
+  * book index, strip white spaces around terms
+    (fix uppercase first character where spaces used)
+  * quote block, insert text indent markup, exclude book index
+  * doc objects, layout group open & close identify is_for
+  * segment numbering, fixed width, leading zeros (for alphanumeric sorting)
+
+* code cosmetic rearrangement
+  * ao*, param, hub, options, composite
+
+* sysenv, developer _CONSTRUCTION_ZONE warning modified
+
+* epub, a fix, double check
+
 %% 6.0.8.orig.tar.xz (2014-06-19:24/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.8
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.8-1
diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org
index 341cdd52..83e74f11 100644
--- a/data/doc/sisu/sisu.org
+++ b/data/doc/sisu/sisu.org
@@ -1459,7 +1459,7 @@ That said re pdf, LaTeX XeTeX are flexible, it may be possible to drop the ocn
 at the start of a code block lower on its line so that it is closer to the code
 that follows
 
-**** DONE (6.0.5) [#D] #744353 [w|u] sisu output: please do not use typewriter for urls :output:consider:
+**** DONE (5.3.5::6.0.5) [#D] #744353 [w|u] sisu output: please do not use typewriter for urls :output:consider:
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744353>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -1640,7 +1640,7 @@ Daniel
 for pdf fix/implement mailto links
 done but requires further testing & possibly refinement
 
-**** DONE (6.0.5) [#C] #744358 [w|u] sisu output: please do not add ';' after \:copyright: :output:fix:
+**** DONE (5.3.5::6.0.5) [#C] #744358 [w|u] sisu output: please do not add ';' after \:copyright: :output:fix:
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744358>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -1864,7 +1864,7 @@ there has been no rule to the contrary (i.e. that headings should be on a single
 
 consider, should there be such a rule?
 
-**** DONE (6.0.5) [#B] #744386 [w|u] sisu syntax: 1~ and 2~ result in the same formatting :output:pdf:fix: (see #744383)
+**** DONE (5.3.5::6.0.5) [#B] #744386 [w|u] sisu syntax: 1~ and 2~ result in the same formatting :output:pdf:fix: (see #744383)
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744386>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -1931,7 +1931,7 @@ seemed to work (checked pdf & html (scroll & seg))
 was not able to reproduce
 will look again
 
-**** DONE (6.0.5) [#C] #744391 [w|u] sisu output: no color on a4 portrait :output:pdf:contemplate:
+**** DONE (5.3.5::6.0.5) [#C] #744391 [w|u] sisu output: no color on a4 portrait :output:pdf:contemplate:
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744391>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -2062,7 +2062,7 @@ Daniel
 
 will look at: should be possible; requires a configuration option
 
-**** DONE (6.0.5) [#B] #744399 [w|u] sisu syntax: :A smaller formatted than :B :output:fix: (see #744383) (partial solution)
+**** DONE (5.3.5::6.0.5) [#B] #744399 [w|u] sisu syntax: :A smaller formatted than :B :output:fix: (see #744383) (partial solution)
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744399>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -2099,7 +2099,7 @@ now is same size see #744383
 \subsection    (level 2)
 \subsubsection (level 3)
 
-**** DONE (6.0.5) [#C] #744402 [w|u] sisu: support sha512 :implement:
+**** DONE (5.3.5::6.0.5) [#C] #744402 [w|u] sisu: support sha512 :implement:
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744402>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
@@ -2124,7 +2124,7 @@ Daniel
 implemented
 document command line option --sha512
 
-**** DONE (6.0.5) [#C] #744405 [w|u] sisu: set default font size :configuration:pdf:implement:
+**** DONE (5.3.5::6.0.5) [#C] #744405 [w|u] sisu: set default font size :configuration:pdf:implement:
       <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744405>
 
 From: Daniel Baumann <daniel.baumann@progress-technologies.net>
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 03e1766f..3bb1a5ea 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-6.0.8)
-" Last Change:     2014-06-19
+" SiSU Markup:     SiSU (sisu-5.4.3)
+" Last Change:     2014-07-01
 " 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)
 
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index a6fa41e7..b6d8dfa8 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.4.2
-:date_stamp: 2014w24/7
-:date: "2014-06-22"
+:version: 5.4.3
+:date_stamp: 2014w26/2
+:date: "2014-07-01"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index 563a9713..fb9cc955 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 6.0.8
-:date_stamp: 2014w24/4
-:date: "2014-06-19"
+:version: 6.0.9
+:date_stamp: 2014w26/2
+:date: "2014-07-01"