Merge tag 'sisu_4.2.2' into debian/sid

SiSU 4.2.2

5 files changed, 44 insertions, 9 deletions

diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index d84e0dab..2c8dc9f8 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -23,6 +23,22 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 4.2.2.orig.tar.xz (2013-09-05:35/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.2-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.2.orig.tar.xz
+  sisu_4.2.2.orig.tar.xz
+  sisu_4.2.2-1.dsc
+
+* dal, grouped text with fontface spanning newlines, partial solution, merge
+  from 5.0.14
+
+* dal, book index markup, allow spaces on both sides of delimiters, or a space
+  before and newline following a delimiter \s+[:|;](\s+|\n)
+  [else parses as before no spaces]
+
+* vim syntax, book index markup, hilight delimeters
+
 %% 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
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index e7a27cc6..9ca1e163 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -23,6 +23,21 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.0.15.orig.tar.xz (2013-09-05:35/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.15
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.15-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.15.orig.tar.xz
+  sisu_5.0.15.orig.tar.xz
+  sisu_5.0.15-1.dsc
+
+* dal, objects, store book index as hash (simplify downstream processing)
+
+* dal, book index markup, allow spaces on both sides of delimiters, or a space
+  before and newline following a delimiter \s+[:|;](\s+|\n)
+  [else parses as before no spaces]
+
+* vim syntax, book index markup, hilight delimeters
+
 %% 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
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 7666b75f..a0f17272 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.1)
-" Last Change:     2013-08-28
+" SiSU Markup:     SiSU (sisu-4.2.2)
+" Last Change:     2013-09-02
 " 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)
 
@@ -45,6 +45,8 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_sub_header_original                                    "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
   syn match   sisu_sub_header_make                                        "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|substitute\|omit\|plaintext_wrap\|texpdf_font_mono\|texpdf_font\|stamp\|promo\|ad\|manpage\|home_button_text\|home_button_image\|cover_image\|footer\):\s"
   syn match   sisu_sub_header_notes                                       "^\s\+:\(description\|abstract\|comment\|coverage\|relation\|source\|history\|type\|format\|prefix\|prefix_[ab]\|suffix\):\s"
+  syn match   sisu_within_index_ignore                                    "\S\+[:;]\(\s\+\|$\)"
+  syn match   sisu_within_index                                           "[:|;]\|+\d\+"
 
 "% "semantic markers: (ignore)
   syn match   sisu_sem_marker                                             ";{\|};[a-z._]*[a-z]"
@@ -142,7 +144,7 @@ syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endn
 "% "Font Face Curly Brackets:
 "syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
 " book index:
-syn region sisu_index matchgroup=sisu_index_block start="^={" end="}"
+syn region sisu_index contains=sisu_within_index_ignore,sisu_within_index matchgroup=sisu_index_block start="^={" end="}"
 " emphasis:
 syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
 " bold:
@@ -250,6 +252,8 @@ hi def link sisu_index                 SpecialKey
 hi def link sisu_index_block           Visual
 hi def link sisu_content_endnote       Special
 hi def link sisu_control               Delimiter
+hi def link sisu_within_index          Delimiter
+hi def link sisu_within_index_ignore   SpecialKey
 hi def link sisu_ocn                   Include
 hi def link sisu_number                Number
 hi def link sisu_identifier            Function
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index b8b4ff72..4b14daf8 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 4.2.1
-:date_stamp: 2013w34/3
-:date: "2013-08-28"
+:version: 4.2.2
+:date_stamp: 2013w35/4
+:date: "2013-09-05"
 :project: SiSU
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 50a3185d..c350fdf9 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 5.0.14
-:date_stamp: 2013w34/3
-:date: "2013-08-28"
+:version: 5.0.15
+:date_stamp: 2013w35/4
+:date: "2013-09-05"
 :project: SiSU