Merge tag 'sisu_4.2.1' into debian/sid

SiSU 4.2.1

7 files changed, 53 insertions, 11 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 12d19140..d84e0dab 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,26 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.2.1.orig.tar.xz (2013-08-28:34/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.1-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.1.orig.tar.xz
+  sisu_4.2.1.orig.tar.xz
+  sisu_4.2.1-1.dsc
+
+* config files (by filetype & filename) touched
+
+* manifest, output organised by, info, minor touch
+
+* vim syntax, sisu.vim, fix typo
+  * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+
+* pdf (latex) tables, bugfix
+
+* odf:odt, footnotes, fix
+
+* dal, text blocks, tuning
+
 %% 4.2.0.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.0-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 86274ec8..e7a27cc6 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,28 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.14.orig.tar.xz (2013-08-28:34/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.14
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.14-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz
+  sisu_5.0.14.orig.tar.xz
+  sisu_5.0.14-1.dsc
+
+* config files (by filetype & filename) touched
+
+* manifest, output organised by, info, minor touch
+
+* vim syntax, sisu.vim, fix typo
+  * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+
+* dal
+  * grouped text with fontface spanning newlines, partial solution, test
+  * text blocks, tuning
+
+* pdf (latex) tables, bugfix
+
+* odf:odt, footnotes, fix
+
 %% 5.0.13.orig.tar.xz (2013-08-25:33/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
index 9bcc416e..bf88977f 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_fn.yml
@@ -97,7 +97,7 @@ db:
 #% 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: multi
+#lingual: mono
 
 permission_set:
   zap:               true
diff --git a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
index bf34d249..0963780c 100644
--- a/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
+++ b/data/doc/sisu/markup-samples/sisu_manual/_sisu/rc/sisurc_by_ft.yml
@@ -97,7 +97,7 @@ db:
 #% 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: multi
+#lingual: mono
 
 permission_set:
   zap:               true
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 87d8c973..7666b75f 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.0)
-" Last Change:     2013-08-25
+" SiSU Markup:     SiSU (sisu-4.2.1)
+" Last Change:     2013-08-28
 " 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)
 
@@ -23,7 +23,7 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_break               contains=@NoSpell                  " \\\\\( \|$\)\|<br>\|<br />"
   syn match   sisu_control             contains=@NoSpell                  "^\(-\\\\-\|=\\\\=\|-\.\.-\|<:p[bn]>\)\s*$"
   syn match   sisu_control             contains=@NoSpell                  "^<:\(bo\|---\)>\s*$"
-  syn match   sisu_markail             contains=@NoSpell                  "^--[+~-]#\s*$"
+  syn match   sisu_marktail            contains=@NoSpell                  "^--[+~-]#\s*$"
   syn match   sisu_marktail                                               "[~-]#"
   syn match   sisu_control                                                "\""
   syn match   sisu_underline                                              "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index 8ca5949d..b8b4ff72 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.2.0
-:date_stamp: 2013w33/7
-:date: "2013-08-25"
+:version: 4.2.1
+:date_stamp: 2013w34/3
+:date: "2013-08-28"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 1435d3fd..50a3185d 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.13
-:date_stamp: 2013w33/7
-:date: "2013-08-25"
+:version: 5.0.14
+:date_stamp: 2013w34/3
+:date: "2013-08-28"
 :project: SiSU