From cf11ff3ad87012499f3f418c2856ed968685b32e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 25 Aug 2013 01:09:39 -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 44e4aa42..251060c9 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.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 + %% 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..9bf898d5 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.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 + %% 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/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 -- cgit v1.2.3 From 07de8418324803c5a28a0825925db5f2dafab357 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 25 Aug 2013 01:11:13 -0400 Subject: v4 v5: css, html, epub, adjust paragraph spacing, aesthetic * increase whitespace (between paragraphs) * [review spacing (generally) further] --- data/doc/sisu/CHANGELOG_v4 | 3 +++ data/doc/sisu/CHANGELOG_v5 | 3 +++ 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 251060c9..fe6577d0 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.0.orig.tar.xz sisu_4.2.0.orig.tar.xz sisu_4.2.0-1.dsc +* 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 9bf898d5..940b9435 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,9 @@ 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 +* 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 -- cgit v1.2.3 From 3429989568b4c48b1ade8800251ec11471348b5f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 25 Aug 2013 01:14:22 -0400 Subject: v5: dal, refine grouped text open and close using tics "```" --- data/doc/sisu/CHANGELOG_v5 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 940b9435..90cfb85a 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,9 @@ 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)] + * css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic, review further) -- cgit v1.2.3 From 0e296ebc472cc38432ec029fd03600a0683d752c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 25 Aug 2013 01:16:36 -0400 Subject: v5: dal, improve font face matching within grouped text (other than code blocks) --- 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 90cfb85a..248c65b4 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -33,6 +33,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.13.orig.tar.xz * 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) + * css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic, review further) -- cgit v1.2.3 From 9ccfd45405e11016bb28fc6d8ff290dff8f5c83d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 25 Aug 2013 01:20:49 -0400 Subject: v4: merge v5, syntax additions, block text related (version bump to 4.2.*) * 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 further refinements will be required; use of tildes "~~" considered but more problematic, tics not used elsewhere] --- data/doc/sisu/CHANGELOG_v4 | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'data') diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index fe6577d0..81b5c534 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -30,6 +30,16 @@ 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)] + * css, html, epub, adjust paragraph spacing, (increase, whitespace aesthetic, review further) -- cgit v1.2.3 From c60b34d1c4d92608d441742629845da3c5ebb6fa Mon Sep 17 00:00:00 2001 From: Ralph Amissah 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 -" 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: "(originally looked at Ruby Vim by Mirko Nasato) @@ -23,7 +23,6 @@ if !exists("sisu_no_identifiers") syn match sisu_break contains=@NoSpell " \\\\\( \|$\)\|
\|
" 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