aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--data/doc/sisu/CHANGELOG_v312
-rw-r--r--data/doc/sisu/CHANGELOG_v427
-rw-r--r--data/sisu/image/b_epub.pngbin668 -> 781 bytes
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim2
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim105
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim105
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim69
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim3
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim2
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim105
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim105
-rw-r--r--data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim4
-rw-r--r--data/sisu/v3/v/version.yml6
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el467
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim2
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim223
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim223
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim223
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim195
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim195
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim195
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim105
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim105
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim69
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim3
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim2
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim105
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim105
-rw-r--r--data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim4
-rw-r--r--data/sisu/v4/v/version.yml6
-rw-r--r--lib/sisu/v3/epub_format.rb6
-rw-r--r--lib/sisu/v3/epub_tune.rb8
-rw-r--r--lib/sisu/v3/html_tune.rb9
-rw-r--r--lib/sisu/v4/constants.rb1
-rw-r--r--lib/sisu/v4/epub_format.rb25
-rw-r--r--lib/sisu/v4/epub_tune.rb9
-rw-r--r--lib/sisu/v4/html.rb12
-rw-r--r--lib/sisu/v4/html_format.rb8
-rw-r--r--lib/sisu/v4/html_tune.rb9
-rw-r--r--lib/sisu/v4/hub.rb2
-rw-r--r--lib/sisu/v4/manifest.rb14
-rw-r--r--lib/sisu/v4/urls.rb4
42 files changed, 2156 insertions, 723 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 0027e209..614167ca 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -31,6 +31,18 @@ v1 branch is removed; it is available in sisu =< 2.7
%% Reverse Chronological:
+%% 3.3.11.orig.tar.xz (2013-02-20:07/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.11
+http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.11.orig.tar.xz
+ sisu_3.3.11.orig.tar.xz
+ sisu_3.3.11-1.dsc
+
+* v3: epub, add markup of angle brackets '<' & '>' to early markup of amp. '&'
+
+* v3: vim, colorschemes, general housekeeping
+
+* b_epub.png, epub icon (for manifest) updated to use official image
+
%% 3.3.10.orig.tar.xz (2013-02-10:05/7)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.10
http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.10.orig.tar.xz
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 3bf9c1c7..eedd132d 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -21,6 +21,33 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 4.0.8.orig.tar.xz (2013-02-20:07/3)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.8
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.8-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.8.orig.tar.xz
+ sisu_4.0.8.orig.tar.xz
+ sisu_4.0.8-1.dsc
+
+* v4: epub
+ * tinkering with some headers
+ * add markup of angle brackets '<' & '>' to early markup of ampersand '&'
+
+* v4: html, modification to markup of angle brackets '<' & '>' and ampersand '&'
+
+* v4: vim, ftplugin & colorschemes housekeeping, scheme "def*" added
+ * general housekeeping
+ * :colorscheme def256* defined from 256 colors (primarily 16 of them) terminal
+ & gui (identical) (terminal scheme based on frugal & extended to cover gui)
+ * :colorscheme def* cterm defined primarily using 16 colors (a few from 256)
+ (to be usable tweak .Xdefaults) gui provided along with Xdefault settings to
+ make cterm match this gui or def256*
+
+* v4: emacs, sisu-mode.el
+ * sisu headers update
+ * cosmetic code reshuffle
+
+* b_epub.png, epub icon (for manifest) updated to use official image
+
%% 4.0.7.orig.tar.xz (2013-02-10:05/7)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.7
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.7-1
diff --git a/data/sisu/image/b_epub.png b/data/sisu/image/b_epub.png
index cbcb1843..1c198cd1 100644
--- a/data/sisu/image/b_epub.png
+++ b/data/sisu/image/b_epub.png
Binary files differ
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 f5bfad97..15c4776e 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
@@ -54,7 +54,7 @@ endif
":hi Function ctermfg=6
":hi Structure ctermfg=2
:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
+:hi CursorLine cterm=bold
:hi CursorColumn cterm=bold
:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
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 3960e421..3fd2a967 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
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "frugal-cterm-ruby"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold ctermfg=1
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=4
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline cterm=none ctermfg=6
-:hi Statement term=bold cterm=none ctermfg=2
-":hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermfg=1
-:hi Type term=underline cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-":hi Include ctermfg=1
-":hi Define ctermfg=3
-":hi Function ctermfg=6
-":hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title ctermfg=1
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=7
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=bold ctermbg=0 ctermfg=4
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier cterm=none ctermfg=6
+:hi Statement cterm=none ctermfg=2
+":hi Operator ctermfg=1
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+":hi Include ctermfg=1
+":hi Define ctermfg=3
+":hi Function ctermfg=6
+":hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
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 b40e4448..37cfaf5a 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
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "frugal-cterm-sisu"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=bold,reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold cterm=bold ctermfg=3
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline ctermfg=6
-:hi Statement term=bold ctermfg=6
-:hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermbg=7 ctermfg=1
-:hi Type term=underline ctermfg=2
-:hi Delimiter term=none cterm=none ctermfg=1
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-:hi Include ctermfg=1
-:hi Define ctermfg=3
-:hi Function ctermfg=6
-:hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=7
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=none ctermbg=0 ctermfg=7
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=6
+:hi Operator ctermfg=1
+:hi PreProc ctermbg=7 ctermfg=1
+:hi Type ctermfg=2
+:hi Delimiter cterm=none ctermfg=1
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
new file mode 100644
index 00000000..39b929a1
--- /dev/null
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
@@ -0,0 +1,69 @@
+" Vim color file
+" Name: frugal-cterm
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-09
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim;hb=HEAD>
+" Note: 8 color cterm, related colorschemes 8 & sparse
+" http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim
+" http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png
+:set t_Co=256
+:set background=dark
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:let colors_name = "frugal-cterm"
+" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=0
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=7
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=none ctermbg=0 ctermfg=7
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=2
+:hi Operator ctermfg=2
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
index 44846402..1677ae0e 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim
@@ -54,8 +54,9 @@ endif
":hi Function ctermfg=6 guifg=magenta
":hi Structure ctermfg=2 guifg=green
:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
+:hi CursorLine cterm=bold,underline
:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
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 e5da6326..14731b2d 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
@@ -56,7 +56,7 @@ endif
:hi Function ctermfg=6 guifg=navajowhite
:hi Structure ctermfg=2 guifg=green
:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline guibg=black
+:hi CursorLine cterm=bold,underline guibg=black
:hi CursorColumn cterm=bold guibg=black
:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white
:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
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 f8271bfc..21698d22 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
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "frugal-cterm-ruby"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold ctermfg=1
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0*
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=0*
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline cterm=none ctermfg=6
-:hi Statement term=bold cterm=none ctermfg=2
-":hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermfg=1
-:hi Type term=underline cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-":hi Include ctermfg=1
-":hi Define ctermfg=3
-":hi Function ctermfg=6
-":hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title ctermfg=1
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=bold ctermbg=0 ctermfg=0*
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=bold ctermbg=0 ctermfg=0*
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier cterm=none ctermfg=6
+:hi Statement cterm=none ctermfg=2
+":hi Operator ctermfg=1
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+":hi Include ctermfg=1
+":hi Define ctermfg=3
+":hi Function ctermfg=6
+":hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
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 6bf8e8cf..0ca364af 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
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "sparse-cterm-sisu"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=bold,reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold cterm=bold ctermfg=3
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0*
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=0*
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline ctermfg=6
-:hi Statement term=bold ctermfg=6
-:hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermbg=7 ctermfg=1
-:hi Type term=underline ctermfg=2
-:hi Delimiter term=none cterm=none ctermfg=1
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-:hi Include ctermfg=1
-:hi Define ctermfg=3
-:hi Function ctermfg=6
-:hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=bold ctermbg=0 ctermfg=0*
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=bold ctermbg=0 ctermfg=0*
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=6
+:hi Operator ctermfg=1
+:hi PreProc ctermbg=7 ctermfg=1
+:hi Type ctermfg=2
+:hi Delimiter cterm=none ctermfg=1
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index be3ff18f..a72251da 100644
--- a/data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/v3/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -67,8 +67,6 @@
:vnoremap <Up> gk
:inoremap <Down> <C-o>gj
:inoremap <Up> <C-o>gk
-"% colorscheme slate
-:map <C-C> :syntax on <cr> :colorscheme slate<cr>
"% search and replace
:map <leader>rd :.,$s///c "search and replace down
:map <leader>rg :%s///c "search and replace whole file
@@ -178,8 +176,6 @@
"% linenumbering, on, relative, off
:map <Leader>nn :set <c-r>={'00':'','01':'r','10':'nor'}[&rnu.&nu]<CR>nu<CR>
"% cursorline
-:highlight CursorLine guibg=black ctermbg=black
-:highlight CursorColumn guibg=black ctermbg=black
:map <leader>cu :if &cursorcolumn <Bar>
\set nocursorline nocursorcolumn <Bar>
\else <Bar>
diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml
index a27b1b0d..b16979ea 100644
--- a/data/sisu/v3/v/version.yml
+++ b/data/sisu/v3/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 3.3.10
-:date_stamp: 2013w05/7
-:date: "2013-02-10"
+:version: 3.3.11
+:date_stamp: 2013w07/3
+:date: "2013-02-20"
:project: SiSU
diff --git a/data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el
index 84e7cbef..1fb0feec 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/v4/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -1,7 +1,9 @@
;;; sisu-mode.el --- a major-mode for highlighting a hierarchy structured text.
;; @Author: Ambrose Kofi Laing & Ralph Amissah
;; @Keywords: text, syntax, processes, tools
-;; @Version: 3.0.7 2011-04-20 (2008-12-14)
+;; @Version: 4.0.8 2013-02-17 (3.0.7 2011-04-20) (2008-12-14)
+;; [3.0.7 2011-04-20 Ambrose Kofi Laing & Ralph Amissah]
+;; [4.0.8 2013-02-17 Ralph Amissah]
;; @URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/emacs/sisu-mode.el;hb=HEAD>
;; @Copyright: Assigned to FSF 2011-04-08 (GNU EMACS)
;; @License: GPLv3
@@ -16,10 +18,8 @@
;;
; Viva Software Libre!
;; Support the free software movement!
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;{{{ Commentary:
-
+;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Commentary:
;;
;; To enter sisu-mode automatically, add (autoload 'sisu-mode "sisu-mode")
;; to your .emacs file and change the first line of your sisu file to:
@@ -29,23 +29,16 @@
;; To handle .sisu files, e.g., 'filename.sisu', add something like
;; (add-to-list 'auto-mode-alist '("\\.sisu$" . sisu-mode))
;; to your .emacs file
-
;;
;; The documentation for the "Structure Of The Hierarchy Text" can be found in
;; the sisustring for the sisu-mode function.
;;
-
-;;}}}
-
-;;{{{ Variables:
-
+;; Variables:
(defgroup sisu-faces nil
"AsciiSisu highlighting"
:group 'sisus)
-
;; == Colors
; color n is more prominent than color n+1
-
(defface sisu-title-1-face
`((((class color)
(background dark))
@@ -56,7 +49,6 @@
(t (:weight bold :inherit variable-pitch)))
"Face for AsciiSisu titles at level 1."
:group 'sisu-faces)
-
(defface sisu-title-2-face
`((((class color)
(background dark))
@@ -67,7 +59,6 @@
(t (:weight bold :inherit variable-pitch)))
"Face for AsciiSisu titles at level 2."
:group 'sisu-faces)
-
(defface sisu-title-3-face
`((((class color)
(background dark))
@@ -78,7 +69,6 @@
(t (:weight bold)))
"Face for AsciiSisu titles at level 3."
:group 'sisu-faces)
-
(defface sisu-title-4-face
`((((class color)
(background dark))
@@ -89,269 +79,271 @@
(t ()))
"Face for AsciiSisu titles at level 4."
:group 'sisu-faces)
-
(defface info-node
'((((class color) (background light)) (:foreground "brown" :bold t :italic t))
(((class color) (background dark)) (:foreground "white" :bold t :italic t))
(t (:bold t :italic t)))
"Face for Info node names."
:group 'sisu-faces)
-
(defvar sisu-title-1 'sisu-title-1-face)
(defvar sisu-title-2 'sisu-title-2-face)
(defvar sisu-title-3 'sisu-title-3-face)
(defvar sisu-title-4 'sisu-title-4-face)
-
(defvar general-font-lock-red1 font-lock-warning-face)
(defvar general-font-lock-red2 font-lock-comment-face)
(defvar general-font-lock-red3 font-lock-string-face)
-
(defvar general-font-lock-green1 font-lock-type-face)
(defvar general-font-lock-green2 font-lock-constant-face)
-
(defvar general-font-lock-blue1 font-lock-keyword-face)
(defvar general-font-lock-blue2 font-lock-function-name-face)
(defvar general-font-lock-blue3 font-lock-builtin-face)
-
(defvar general-font-lock-yellow1 font-lock-variable-name-face)
(defvar general-font-lock-yellow2 font-lock-comment-face)
-
;; == sisu-mode settings
-
(defvar sisu-mode-hook nil
"Normal hook run when entering Sisu Text mode.")
-
(defvar sisu-mode-abbrev-table nil
"Abbrev table in use in Sisu-mode buffers.")
(define-abbrev-table 'sisu-mode-abbrev-table ())
-
(defconst sisu-font-lock-keywords
(eval-when-compile
(list
-
- ;;grouped text
- (cons "^group\{\\|^\}group" 'general-font-lock-red2)
- (cons "^block\{\\|^\}block" 'general-font-lock-red2)
- (cons "^code\{\\|^\}code" 'general-font-lock-red2)
- (cons "^poem\{\\|^\}poem" 'general-font-lock-red2)
- (cons "^alt\{\\|^\}alt" 'general-font-lock-red2)
- (cons "^table\{.+\\|^\}table" 'general-font-lock-red2)
- (cons "^\{table[^}]+\}" 'general-font-lock-red2)
-
- ;; footnote/endnote
- ;(cons "\~\{.+?\}\~" 'general-font-lock-green1)
- (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~" 'general-font-lock-red2)
- (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~" 'general-font-lock-red2)
-
- (cons "\~\\^ \\|^\\^\~ " 'general-font-lock-red2)
-
- (list (concat
- "\\(\*\~\\)"
- "\\([^ \r\t\n]+\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-blue2 t))
-
- ;; emphasis (can be program configured to be bold italics or underscore)
- (list (concat
- "\\([*]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[*]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; bold
- (list (concat
- "\\([!]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[!]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
- (cons "\\*[^ ]+\\*" 'general-font-lock-red1)
- (cons "^!_ .+" 'general-font-lock-red1)
-
- ;;; italics
- (list (concat
- "\\([/]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[/]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-blue1 t)
- '(3 general-font-lock-red1 t))
-
- ;; underscore
- (list (concat
- "\\([_]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[_]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; monospace
- (list (concat
- "\\([#]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[#]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; citation
- (list (concat
- "\\([\"]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[\"]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; inserted text
- (list (concat
- "\\([\+]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[\+]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; strike through
- (list (concat
- "\\(\\-\{\\)"
- "\\([^\}]+\\)"
- "\\(\}\\-\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; superscript
- (list (concat
- "\\(\\^\{\\)"
- "\\([^\}]+\\)"
- "\\(\}\\^\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;; subscript
- (list (concat
- "\\([,]\{\\)"
- "\\([^\}]+\\)"
- "\\(\}[,]\\)")
- '(1 general-font-lock-red1 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-red1 t))
-
- ;;numbered list
- (cons "^# \\|^_# " 'general-font-lock-red1)
-
- ;;bullet text
- (cons "^_\\*[1-9] \\|^_\\* " 'general-font-lock-red1)
-
- ;;indented text
- (cons "^_[1-9] " 'general-font-lock-red1)
- (cons "^_[1-9]! " 'general-font-lock-red1)
-
- ;hanging indented text [proposed enable when implemented]
+ ;;grouped text ---------
+ (cons "^group\{\\|^\}group" 'general-font-lock-red2)
+ (cons "^block\{\\|^\}block" 'general-font-lock-red2)
+ (cons "^code\{\\|^\}code" 'general-font-lock-red2)
+ (cons "^poem\{\\|^\}poem" 'general-font-lock-red2)
+ (cons "^alt\{\\|^\}alt" 'general-font-lock-red2)
+ (cons "^table\{.+\\|^\}table" 'general-font-lock-red2)
+ (cons "^\{table[^}]+\}" 'general-font-lock-red2)
+ ;; footnote/endnote ----
+ ;(cons "\~\{.+?\}\~" 'general-font-lock-green1)
+ (cons "\~\{\\*\\*\\|\~\{\\*\\|\~\{\\|\}\~" 'general-font-lock-red2)
+ (cons "\~\\[\\+\\|\~\\[\\*\\|\~\\[\\|\\]\~" 'general-font-lock-red2)
+ (cons "\~\\^ \\|^\\^\~ " 'general-font-lock-red2)
+ (list
+ (concat
+ "\\(\*\~\\)"
+ "\\([^ \r\t\n]+\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-blue2 t)
+ )
+ ;; emphasis (can be program configured to be bold italics or underscore)
+ (list
+ (concat
+ "\\([*]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[*]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; bold ----------------
+ (list
+ (concat
+ "\\([!]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[!]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ (cons "\\*[^ ]+\\*" 'general-font-lock-red1)
+ (cons "^!_ .+" 'general-font-lock-red1)
+ ;; italics -------------
+ (list
+ (concat
+ "\\([/]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[/]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-blue1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; underscore ----------
+ (list
+ (concat
+ "\\([_]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[_]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; monospace -----------
+ (list
+ (concat
+ "\\([#]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[#]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; citation ------------
+ (list
+ (concat
+ "\\([\"]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[\"]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; inserted text -------
+ (list
+ (concat
+ "\\([\+]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[\+]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; strike through ------
+ (list
+ (concat
+ "\\(\\-\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}\\-\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; superscript ---------
+ (list
+ (concat
+ "\\(\\^\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}\\^\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; subscript -----------
+ (list
+ (concat
+ "\\([,]\{\\)"
+ "\\([^\}]+\\)"
+ "\\(\}[,]\\)"
+ )
+ '(1 general-font-lock-red1 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-red1 t)
+ )
+ ;; numbered list
+ (cons "^# \\|^_# " 'general-font-lock-red1)
+ ;; bullet text
+ (cons "^_\\*[1-9] \\|^_\\* " 'general-font-lock-red1)
+ ;; indented text
+ (cons "^_[1-9] " 'general-font-lock-red1)
+ (cons "^_[1-9]! " 'general-font-lock-red1)
+ ;; hanging indented text [proposed enable when implemented]
(cons "^__[1-9] " 'general-font-lock-red1)
(cons "^_[0-9]_[0-9] " 'general-font-lock-red1)
(cons "^__[1-9]! " 'general-font-lock-red1)
(cons "^_[0-9]_[0-9]! " 'general-font-lock-red1)
-
- ;;url
- (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2)
-
- ;; Comment Lines
- (cons "^% .*" 'general-font-lock-blue1)
-
- ;; line break
- (cons " \\\\\\\\ " 'general-font-lock-red1)
- ;; line break (depreciated)
- (cons "<br>" 'general-font-lock-red1)
-
- ;; Section titles
- (list "^\\(\\([1-8]\\|:?[A-C]\\)\\~\\)\\(.*\\)"
- '(1 sisu-title-1 t)
- '(3 sisu-title-2 t))
-
- ;; hyper-links
- (list (concat
- "\\(\{~^\\|\{\\)"
- "\\([^\}\{]+\\)"
- "\\(\}http:[/][/][^ \r\n\t<]+\\)")
- '(1 general-font-lock-blue2 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-blue2 t))
-
- ;; book index
- (cons "^\=\{.+\}" 'general-font-lock-green1)
-
- ;; numbers
- (cons "\\<[.0-9]+\\>" 'general-font-lock-green2)
-
- ;; bullets sisu_normal (nearly copied regexp)
- (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'general-font-lock-blue2)
-
- ;; image links
- (list (concat
- "\\(\{\\)"
- "\\([^\}\{]+\\)"
- "\\(\}image\\)")
- '(1 general-font-lock-blue2 t)
- '(2 general-font-lock-red1 t)
- '(3 general-font-lock-blue2 t))
-
- ;; insert file links
- (list (concat
- "\\(<< \\)"
- "\\([^ \r\t\n]+\\.ss\\)"
- "\\(i\\|t\\)")
- '(1 general-font-lock-blue2 t)
- '(2 general-font-lock-blue2 t)
- '(3 general-font-lock-blue2 t))
-
- ;; raw keywords
- (list (concat
- "^\\(\\@\\("
- "title\\|"
- "creator\\|"
- "date\\|"
- "publisher\\|"
- "rights\\|"
- "classify\\|"
- "original\\|"
- "notes\\|"
- "links\\|"
- "make\\|"
- "\\):\\)\\(.*\\)")
- '(1 sisu-title-2 keep)
- '(3 sisu-title-3 keep))
-
- ))
- "Default expressions to highlight in AsciiSisu mode.")
-
-;;}}}
-
-;;{{{ Sisu & Autoload:
-
-;;###autoload
+ ;; url
+ (cons "\\(^\\|[ ]\\)http:[/][/][^ \t\n\r<]+" 'general-font-lock-blue2)
+ ;; Comment Lines
+ (cons "^% .*" 'general-font-lock-blue1)
+ ;; line break
+ (cons " \\\\\\\\ " 'general-font-lock-red1)
+ ;; line break (depreciated)
+ (cons "<br>" 'general-font-lock-red1)
+ ;; Section titles
+ (list "^\\(\\([1-8]\\|:?[A-C]\\)\\~\\)\\(.*\\)"
+ '(1 sisu-title-1 t)
+ '(3 sisu-title-2 t)
+ )
+ ;; hyper-links
+ (list
+ (concat
+ "\\(\{~^\\|\{\\)"
+ "\\([^\}\{]+\\)"
+ "\\(\}http:[/][/][^ \r\n\t<]+\\)"
+ )
+ '(1 general-font-lock-blue2 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-blue2 t)
+ )
+ ;; book index
+ (cons "^\=\{.+\}" 'general-font-lock-green1)
+ ;; numbers
+ (cons "\\<[.0-9]+\\>" 'general-font-lock-green2)
+ ;; bullets sisu_normal (nearly copied regexp)
+ (cons "^_\\([1-9*]\\|[1-9]\\*\\) " 'general-font-lock-blue2)
+ ;; image links
+ (list
+ (concat
+ "\\(\{\\)"
+ "\\([^\}\{]+\\)"
+ "\\(\}image\\)"
+ )
+ '(1 general-font-lock-blue2 t)
+ '(2 general-font-lock-red1 t)
+ '(3 general-font-lock-blue2 t)
+ )
+ ;; insert file links
+ (list
+ (concat
+ "\\(<< \\)"
+ "\\([^ \r\t\n]+\\.ss\\)"
+ "\\(i\\|t\\)"
+ )
+ '(1 general-font-lock-blue2 t)
+ '(2 general-font-lock-blue2 t)
+ '(3 general-font-lock-blue2 t)
+ )
+ ;; raw keywords
+ (list
+ (concat
+ "^\\(\\@\\("
+ "creator\\|"
+ "title\\|"
+ "date\\|"
+ "rights\\|"
+ "publisher\\|"
+ "classify\\|"
+ "identifier\\|"
+ "original\\|"
+ "notes\\|"
+ "links\\|"
+ "make\\|"
+ "\\):\\)\\(.*\\)"
+ )
+ '(1 sisu-title-2 keep)
+ '(3 sisu-title-3 keep)
+ )
+ )
+ )
+ "Default expressions to highlight in AsciiSisu mode."
+)
+;; Sisu & Autoload:
+;; ##autoload
(define-derived-mode sisu-mode text-mode "SiSU"
"Major mode for editing SiSU files."
(interactive)
(modify-syntax-entry ?\' ".")
;(flyspell-mode nil)
-
(make-local-variable 'paragraph-start)
(setq paragraph-start (concat "$\\|>" page-delimiter))
(make-local-variable 'paragraph-separate)
(setq paragraph-separate paragraph-start)
(make-local-variable 'paragraph-ignore-fill-prefix)
(setq paragraph-ignore-fill-prefix t)
-
(make-local-variable 'require-final-newline)
(setq require-final-newline t)
-
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults
'(sisu-font-lock-keywords
@@ -359,10 +351,7 @@
nil ; CASE-FOLD: no
((?_ . "w")) ; SYNTAX-ALIST
))
- (run-hooks 'sisu-mode-hook))
-
+ (run-hooks 'sisu-mode-hook)
+)
(provide 'sisu-mode)
-
-;;}}}
-
-;;; sisu-mode.el ends here
+;; sisu-mode.el ends here
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
index 1fcb6e38..ac973e8e 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/8.vim
@@ -54,7 +54,7 @@ endif
":hi Function ctermfg=6
":hi Structure ctermfg=2
:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
+:hi CursorLine cterm=bold
:hi CursorColumn cterm=bold
:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim
new file mode 100644
index 00000000..a3fdfb44
--- /dev/null
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim
@@ -0,0 +1,223 @@
+" Vim color file
+" Name: def-ruby
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-14
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-ruby.vim;hb=HEAD>
+" Note: primarily 16 color cterm improved by tweaking of .Xdefaults
+" (with occasional other colors selected from 256 color palate)
+" .Xdefaults tweaking to make identical to def (256) provided,
+" along with an alternative possibility using colors beyond
+" 256 color palate
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:set t_Co=256
+:set background=dark
+:let colors_name = "def-ruby"
+" -------
+" terminal def
+" -------
+:hi Normal ctermbg=0 ctermfg=7
+":hi Cursor ctermbg=5 ctermfg=0
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=57 ctermfg=0
+:hi IncSearch cterm=none ctermbg=154 ctermfg=0
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title ctermfg=1
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=8
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=none ctermbg=0 ctermfg=4
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier cterm=none ctermfg=6
+:hi Statement cterm=none ctermfg=2
+:hi Operator ctermfg=1
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold
+:hi CursorColumn ctermbg=17
+:hi ColorColumn ctermbg=17
+:hi SpellBad cterm=underline ctermbg=0 ctermfg=5
+:hi SpellCap cterm=underline ctermbg=0 ctermfg=5
+:hi SpellLocal cterm=underline ctermbg=0 ctermfg=5
+:hi SpellRare cterm=underline ctermbg=0 ctermfg=5
+:hi TrailingWhitespace ctermbg=1
+:hi ExtraWhitespace ctermbg=1
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
+" -------
+" gui def
+" -------
+:hi Normal guibg=#000000 guifg=#D3D3D3
+:hi Cursor guibg=#CC9966 guifg=#000000
+:hi lCursor gui=reverse
+:hi StatusLine gui=reverse
+:hi StatusLineNC gui=reverse
+:hi Search gui=none guibg=#5F00FF guifg=#000000
+:hi IncSearch gui=none guibg=#AFFF00 guifg=#000000
+:hi SpecialKey guifg=#5971AD
+:hi Visual gui=reverse
+:hi VisualNOS gui=bold,underline
+:hi MoreMsg guifg=#4E9A06
+:hi ModeMsg gui=bold
+:hi Question guifg=#4E9A06
+:hi Title guifg=#CC0000
+:hi NonText gui=bold guifg=#5971AD
+:hi LineNr gui=bold guibg=#000000 guifg=#808080
+:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi Directory guifg=#5971AD
+:hi WildMenu guibg=#C4A000 guifg=#000000
+:hi VertSplit gui=reverse
+:hi Folded gui=none guibg=#000000 guifg=#808080
+:hi FoldColumn guibg=#D3D3D3 guifg=#5971AD
+:hi DiffAdd gui=none guibg=#4E9A06 guifg=#000000
+:hi DiffChange gui=none guibg=#D3D3D3 guifg=#000000
+:hi DiffDelete gui=none guibg=#D3D3D3 guifg=#000000
+:hi DiffText gui=none guibg=#06989A guifg=#000000
+:hi String gui=none guifg=#C4A000
+:hi Comment gui=none guibg=#000000 guifg=#5971AD
+:hi Constant guifg=#CC0000
+:hi Special guifg=#06989A
+:hi Identifier gui=none guifg=#06989A
+:hi Statement gui=none guifg=#4E9A06
+:hi Operator guifg=#CC0000
+:hi PreProc guifg=#CC0000
+:hi Type gui=bold guifg=#C4A000
+:hi Delimiter gui=none guifg=#4E9A06
+:hi Ignore gui=bold guifg=#D3D3D3
+:hi Todo guibg=#C4A000 guifg=#000000
+:hi Underlined gui=underline
+:hi Include guifg=#CC0000
+:hi Define guifg=#C4A000
+:hi Function guifg=#06989A
+:hi Structure guifg=#4E9A06
+:hi MatchParen gui=bold guibg=#5971AD guifg=#D3D3D3
+:hi CursorLine gui=bold
+:hi CursorColumn guibg=#00005F
+:hi ColorColumn guibg=#00005F
+:hi SpellBad gui=underline guibg=#000000 guifg=#75507B
+:hi SpellCap gui=underline guibg=#000000 guifg=#75507B
+:hi SpellLocal gui=underline guibg=#000000 guifg=#75507B
+:hi SpellRare gui=underline guibg=#000000 guifg=#75507B
+:hi TrailingWhitespace guibg=#CC0000
+:hi ExtraWhitespace guibg=#CC0000
+:hi WarningMsg guifg=#CC0000
+:hi ErrorMsg gui=bold guibg=#CC0000 guifg=#D3D3D3
+:hi Error gui=bold guibg=#CC0000 guifg=#D3D3D3
+" -------
+"256 color .Xdefaults vim: cterm giu
+"<http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim>
+"<http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png>
+" -------
+" 256 color .Xdefaults vim: cterm giu def
+" -------
+" 16 color standard altered 256 altered beyond 256
+" black/dark grey
+" 0 [ 0:#000000] #000000
+" 8 [ 8:#808080] [59:#5F5F5F] #555555
+" red
+" 1 [ 1:#800000] 160:#DF0000 #CC0000
+" 9 [ 9:#FF0000] #EF2929
+" green
+" 2 [ 2:#008000] 112:#87DF00 #4E9A06
+" 10 [10:#00FF00] 154:#AFFF00 #8AE234
+" yellow/orange
+" 3 [ 3:#808000] 178:#DFAF00 #C4A000
+" 11 [11:#FFFF00] 184:#DFDF00 #FC9E4F
+" blue
+" 4 [ 4:#000080] 24:#005F87 #5971AD
+" 12 [12:#0000FF] 73:#5FAFAF #729FCF
+" magenta
+" 5 [ 5:#800080] 90:#870087 #75507B
+" 13 [13:#FF00FF] 126:#AF0087 #AD7FA8
+" cyan
+" 6 [ 6:#008080] 37:#00AFAF #06989A
+" 14 [14:#00FFFF] 87:#5FFFFF #34E2E2
+" white
+" 7 [ 7:#C0C0C0] #D3D3D3
+" 15 [15:#FFFFFF] #EEEEEE
+" --------
+" .Xdefaults (rxvt urxvt setting beyond 256 colors, vim colorscheme "def" gui settings)
+" (vim colorscheme "def" cterm matches "def" gui if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #555555
+" ! red
+" Rxvt.color1 : #CC0000
+" Rxvt.color9 : #EF2929
+" ! green
+" Rxvt.color2 : #4E9A06
+" Rxvt.color10 : #8AE234
+" ! yellow
+" Rxvt.color3 : #C4A000
+" Rxvt.color11 : #FCE94F
+" ! blue
+" Rxvt.color4 : #5971AD
+" Rxvt.color12 : #729FCF
+" ! magenta
+" Rxvt.color5 : #75507B
+" Rxvt.color13 : #AD7FA8
+" ! cyan
+" Rxvt.color6 : #06989A
+" Rxvt.color14 : #34E2E2
+" ! white
+" Rxvt.color7 : #D3D7CF
+" Rxvt.color15 : #EEEEEE
+" --------
+" .Xdefaults 256 (rxvt urxvt setting, vim colorscheme "def256" cterm & gui settings)
+" (vim colorscheme "def" cterm matches "def256" if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #808080
+" ! red
+" Rxvt.color1 : #DF0000
+" Rxvt.color9 : #FF0000
+" ! green
+" Rxvt.color2 : #87DF00
+" Rxvt.color10 : #AFFF00
+" ! yellow
+" Rxvt.color3 : #DFAF00
+" Rxvt.color11 : #FFFF00
+" ! blue
+" Rxvt.color4 : #5F87DF
+" Rxvt.color12 : #87DFFF
+" ! magenta
+" Rxvt.color5 : #8700DF
+" Rxvt.color13 : #87DFFF
+" ! cyan
+" Rxvt.color6 : #00DFDF
+" Rxvt.color14 : #5F5FDF
+" ! white
+" Rxvt.color7 : #C0C0C0
+" Rxvt.color15 : #FFFFFF
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim
new file mode 100644
index 00000000..e0067507
--- /dev/null
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim
@@ -0,0 +1,223 @@
+" Vim color file
+" Name: def-sisu
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-14
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def-sisu.vim;hb=HEAD>
+" Note: primarily 16 color cterm improved by tweaking of .Xdefaults
+" (with occasional other colors selected from 256 color palate)
+" .Xdefaults tweaking to make identical to def (256) provided,
+" along with an alternative possibility using colors beyond
+" 256 color palate
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:set t_Co=256
+:set background=dark
+:let colors_name = "def-sisu"
+" -------
+" terminal def
+" -------
+:hi Normal ctermbg=0 ctermfg=7
+":hi Cursor ctermbg=5 ctermfg=0
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=57 ctermfg=0
+:hi IncSearch cterm=none ctermbg=154 ctermfg=0
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=8
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=none ctermbg=0 ctermfg=4
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=6
+:hi Operator ctermfg=1
+:hi PreProc ctermbg=7 ctermfg=1
+:hi Type ctermfg=2
+:hi Delimiter cterm=none ctermfg=1
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold
+:hi CursorColumn ctermbg=17
+:hi ColorColumn ctermbg=17
+:hi SpellBad cterm=underline ctermbg=0 ctermfg=5
+:hi SpellCap cterm=underline ctermbg=0 ctermfg=5
+:hi SpellLocal cterm=underline ctermbg=0 ctermfg=5
+:hi SpellRare cterm=underline ctermbg=0 ctermfg=5
+:hi TrailingWhitespace ctermbg=1
+:hi ExtraWhitespace ctermbg=1
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
+" -------
+" gui def
+" -------
+:hi Normal guibg=#000000 guifg=#D3D3D3
+:hi Cursor guibg=#CC9966 guifg=#000000
+:hi lCursor gui=reverse
+:hi StatusLine gui=bold,reverse
+:hi StatusLineNC gui=reverse
+:hi Search gui=none guibg=#5F00FF guifg=#000000
+:hi IncSearch gui=none guibg=#AFFF00 guifg=#000000
+:hi SpecialKey guifg=#5971AD
+:hi Visual gui=reverse
+:hi VisualNOS gui=bold,underline
+:hi MoreMsg guifg=#4E9A06
+:hi ModeMsg gui=bold
+:hi Question guifg=#4E9A06
+:hi Title gui=bold guifg=#C4A000
+:hi NonText gui=bold guifg=#5971AD
+:hi LineNr gui=bold guibg=#000000 guifg=#808080
+:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi Directory guifg=#5971AD
+:hi WildMenu guibg=#C4A000 guifg=#000000
+:hi VertSplit gui=reverse
+:hi Folded gui=none guibg=#000000 guifg=#808080
+:hi FoldColumn guibg=#D3D3D3 guifg=#5971AD
+:hi DiffAdd gui=none guibg=#4E9A06 guifg=#000000
+:hi DiffChange gui=none guibg=#D3D3D3 guifg=#000000
+:hi DiffDelete gui=none guibg=#D3D3D3 guifg=#000000
+:hi DiffText gui=none guibg=#06989A guifg=#000000
+:hi String gui=none guifg=#C4A000
+:hi Comment gui=none guibg=#000000 guifg=#5971AD
+:hi Constant guifg=#CC0000
+:hi Special guifg=#06989A
+:hi Identifier guifg=#06989A
+:hi Statement guifg=#06989A
+:hi Operator guifg=#CC0000
+:hi PreProc guibg=#D3D3D3 guifg=#CC0000
+:hi Type guifg=#4E9A06
+:hi Delimiter gui=none guifg=#CC0000
+:hi Ignore gui=bold guifg=#D3D3D3
+:hi Todo guibg=#C4A000 guifg=#000000
+:hi Underlined gui=underline
+:hi Include guifg=#CC0000
+:hi Define guifg=#C4A000
+:hi Function guifg=#06989A
+:hi Structure guifg=#4E9A06
+:hi MatchParen gui=bold guibg=#5971AD guifg=#D3D3D3
+:hi CursorLine gui=bold
+:hi CursorColumn guibg=#00005F
+:hi ColorColumn guibg=#00005F
+:hi SpellBad gui=underline guibg=#000000 guifg=#75507B
+:hi SpellCap gui=underline guibg=#000000 guifg=#75507B
+:hi SpellLocal gui=underline guibg=#000000 guifg=#75507B
+:hi SpellRare gui=underline guibg=#000000 guifg=#75507B
+:hi TrailingWhitespace guibg=#080000
+:hi ExtraWhitespace guibg=#CC0000
+:hi WarningMsg guifg=#CC0000
+:hi ErrorMsg gui=bold guibg=#CC0000 guifg=#D3D3D3
+:hi Error gui=bold guibg=#CC0000 guifg=#D3D3D3
+" -------
+"256 color .Xdefaults vim: cterm giu
+"<http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim>
+"<http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png>
+" -------
+" 256 color .Xdefaults vim: cterm giu def
+" -------
+" 16 color standard altered 256 altered beyond 256
+" black/dark grey
+" 0 [ 0:#000000] #000000
+" 8 [ 8:#808080] [59:#5F5F5F] #555555
+" red
+" 1 [ 1:#800000] 160:#DF0000 #CC0000
+" 9 [ 9:#FF0000] #EF2929
+" green
+" 2 [ 2:#008000] 112:#87DF00 #4E9A06
+" 10 [10:#00FF00] 154:#AFFF00 #8AE234
+" yellow/orange
+" 3 [ 3:#808000] 178:#DFAF00 #C4A000
+" 11 [11:#FFFF00] 184:#DFDF00 #FC9E4F
+" blue
+" 4 [ 4:#000080] 24:#005F87 #5971AD
+" 12 [12:#0000FF] 73:#5FAFAF #729FCF
+" magenta
+" 5 [ 5:#800080] 90:#870087 #75507B
+" 13 [13:#FF00FF] 126:#AF0087 #AD7FA8
+" cyan
+" 6 [ 6:#008080] 37:#00AFAF #06989A
+" 14 [14:#00FFFF] 87:#5FFFFF #34E2E2
+" white
+" 7 [ 7:#C0C0C0] #D3D3D3
+" 15 [15:#FFFFFF] #EEEEEE
+" --------
+" .Xdefaults (rxvt urxvt setting beyond 256 colors, vim colorscheme "def" gui settings)
+" (vim colorscheme "def" cterm matches "def" gui if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #555555
+" ! red
+" Rxvt.color1 : #CC0000
+" Rxvt.color9 : #EF2929
+" ! green
+" Rxvt.color2 : #4E9A06
+" Rxvt.color10 : #8AE234
+" ! yellow
+" Rxvt.color3 : #C4A000
+" Rxvt.color11 : #FCE94F
+" ! blue
+" Rxvt.color4 : #5971AD
+" Rxvt.color12 : #729FCF
+" ! magenta
+" Rxvt.color5 : #75507B
+" Rxvt.color13 : #AD7FA8
+" ! cyan
+" Rxvt.color6 : #06989A
+" Rxvt.color14 : #34E2E2
+" ! white
+" Rxvt.color7 : #D3D7CF
+" Rxvt.color15 : #EEEEEE
+" --------
+" .Xdefaults 256 (rxvt urxvt setting, vim colorscheme "def256" cterm & gui settings)
+" (vim colorscheme "def" cterm matches "def256" if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #808080
+" ! red
+" Rxvt.color1 : #DF0000
+" Rxvt.color9 : #FF0000
+" ! green
+" Rxvt.color2 : #87DF00
+" Rxvt.color10 : #AFFF00
+" ! yellow
+" Rxvt.color3 : #DFAF00
+" Rxvt.color11 : #FFFF00
+" ! blue
+" Rxvt.color4 : #5F87DF
+" Rxvt.color12 : #87DFFF
+" ! magenta
+" Rxvt.color5 : #8700DF
+" Rxvt.color13 : #87DFFF
+" ! cyan
+" Rxvt.color6 : #00DFDF
+" Rxvt.color14 : #5F5FDF
+" ! white
+" Rxvt.color7 : #C0C0C0
+" Rxvt.color15 : #FFFFFF
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim
new file mode 100644
index 00000000..20bd9dde
--- /dev/null
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim
@@ -0,0 +1,223 @@
+" Vim color file
+" Name: def
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-14
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def.vim;hb=HEAD>
+" Note: primarily 16 color cterm improved by tweaking of .Xdefaults
+" (with occasional other colors selected from 256 color palate)
+" .Xdefaults tweaking to make identical to def (256) provided,
+" along with an alternative possibility using colors beyond
+" 256 color palate
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:set t_Co=256
+:set background=dark
+:let colors_name = "def"
+" -------
+" terminal def
+" -------
+:hi Normal ctermbg=0 ctermfg=7
+":hi Cursor ctermbg=5 ctermfg=0
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=57 ctermfg=0
+:hi IncSearch cterm=none ctermbg=154 ctermfg=0
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=8
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=none ctermbg=0 ctermfg=4
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=2
+:hi Operator ctermfg=2
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold
+:hi CursorColumn ctermbg=17
+:hi ColorColumn ctermbg=17
+:hi SpellBad cterm=underline ctermbg=0 ctermfg=5
+:hi SpellCap cterm=underline ctermbg=0 ctermfg=5
+:hi SpellLocal cterm=underline ctermbg=0 ctermfg=5
+:hi SpellRare cterm=underline ctermbg=0 ctermfg=5
+:hi TrailingWhitespace ctermbg=1
+:hi ExtraWhitespace ctermbg=1
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
+" -------
+" gui def
+" -------
+:hi Normal guibg=#000000 guifg=#D3D3D3
+:hi Cursor guibg=#CC9966 guifg=#000000
+:hi lCursor gui=reverse
+:hi StatusLine gui=bold,reverse
+:hi StatusLineNC gui=reverse
+:hi Search gui=none guibg=#5F00FF guifg=#000000
+:hi IncSearch gui=none guibg=#AFFF00 guifg=#000000
+:hi SpecialKey guifg=#5971AD
+:hi Visual gui=reverse
+:hi VisualNOS gui=bold,underline
+:hi MoreMsg guifg=#4E9A06
+:hi ModeMsg gui=bold
+:hi Question guifg=#4E9A06
+:hi Title gui=bold guifg=#C4A000
+:hi NonText gui=bold guifg=#5971AD
+:hi LineNr gui=bold guibg=#000000 guifg=#808080
+:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi Directory guifg=#5971AD
+:hi WildMenu guibg=#C4A000 guifg=#000000
+:hi VertSplit gui=reverse
+:hi Folded gui=none guibg=#000000 guifg=#808080
+:hi FoldColumn guibg=#D3D3D3 guifg=#5971AD
+:hi DiffAdd gui=none guibg=#4E9A06 guifg=#000000
+:hi DiffChange gui=none guibg=#D3D3D3 guifg=#000000
+:hi DiffDelete gui=none guibg=#D3D3D3 guifg=#000000
+:hi DiffText gui=none guibg=#06989A guifg=#000000
+:hi String gui=none guifg=#C4A000
+:hi Comment gui=none guibg=#000000 guifg=#5971AD
+:hi Constant guifg=#CC0000
+:hi Special guifg=#06989A
+:hi Identifier guifg=#06989A
+:hi Statement guifg=#4E9A06
+:hi Operator guifg=#4E9A06
+:hi PreProc guifg=#CC0000
+:hi Type gui=bold guifg=#C4A000
+:hi Delimiter gui=none guifg=#4E9A06
+:hi Ignore gui=bold guifg=#D3D3D3
+:hi Todo guibg=#C4A000 guifg=#000000
+:hi Underlined gui=underline
+:hi Include guifg=#CC0000
+:hi Define guifg=#C4A000
+:hi Function guifg=#06989A
+:hi Structure guifg=#4E9A06
+:hi MatchParen gui=bold guibg=#5971AD guifg=#D3D3D3
+:hi CursorLine gui=bold
+:hi CursorColumn guibg=#00005F
+:hi ColorColumn guibg=#00005F
+:hi SpellBad gui=underline guibg=#000000 guifg=#75507B
+:hi SpellCap gui=underline guibg=#000000 guifg=#75507B
+:hi SpellLocal gui=underline guibg=#000000 guifg=#75507B
+:hi SpellRare gui=underline guibg=#000000 guifg=#75507B
+:hi TrailingWhitespace guibg=#080000
+:hi ExtraWhitespace guibg=#CC0000
+:hi WarningMsg guifg=#CC0000
+:hi ErrorMsg gui=bold guibg=#CC0000 guifg=#D3D3D3
+:hi Error gui=bold guibg=#CC0000 guifg=#D3D3D3
+" -------
+"256 color .Xdefaults vim: cterm giu
+"<http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim>
+"<http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png>
+" -------
+" 256 color .Xdefaults vim: cterm giu def
+" -------
+" 16 color standard altered 256 altered beyond 256
+" black/dark grey
+" 0 [ 0:#000000] #000000
+" 8 [ 8:#808080] [59:#5F5F5F] #555555
+" red
+" 1 [ 1:#800000] 160:#DF0000 #CC0000
+" 9 [ 9:#FF0000] #EF2929
+" green
+" 2 [ 2:#008000] 112:#87DF00 #4E9A06
+" 10 [10:#00FF00] 154:#AFFF00 #8AE234
+" yellow/orange
+" 3 [ 3:#808000] 178:#DFAF00 #C4A000
+" 11 [11:#FFFF00] 184:#DFDF00 #FC9E4F
+" blue
+" 4 [ 4:#000080] 24:#005F87 #5971AD
+" 12 [12:#0000FF] 73:#5FAFAF #729FCF
+" magenta
+" 5 [ 5:#800080] 90:#870087 #75507B
+" 13 [13:#FF00FF] 126:#AF0087 #AD7FA8
+" cyan
+" 6 [ 6:#008080] 37:#00AFAF #06989A
+" 14 [14:#00FFFF] 87:#5FFFFF #34E2E2
+" white
+" 7 [ 7:#C0C0C0] #D3D3D3
+" 15 [15:#FFFFFF] #EEEEEE
+" --------
+" .Xdefaults (rxvt urxvt setting beyond 256 colors, vim colorscheme "def" gui settings)
+" (vim colorscheme "def" cterm matches "def" gui if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #555555
+" ! red
+" Rxvt.color1 : #CC0000
+" Rxvt.color9 : #EF2929
+" ! green
+" Rxvt.color2 : #4E9A06
+" Rxvt.color10 : #8AE234
+" ! yellow
+" Rxvt.color3 : #C4A000
+" Rxvt.color11 : #FCE94F
+" ! blue
+" Rxvt.color4 : #5971AD
+" Rxvt.color12 : #729FCF
+" ! magenta
+" Rxvt.color5 : #75507B
+" Rxvt.color13 : #AD7FA8
+" ! cyan
+" Rxvt.color6 : #06989A
+" Rxvt.color14 : #34E2E2
+" ! white
+" Rxvt.color7 : #D3D7CF
+" Rxvt.color15 : #EEEEEE
+" --------
+" .Xdefaults 256 (rxvt urxvt setting, vim colorscheme "def256" cterm & gui settings)
+" (vim colorscheme "def" cterm matches "def256" if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #808080
+" ! red
+" Rxvt.color1 : #DF0000
+" Rxvt.color9 : #FF0000
+" ! green
+" Rxvt.color2 : #87DF00
+" Rxvt.color10 : #AFFF00
+" ! yellow
+" Rxvt.color3 : #DFAF00
+" Rxvt.color11 : #FFFF00
+" ! blue
+" Rxvt.color4 : #5F87DF
+" Rxvt.color12 : #87DFFF
+" ! magenta
+" Rxvt.color5 : #8700DF
+" Rxvt.color13 : #87DFFF
+" ! cyan
+" Rxvt.color6 : #00DFDF
+" Rxvt.color14 : #5F5FDF
+" ! white
+" Rxvt.color7 : #C0C0C0
+" Rxvt.color15 : #FFFFFF
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
new file mode 100644
index 00000000..59f17ce1
--- /dev/null
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim
@@ -0,0 +1,195 @@
+" Vim color file
+" Name: def256-ruby
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-14
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-ruby.vim;hb=HEAD>
+" Note: based on colorscheme defx, this scheme has 256 colors
+" selected primarily from 16 colors around the colors available
+" for 16 color cterm (with occasional other colors selected
+" from 256 color palate) .Xdefaults settings provided to make
+" term 16 colors match this, using 256 color palate.
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:set t_Co=256
+:set background=dark
+:let colors_name = "def256-ruby"
+" -------
+" terminal def
+" -------
+:hi Normal ctermbg=0 ctermfg=7
+":hi Cursor ctermbg=5 ctermfg=0
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=57 ctermfg=0
+:hi IncSearch cterm=none ctermbg=154 ctermfg=0
+:hi SpecialKey ctermfg=24
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=112
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=112
+:hi Title ctermfg=160
+:hi NonText cterm=bold ctermfg=24
+:hi LineNr cterm=bold ctermbg=0 ctermfg=8
+:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi Directory ctermfg=24
+:hi WildMenu ctermbg=178 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=59
+:hi FoldColumn ctermbg=7 ctermfg=24
+:hi DiffAdd cterm=none ctermbg=112 ctermfg=0
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=37 ctermfg=0
+:hi String cterm=none ctermfg=178
+:hi Comment cterm=none ctermbg=0 ctermfg=24
+:hi Constant ctermfg=160
+:hi Special ctermfg=37
+:hi Identifier cterm=none ctermfg=37
+:hi Statement cterm=none ctermfg=112
+:hi Operator ctermfg=160
+:hi PreProc ctermfg=160
+:hi Type cterm=bold ctermfg=178
+:hi Delimiter cterm=none ctermfg=112
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=178 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=160
+:hi Define ctermfg=178
+:hi Function ctermfg=37
+:hi Structure ctermfg=112
+:hi MatchParen cterm=bold ctermbg=24 ctermfg=7
+:hi CursorLine cterm=bold
+:hi CursorColumn ctermbg=17
+:hi ColorColumn ctermbg=17
+:hi SpellBad cterm=underline ctermbg=0 ctermfg=90
+:hi SpellCap cterm=underline ctermbg=0 ctermfg=90
+:hi SpellLocal cterm=underline ctermbg=0 ctermfg=90
+:hi SpellRare cterm=underline ctermbg=0 ctermfg=90
+:hi TrailingWhitespace ctermbg=160
+:hi ExtraWhitespace ctermbg=160
+:hi WarningMsg ctermfg=160
+:hi ErrorMsg cterm=bold ctermbg=160 ctermfg=7
+:hi Error cterm=bold ctermbg=160 ctermfg=7
+" -------
+" gui def
+" -------
+:hi Normal guibg=#000000 guifg=#C0C0C0
+:hi Cursor guibg=#CC9966 guifg=#000000
+:hi lCursor gui=reverse
+:hi StatusLine gui=reverse
+:hi StatusLineNC gui=reverse
+:hi Search gui=none guibg=#5F00FF guifg=#000000
+:hi IncSearch gui=none guibg=#AFFF00 guifg=#000000
+:hi SpecialKey guifg=#005F87
+:hi Visual gui=reverse
+:hi VisualNOS gui=bold,underline
+:hi MoreMsg guifg=#87DF00
+:hi ModeMsg gui=bold
+:hi Question guifg=#87DF00
+:hi Title guifg=#CC0000
+:hi NonText gui=bold guifg=#005F87
+:hi LineNr gui=bold guibg=#000000 guifg=#808080
+:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi Directory guifg=#005F87
+:hi WildMenu guibg=#DFAF00 guifg=#000000
+:hi VertSplit gui=reverse
+:hi Folded gui=none guibg=#000000 guifg=#808080
+:hi FoldColumn guibg=#C0C0C0 guifg=#005F87
+:hi DiffAdd gui=none guibg=#87DF00 guifg=#000000
+:hi DiffChange gui=none guibg=#C0C0C0 guifg=#000000
+:hi DiffDelete gui=none guibg=#C0C0C0 guifg=#000000
+:hi DiffText gui=none guibg=#00AFAF guifg=#000000
+:hi String gui=none guifg=#DFAF00
+:hi Comment gui=none guibg=#000000 guifg=#005F87
+:hi Constant guifg=#CC0000
+:hi Special guifg=#06989A
+:hi Identifier gui=none guifg=#06989A
+:hi Statement gui=none guifg=#87DF00
+:hi Operator guifg=#CC0000
+:hi PreProc guifg=#CC0000
+:hi Type gui=bold guifg=#DFAF00
+:hi Delimiter gui=none guifg=#87DF00
+:hi Ignore gui=bold guifg=#C0C0C0
+:hi Todo guibg=#DFAF00 guifg=#000000
+:hi Underlined gui=underline
+:hi Include guifg=#CC0000
+:hi Define guifg=#DFAF00
+:hi Function guifg=#00AFAF
+:hi Structure guifg=#87DF00
+:hi MatchParen gui=bold guibg=#005F87 guifg=#C0C0C0
+:hi CursorLine gui=bold
+:hi CursorColumn guibg=#00005F
+:hi ColorColumn guibg=#00005F
+:hi SpellBad gui=underline guibg=#000000 guifg=#870087
+:hi SpellCap gui=underline guibg=#000000 guifg=#870087
+:hi SpellLocal gui=underline guibg=#000000 guifg=#870087
+:hi SpellRare gui=underline guibg=#000000 guifg=#870087
+:hi TrailingWhitespace guibg=#CC0000
+:hi ExtraWhitespace guibg=#CC0000
+:hi WarningMsg guifg=#CC0000
+:hi ErrorMsg gui=bold guibg=#CC0000 guifg=#C0C0C0
+:hi Error gui=bold guibg=#CC0000 guifg=#C0C0C0
+" -------
+"256 color .Xdefaults vim: cterm giu
+"<http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim>
+"<http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png>
+" -------
+" 256 color .Xdefaults vim: cterm giu def
+" -------
+" 16 color standard altered 256 altered beyond 256
+" black/dark grey
+" 0 [ 0:#000000] #000000
+" 8 [ 8:#808080] [59:#5F5F5F] #555555
+" red
+" 1 [ 1:#800000] 160:#DF0000 #CC0000
+" 9 [ 9:#FF0000] #EF2929
+" green
+" 2 [ 2:#008000] 112:#87DF00 #4E9A06
+" 10 [10:#00FF00] 154:#AFFF00 #8AE234
+" yellow/orange
+" 3 [ 3:#808000] 178:#DFAF00 #C4A000
+" 11 [11:#FFFF00] 184:#DFDF00 #FC9E4F
+" blue
+" 4 [ 4:#000080] 24:#005F87 #5971AD
+" 12 [12:#0000FF] 73:#5FAFAF #729FCF
+" magenta
+" 5 [ 5:#800080] 90:#870087 #75507B
+" 13 [13:#FF00FF] 126:#AF0087 #AD7FA8
+" cyan
+" 6 [ 6:#008080] 37:#00AFAF #06989A
+" 14 [14:#00FFFF] 87:#5FFFFF #34E2E2
+" white
+" 7 [ 7:#C0C0C0] #D3D3D3
+" 15 [15:#FFFFFF] #EEEEEE
+" --------
+" .Xdefaults 256 (rxvt urxvt setting, vim colorscheme "def256" cterm & gui settings)
+" (vim colorscheme "def" cterm matches "def256" if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #5F5F5F
+" ! red
+" Rxvt.color1 : #DF0000
+" Rxvt.color9 : #FF0000
+" ! green
+" Rxvt.color2 : #87DF00
+" Rxvt.color10 : #AFFF00
+" ! yellow
+" Rxvt.color3 : #DFAF00
+" Rxvt.color11 : #FFFF00
+" ! blue
+" Rxvt.color4 : #5F87DF
+" Rxvt.color12 : #87DFFF
+" ! magenta
+" Rxvt.color5 : #8700DF
+" Rxvt.color13 : #87DFFF
+" ! cyan
+" Rxvt.color6 : #00DFDF
+" Rxvt.color14 : #5F5FDF
+" ! white
+" Rxvt.color7 : #C0C0C0
+" Rxvt.color15 : #FFFFFF
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
new file mode 100644
index 00000000..2866c820
--- /dev/null
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim
@@ -0,0 +1,195 @@
+" Vim color file
+" Name: def256-sisu
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-14
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256-sisu.vim;hb=HEAD>
+" Note: based on colorscheme defx, this scheme has 256 colors
+" selected primarily from 16 colors around the colors available
+" for 16 color cterm (with occasional other colors selected
+" from 256 color palate) .Xdefaults settings provided to make
+" term 16 colors match this, using 256 color palate.
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:set t_Co=256
+:set background=dark
+:let colors_name = "def256-sisu"
+" -------
+" terminal def
+" -------
+:hi Normal ctermbg=0 ctermfg=7
+":hi Cursor ctermbg=90 ctermfg=0
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=57 ctermfg=0
+:hi IncSearch cterm=none ctermbg=154 ctermfg=0
+:hi SpecialKey ctermfg=24
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=112
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=112
+:hi Title cterm=bold ctermfg=178
+:hi NonText cterm=bold ctermfg=24
+:hi LineNr cterm=bold ctermbg=0 ctermfg=8
+:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi Directory ctermfg=24
+:hi WildMenu ctermbg=178 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=8
+:hi FoldColumn ctermbg=7 ctermfg=24
+:hi DiffAdd cterm=none ctermbg=112 ctermfg=0
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=37 ctermfg=0
+:hi String cterm=none ctermfg=178
+:hi Comment cterm=none ctermbg=0 ctermfg=24
+:hi Constant ctermfg=160
+:hi Special ctermfg=37
+:hi Identifier ctermfg=37
+:hi Statement ctermfg=37
+:hi Operator ctermfg=160
+:hi PreProc ctermbg=7 ctermfg=160
+:hi Type ctermfg=112
+:hi Delimiter cterm=none ctermfg=160
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=178 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=160
+:hi Define ctermfg=178
+:hi Function ctermfg=37
+:hi Structure ctermfg=112
+:hi MatchParen cterm=bold ctermbg=24 ctermfg=7
+:hi CursorLine cterm=bold
+:hi CursorColumn ctermbg=17
+:hi ColorColumn ctermbg=17
+:hi SpellBad cterm=underline ctermbg=0 ctermfg=90
+:hi SpellCap cterm=underline ctermbg=0 ctermfg=90
+:hi SpellLocal cterm=underline ctermbg=0 ctermfg=90
+:hi SpellRare cterm=underline ctermbg=0 ctermfg=90
+:hi TrailingWhitespace ctermbg=160
+:hi ExtraWhitespace ctermbg=160
+:hi WarningMsg ctermfg=160
+:hi ErrorMsg cterm=bold ctermbg=160 ctermfg=7
+:hi Error cterm=bold ctermbg=160 ctermfg=7
+" -------
+" gui def
+" -------
+:hi Normal guibg=#000000 guifg=#C0C0C0
+:hi Cursor guibg=#CC9966 guifg=#000000
+:hi lCursor gui=reverse
+:hi StatusLine gui=bold,reverse
+:hi StatusLineNC gui=reverse
+:hi Search gui=none guibg=#5F00FF guifg=#000000
+:hi IncSearch gui=none guibg=#AFFF00 guifg=#000000
+:hi SpecialKey guifg=#005F87
+:hi Visual gui=reverse
+:hi VisualNOS gui=bold,underline
+:hi MoreMsg guifg=#87DF00
+:hi ModeMsg gui=bold
+:hi Question guifg=#87DF00
+:hi Title gui=bold guifg=#DFAF00
+:hi NonText gui=bold guifg=#005F87
+:hi LineNr gui=bold guibg=#000000 guifg=#808080
+:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi Directory guifg=#005F87
+:hi WildMenu guibg=#DFAF00 guifg=#000000
+:hi VertSplit gui=reverse
+:hi Folded gui=none guibg=#000000 guifg=#808080
+:hi FoldColumn guibg=#C0C0C0 guifg=#005F87
+:hi DiffAdd gui=none guibg=#87DF00 guifg=#000000
+:hi DiffChange gui=none guibg=#C0C0C0 guifg=#000000
+:hi DiffDelete gui=none guibg=#C0C0C0 guifg=#000000
+:hi DiffText gui=none guibg=#00AFAF guifg=#000000
+:hi String gui=none guifg=#DFAF00
+:hi Comment gui=none guibg=#000000 guifg=#005F87
+:hi Constant guifg=#CC0000
+:hi Special guifg=#00AFAF
+:hi Identifier guifg=#00AFAF
+:hi Statement guifg=#00AFAF
+:hi Operator guifg=#CC0000
+:hi PreProc guibg=#C0C0C0 guifg=#CC0000
+:hi Type guifg=#87DF00
+:hi Delimiter gui=none guifg=#CC0000
+:hi Ignore gui=bold guifg=#C0C0C0
+:hi Todo guibg=#DFAF00 guifg=#000000
+:hi Underlined gui=underline
+:hi Include guifg=#CC0000
+:hi Define guifg=#DFAF00
+:hi Function guifg=#00AFAF
+:hi Structure guifg=#87DF00
+:hi MatchParen gui=bold guibg=#005F87 guifg=#C0C0C0
+:hi CursorLine gui=bold
+:hi CursorColumn guibg=#00005F
+:hi ColorColumn guibg=#00005F
+:hi SpellBad gui=underline guibg=#000000 guifg=#870087
+:hi SpellCap gui=underline guibg=#000000 guifg=#870087
+:hi SpellLocal gui=underline guibg=#000000 guifg=#870087
+:hi SpellRare gui=underline guibg=#000000 guifg=#870087
+:hi TrailingWhitespace guibg=#CC0000
+:hi ExtraWhitespace guibg=#CC0000
+:hi WarningMsg guifg=#CC0000
+:hi ErrorMsg gui=bold guibg=#CC0000 guifg=#C0C0C0
+:hi Error gui=bold guibg=#CC0000 guifg=#C0C0C0
+" -------
+"256 color .Xdefaults vim: cterm giu
+"<http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim>
+"<http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png>
+" -------
+" 256 color .Xdefaults vim: cterm giu def
+" -------
+" 16 color standard altered 256 altered beyond 256
+" black/dark grey
+" 0 [ 0:#000000] #000000
+" 8 [ 8:#808080] [59:#5F5F5F] #555555
+" red
+" 1 [ 1:#800000] 160:#DF0000 #CC0000
+" 9 [ 9:#FF0000] #EF2929
+" green
+" 2 [ 2:#008000] 112:#87DF00 #4E9A06
+" 10 [10:#00FF00] 154:#AFFF00 #8AE234
+" yellow/orange
+" 3 [ 3:#808000] 178:#DFAF00 #C4A000
+" 11 [11:#FFFF00] 184:#DFDF00 #FC9E4F
+" blue
+" 4 [ 4:#000080] 24:#005F87 #5971AD
+" 12 [12:#0000FF] 73:#5FAFAF #729FCF
+" magenta
+" 5 [ 5:#800080] 90:#870087 #75507B
+" 13 [13:#FF00FF] 126:#AF0087 #AD7FA8
+" cyan
+" 6 [ 6:#008080] 37:#00AFAF #06989A
+" 14 [14:#00FFFF] 87:#5FFFFF #34E2E2
+" white
+" 7 [ 7:#C0C0C0] #D3D3D3
+" 15 [15:#FFFFFF] #EEEEEE
+" --------
+" .Xdefaults 256 (rxvt urxvt setting, vim colorscheme "def256" cterm & gui settings)
+" (vim colorscheme "def" cterm matches "def256" if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #5F5F5F
+" ! red
+" Rxvt.color1 : #DF0000
+" Rxvt.color9 : #FF0000
+" ! green
+" Rxvt.color2 : #87DF00
+" Rxvt.color10 : #AFFF00
+" ! yellow
+" Rxvt.color3 : #DFAF00
+" Rxvt.color11 : #FFFF00
+" ! blue
+" Rxvt.color4 : #5F87DF
+" Rxvt.color12 : #87DFFF
+" ! magenta
+" Rxvt.color5 : #8700DF
+" Rxvt.color13 : #87DFFF
+" ! cyan
+" Rxvt.color6 : #00DFDF
+" Rxvt.color14 : #5F5FDF
+" ! white
+" Rxvt.color7 : #C0C0C0
+" Rxvt.color15 : #FFFFFF
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim
new file mode 100644
index 00000000..bbafc3cc
--- /dev/null
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim
@@ -0,0 +1,195 @@
+" Vim color file
+" Name: def256
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-14
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/def256.vim;hb=HEAD>
+" Note: based on colorscheme defx, this scheme has 256 colors
+" selected primarily from 16 colors around the colors available
+" for 16 color cterm (with occasional other colors selected
+" from 256 color palate) .Xdefaults settings provided to make
+" term 16 colors match this, using 256 color palate.
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:set t_Co=256
+:set background=dark
+:let colors_name = "def256"
+" -------
+" terminal def
+" -------
+:hi Normal ctermbg=0 ctermfg=7
+":hi Cursor ctermbg=90 ctermfg=0
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=57 ctermfg=0
+:hi IncSearch cterm=none ctermbg=154 ctermfg=0
+:hi SpecialKey ctermfg=24
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=112
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=112
+:hi Title cterm=bold ctermfg=178
+:hi NonText cterm=bold ctermfg=24
+:hi LineNr cterm=bold ctermbg=0 ctermfg=8
+:hi CursorLineNr cterm=bold ctermbg=17 ctermfg=0
+:hi Directory ctermfg=24
+:hi WildMenu ctermbg=178 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=8
+:hi FoldColumn ctermbg=7 ctermfg=24
+:hi DiffAdd cterm=none ctermbg=112 ctermfg=0
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=37 ctermfg=0
+:hi String cterm=none ctermfg=178
+:hi Comment cterm=none ctermbg=0 ctermfg=24
+:hi Constant ctermfg=160
+:hi Special ctermfg=37
+:hi Identifier ctermfg=37
+:hi Statement ctermfg=112
+:hi Operator ctermfg=112
+:hi PreProc ctermfg=160
+:hi Type cterm=bold ctermfg=178
+:hi Delimiter cterm=none ctermfg=112
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=178 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=160
+:hi Define ctermfg=178
+:hi Function ctermfg=37
+:hi Structure ctermfg=112
+:hi MatchParen cterm=bold ctermbg=24 ctermfg=7
+:hi CursorLine cterm=bold
+:hi CursorColumn ctermbg=17
+:hi ColorColumn ctermbg=17
+:hi SpellBad cterm=underline ctermbg=0 ctermfg=90
+:hi SpellCap cterm=underline ctermbg=0 ctermfg=90
+:hi SpellLocal cterm=underline ctermbg=0 ctermfg=90
+:hi SpellRare cterm=underline ctermbg=0 ctermfg=90
+:hi TrailingWhitespace ctermbg=160
+:hi ExtraWhitespace ctermbg=160
+:hi WarningMsg ctermfg=160
+:hi ErrorMsg cterm=bold ctermbg=160 ctermfg=7
+:hi Error cterm=bold ctermbg=160 ctermfg=7
+" -------
+" gui def
+" -------
+:hi Normal guibg=#000000 guifg=#C0C0C0
+:hi Cursor guibg=#CC9966 guifg=#000000
+:hi lCursor gui=reverse
+:hi StatusLine gui=bold,reverse
+:hi StatusLineNC gui=reverse
+:hi Search gui=none guibg=#5F00FF guifg=#000000
+:hi IncSearch gui=none guibg=#AFFF00 guifg=#000000
+:hi SpecialKey guifg=#005F87
+:hi Visual gui=reverse
+:hi VisualNOS gui=bold,underline
+:hi MoreMsg guifg=#87DF00
+:hi ModeMsg gui=bold
+:hi Question guifg=#87DF00
+:hi Title gui=bold guifg=#DFAF00
+:hi NonText gui=bold guifg=#005F87
+:hi LineNr gui=bold guibg=#000000 guifg=#808080
+:hi CursorLineNr gui=bold guibg=#00005F guifg=#000000
+:hi Directory guifg=#005F87
+:hi WildMenu guibg=#DFAF00 guifg=#000000
+:hi VertSplit gui=reverse
+:hi Folded gui=none guibg=#000000 guifg=#808080
+:hi FoldColumn guibg=#C0C0C0 guifg=#005F87
+:hi DiffAdd gui=none guibg=#87DF00 guifg=#000000
+:hi DiffChange gui=none guibg=#C0C0C0 guifg=#000000
+:hi DiffDelete gui=none guibg=#C0C0C0 guifg=#000000
+:hi DiffText gui=none guibg=#00AFAF guifg=#000000
+:hi String gui=none guifg=#DFAF00
+:hi Comment gui=none guibg=#000000 guifg=#005F87
+:hi Constant guifg=#CC0000
+:hi Special guifg=#00AFAF
+:hi Identifier guifg=#00AFAF
+:hi Statement guifg=#87DF00
+:hi Operator guifg=#87DF00
+:hi PreProc guifg=#CC0000
+:hi Type gui=bold guifg=#DFAF00
+:hi Delimiter gui=none guifg=#87DF00
+:hi Ignore gui=bold guifg=#C0C0C0
+:hi Todo guibg=#DFAF00 guifg=#000000
+:hi Underlined gui=underline
+:hi Include guifg=#CC0000
+:hi Define guifg=#DFAF00
+:hi Function guifg=#00AFAF
+:hi Structure guifg=#87DF00
+:hi MatchParen gui=bold guibg=#005F87 guifg=#C0C0C0
+:hi CursorLine gui=bold
+:hi CursorColumn guibg=#00005F
+:hi ColorColumn guibg=#00005F
+:hi SpellBad gui=underline guibg=#000000 guifg=#870087
+:hi SpellCap gui=underline guibg=#000000 guifg=#870087
+:hi SpellLocal gui=underline guibg=#000000 guifg=#870087
+:hi SpellRare gui=underline guibg=#000000 guifg=#870087
+:hi TrailingWhitespace guibg=#CC0000
+:hi ExtraWhitespace guibg=#CC0000
+:hi WarningMsg guifg=#CC0000
+:hi ErrorMsg gui=bold guibg=#CC0000 guifg=#C0C0C0
+:hi Error gui=bold guibg=#CC0000 guifg=#C0C0C0
+" -------
+"256 color .Xdefaults vim: cterm giu
+"<http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim>
+"<http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png>
+" -------
+" 256 color .Xdefaults vim: cterm giu def
+" -------
+" 16 color standard altered 256 altered beyond 256
+" black/dark grey
+" 0 [ 0:#000000] #000000
+" 8 [ 8:#808080] [59:#5F5F5F] #555555
+" red
+" 1 [ 1:#800000] 160:#DF0000 #CC0000
+" 9 [ 9:#FF0000] #EF2929
+" green
+" 2 [ 2:#008000] 112:#87DF00 #4E9A06
+" 10 [10:#00FF00] 154:#AFFF00 #8AE234
+" yellow/orange
+" 3 [ 3:#808000] 178:#DFAF00 #C4A000
+" 11 [11:#FFFF00] 184:#DFDF00 #FC9E4F
+" blue
+" 4 [ 4:#000080] 24:#005F87 #5971AD
+" 12 [12:#0000FF] 73:#5FAFAF #729FCF
+" magenta
+" 5 [ 5:#800080] 90:#870087 #75507B
+" 13 [13:#FF00FF] 126:#AF0087 #AD7FA8
+" cyan
+" 6 [ 6:#008080] 37:#00AFAF #06989A
+" 14 [14:#00FFFF] 87:#5FFFFF #34E2E2
+" white
+" 7 [ 7:#C0C0C0] #D3D3D3
+" 15 [15:#FFFFFF] #EEEEEE
+" --------
+" .Xdefaults 256 (rxvt urxvt setting, vim colorscheme "def256" cterm & gui settings)
+" (vim colorscheme "def" cterm matches "def256" if .Xdefaults set thus)
+" --------
+" ! black
+" Rxvt.color0 : #000000
+" Rxvt.color8 : #5F5F5F
+" ! red
+" Rxvt.color1 : #DF0000
+" Rxvt.color9 : #FF0000
+" ! green
+" Rxvt.color2 : #87DF00
+" Rxvt.color10 : #AFFF00
+" ! yellow
+" Rxvt.color3 : #DFAF00
+" Rxvt.color11 : #FFFF00
+" ! blue
+" Rxvt.color4 : #5F87DF
+" Rxvt.color12 : #87DFFF
+" ! magenta
+" Rxvt.color5 : #8700DF
+" Rxvt.color13 : #87DFFF
+" ! cyan
+" Rxvt.color6 : #00DFDF
+" Rxvt.color14 : #5F5FDF
+" ! white
+" Rxvt.color7 : #C0C0C0
+" Rxvt.color15 : #FFFFFF
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
index 487e4084..6240330d 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "frugal-cterm-ruby"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold ctermfg=1
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=4
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline cterm=none ctermfg=6
-:hi Statement term=bold cterm=none ctermfg=2
-":hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermfg=1
-:hi Type term=underline cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-":hi Include ctermfg=1
-":hi Define ctermfg=3
-":hi Function ctermfg=6
-":hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title ctermfg=1
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=7
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=bold ctermbg=0 ctermfg=4
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier cterm=none ctermfg=6
+:hi Statement cterm=none ctermfg=2
+":hi Operator ctermfg=1
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+":hi Include ctermfg=1
+":hi Define ctermfg=3
+":hi Function ctermfg=6
+":hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
index 9afe2f65..1c4d2d6b 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "frugal-cterm-sisu"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=bold,reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold cterm=bold ctermfg=3
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
-:hi String cterm=none ctermfg=3
-:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline ctermfg=6
-:hi Statement term=bold ctermfg=6
-:hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermbg=7 ctermfg=1
-:hi Type term=underline ctermfg=2
-:hi Delimiter term=none cterm=none ctermfg=1
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-:hi Include ctermfg=1
-:hi Define ctermfg=3
-:hi Function ctermfg=6
-:hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=7
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=none ctermbg=0 ctermfg=7
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=6
+:hi Operator ctermfg=1
+:hi PreProc ctermbg=7 ctermfg=1
+:hi Type ctermfg=2
+:hi Delimiter cterm=none ctermfg=1
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
new file mode 100644
index 00000000..fcafe3f4
--- /dev/null
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim
@@ -0,0 +1,69 @@
+" Vim color file
+" Name: frugal-cterm
+" Maintainer: Ralph Amissah <ralph@amissah.com>
+" Last Change: 2013-02-09
+" URL: <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal-cterm.vim;hb=HEAD>
+" Note: 8 color cterm, related colorschemes 8 & sparse
+" http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim
+" http://guns.github.com/xterm-color-table.vim/images/xterm-color-table-with-visible-rgb.png
+:set t_Co=256
+:set background=dark
+:hi clear
+if exists("syntax_on")
+ syntax reset
+endif
+:let colors_name = "frugal-cterm"
+" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=0
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=none ctermbg=0 ctermfg=7
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=none ctermbg=7 ctermfg=0
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=none ctermbg=0 ctermfg=7
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=2
+:hi Operator ctermfg=2
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
index 57727664..4a021519 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/frugal.vim
@@ -54,8 +54,9 @@ endif
":hi Function ctermfg=6 guifg=magenta
":hi Structure ctermfg=2 guifg=green
:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
+:hi CursorLine cterm=bold,underline
:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
index eaa22ef0..94e5f43b 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/slate.vim
@@ -56,7 +56,7 @@ endif
:hi Function ctermfg=6 guifg=navajowhite
:hi Structure ctermfg=2 guifg=green
:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline guibg=black
+:hi CursorLine cterm=bold,underline guibg=black
:hi CursorColumn cterm=bold guibg=black
:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white
:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
index f8625c4b..8bd1dfa8 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "frugal-cterm-ruby"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold ctermfg=1
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0*
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=0*
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline cterm=none ctermfg=6
-:hi Statement term=bold cterm=none ctermfg=2
-":hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermfg=1
-:hi Type term=underline cterm=bold ctermfg=3
-:hi Delimiter cterm=none ctermfg=2
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-":hi Include ctermfg=1
-":hi Define ctermfg=3
-":hi Function ctermfg=6
-":hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title ctermfg=1
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=bold ctermbg=0 ctermfg=0*
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=bold ctermbg=0 ctermfg=0*
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier cterm=none ctermfg=6
+:hi Statement cterm=none ctermfg=2
+":hi Operator ctermfg=1
+:hi PreProc ctermfg=1
+:hi Type cterm=bold ctermfg=3
+:hi Delimiter cterm=none ctermfg=2
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+":hi Include ctermfg=1
+":hi Define ctermfg=3
+":hi Function ctermfg=6
+":hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
index 492b888b..4de32515 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim
@@ -11,55 +11,56 @@ if exists("syntax_on")
endif
:let colors_name = "sparse-cterm-sisu"
" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white
-:hi Normal ctermbg=0 ctermfg=7
-:hi Cursor term=reverse cterm=reverse
-:hi lCursor term=reverse cterm=reverse
-:hi StatusLine term=reverse cterm=bold,reverse
-:hi StatusLineNC 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
-:hi MoreMsg term=bold ctermfg=2
-:hi ModeMsg term=bold cterm=bold
-:hi Question term=standout ctermfg=2
-:hi Title term=bold cterm=bold ctermfg=3
-:hi NonText term=bold cterm=bold ctermfg=4
-:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0*
-:hi Directory term=bold ctermfg=4
-:hi WildMenu term=standout ctermbg=3 ctermfg=0
-:hi VertSplit term=reverse cterm=reverse
-:hi Folded term=standout cterm=bold ctermbg=0 ctermfg=0*
-:hi FoldColumn term=standout ctermbg=7 ctermfg=4
-:hi DiffChange cterm=none ctermbg=7 ctermfg=0
-:hi DiffText cterm=none ctermbg=6 ctermfg=0
-:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
-:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
-:hi String cterm=none ctermfg=3
-:hi Comment cterm=bold ctermbg=0 ctermfg=0*
-:hi Constant term=underline ctermfg=1
-:hi Special term=bold ctermfg=6
-:hi Identifier term=underline ctermfg=6
-:hi Statement term=bold ctermfg=6
-:hi Operator term=bold ctermfg=1
-:hi PreProc term=underline ctermbg=7 ctermfg=1
-:hi Type term=underline ctermfg=2
-:hi Delimiter term=none cterm=none ctermfg=1
-:hi Ignore cterm=bold ctermfg=7
-:hi Todo term=standout ctermbg=3 ctermfg=0
-:hi Underlined term=underline cterm=underline
-:hi Include ctermfg=1
-:hi Define ctermfg=3
-:hi Function ctermfg=6
-:hi Structure ctermfg=2
-:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
-:hi CursorLine cterm=underline
-:hi CursorColumn cterm=bold
-:hi SpellBad term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellCap term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0
-:hi WarningMsg term=standout ctermfg=1
-:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7
-:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7
+:hi Normal ctermbg=0 ctermfg=7
+:hi Cursor cterm=reverse
+:hi lCursor cterm=reverse
+:hi StatusLine cterm=bold,reverse
+:hi StatusLineNC cterm=reverse
+:hi Search cterm=none ctermbg=2 ctermfg=0
+:hi IncSearch cterm=bold ctermbg=2 ctermfg=7
+:hi SpecialKey ctermfg=4
+:hi Visual cterm=reverse
+:hi VisualNOS cterm=bold,underline
+:hi MoreMsg ctermfg=2
+:hi ModeMsg cterm=bold
+:hi Question ctermfg=2
+:hi Title cterm=bold ctermfg=3
+:hi NonText cterm=bold ctermfg=4
+:hi LineNr cterm=bold ctermbg=0 ctermfg=0*
+:hi Directory ctermfg=4
+:hi WildMenu ctermbg=3 ctermfg=0
+:hi VertSplit cterm=reverse
+:hi Folded cterm=bold ctermbg=0 ctermfg=0*
+:hi FoldColumn ctermbg=7 ctermfg=4
+:hi DiffChange cterm=none ctermbg=7 ctermfg=0
+:hi DiffText cterm=none ctermbg=6 ctermfg=0
+:hi DiffAdd cterm=none ctermbg=2 ctermfg=0
+:hi DiffDelete cterm=bold ctermbg=0 ctermfg=0*
+:hi String cterm=none ctermfg=3
+:hi Comment cterm=bold ctermbg=0 ctermfg=0*
+:hi Constant ctermfg=1
+:hi Special ctermfg=6
+:hi Identifier ctermfg=6
+:hi Statement ctermfg=6
+:hi Operator ctermfg=1
+:hi PreProc ctermbg=7 ctermfg=1
+:hi Type ctermfg=2
+:hi Delimiter cterm=none ctermfg=1
+:hi Ignore cterm=bold ctermfg=7
+:hi Todo ctermbg=3 ctermfg=0
+:hi Underlined cterm=underline
+:hi Include ctermfg=1
+:hi Define ctermfg=3
+:hi Function ctermfg=6
+:hi Structure ctermfg=2
+:hi MatchParen cterm=bold ctermbg=4 ctermfg=7
+:hi CursorLine cterm=bold,underline
+:hi CursorColumn cterm=bold
+:hi ColorColumn ctermbg=8
+:hi SpellBad cterm=none ctermbg=7 ctermfg=0
+:hi SpellCap cterm=none ctermbg=7 ctermfg=0
+:hi SpellLocal cterm=none ctermbg=7 ctermfg=0
+:hi SpellRare cterm=none ctermbg=7 ctermfg=0
+:hi WarningMsg ctermfg=1
+:hi ErrorMsg cterm=bold ctermbg=1 ctermfg=7
+:hi Error cterm=bold ctermbg=1 ctermfg=7
diff --git a/data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index be3ff18f..a72251da 100644
--- a/data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/v4/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -67,8 +67,6 @@
:vnoremap <Up> gk
:inoremap <Down> <C-o>gj
:inoremap <Up> <C-o>gk
-"% colorscheme slate
-:map <C-C> :syntax on <cr> :colorscheme slate<cr>
"% search and replace
:map <leader>rd :.,$s///c "search and replace down
:map <leader>rg :%s///c "search and replace whole file
@@ -178,8 +176,6 @@
"% linenumbering, on, relative, off
:map <Leader>nn :set <c-r>={'00':'','01':'r','10':'nor'}[&rnu.&nu]<CR>nu<CR>
"% cursorline
-:highlight CursorLine guibg=black ctermbg=black
-:highlight CursorColumn guibg=black ctermbg=black
:map <leader>cu :if &cursorcolumn <Bar>
\set nocursorline nocursorcolumn <Bar>
\else <Bar>
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml
index 30306e4c..4f2891e2 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v4/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 4.0.7
-:date_stamp: 2013w05/7
-:date: "2013-02-10"
+:version: 4.0.8
+:date_stamp: 2013w07/3
+:date: "2013-02-20"
:project: SiSU
diff --git a/lib/sisu/v3/epub_format.rb b/lib/sisu/v3/epub_format.rb
index 61accf22..228c2df4 100644
--- a/lib/sisu/v3/epub_format.rb
+++ b/lib/sisu/v3/epub_format.rb
@@ -1402,7 +1402,7 @@ output_epub_cont_seg.close
end
def navpoint(dob,no,name=nil)
name=name ? name : dob.name
- cont_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
+ cont_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
id_u=DISABLE[:epub][:ncx_navpoint_unique_id] \
? ''
: "-#{no}"
@@ -1597,7 +1597,7 @@ output_epub_cont_seg.close
end
def manifest_content(dob,name=nil)
name=name ? name : dob.name
- href_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
+ href_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
<<-WOK
<item id="#{name}" href="#{href_name}" media-type="application/xhtml+xml" />
WOK
@@ -1654,7 +1654,7 @@ output_epub_cont_seg.close
end
def guide(dob,name=nil)
name=name ? name : dob.name
- guide_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
+ guide_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
<<-WOK
<reference type="text" href="#{guide_name}" />
WOK
diff --git a/lib/sisu/v3/epub_tune.rb b/lib/sisu/v3/epub_tune.rb
index a6b23a0d..664f143e 100644
--- a/lib/sisu/v3/epub_tune.rb
+++ b/lib/sisu/v3/epub_tune.rb
@@ -123,7 +123,7 @@ module SiSU_EPUB_Tune
begin
@cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
SiSU_Screen::Ansi.new(@md.opt.cmd,'Tune').txt_grey if @md.opt.cmd =~/[MVv]/
- data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_html
+ data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_angle_brackets
data=SiSU_EPUB_Tune::Tune.new(data,@md).endnotes_html
data=SiSU_EPUB_Tune::Tune.new(data,@md).url_markup
data=SiSU_EPUB_Tune::Tune.new(data,@md).markup
@@ -274,10 +274,12 @@ module SiSU_EPUB_Tune
@tuned_file << dob
end
end
- def amp_html
+ def amp_angle_brackets
data,data_new=@data,[]
data.each do |dob|
- dob.obj=dob.obj.gsub(/&/u,'&amp;')
+ dob.obj=dob.obj.
+ gsub(/&/u,'&amp;').
+ gsub(/</u,'&lt;').gsub(/>/u,'&gt;')
data_new << dob
end
data_new
diff --git a/lib/sisu/v3/html_tune.rb b/lib/sisu/v3/html_tune.rb
index 32426076..23fa586e 100644
--- a/lib/sisu/v3/html_tune.rb
+++ b/lib/sisu/v3/html_tune.rb
@@ -144,7 +144,7 @@ module SiSU_HTML_Tune
data_tuned=[]
#@tuned_file=[]
data.each do |dob|
- dob=angle_brackets(dob)
+ dob=amp_angle_brackets(dob)
dob=endnotes_html(dob)
dob=url_markup(dob)
dob=markup(dob)
@@ -241,8 +241,11 @@ module SiSU_HTML_Tune
end
dob
end
- def angle_brackets(dob)
- dob.obj=dob.obj.gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}")
+ def amp_angle_brackets(dob)
+ dob.obj=dob.obj.
+ gsub(/&/u,'&amp;').
+ gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}").
+ gsub(/</u,'&lt;').gsub(/>/u,'&gt;')
dob
end
def endnotes_html(dob)
diff --git a/lib/sisu/v4/constants.rb b/lib/sisu/v4/constants.rb
index 7ad3516b..505fdc02 100644
--- a/lib/sisu/v4/constants.rb
+++ b/lib/sisu/v4/constants.rb
@@ -295,6 +295,7 @@ DEVELOPER={
__END__
puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:red).set
puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:green)
+puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__
puts "#{ANSI_C[:red]} #{__LINE__.to_s} #{ANSI_C[:off]} #{__FILE__}"
puts ANSI_C[:fuchsia] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$)/,"#{ANSI_C[:fuchsia]}\\1#{ANSI_C[:off]}")
diff --git a/lib/sisu/v4/epub_format.rb b/lib/sisu/v4/epub_format.rb
index 48408162..98f4d7e4 100644
--- a/lib/sisu/v4/epub_format.rb
+++ b/lib/sisu/v4/epub_format.rb
@@ -65,30 +65,27 @@ module SiSU_EPUB_Format
def initialize(md,ocn)
@md,@ocn=md,ocn.to_s
@ocn ||=''
- vz=SiSU_Viz::Defaults.new
end
def ocn_display
make=SiSU_Env::ProcessingSettings.new(@md)
if make.build.ocn?
ocn_class='ocn'
if @ocn.to_i==0
- @ocn.gsub(/^(\d+|)$/,
- %{<label class="#{ocn_class}">#{$ep[:hsp]}</label>})
+ @ocn.gsub(/^(\d+|)$/,'')
else
@ocn.gsub(/^(\d+|)$/,
%{<label class="#{ocn_class}"><a href="#o\\1" class="lnk#{ocn_class}">\\1</a></label>})
end
else
ocn_class='ocn_off'
- @ocn.gsub(/^(\d+|)$/,
- %{<label class="#{ocn_class}">#{$ep[:hsp]}</label>})
+ @ocn.gsub(/^(\d+|)$/,'')
end
end
def name
%{<a name="#{@ocn}"></a>}
end
def id #w3c? "tidy" complains about numbers as identifiers ! annoying
- %{id="o#{@ocn}"}
+ (@ocn.empty?) ? '' : %{id="o#{@ocn}"}
end
def goto
%{<a href="##{@ocn}">}
@@ -1226,7 +1223,8 @@ module SiSU_EPUB_Format
if x.is_a?(String)
x=x.gsub(/&nbsp;/,' ') if Ep[:alt]==:on
x.gsub(/&/,'&amp;').
- gsub(/</,'&lt;').gsub(/>/,'&gt;').
+ gsub(/</,"&lt;").gsub(/>/,"&gt;").
+ gsub(/#{Dx[:url_o]}/,Dx[:url_o_xml]).gsub(/#{Dx[:url_c]}/,Dx[:url_o_xml]).
#gsub(/</,'&#60;').gsub(/>/,'&#62;').
gsub(/\\\\/,'<br />').
gsub(/&lt;br(?: \/)?&gt;/,'<br />')
@@ -1244,9 +1242,8 @@ module SiSU_EPUB_Format
@css=SiSU_Env::CSS_Stylesheet.new(md)
@seg_name_xhtml=(SiSU_EPUB::Source::Seg.new.seg_name_xhtml || [])
@seg_name_xhtml_tracker=(SiSU_EPUB::Source::Seg.new.seg_name_xhtml_tracker || [])
- @index='index'
- @metalink='#metadata'
@tocband_scroll,@tocband_segtoc=nil,nil
+ @index,@metalink='index','#metadata'
end
def doc_type_xhtml
<<-WOK
@@ -1573,17 +1570,21 @@ output_epub_cont_seg.close
rights=if defined? @md.rights.all \
and @md.rights.all =~/\S+/
rights=SanitizeXML.xml(@md.rights.all)
+ rights=rights.gsub(/<br\s*\/?>/,' ')
%{\n <dc:rights>#{rights}</dc:rights>}
else ''
end
f=SiSU_Env::FileOp.new(@md)
<<-WOK
- <#{$ep[:o]}metadata xmlns:dc="http://purl.org/dc/elements/1.1/"
+ <#{$ep[:o]}metadata
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:opf="http://www.idpf.org/2007/opf"
+ xmlns:dcterms="http://purl.org/dc/terms/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
unique-identifier="urn:uuid:#{@md.dgst[1]}" version="2.0">
<dc:title>#{@md.title.full}</dc:title>
#{cover_image}#{author}#{editor}#{translator}#{illustrator}#{language}#{date_published}#{subject}#{rights}
- <dc:identifier opf:scheme="URI">#{f.output_path.epub.url}/#{f.base_filename.epub}</dc:identifier>
+ <dc:identifier opf:scheme="URI">#{f.output_path.epub.url.gsub(/http:\/\//,'')}/#{f.base_filename.epub}</dc:identifier>
<dc:identifier id="bookid">urn:uuid:#{@md.dgst[1]}</dc:identifier>
<!-- <dc:identifier id="EPB-UUID">urn:uuid:#{@md.dgst[1]}</dc:identifier> -->
</#{$ep[:o]}metadata>
@@ -1687,7 +1688,7 @@ output_epub_cont_seg.close
fn=fn_base + Sfx[:epub_xhtml]
name=hashtag ? fn + hashtag : fn
name=name ? name : dob.name
- guide_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
+ guide_name=(name =~/#{Sfx[:epub_xhtml]}/) ? name : (name + Sfx[:epub_xhtml])
<<-WOK
<reference type="text" href="#{guide_name}" />
WOK
diff --git a/lib/sisu/v4/epub_tune.rb b/lib/sisu/v4/epub_tune.rb
index bce4aed7..fbb42bc4 100644
--- a/lib/sisu/v4/epub_tune.rb
+++ b/lib/sisu/v4/epub_tune.rb
@@ -123,7 +123,7 @@ module SiSU_EPUB_Tune
begin
@cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX
SiSU_Screen::Ansi.new(@md.opt.cmd,'Tune').txt_grey if @md.opt.cmd =~/[MVv]/
- data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_html
+ data=SiSU_EPUB_Tune::Tune.new(@data,@md).amp_angle_brackets
data=SiSU_EPUB_Tune::Tune.new(data,@md).endnotes_html
data=SiSU_EPUB_Tune::Tune.new(data,@md).url_markup
data=SiSU_EPUB_Tune::Tune.new(data,@md).markup
@@ -156,6 +156,7 @@ module SiSU_EPUB_Tune
gsub(/#{Mx[:fa_monospace_o]}(.+?)#{Mx[:fa_monospace_c]}/,'<tt>\1</tt>'). # tt, kbd
gsub(/#{Mx[:mk_o]}:name#(\S+?)#{Mx[:mk_c]}/,'').
gsub(/#{Mx[:gl_bullet]}/m,"●#{$ep[:hsp]*2}").
+ gsub(/#{Dx[:url_o]}/,Dx[:url_o_xml]).gsub(/#{Dx[:url_c]}/,Dx[:url_o_xml]).
gsub(/#{Mx[:nbsp]}/,$ep[:hsp]).
gsub(/<(p|br)>/,'<\1 />')
dob.obj=SiSU_EPUB_Tune::CleanXHTML.new(dob.obj).clean
@@ -274,10 +275,12 @@ module SiSU_EPUB_Tune
@tuned_file << dob
end
end
- def amp_html
+ def amp_angle_brackets
data,data_new=@data,[]
data.each do |dob|
- dob.obj=dob.obj.gsub(/&/u,'&amp;')
+ dob.obj=dob.obj.
+ gsub(/&/u,'&amp;').
+ gsub(/</u,'&lt;').gsub(/>/u,'&gt;')
data_new << dob
end
data_new
diff --git a/lib/sisu/v4/html.rb b/lib/sisu/v4/html.rb
index 94b20afe..9b73823b 100644
--- a/lib/sisu/v4/html.rb
+++ b/lib/sisu/v4/html.rb
@@ -108,18 +108,18 @@ module SiSU_HTML
data=nil
tuned_file_array=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions
data=tuned_file_array
- if @opt.act[:html_scroll][:set]==:on
+ if @opt.act[:html_scroll][:set]==:on
scr_endnotes=SiSU_HTML::Source::Endnotes.new(data,@md).scroll
end
toc=SiSU_HTML::Source::Toc.new(@md,data).songsheet
links_guide=SiSU_HTML::Source::LinksGuide.new(data,@md).toc
data=tuned_file_array
scr_toc=SiSU_HTML::Source::ScrollHeadAndSegToc.new(@md,toc,links_guide).in_common #watch
- if @opt.act[:html_seg][:set]==:on
+ if @opt.act[:html_seg][:set]==:on
SiSU_HTML::Source::Seg.new(@md,data).songsheet
end
data=tuned_file_array
- if @opt.act[:html_scroll][:set]==:on
+ if @opt.act[:html_scroll][:set]==:on
scr=SiSU_HTML::Source::Scroll.new(@md,data,scr_endnotes).songsheet
scroll=SiSU_HTML::Source::ScrollOutput.new(scr_toc,scr[:body],scr[:metadata],scr[:owner_details],scr[:tails],@md).publish
SiSU_HTML::Source::Output.new(scroll,@md).scroll
@@ -602,7 +602,7 @@ WOK
ads=SiSU_HTML_Promo::Ad.new(@md)
@segtoc << format_head_toc.seg_navigation_tail << ads.div.close << ads.display << format_head_toc.html_close
@segtoc=@segtoc.flatten.compact #watch
- if @md.opt.act[:html_seg][:set]==:on
+ if @md.opt.act[:html_seg][:set]==:on
SiSU_HTML::Source::Output.new(@segtoc,@md).segtoc
end
@segtoc=[]
@@ -633,7 +633,7 @@ WOK
@o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
end
def scroll
- if @md.opt.act[:html_scroll][:set]==:on
+ if @md.opt.act[:html_scroll][:set]==:on
begin
@filename_html_scroll=@file.write_file.html_scroll
@data.each do |para|
@@ -657,7 +657,7 @@ WOK
end
end
def segtoc
- if @md.opt.act[:html_seg][:set]==:on
+ if @md.opt.act[:html_seg][:set]==:on
begin
@filename_html_segtoc=@file.write_file.html_segtoc
@data.each do |para|
diff --git a/lib/sisu/v4/html_format.rb b/lib/sisu/v4/html_format.rb
index 7fcf89a0..25a8dbee 100644
--- a/lib/sisu/v4/html_format.rb
+++ b/lib/sisu/v4/html_format.rb
@@ -67,8 +67,8 @@ module SiSU_HTML_Format
@ocn ||=''
end
def ocn_display
- @make=SiSU_Env::ProcessingSettings.new(@md)
- if @make.build.ocn?
+ make=SiSU_Env::ProcessingSettings.new(@md)
+ if make.build.ocn?
ocn_class='ocn'
if @ocn.to_i==0
@ocn.gsub(/^(\d+|)$/,
@@ -104,11 +104,10 @@ module SiSU_HTML_Format
@vz=SiSU_Viz::Defaults.new
@seg_name_html=(SiSU_HTML::Source::Seg.new.seg_name_html || [])
@seg_name_html_tracker=(SiSU_HTML::Source::Seg.new.seg_name_html_tracker || [])
- @metalink='#metadata'
@tocband_scroll,@tocband_segtoc=nil,nil
@stylesheet=SiSU_Style::CSS_HeadInfo.new(md).stylesheet
@o_str ||=SiSU_Env::ProcessingSettings.new(md).output_dir_structure
- @index='index'
+ @index,@metalink='index','#metadata'
@toc="#{@md.file.output_path.html_seg.dir}/#{@md.file.base_filename.html_segtoc}"
end
def url_path_image_sys
@@ -1235,7 +1234,6 @@ WOK
def clean(txt)
txt=txt.gsub(/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}/,'').
gsub(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/,'')
- txt
end
def subtoc_lev(tag,attrib)
@txt=clean(@txt)
diff --git a/lib/sisu/v4/html_tune.rb b/lib/sisu/v4/html_tune.rb
index 2661ee52..41845007 100644
--- a/lib/sisu/v4/html_tune.rb
+++ b/lib/sisu/v4/html_tune.rb
@@ -144,7 +144,7 @@ module SiSU_HTML_Tune
data_tuned=[]
#@tuned_file=[]
data.each do |dob|
- dob=angle_brackets(dob)
+ dob=amp_angle_brackets(dob)
dob=endnotes_html(dob)
dob=url_markup(dob)
dob=markup(dob)
@@ -241,8 +241,11 @@ module SiSU_HTML_Tune
end
dob
end
- def angle_brackets(dob)
- dob.obj=dob.obj.gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}")
+ def amp_angle_brackets(dob)
+ dob.obj=dob.obj.
+ gsub(/&/u,'&amp;').
+ gsub(/<([a-z:\/]+)>/,"#{Dx[:lt_xml]}\\1#{Dx[:gt_xml]}").
+ gsub(/</u,'&lt;').gsub(/>/u,'&gt;')
dob
end
def endnotes_html(dob)
diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index d55a5f17..e02fa940 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -673,7 +673,7 @@ p "#{__LINE__}:#{__FILE__}" if @opt.act[:maintenance][:set] ==:on
or @opt.act[:scp][:set]==:on \
or @opt.act[:webrick][:set]==:on \
or @opt.act[:zap][:set]==:on \
- or (
+ or (
@opt.cmd =~/^-/ \
and @opt.cmd =~/([abCcDdeFGgHhIjikLMmNnoPpQqRrSsTtUuVvWwXxYyZ_0-9])/ \
and @opt.mod.inspect !~/--(?:sitemaps|query|identify)/ \
diff --git a/lib/sisu/v4/manifest.rb b/lib/sisu/v4/manifest.rb
index c5a841a1..d7c4d33a 100644
--- a/lib/sisu/v4/manifest.rb
+++ b/lib/sisu/v4/manifest.rb
@@ -511,14 +511,14 @@ WOK
end
end
def metadata_tests
- if defined? @md.title #%
+ if defined? @md.title #%
if defined? @md.title.full \
and @md.title.full=~/\S+/
id,info=@translate.full_title,@md.title.full
metadata(id,info)
end
end
- if defined? @md.creator #%
+ if defined? @md.creator #%
if defined? @md.creator.author \
and @md.creator.author=~/\S+/
id,info=@translate.author,@md.creator.author
@@ -562,7 +562,7 @@ WOK
metadata(id,info)
end
end
- if defined? @md.date #%
+ if defined? @md.date #%
if defined? @md.date.published \
and @md.date.published=~/\S+/ #dc
id,info=@translate.date,@md.date.published
@@ -599,7 +599,7 @@ WOK
id,info=@translate.publisher,@md.publisher
metadata(id,info)
end
- if defined? @md.notes #%
+ if defined? @md.notes #%
if defined? @md.notes.description \
and @md.notes.description=~/\S+/
id,info=@translate.description,@md.notes.description
@@ -626,7 +626,7 @@ WOK
metadata(id,info)
end
end
- if defined? @md.title #%
+ if defined? @md.title #%
if defined? @md.title.language \
and @md.title.language=~/\S+/
id,info=@translate.language,@md.title.language
@@ -638,7 +638,7 @@ WOK
metadata(id,info)
end
end
- if defined? @md.classify #%
+ if defined? @md.classify #%
if defined? @md.topic_register_array \
and @md.topic_register_array.length > 0
@manifest[:html] << %{<tr><th class="left"><p class="bold_left">#{@translate.topic_register}:</p></th><td>\n}
@@ -701,7 +701,7 @@ WOK
metadata(id,info)
end
end
- if defined? @md.identifier #%
+ if defined? @md.identifier #%
if defined? @md.identifier.oclc \
and @md.identifier.oclc=~/\S+/
id,info=@translate.cls_oclc,@md.identifier.oclc
diff --git a/lib/sisu/v4/urls.rb b/lib/sisu/v4/urls.rb
index ad7ab480..e5341581 100644
--- a/lib/sisu/v4/urls.rb
+++ b/lib/sisu/v4/urls.rb
@@ -324,11 +324,11 @@ module SiSU_Urls
or @opt.act[:html_scroll][:set]==:on \
or @opt.act[:html_seg][:set]==:on)
if x =~/scroll/
- if @opt.act[:html_scroll][:set]==:on
+ if @opt.act[:html_scroll][:set]==:on
show.html.scroll(x)
end
else
- if @opt.act[:html_seg][:set]==:on
+ if @opt.act[:html_seg][:set]==:on
show.html.toc(x)
end
end