Merge tag 'sisu_3.1.13' into debian/sid

7 files changed, 47 insertions, 9 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 79293dca..ce9abf00 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,13 +13,35 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.1.13.orig.tar.xz (2012-02-03:05/5)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.13
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.13-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.13.orig.tar.xz
+  sisu_3.1.13.orig.tar.xz
+  sisu_3.1.13-1.dsc
+  sisu_3.1.13-1.debian.tar.gz
+
+* v3 v3dv, path & url links, updates for multi output directory structure
+  possibilities (fixes)
+
+* v3dv, dal (& code affected as a result), use symbols to identify document
+  objects type (is) and group (of)
+
+* v3dv, epub, html, some cleaning of redundancy
+
+* v3dv, texinfo BROKEN, since 3.1.12 at least
+
+* v3 v3dv, vim syntax highlighting, patch from Thilo Six <T.Six@gmx.de> applied
+  Re: <http://thread.gmane.org/gmane.editors.vim.devel/32151> &
+  <http://vimdoc.sourceforge.net/htmldoc/options.html#cpo-l>
+
 %% 3.1.12.orig.tar.xz (2012-01-23:04/1)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/sisu_3.1.12
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_3.1.12-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.12.orig.tar.xz
-  sisu_3.1.12.orig.tar.xz
-  sisu_3.1.12-1.dsc
-  sisu_3.1.12-1.debian.tar.gz
+  18c7fa9dcbd1a2b901012c6946c4ff8feca45e049f35ca988487c631a1cfaf92 1680904 sisu_3.1.12.orig.tar.xz
+  ace21c0aba04d24b20ce3768aad58c93a80481840661ce505b06c3318c0370f1 1389 sisu_3.1.12-1.dsc
+  6bd103940b907edd6622be163131b21d139e2d301be6b0219fd366c514725bbd 291315 sisu_3.1.12-1.debian.tar.gz
 
 * texpdf, tampering with "safe" special character transformations, a fix (that
   may introduce new issues, watch) [in response to report of a pdf title bug
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
index bfcfc3e6..4545ee8f 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -11,6 +11,8 @@ elseif exists("b:current_syntax")
   finish
 else
 endif
+let s:cpo_save = &cpo
+set cpo&vim
 
 "% "Errors:
 syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
@@ -260,3 +262,5 @@ hi def link sisu_error_sem_marker      Error
 hi def link sisu_error_wspace          Error
 hi def link sisu_error                 Error
 let b:current_syntax = "sisu"
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
index 61504dbd..257e1cba 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
@@ -11,6 +11,8 @@ elseif exists("b:current_syntax")
   finish
 else
 endif
+let s:cpo_save = &cpo
+set cpo&vim
 
 "% "Errors:
 syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
@@ -275,3 +277,5 @@ hi def link sisu_error_sem_marker      Error
 hi def link sisu_error_wspace          Error
 hi def link sisu_error                 Error
 let b:current_syntax = "sisu"
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 78011058..2729abab 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.1.12
-:date_stamp: 2012w04/1
-:date: "2012-01-23"
+:version: 3.1.13
+:date_stamp: 2012w05/5
+:date: "2012-02-03"
 :project: SiSU
diff --git a/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu.vim
index bfcfc3e6..4545ee8f 100644
--- a/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -11,6 +11,8 @@ elseif exists("b:current_syntax")
   finish
 else
 endif
+let s:cpo_save = &cpo
+set cpo&vim
 
 "% "Errors:
 syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
@@ -260,3 +262,5 @@ hi def link sisu_error_sem_marker      Error
 hi def link sisu_error_wspace          Error
 hi def link sisu_error                 Error
 let b:current_syntax = "sisu"
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu_next.vim b/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
index 61504dbd..257e1cba 100644
--- a/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
+++ b/data/sisu/v3dv/conf/editor-syntax-etc/vim/syntax/sisu_next.vim
@@ -11,6 +11,8 @@ elseif exists("b:current_syntax")
   finish
 else
 endif
+let s:cpo_save = &cpo
+set cpo&vim
 
 "% "Errors:
 syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
@@ -275,3 +277,5 @@ hi def link sisu_error_sem_marker      Error
 hi def link sisu_error_wspace          Error
 hi def link sisu_error                 Error
 let b:current_syntax = "sisu"
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/data/sisu/v3dv/v/version.yml b/data/sisu/v3dv/v/version.yml
index 2e506e6d..ea289dd5 100644
--- a/data/sisu/v3dv/v/version.yml
+++ b/data/sisu/v3dv/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.2.0~pre_3.1.12
-:date_stamp: 2012w04/1
-:date: "2012-01-23"
+:version: 3.2.0~pre_3.1.13
+:date_stamp: 2012w05/5
+:date: "2012-02-03"
 :project: SiSU