Merge tag 'sisu_4.1.12' into debian/sid

SiSU 4.1.12

5 files changed, 48 insertions, 8 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index d12acf79..44e4aa42 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,18 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.1.12.orig.tar.xz (2013-08-21:33/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.12
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.12-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.12.orig.tar.xz
+  sisu_4.1.12.orig.tar.xz
+  sisu_4.1.12-1.dsc
+
+* messages to terminal
+  * code marker
+  * rescued error messages
+  * fuchsia (sp.)
+
 %% 4.1.11.orig.tar.xz (2013-08-08:31/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.11
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.11-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 38d16c60..07d98caf 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,32 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.12.orig.tar.xz (2013-08-21:33/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.12
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.12-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.12.orig.tar.xz
+  sisu_5.0.12.orig.tar.xz
+  sisu_5.0.12-1.dsc
+
+* syntax add
+  * switch ocn off and on for a block of content, line containing only
+    off: "--~#" (omit headings where possible) "---#" on: "--+#"
+  * alternative open and close for blocks using line starting with "```", e.g.
+    open code block:  "``` code"
+    close code block: "```"
+    start poem:       "``` poem"
+    end poem:         "```"
+  * remove need for an empty line between opening & closing of a text block
+
+* vim syntax, add
+  * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+  * grouped text, open, close of blocks using tics "```"
+
+* messages to terminal
+  * code marker
+  * rescued error messages
+  * fuchsia (sp.)
+
 %% 5.0.11.orig.tar.xz (2013-08-08:31/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.11
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.11-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 1d5a0748..d1ae5f4b 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.0.9)
-" Last Change:     2013-02-22
+" SiSU Markup:     SiSU (sisu-5.0.12)
+" Last Change:     2013-08-21
 " 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,6 +23,8 @@ 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_control             contains=@NoSpell                  "^```\(\s*\(code\|poem\|group\|table\)\)\?\s*$"
+  syn match   sisu_markail             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 5bf2af03..e55b1515 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.1.11
-:date_stamp: 2013w31/4
-:date: "2013-08-08"
+:version: 4.1.12
+:date_stamp: 2013w33/3
+:date: "2013-08-21"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 9521d30b..ee8919df 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.11
-:date_stamp: 2013w31/4
-:date: "2013-08-08"
+:version: 5.0.12
+:date_stamp: 2013w33/3
+:date: "2013-08-21"
 :project: SiSU