Merge branch 'upstream' into debian/sid

17 files changed, 105 insertions, 48 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index 1420cfe6..d892910d 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -12,6 +12,17 @@ Reverse Chronological:
 
 %% STABLE Branch
 
+%% 2.9.4.orig.tar.gz (2011-05-15:19/7) [see 3.0.9]
+http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.9-1
+
+  * bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
+    (later switch bin/sisu to bin/sisu3; consider using update-alternatives)
+
+  * vim, cterm colorschemes, touch search color
+
+  * copyright file, softlink, make more visible in tarball and update
+    * sisu-mode.el assigned to FSF (GNU EMACS)
+
 %% 2.9.3.orig.tar.gz (2011-04-27:17/3) [see 3.0.8]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 2fdc9575..682db1a9 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -13,12 +13,54 @@ Reverse Chronological:
 %% Development branch UNSTABLE
 v3 branch once stable will supersede & replace current stable v2 branch
 
+%% 3.0.9.orig.tar.gz (2011-05-17:20/2)
+http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.9-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.9.orig.tar.gz
+  sisu_3.0.9.orig.tar.gz
+  sisu_3.0.9-1.dsc
+  sisu_3.0.9-1.debian.tar.gz
+
+  * bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
+    (later switch bin/sisu to bin/sisu3; consider using update-alternatives)
+
+  * vim, cterm colorschemes, touch search color
+
+  * copyright file, softlink, make more visible in tarball and update
+    * sisu-mode.el assigned to FSF (GNU EMACS)
+
+  * options, expand name of file for selected language directories
+    * only use for single file(name) available in multiple languages e.g.
+      sisu3 -hv en/free_culture.lawrence_lessig.sst es fr
+    * english assumed as default language, make default configurable later
+    * particularly useful for po4a
+
+  * sysenv
+    * output directory structure check, fix & start testing alternatives
+      sisurc.yml output_by: (language|filetype|filename)
+    * output paths restructured, to have dir, url rel(ative) & rcp (for rsync or scp)
+      * url paths to output files (requires setup in sisurc.yml)
+      * consolidated output paths, directory & url, affecting many files
+
+  * rsync of output must cope with alternative file structures
+
+  * scp, disable until looked at
+
+  * dal_expand_insertions, fix resulting urls for shortcut for sisu generated
+    document in same output directory
+
+  * cgi sample search form generated to provide different links depending on
+    output structure, now links only to manifest and html toc
+
+  * manifest, url path, fix
+
+  * po4a, re-enabled, numerous issues
+
 %% 3.0.8.orig.tar.gz (2011-05-05:18/4)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.8-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
-  sisu_3.0.8.orig.tar.gz
-  sisu_3.0.8-1.dsc
-  sisu_3.0.8-1.debian.tar.gz
+  87b595cc6e108e325d80e7ef78e58463ab3cdd0d7036fd943224114c8eb9b897 1936305 sisu_3.0.8.orig.tar.gz
+  d3114d3aeba230501c79ab478c30985438ad1bf4a5cde628cb82ab7717028623 286421 sisu_3.0.8-1.dsc
+  43bc0459adb7174f03b91c67efd10d053a39da07dd1319f26fd2928f80876d03 1216 sisu_3.0.8-1.debian.tar.gz
 
   * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet
     * improved ruby version check
diff --git a/data/doc/sisu/copyright b/data/doc/sisu/copyright
index 84e8f311..5974c3fc 100644
--- a/data/doc/sisu/copyright
+++ b/data/doc/sisu/copyright
@@ -1,8 +1,12 @@
 Author: Ralph Amissah <ralph@amissah.com>
-Download: http://www.jus.uio.no/sisu/
+Download: <http://www.sisudoc.org> <http://www.jus.uio.no/sisu/>
 
-Files: *
-Copyright: (C) 1997-2009, Ralph Amissah
+Files: SiSU *
+Copyright: (C) 1997-2011, Ralph Amissah
+License: GPL-3+
+Files: sisu-mode.el
+Copyright: (C) 1997-2011, Ambrose Kofi Laing, Ralph Amissah
+  assigned to FSF 2011-04-08 (GNU EMACS)
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim
index 773f87cb..9f1e7222 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            8
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-04-25
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes frugal & sparse
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=bold,reverse        cterm=bold,reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse                                      ctermbg=2
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
index 38197f2d..c8d7333b 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            frugal-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
index b15cd3a6..0190c699 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            frugal-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=bold,reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
index 2aad27ca..9648534e 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,7 +1,7 @@
 "%% SiSU Vim color file
 " Name:            Slate
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
 " Notes:          cterm now uses frugal-sisu 8 colors for term
 "                 (for gui originally looked at desert Hans Fugal <hans@fugal.net>
@@ -18,8 +18,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=bold,reverse                                               gui=none  guibg=#c2bfa5       guifg=black
 :hi StatusLineNC   term=reverse             cterm=reverse                                                    gui=none  guibg=#c2bfa5       guifg=grey40
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7                     guibg=peru          guifg=wheat
-:hi IncSearch      term=reverse             cterm=reverse                                                              guibg=black         guifg=green
+:hi Search         term=reverse             cterm=none               ctermbg=2           ctermfg=0                     guibg=peru          guifg=wheat
+:hi IncSearch      term=reverse             cterm=bold               ctermbg=2           ctermfg=7                     guibg=black         guifg=green
 :hi SpecialKey     term=bold                                                             ctermfg=4                                         guifg=yellowgreen
 :hi Visual         term=reverse             cterm=reverse                                                    gui=none  guibg=olivedrab     guifg=khaki
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
index 17b67557..d17c3e5e 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            sparse-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
index 3d1b8bad..13d9f02f 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            sparse-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=bold,reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 9a5dd08a..85cdd471 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 2.9.3
-:date_stamp: 2011w17/3
-:date: "2011-04-27"
+:version: 2.9.4
+:date_stamp: 2011w19/7
+:date: "2011-05-15"
 :project: SiSU
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
index 773f87cb..9f1e7222 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            8
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-04-25
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes frugal & sparse
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=bold,reverse        cterm=bold,reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse                                      ctermbg=2
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
index 38197f2d..c8d7333b 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            frugal-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
index b15cd3a6..0190c699 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            frugal-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & sparse
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=bold,reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
index 2aad27ca..9648534e 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -1,7 +1,7 @@
 "%% SiSU Vim color file
 " Name:            Slate
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD>
 " Notes:          cterm now uses frugal-sisu 8 colors for term
 "                 (for gui originally looked at desert Hans Fugal <hans@fugal.net>
@@ -18,8 +18,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=bold,reverse                                               gui=none  guibg=#c2bfa5       guifg=black
 :hi StatusLineNC   term=reverse             cterm=reverse                                                    gui=none  guibg=#c2bfa5       guifg=grey40
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7                     guibg=peru          guifg=wheat
-:hi IncSearch      term=reverse             cterm=reverse                                                              guibg=black         guifg=green
+:hi Search         term=reverse             cterm=none               ctermbg=2           ctermfg=0                     guibg=peru          guifg=wheat
+:hi IncSearch      term=reverse             cterm=bold               ctermbg=2           ctermfg=7                     guibg=black         guifg=green
 :hi SpecialKey     term=bold                                                             ctermfg=4                                         guifg=yellowgreen
 :hi Visual         term=reverse             cterm=reverse                                                    gui=none  guibg=olivedrab     guifg=khaki
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
index 17b67557..d17c3e5e 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            sparse-cterm-ruby
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
index 3d1b8bad..13d9f02f 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Name:            sparse-cterm-sisu
 " Maintainer:      Ralph Amissah <ralph@amissah.com>
-" Last Change:     2011-05-04
+" Last Change:     2011-05-10
 " URL:             <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD>
 " Note:            8 color cterm, related colorschemes 8 & frugal
 :set background=dark
@@ -16,8 +16,8 @@ endif
 :hi lCursor        term=reverse             cterm=reverse
 :hi StatusLine     term=reverse             cterm=bold,reverse
 :hi StatusLineNC   term=reverse             cterm=reverse
-:hi Search         term=reverse             cterm=bold                ctermbg=2          ctermfg=7
-:hi IncSearch      term=reverse             cterm=reverse
+:hi Search         term=reverse             cterm=none                ctermbg=2          ctermfg=0
+:hi IncSearch      term=reverse             cterm=bold                ctermbg=2          ctermfg=7
 :hi SpecialKey     term=bold                                                             ctermfg=4
 :hi Visual         term=reverse             cterm=reverse
 :hi VisualNOS      term=bold,underline      cterm=bold,underline
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index 65a09a0e..e2f62d8c 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
 ---
-:version: 3.0.8-beta-rb1.9.2p180
-:date_stamp: 2011w18/4
-:date: "2011-05-05"
+:version: 3.0.9-beta-rb1.9.2p180
+:date_stamp: 2011w20/2
+:date: "2011-05-17"
 :project: SiSU