From e9b1f97a7c9367e64c02c6d68c2155e0d79c572f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Sep 2013 23:39:13 -0400 Subject: v4 v5: version & changelog --- data/doc/sisu/CHANGELOG_v4 | 7 +++++++ data/doc/sisu/CHANGELOG_v5 | 7 +++++++ data/sisu/v4/v/version.yml | 6 +++--- data/sisu/v5/v/version.yml | 6 +++--- 4 files changed, 20 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index d84e0dab..82f82751 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -23,6 +23,13 @@ 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 + %% 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..ab3e139e 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -23,6 +23,13 @@ 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 + %% 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/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 -- cgit v1.2.3 From d756e90690f3a395b52c60843015ba2b8e89df2a Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Sep 2013 23:40:49 -0400 Subject: v4: dal, grouped text with fontface spanning newlines, partial solution * merged from v5 --- data/doc/sisu/CHANGELOG_v4 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 82f82751..f41bafaa 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -30,6 +30,9 @@ 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 + %% 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 -- cgit v1.2.3 From 55617009d55521dc4c9bf3e998dc8354a74fb8e1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Sep 2013 23:42:16 -0400 Subject: v4 v5: dal, book index markup, round delimiters: allow spaces or space & newline * allow spaces on both sides of delimiters, or a space before & newline following a delimiter \s+[:|;](\s+|\n) [else parses as before no spaces] --- data/doc/sisu/CHANGELOG_v4 | 4 ++++ data/doc/sisu/CHANGELOG_v5 | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index f41bafaa..d7e1b7ea 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -33,6 +33,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.2.orig.tar.xz * 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] + %% 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 ab3e139e..54b251a7 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,10 @@ 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, 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] + %% 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 -- cgit v1.2.3 From d711e3f86c3c534be2fa84aa0e6dea806d4fb9d1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Sep 2013 23:44:05 -0400 Subject: v4 v5: vim syntax, book index markup, hilight delimeters --- data/doc/sisu/CHANGELOG_v4 | 2 ++ data/doc/sisu/CHANGELOG_v5 | 2 ++ data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim | 10 +++++++--- 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 d7e1b7ea..2c8dc9f8 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -37,6 +37,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.2.orig.tar.xz 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 54b251a7..466513b2 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -34,6 +34,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.15.orig.tar.xz 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 -" 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: "(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 -- cgit v1.2.3 From 6fd685918309318549009821d73d87d85c558017 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Sep 2013 23:45:58 -0400 Subject: v5: dal, objects, store book index as hash (simplify downstream processing) --- data/doc/sisu/CHANGELOG_v5 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 466513b2..9ca1e163 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,8 @@ 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] -- cgit v1.2.3