5 files changed, 52 insertions, 9 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 44e4aa42..12d19140 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,30 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 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
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.0.orig.tar.xz
+  sisu_4.2.0.orig.tar.xz
+  sisu_4.2.0-1.dsc
+
+* merge v5
+  * 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
+  [note use of "~~" considered but more problematic, (tics not used elsewhere)]
+
+* vim syntax, improve grouped text match, open, close of blocks using tics "```"
+  * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
+  * grouped text, open, close of blocks using tics "```"
+
+* css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic,
+  review further)
+
 %% 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
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 07d98caf..86274ec8 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,23 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 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
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.13.orig.tar.xz
+  sisu_5.0.13.orig.tar.xz
+  sisu_5.0.13-1.dsc
+
+* dal, refine grouped text open and close using tics "```"
+  [note use of "~~" considered but more problematic, (tics not used elsewhere)]
+
+* dal, improve font face matching within grouped text (other than code blocks)
+
+* vim syntax, improve grouped text match, open, close of blocks using tics "```"
+
+* css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic,
+  review further)
+
 %% 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
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 d1ae5f4b..87d8c973 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-5.0.12)
-" Last Change:     2013-08-21
+" SiSU Markup:     SiSU (sisu-4.2.0)
+" Last Change:     2013-08-25
 " 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,6 @@ 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                                                "\""
@@ -101,11 +100,14 @@ syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_mar
 " table
 syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table"
 " table
+syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+table" end="^```\(\s\|$\)"
 syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$"
 " block, group, poem, alt
 syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\(block\|group\|poem\|alt\){" end="^}\(block\|group\|poem\|alt\)"
+syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+\(block\|group\|poem\|alt\)" end="^```\(\s\|$\)"
 " code
 syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^code{" end="^}code"
+syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^```\s\+code" end="^```\(\s\|$\)"
 
 "% "Endnotes:
 " regular endnote or asterisk or plus sign endnote
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index e55b1515..8ca5949d 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.1.12
-:date_stamp: 2013w33/3
-:date: "2013-08-21"
+:version: 4.2.0
+:date_stamp: 2013w33/7
+:date: "2013-08-25"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index ee8919df..1435d3fd 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.12
-:date_stamp: 2013w33/3
-:date: "2013-08-21"
+:version: 5.0.13
+:date_stamp: 2013w33/7
+:date: "2013-08-25"
 :project: SiSU