From c60b34d1c4d92608d441742629845da3c5ebb6fa Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 25 Aug 2013 01:23:35 -0400
Subject: v4 v5: vim syntax, sisu.vim, improve grouped text match, for blocks
 using tics

* syntax additions (introduced for 5.0.12) now relevant also for v4
  * ocn (object numbering) on, off, text block using "--~#" "---#" "--+#"
  * grouped text, open, close of blocks using tics "```"
---
 data/doc/sisu/CHANGELOG_v4                           | 4 ++++
 data/doc/sisu/CHANGELOG_v5                           | 2 ++
 data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim | 8 +++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 81b5c534..12d19140 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -40,6 +40,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.0.orig.tar.xz
     * 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)
 
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 248c65b4..86274ec8 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -35,6 +35,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.13.orig.tar.xz
 
 * 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)
 
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
-- 
cgit v1.2.3