6 files changed, 113 insertions, 11 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index fe2834c2..74dd197e 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,21 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.4.1.orig.tar.xz (2014-06-19:24/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.1-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.1.orig.tar.xz
+  sisu_5.4.1.orig.tar.xz
+  sisu_5.4.1-1.dsc
+
+* ao,
+  * regex match for tics "```" followed by space tweaked
+  * Symbol to match grouped text open & close (instead of String)
+  * introduce way of removing unrecognized tic markers
+  * turn id numbers (for tags) into a hash
+  * code blocks, clean trailing newlines
+  * misc, minorish
+
 %% 5.4.0.orig.tar.xz (2014-05-25:20/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.0
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.0-1
@@ -38,6 +53,53 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.0.orig.tar.xz
   sisu_5.4.0.orig.tar.xz
   sisu_5.4.0-1.dsc
 
+* v5: merge v6 to v5, version bump to 5.4.*, reason adds structure check
+  * ao, document structure check, stop processing on major error
+    (with error message & text at location of failure)
+    [reason for version bump the addition of structure check]
+  * utils, add ok code marker
+  * ao, heading with no ocn, distinguish ~# from -#
+    * ~# is general & means no ocn (for any object to which it is applied)
+    * -# is relevant only for 1~ dummy headings & instructs that they should be
+      removed from output where possible
+    * applied so far to pdf, odt & plaintext
+  * ao_images, reduce warnings when ruby RMagic absent as program used directly
+    * reduced dependency on ruby RMagic library (as some time way back had
+      issues)
+  * ao, document markup structure check, skip processing file on major error
+    * with error message & text at location of failure
+  * texpdf, urls in creator cause breakage
+  * texpdf, mailto markup links set for normal text objects
+  * texpdf, '&' in heading breaks toc (now removed from toc (not heading)), bug
+    * revisit, bug
+  * texpdf, for urls switch to sans serif (small fontsize)
+    * instead of typewriter, latex default
+  * texpdf, pdf colored hyperlinks configurable
+    * --pdf-hyperlinks-color
+      --pdf-hyperlinks-no-color or --pdf-hyperlinks-monochrome
+    * ['default']['pdf_hyperlinks']='color'
+      (other options switch hyperlink color off 'no-color' 'color-off'
+      'monochrome')
+  * texpdf, pdf default font size configurable (cli & sisurc.yml) (no fractions)
+    * --pdf-fontsize-12 --pdf-fontsize-8
+    * default:
+      texpdf_fontsize: 12
+  * texpdf, headings and table of contents representation
+    * fixes 1~ and 2~ result in the same formatting
+      1~ 2~ & 3~ now differentiated, see discussion in sisu.org under #744383
+    * fixes :A smaller formatted than :B
+      A~ B~ C~ now the same size, see discussion in sisu.org under #744383
+    * :B and :C result in the same formatting, issue explained see sisu.org
+  * texpdf, (internal coding) fontface, rename texpdf_font texpdf_fontface
+  * texpdf, (internal coding) use symbols to identify page orientation
+  * param, metadata rights, line-breaks instead of semicolons separating rights
+    * fixes remove trailing semicolon after :copyright:
+  * digests sha512 option implemented
+    * options sha512 sha256 md5
+    * command line --sha512
+    * rcconf.yml ['defsault']['digest'] = sha512
+  * xml object citation numbering (docbook fictionbook)
+
 %% 5.3.6.orig.tar.xz (2014-05-18:19/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.6
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.6-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index d58762a9..4d324faa 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,37 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.0.8.orig.tar.xz (2014-06-19:24/4)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.8
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.8-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.8.orig.tar.xz
+  sisu_6.0.8.orig.tar.xz
+  sisu_6.0.8-1.dsc
+
+* ao,
+  * regex match for tics "```" followed by space tweaked
+  * Symbol to match grouped text open & close (instead of String)
+  * introduce way of removing unrecognized tic markers
+  * syntax, able optionally to indicate the language syntax of a code block
+  * syntax, introduce box text block/group
+  * syntax, introduce tics quotes markup (blockquote equivalent)
+  * turn id numbers (for tags) into a hash
+  * code blocks, clean trailing newlines
+  * misc, minorish
+
+* docbook,
+  * ocn & footnote numbers (as xml comments)
+  * metadata header (docinfo)
+  * quotes (blockquote)
+  * tables
+  * images
+  * code block
+
+* vim syntax, add
+  * code block, language syntax, optional
+  * box block
+  * quote block
+
 %% 6.0.7.orig.tar.xz (2014-05-25:20/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.7
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.7-1
diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org
index f8817e68..341cdd52 100644
--- a/data/doc/sisu/sisu.org
+++ b/data/doc/sisu/sisu.org
@@ -271,6 +271,10 @@ The package is divided into the following components:
     ``` box:red:"Warn"       (select color and lead text of box, else instead
           select color box & use regular single line bold markup ^!_ Warn$)
 
+*** TODO [#D] blockquotes implement? :feature:ponder:
+    ``` quote
+    not sure how best to represent
+
 *** TODO [#D] bibliography            :feature:ponder:
 
 *** TODO speaker, as e.g. play (irc?) :feature:ponder:
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 d88720f4..03e1766f 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.2.0)
-" Last Change:     2014-01-06
+" SiSU Markup:     SiSU (sisu-6.0.8)
+" Last Change:     2014-06-19
 " 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)
 
@@ -103,11 +103,16 @@ syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_c
 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="^\(block\|group\|poem\|alt\){" end="^}\1"
 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\|$\)"
+" box
+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="^box\(\.[a-z]\+\)\?{" end="^}box"
+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\+\box\(\.[a-z]\+\)\?" 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\|$\)"
+syn region sisu_content_alt contains=sisu_error,@NoSpell matchgroup=sisu_contain start="^code\(\.[a-z][0-9a-z_]\+\)\?{" end="^}code"
+syn region sisu_content_alt contains=sisu_error,@NoSpell matchgroup=sisu_contain start="^```\s\+code\(\.[a-z][0-9a-z_]\+\)\?" end="^```\(\s\|$\)"
+" quote
+syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_contain start="^```\s\+quote" end="^```\(\s\|$\)"
 
 "% "Endnotes:
 " regular endnote or asterisk or plus sign endnote
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 959947ba..ec9d1cde 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.4.0
-:date_stamp: 2014w20/7
-:date: "2014-05-25"
+:version: 5.4.1
+:date_stamp: 2014w24/4
+:date: "2014-06-19"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index 098c97b5..563a9713 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 6.0.7
-:date_stamp: 2014w20/7
-:date: "2014-05-25"
+:version: 6.0.8
+:date_stamp: 2014w24/4
+:date: "2014-06-19"