diff options
author | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2011-05-05 22:11:58 -0400 |
commit | a9642d67f69d83d3fdb56ab115ef3c10bcd1895c (patch) | |
tree | 352c633d6b60a54a9ef74ff143162ac07c981b18 /data | |
parent | debian/changelog (3.0.7-1) (diff) | |
parent | v3: i18n, sysenv, class variable to prevent unnecessary re-construction of hash (diff) |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data')
20 files changed, 1025 insertions, 327 deletions
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index dc024147..1420cfe6 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -12,6 +12,55 @@ Reverse Chronological: %% STABLE Branch +%% 2.9.3.orig.tar.gz (2011-04-27:17/3) [see 3.0.8] +http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1 + + * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet + * improved ruby version check + + * vim + * sisu syntax change of a couple of color groups (Delimiter instead of + Include) + * 8 color cterm colorschemes + * sparse series uses dark grey on black, usually looks better, but only + works with a fixed color cursor, preferred in terms where you can get + away with using it + * frugal series avoids dark grey + * slate for cterm now incorporates frugal-cterm-sisu + * *-cterm-ruby & *-cterm-sisu colors adjusted where other color groupings are + preferred for programming / sisu markup + + * sysenv, lowriter (instead of oowriter) + + * manpage, reinstate escape of hyphens (clearly preferred, else lintian + reports hyphen-used-as-minus-sign) + + * NOTE: generated cgi sample search form caught by Ruby/DBI libdbi-ruby1.9.1 + reported as libdbd-pg-ruby1.9.1 bug #596103, where "select_all fails". The + cgi sample search scripts for postgresql and sqlite3 are almost identical, + both work in ruby 1.8.7, both have the same error in ruby 1.9.2... a very + similar bug is reported about the mysql library. Should #596103 and the + upstream report be reported against Ruby/DBI (libdbi-ruby1.9.1) rather than + libdbd-pg-ruby1.9.1? + * <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596103> + * <http://rubyforge.org/tracker/index.php?func=detail&aid=28624&group_id=234&atid=967> + * <http://rubyforge.org/forum/forum.php?set=custom&forum_id=958&style=nested&max_rows=25&submit=Change+View> + fix/workaround options include: + * await bugfix, (bug has existed at least since 2010-09) + * rewrite for ruby-dbi using other constructs + e.g. s.fetch {|row| ...} + * revert to ruby 1.8.7 for the cgi script (they work independently of the + rest of the program anyway) + * rewrite for individual database dbi re: psql and sqlite3 + * await rdbi (ruby-dbi replacement), also needs to be packaged for Debian + <rdbi https://github.com/RDBI/rdbi> + <http://rdbi.hollensbe.org/> + <http://rdbi.hollensbe.org/files/README_rdoc.html> + and develop for that + or some meaningful combination of any of the above. + + * vim colors colorscheme sparse-* frugal-* Slate minor changes + %% 2.9.2.orig.tar.gz (2011-04-20:16/3) [see 3.0.7] http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1 diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index d69759ef..2fdc9575 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,12 +13,93 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch +%% 3.0.8.orig.tar.gz (2011-05-05:18/4) +http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.8-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz + sisu_3.0.8.orig.tar.gz + sisu_3.0.8-1.dsc + sisu_3.0.8-1.debian.tar.gz + + * bin/sisu3 bin/sisu /bin/sisu_webrick bin/sisu_termsheet + * improved ruby version check + + * options, language setting, based on directory structure or filename + * sysenv, language setting from options + * affects multiple libraries + + * i18n, sysenv, options, language setting changes affecting many files + * must be able to set language at options stage from filename or directory + + * prog_text_translation, renamed from what was i18n, i18n name reused + + * db, directory structure changed, database prefix renamed + * language_document_char field made larger + [consider renaming language_document_code or ..._id] + * title, src_filename and language_document_char fields mandatory + (title, title_main, src_filename, language_document_char) + + * NOTE: cgi sample search form caught by Ruby/DBI libdbi-ruby1.9.1 reported + reported as libdbd-pg-ruby1.9.1 bug #596103, where "select_all fails". The + cgi sample search scripts for postgresql and sqlite3 are almost identical, + both work in ruby 1.8.7, both have the same error in ruby 1.9.2... a very + similar bug is reported about the mysql library. Should #596103 and the + upstream report be reported against Ruby/DBI (libdbi-ruby1.9.1) rather than + libdbd-pg-ruby1.9.1? + * <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596103> + * <http://rubyforge.org/tracker/index.php?func=detail&aid=28624&group_id=234&atid=967> + * <http://rubyforge.org/forum/forum.php?set=custom&forum_id=958&style=nested&max_rows=25&submit=Change+View> + fix/workaround options include: + * await bugfix, (bug has existed at least since 2010-09) + * rewrite for ruby-dbi using other constructs + e.g. s.fetch {|row| ...} + * revert to ruby 1.8.7 for the cgi script (they work independently of the + rest of the program anyway) + * rewrite for individual database dbi re: psql and sqlite3 + * await rdbi (ruby-dbi replacement), also needs to be packaged for Debian + <rdbi https://github.com/RDBI/rdbi> + <http://rdbi.hollensbe.org/> + <http://rdbi.hollensbe.org/files/README_rdoc.html> + and develop for that + * use some other programming language for sample search form + or some meaningful combination of any of the above. + + * sample search form, revert to generating ruby 1.8.7 sample + * sisu3 using ruby >=1.9.2p180 generates search form for ruby 1.8.7, so: + generate sample form using sisu3 -F (options), then; start webrick using + ruby 1.8.7 & sisu -W (not sisu3) + * take account of alternative output directory structures [work on, test] + + * manpage, reinstate escape of hyphens (clearly preferred, else lintian + reports hyphen-used-as-minus-sign) + + * manpages, escaped hyphens reinstated (remove lintian info) + + * urls, a fix, sqlite + + * sysenv, lowriter (instead of libreoffice) + + * db_select, ansi screen reporting, correction for sqlite db update + + * concordance, output path, screen info correction + + * vim + * sisu syntax change of a couple of color groups (Delimiter instead of + Include) + * 8 color cterm colorschemes + * sparse series uses dark grey on black, usually looks better, but only + works with a fixed color cursor, preferred in terms where you can get + away with using it + * frugal series avoids dark grey + * slate for cterm now incorporates frugal-cterm-sisu + * *-cterm-ruby & *-cterm-sisu colors adjusted where other color groupings are + preferred for programming / sisu markup + %% 3.0.7.orig.tar.gz (2011-04-20:16/3) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.7-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz - sisu_3.0.7.orig.tar.gz - sisu_3.0.7-1.dsc - sisu_3.0.7-1.debian.tar.gz + 08474012bd979f4c18881be47d0b2e6c5add9a013b886ea6f7f943464db84825 1929419 sisu_3.0.7.orig.tar.gz + 0028f57ed75fb1e358a0a14e197c607091d8a99c18b856750bd1d820c760ff6c 1216 sisu_3.0.7-1.dsc + 9a9a9d139cc0f4c7ccdfcb41be7eaba517ce96914b68a483d08debd233c76929 285739 sisu_3.0.7-1.debian.tar.gz * param, md remove md.cmd and md.mod shortcut methods, use use md.opt (md.opt.cmd md.opt.mod) diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim index 9d2e6edb..773f87cb 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/8.vim @@ -1,8 +1,9 @@ " Vim color file " Name: 8 " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes frugal & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "8" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":hi Cursor term=reverse cterm=reverse -":hi lCursor term=reverse cterm=reverse -:hi StatusLine term=bold,reverse cterm=bold,reverse -:hi StatusLineNC term=reverse cterm=reverse -:hi Search term=reverse ctermbg=3 -:hi IncSearch term=reverse cterm=reverse -: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 ctermbg=7 ctermfg=0 -":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 ctermbg=7 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=standout -:hi SpellCap term=standout -:hi SpellLocal term=standout -:hi SpellRare term=standout -: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 term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=bold,reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse ctermbg=2 +:hi IncSearch term=reverse cterm=reverse +:hi 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=none ctermbg=7 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=none ctermbg=0 ctermfg=4 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=3 +: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 CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +: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 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim new file mode 100644 index 00000000..38197f2d --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim new file mode 100644 index 00000000..b15cd3a6 --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim index 8128790f..18d341c8 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/frugal.vim @@ -1,8 +1,9 @@ " Vim color file " Name: frugal " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "frugal" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":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 ctermbg=2 -:hi IncSearch term=reverse cterm=reverse -: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 Normal ctermbg=0 ctermfg=7 guibg=black guifg=white +:hi Cursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi lCursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse gui=reverse +:hi Search term=reverse ctermbg=2 guifg=green +:hi IncSearch term=reverse cterm=reverse gui=reverse +:hi SpecialKey term=bold ctermfg=4 guifg=blue +:hi Visual term=reverse cterm=reverse gui=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=green :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 LineNr term=underline ctermbg=7 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 ctermbg=242 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellCap term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellLocal term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellRare term=underline,standout ctermbg=7 ctermfg=5 -: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 Question term=standout ctermfg=2 guifg=green +:hi Title term=bold ctermfg=1 guifg=red +:hi NonText term=bold cterm=bold ctermfg=4 guifg=blue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* gui=bold guibg=black guifg=grey +:hi Directory term=bold ctermfg=4 guifg=blue +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 gui=none guibg=black guifg=white +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi DiffText cterm=none ctermbg=6 ctermfg=0 gui=none guibg=magenta guifg=black +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 gui=none guibg=green guifg=black +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi String cterm=none ctermfg=3 gui=none guifg=yellow +:hi Comment cterm=none ctermbg=0 ctermfg=4 gui=bold guibg=black guifg=grey +:hi Constant term=underline ctermfg=1 guifg=red +:hi Special term=bold ctermfg=3 guifg=yellow +:hi Identifier term=underline cterm=none ctermfg=6 gui=none guifg=magenta +:hi Statement term=bold cterm=none ctermfg=2 gui=none guifg=green +":hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermfg=1 guifg=red +:hi Type term=underline cterm=bold ctermfg=3 gui=bold guifg=yellow +:hi Delimiter cterm=none ctermfg=2 gui=none guifg=green +:hi Ignore cterm=bold ctermfg=7 gui=bold guifg=white +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi Underlined term=underline cterm=underline gui=underline +":hi Include ctermfg=1 guifg=red +":hi Define ctermfg=3 guifg=yellow +":hi Function ctermfg=6 guifg=magenta +":hi Structure ctermfg=2 guifg=green +":hi CursorLine ctermbg=4 guibg=blue +":hi CursorColumn ctermbg=4 guibg=blue +: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 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi WarningMsg term=standout ctermfg=1 guifg=red +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim index 57f7925b..2aad27ca 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/slate.vim @@ -1,72 +1,75 @@ "%% SiSU Vim color file " Name: Slate " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-05-04 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD> -" (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) +" Notes: cterm now uses frugal-sisu 8 colors for term +" (for gui originally looked at desert Hans Fugal <hans@fugal.net> +" <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) :set background=dark -:highlight clear -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif +:hi clear +if exists("syntax_on") + syntax reset endif :let colors_name = "slate" -:hi Normal ctermbg=black guibg=grey15 guifg=white -:hi Cursor guibg=khaki guifg=slategrey -:hi VertSplit cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Folded ctermbg=black ctermfg=grey guibg=black guifg=grey40 -:hi FoldColumn ctermbg=grey ctermfg=darkblue guibg=black guifg=grey20 -:hi IncSearch cterm=none ctermbg=green ctermfg=yellow guibg=black guifg=green -:hi ModeMsg cterm=none ctermfg=brown guifg=goldenrod -:hi MoreMsg ctermfg=darkgreen guifg=SeaGreen -:hi NonText cterm=bold ctermfg=blue guibg=grey15 guifg=RoyalBlue -:hi Question ctermfg=green guifg=springgreen -:hi Search ctermbg=yellow ctermfg=darkgreen guibg=peru guifg=wheat -:hi SpecialKey ctermfg=darkgreen guifg=yellowgreen -:hi StatusLine cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black -:hi StatusLineNC cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Title cterm=bold ctermfg=yellow gui=bold guifg=gold -:hi Statement ctermfg=lightblue guifg=CornflowerBlue -:hi Visual cterm=reverse gui=none guibg=olivedrab guifg=khaki -:hi String ctermfg=darkcyan guifg=SkyBlue -:hi Comment term=bold ctermfg=grey guifg=grey40 -:hi Constant ctermfg=brown guifg=#ffa0a0 -:hi Special ctermfg=brown guifg=darkkhaki -:hi Identifier ctermfg=red guifg=salmon -:hi Include ctermfg=red guifg=red -:hi PreProc ctermfg=red guibg=white guifg=red -:hi Operator ctermfg=red guifg=red -:hi Define ctermfg=yellow gui=bold guifg=gold -:hi Type ctermfg=darkgreen guifg=CornflowerBlue -:hi Function ctermfg=brown guifg=navajowhite -:hi Structure ctermfg=green guifg=green -:hi LineNr ctermbg=darkgrey ctermfg=black guifg=grey50 -:hi Ignore cterm=bold ctermfg=grey guifg=grey40 -:hi Todo guibg=yellow2 guifg=orangered -:hi Directory ctermfg=darkcyan -:hi VisualNOS cterm=bold,underline -:hi WildMenu ctermbg=darkyellow ctermfg=black guibg=darkyellow guifg=black -:hi DiffChange cterm=none ctermbg=darkgrey ctermfg=white guibg=darkgrey guifg=white -:hi DiffText cterm=none ctermbg=darkcyan ctermfg=white guibg=darkcyan guifg=white -:hi DiffAdd cterm=none ctermbg=darkgreen ctermfg=white guibg=darkgreen guifg=white -:hi DiffDelete cterm=none ctermbg=darkgrey ctermfg=black guibg=darkgrey guifg=black -:hi Underlined term=underline ctermfg=darkmagenta -:hi WarningMsg ctermbg=darkmagenta ctermfg=black guibg=darkmagenta guifg=salmon -:hi ErrorMsg cterm=bold ctermbg=darkmagenta ctermfg=white guibg=darkmagenta guifg=white -:hi Error cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellErrors cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellBad cterm=bold ctermbg=magenta ctermfg=black guibg=darkmagenta guifg=white -:hi SpellLocal ctermbg=blue ctermfg=white guibg=darkmagenta guifg=white -:hi CursorLine ctermbg=black guibg=black -:hi CursorColumn ctermbg=black guibg=black -:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black -:hi Red ctermbg=black ctermfg=red guibg=black guifg=red -:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta -:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue -:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan -:hi Green ctermbg=black ctermfg=green guibg=black guifg=green -:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow -:hi White ctermbg=black ctermfg=white guibg=black guifg=white - +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 guibg=grey15 guifg=white +:hi Cursor term=reverse cterm=reverse guibg=khaki guifg=slategrey +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black +:hi StatusLineNC term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 guibg=peru guifg=wheat +:hi IncSearch term=reverse cterm=reverse guibg=black guifg=green +:hi SpecialKey term=bold ctermfg=4 guifg=yellowgreen +:hi Visual term=reverse cterm=reverse gui=none guibg=olivedrab guifg=khaki +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=SeaGreen +:hi ModeMsg term=bold cterm=bold guifg=goldenrod +:hi Question term=standout ctermfg=2 guifg=springgreen +:hi Title term=bold cterm=bold ctermfg=3 gui=bold guifg=gold +:hi NonText term=bold cterm=bold ctermfg=4 guibg=grey15 guifg=RoyalBlue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* guifg=grey50 +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=darkyellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 guibg=black guifg=grey40 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 guibg=black guifg=grey20 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=white +:hi DiffText cterm=none ctermbg=6 ctermfg=0 guibg=darkcyan guifg=white +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 guibg=darkgreen guifg=white +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=black +:hi String cterm=none ctermfg=3 guifg=SkyBlue +:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7 guifg=grey40 +:hi Constant term=underline ctermfg=1 guifg=#ffa0a0 +:hi Special term=bold ctermfg=6 guifg=darkkhaki +:hi Identifier term=underline ctermfg=6 guifg=salmon +:hi Statement term=bold ctermfg=6 guifg=CornflowerBlue +:hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermbg=7 ctermfg=1 guibg=white guifg=red +:hi Type term=underline ctermfg=2 guifg=CornflowerBlue +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 guifg=grey40 +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow2 guifg=orangered +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 guifg=red +:hi Define ctermfg=3 gui=bold guifg=gold +:hi Function ctermfg=6 guifg=navajowhite +:hi Structure ctermfg=2 guifg=green +:hi CursorLine ctermbg=4 guibg=black +:hi CursorColumn ctermbg=4 guibg=black +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 guibg=darkmagenta guifg=salmon +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black +:hi Red ctermbg=black ctermfg=red guibg=black guifg=red +:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta +:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue +:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan +:hi Green ctermbg=black ctermfg=green guibg=black guifg=green +:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow +:hi White ctermbg=black ctermfg=white guibg=black guifg=white diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim new file mode 100644 index 00000000..17b67557 --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim new file mode 100644 index 00000000..3d1b8bad --- /dev/null +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim index 751202cc..ef7207a3 100644 --- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,8 @@ -"SiSU Vim syntax file -"SiSU Maintainer: Ralph Amissah <ralph@amissah.com> -"SiSU Markup: SiSU (sisu-2.8.3, 2011-03-20) +" SiSU Vim syntax file +" SiSU Maintainer: Ralph Amissah <ralph@amissah.com> +" SiSU Markup: SiSU (sisu-3.0.8) +" Last Change: 2011-04-23 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD> "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 @@ -12,13 +14,16 @@ endif " Errors: syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>" - " Markers Identifiers: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" syn match sisu_break contains=@NoSpell "<br>\|<br />" syn match sisu_control contains=@NoSpell "^<:p[bn]>\s*$" + "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pg\|pgn\|pn\)>\s*$" + "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pg\|pgn\|pn\)\]\s*$" syn match sisu_control contains=@NoSpell "^<:\(bo\|---\)>\s*$" + "syn match sisu_control contains=@NoSpell "^<\(br\)\?:\(pr\|o\)>\s*$" + "syn match sisu_control contains=@NoSpell "^\[\(br\)\?:\(pr\|o\)\]\s*$" syn match sisu_marktail "[~-]#" syn match sisu_control "\"" syn match sisu_underline "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)" @@ -166,11 +171,11 @@ hi def link sisu_sub_header_make Statement hi def link sisu_heading Title hi def link sisu_structure Operator hi def link sisu_contain Include -hi def link sisu_mark_endnote Include +hi def link sisu_mark_endnote Delimiter hi def link sisu_require NonText hi def link sisu_link NonText hi def link sisu_linked String -hi def link sisu_fontface Include +hi def link sisu_fontface Delimiter hi def link sisu_strikeout DiffDelete hi def link sisu_content_alt Special hi def link sisu_sem_content SpecialKey @@ -186,7 +191,7 @@ hi def link sisu_sem_ex_block Comment hi def link sisu_index SpecialKey hi def link sisu_index_block Visual hi def link sisu_content_endnote Special -hi def link sisu_control Define +hi def link sisu_control Delimiter hi def link sisu_ocn Include hi def link sisu_number Number hi def link sisu_identifier Function diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index f83eb61d..9a5dd08a 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.9.2 -:date_stamp: 2011w16/3 -:date: "2011-04-20" +:version: 2.9.3 +:date_stamp: 2011w17/3 +:date: "2011-04-27" :project: SiSU diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim index 9d2e6edb..773f87cb 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim @@ -1,8 +1,9 @@ " Vim color file " Name: 8 " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/8.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes frugal & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "8" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":hi Cursor term=reverse cterm=reverse -":hi lCursor term=reverse cterm=reverse -:hi StatusLine term=bold,reverse cterm=bold,reverse -:hi StatusLineNC term=reverse cterm=reverse -:hi Search term=reverse ctermbg=3 -:hi IncSearch term=reverse cterm=reverse -: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 ctermbg=7 ctermfg=0 -":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 ctermbg=7 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=standout -:hi SpellCap term=standout -:hi SpellLocal term=standout -:hi SpellRare term=standout -: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 term=reverse cterm=reverse +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=bold,reverse cterm=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse +:hi Search term=reverse ctermbg=2 +:hi IncSearch term=reverse cterm=reverse +:hi 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=none ctermbg=7 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=none ctermbg=0 ctermfg=4 +:hi Constant term=underline ctermfg=1 +:hi Special term=bold ctermfg=3 +: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 CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +: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 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 new file mode 100644 index 00000000..38197f2d --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 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 new file mode 100644 index 00000000..b15cd3a6 --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: frugal-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 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 8128790f..18d341c8 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 @@ -1,8 +1,9 @@ " Vim color file " Name: frugal " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-04-25 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/frugal.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & sparse :set background=dark :hi clear if exists("syntax_on") @@ -10,46 +11,54 @@ if exists("syntax_on") endif :let colors_name = "frugal" " 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white -":hi Normal -":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 ctermbg=2 -:hi IncSearch term=reverse cterm=reverse -: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 Normal ctermbg=0 ctermfg=7 guibg=black guifg=white +:hi Cursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi lCursor term=reverse cterm=reverse gui=bold guibg=white guifg=black +:hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold,reverse +:hi StatusLineNC term=reverse cterm=reverse gui=reverse +:hi Search term=reverse ctermbg=2 guifg=green +:hi IncSearch term=reverse cterm=reverse gui=reverse +:hi SpecialKey term=bold ctermfg=4 guifg=blue +:hi Visual term=reverse cterm=reverse gui=reverse +:hi VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=green :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 LineNr term=underline ctermbg=7 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 ctermbg=242 ctermfg=0 -:hi FoldColumn term=standout ctermbg=7 ctermfg=4 -:hi DiffChange cterm=none ctermbg=3 ctermfg=7 -:hi DiffText cterm=none ctermbg=6 ctermfg=7 -:hi DiffAdd cterm=none ctermbg=2 ctermfg=7 -:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 -:hi String ctermfg=6 -:hi Comment term=bold ctermfg=7 -:hi Constant term=underline ctermfg=1 -:hi Special term=bold ctermfg=3 -:hi Identifier term=underline ctermfg=6 -:hi Statement term=bold ctermfg=2 -:hi PreProc term=underline ctermfg=1 -:hi Type term=underline ctermfg=2 -:hi Ignore cterm=bold ctermfg=7 -:hi Todo term=standout ctermbg=3 ctermfg=0 -:hi SpellBad term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellCap term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellLocal term=underline,standout ctermbg=7 ctermfg=5 -:hi SpellRare term=underline,standout ctermbg=7 ctermfg=5 -: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 Question term=standout ctermfg=2 guifg=green +:hi Title term=bold ctermfg=1 guifg=red +:hi NonText term=bold cterm=bold ctermfg=4 guifg=blue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* gui=bold guibg=black guifg=grey +:hi Directory term=bold ctermfg=4 guifg=blue +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=reverse +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 gui=none guibg=black guifg=white +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi DiffText cterm=none ctermbg=6 ctermfg=0 gui=none guibg=magenta guifg=black +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 gui=none guibg=green guifg=black +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 gui=none guibg=white guifg=black +:hi String cterm=none ctermfg=3 gui=none guifg=yellow +:hi Comment cterm=none ctermbg=0 ctermfg=4 gui=bold guibg=black guifg=grey +:hi Constant term=underline ctermfg=1 guifg=red +:hi Special term=bold ctermfg=3 guifg=yellow +:hi Identifier term=underline cterm=none ctermfg=6 gui=none guifg=magenta +:hi Statement term=bold cterm=none ctermfg=2 gui=none guifg=green +":hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermfg=1 guifg=red +:hi Type term=underline cterm=bold ctermfg=3 gui=bold guifg=yellow +:hi Delimiter cterm=none ctermfg=2 gui=none guifg=green +:hi Ignore cterm=bold ctermfg=7 gui=bold guifg=white +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow guifg=black +:hi Underlined term=underline cterm=underline gui=underline +":hi Include ctermfg=1 guifg=red +":hi Define ctermfg=3 guifg=yellow +":hi Function ctermfg=6 guifg=magenta +":hi Structure ctermfg=2 guifg=green +":hi CursorLine ctermbg=4 guibg=blue +":hi CursorColumn ctermbg=4 guibg=blue +: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 +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=white guifg=black +:hi WarningMsg term=standout ctermfg=1 guifg=red +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 gui=bold guibg=red guifg=white 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 57f7925b..2aad27ca 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim @@ -1,72 +1,75 @@ "%% SiSU Vim color file " Name: Slate " Maintainer: Ralph Amissah <ralph@amissah.com> -" Last Change: 2011-04-20 +" Last Change: 2011-05-04 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/slate.vim;hb=HEAD> -" (originally looked at desert Hans Fugal <hans@fugal.net> <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) +" Notes: cterm now uses frugal-sisu 8 colors for term +" (for gui originally looked at desert Hans Fugal <hans@fugal.net> +" <http://hans.fugal.net/vim/colors/desert.vim> (April/May 2003)) :set background=dark -:highlight clear -if version > 580 - hi clear - if exists("syntax_on") - syntax reset - endif +:hi clear +if exists("syntax_on") + syntax reset endif :let colors_name = "slate" -:hi Normal ctermbg=black guibg=grey15 guifg=white -:hi Cursor guibg=khaki guifg=slategrey -:hi VertSplit cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Folded ctermbg=black ctermfg=grey guibg=black guifg=grey40 -:hi FoldColumn ctermbg=grey ctermfg=darkblue guibg=black guifg=grey20 -:hi IncSearch cterm=none ctermbg=green ctermfg=yellow guibg=black guifg=green -:hi ModeMsg cterm=none ctermfg=brown guifg=goldenrod -:hi MoreMsg ctermfg=darkgreen guifg=SeaGreen -:hi NonText cterm=bold ctermfg=blue guibg=grey15 guifg=RoyalBlue -:hi Question ctermfg=green guifg=springgreen -:hi Search ctermbg=yellow ctermfg=darkgreen guibg=peru guifg=wheat -:hi SpecialKey ctermfg=darkgreen guifg=yellowgreen -:hi StatusLine cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black -:hi StatusLineNC cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 -:hi Title cterm=bold ctermfg=yellow gui=bold guifg=gold -:hi Statement ctermfg=lightblue guifg=CornflowerBlue -:hi Visual cterm=reverse gui=none guibg=olivedrab guifg=khaki -:hi String ctermfg=darkcyan guifg=SkyBlue -:hi Comment term=bold ctermfg=grey guifg=grey40 -:hi Constant ctermfg=brown guifg=#ffa0a0 -:hi Special ctermfg=brown guifg=darkkhaki -:hi Identifier ctermfg=red guifg=salmon -:hi Include ctermfg=red guifg=red -:hi PreProc ctermfg=red guibg=white guifg=red -:hi Operator ctermfg=red guifg=red -:hi Define ctermfg=yellow gui=bold guifg=gold -:hi Type ctermfg=darkgreen guifg=CornflowerBlue -:hi Function ctermfg=brown guifg=navajowhite -:hi Structure ctermfg=green guifg=green -:hi LineNr ctermbg=darkgrey ctermfg=black guifg=grey50 -:hi Ignore cterm=bold ctermfg=grey guifg=grey40 -:hi Todo guibg=yellow2 guifg=orangered -:hi Directory ctermfg=darkcyan -:hi VisualNOS cterm=bold,underline -:hi WildMenu ctermbg=darkyellow ctermfg=black guibg=darkyellow guifg=black -:hi DiffChange cterm=none ctermbg=darkgrey ctermfg=white guibg=darkgrey guifg=white -:hi DiffText cterm=none ctermbg=darkcyan ctermfg=white guibg=darkcyan guifg=white -:hi DiffAdd cterm=none ctermbg=darkgreen ctermfg=white guibg=darkgreen guifg=white -:hi DiffDelete cterm=none ctermbg=darkgrey ctermfg=black guibg=darkgrey guifg=black -:hi Underlined term=underline ctermfg=darkmagenta -:hi WarningMsg ctermbg=darkmagenta ctermfg=black guibg=darkmagenta guifg=salmon -:hi ErrorMsg cterm=bold ctermbg=darkmagenta ctermfg=white guibg=darkmagenta guifg=white -:hi Error cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellErrors cterm=bold ctermbg=darkmagenta ctermfg=grey guibg=darkmagenta guifg=white -:hi SpellBad cterm=bold ctermbg=magenta ctermfg=black guibg=darkmagenta guifg=white -:hi SpellLocal ctermbg=blue ctermfg=white guibg=darkmagenta guifg=white -:hi CursorLine ctermbg=black guibg=black -:hi CursorColumn ctermbg=black guibg=black -:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black -:hi Red ctermbg=black ctermfg=red guibg=black guifg=red -:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta -:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue -:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan -:hi Green ctermbg=black ctermfg=green guibg=black guifg=green -:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow -:hi White ctermbg=black ctermfg=white guibg=black guifg=white - +" 0 = black, 1 = red, 2 = green, 3 = yellow/orange, 4 = blue, 5 = magenta, 6 = cyan, 7 = white +:hi Normal ctermbg=0 ctermfg=7 guibg=grey15 guifg=white +:hi Cursor term=reverse cterm=reverse guibg=khaki guifg=slategrey +:hi lCursor term=reverse cterm=reverse +:hi StatusLine term=reverse cterm=bold,reverse gui=none guibg=#c2bfa5 guifg=black +:hi StatusLineNC term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Search term=reverse cterm=bold ctermbg=2 ctermfg=7 guibg=peru guifg=wheat +:hi IncSearch term=reverse cterm=reverse guibg=black guifg=green +:hi SpecialKey term=bold ctermfg=4 guifg=yellowgreen +:hi Visual term=reverse cterm=reverse gui=none guibg=olivedrab guifg=khaki +:hi VisualNOS term=bold,underline cterm=bold,underline +:hi MoreMsg term=bold ctermfg=2 guifg=SeaGreen +:hi ModeMsg term=bold cterm=bold guifg=goldenrod +:hi Question term=standout ctermfg=2 guifg=springgreen +:hi Title term=bold cterm=bold ctermfg=3 gui=bold guifg=gold +:hi NonText term=bold cterm=bold ctermfg=4 guibg=grey15 guifg=RoyalBlue +:hi LineNr term=underline cterm=bold ctermbg=0 ctermfg=0* guifg=grey50 +:hi Directory term=bold ctermfg=4 +:hi WildMenu term=standout ctermbg=3 ctermfg=0 guibg=darkyellow guifg=black +:hi VertSplit term=reverse cterm=reverse gui=none guibg=#c2bfa5 guifg=grey40 +:hi Folded term=standout cterm=none ctermbg=0 ctermfg=7 guibg=black guifg=grey40 +:hi FoldColumn term=standout ctermbg=7 ctermfg=4 guibg=black guifg=grey20 +:hi DiffChange cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=white +:hi DiffText cterm=none ctermbg=6 ctermfg=0 guibg=darkcyan guifg=white +:hi DiffAdd cterm=none ctermbg=2 ctermfg=0 guibg=darkgreen guifg=white +:hi DiffDelete cterm=none ctermbg=7 ctermfg=0 guibg=darkgrey guifg=black +:hi String cterm=none ctermfg=3 guifg=SkyBlue +:hi Comment term=bold cterm=none ctermbg=0 ctermfg=7 guifg=grey40 +:hi Constant term=underline ctermfg=1 guifg=#ffa0a0 +:hi Special term=bold ctermfg=6 guifg=darkkhaki +:hi Identifier term=underline ctermfg=6 guifg=salmon +:hi Statement term=bold ctermfg=6 guifg=CornflowerBlue +:hi Operator term=bold ctermfg=1 guifg=red +:hi PreProc term=underline ctermbg=7 ctermfg=1 guibg=white guifg=red +:hi Type term=underline ctermfg=2 guifg=CornflowerBlue +:hi Delimiter term=none cterm=none ctermfg=1 +:hi Ignore cterm=bold ctermfg=7 guifg=grey40 +:hi Todo term=standout ctermbg=3 ctermfg=0 guibg=yellow2 guifg=orangered +:hi Underlined term=underline cterm=underline +:hi Include ctermfg=1 guifg=red +:hi Define ctermfg=3 gui=bold guifg=gold +:hi Function ctermfg=6 guifg=navajowhite +:hi Structure ctermfg=2 guifg=green +:hi CursorLine ctermbg=4 guibg=black +:hi CursorColumn ctermbg=4 guibg=black +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 +:hi SpellLocal term=underline,standout cterm=none ctermbg=7 ctermfg=0 guibg=darkmagenta guifg=white +:hi SpellRare term=underline,standout cterm=none ctermbg=7 ctermfg=0 +:hi WarningMsg term=standout ctermfg=1 guibg=darkmagenta guifg=salmon +:hi ErrorMsg term=standout cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Error term=reverse cterm=bold ctermbg=1 ctermfg=7 guibg=darkmagenta guifg=white +:hi Black ctermbg=grey ctermfg=black guibg=grey guifg=black +:hi Red ctermbg=black ctermfg=red guibg=black guifg=red +:hi Magenta ctermbg=black ctermfg=magenta guibg=black guifg=magenta +:hi Blue ctermbg=black ctermfg=blue guibg=black guifg=blue +:hi Cyan ctermbg=black ctermfg=cyan guibg=black guifg=cyan +:hi Green ctermbg=black ctermfg=green guibg=black guifg=green +:hi Yellow ctermbg=black ctermfg=yellow guibg=black guifg=yellow +:hi White ctermbg=black ctermfg=white guibg=black guifg=white 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 new file mode 100644 index 00000000..17b67557 --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-ruby +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-ruby.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +":hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 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 new file mode 100644 index 00000000..3d1b8bad --- /dev/null +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim @@ -0,0 +1,65 @@ +" Vim color file +" Name: sparse-cterm-sisu +" Maintainer: Ralph Amissah <ralph@amissah.com> +" Last Change: 2011-05-04 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/colors/sparse-cterm-sisu.vim;hb=HEAD> +" Note: 8 color cterm, related colorschemes 8 & frugal +:set background=dark +:hi clear +if exists("syntax_on") + syntax reset +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=bold ctermbg=2 ctermfg=7 +:hi IncSearch term=reverse cterm=reverse +: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 CursorLine ctermbg=4 +:hi CursorColumn ctermbg=4 +:hi MatchParen cterm=bold ctermbg=4 ctermfg=7 +: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 diff --git a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim index 00cdbea4..ef7207a3 100644 --- a/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim +++ b/data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim @@ -1,6 +1,8 @@ -"SiSU Vim syntax file -"SiSU Maintainer: Ralph Amissah <ralph@amissah.com> -"SiSU Markup: SiSU (sisu-3.0.5, 2011-03-20) +" SiSU Vim syntax file +" SiSU Maintainer: Ralph Amissah <ralph@amissah.com> +" SiSU Markup: SiSU (sisu-3.0.8) +" Last Change: 2011-04-23 +" URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/v3/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD> "(originally looked at Ruby Vim by Mirko Nasato) if version < 600 @@ -12,7 +14,6 @@ endif " Errors: syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>" - " Markers Identifiers: if !exists("sisu_no_identifiers") syn match sisu_mark_endnote "\~^" @@ -170,11 +171,11 @@ hi def link sisu_sub_header_make Statement hi def link sisu_heading Title hi def link sisu_structure Operator hi def link sisu_contain Include -hi def link sisu_mark_endnote Include +hi def link sisu_mark_endnote Delimiter hi def link sisu_require NonText hi def link sisu_link NonText hi def link sisu_linked String -hi def link sisu_fontface Include +hi def link sisu_fontface Delimiter hi def link sisu_strikeout DiffDelete hi def link sisu_content_alt Special hi def link sisu_sem_content SpecialKey @@ -190,7 +191,7 @@ hi def link sisu_sem_ex_block Comment hi def link sisu_index SpecialKey hi def link sisu_index_block Visual hi def link sisu_content_endnote Special -hi def link sisu_control Define +hi def link sisu_control Delimiter hi def link sisu_ocn Include hi def link sisu_number Number hi def link sisu_identifier Function diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index e4915326..65a09a0e 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 3.0.7-beta-rb1.9.2p180 -:date_stamp: 2011w16/3 -:date: "2011-04-20" +:version: 3.0.8-beta-rb1.9.2p180 +:date_stamp: 2011w18/4 +:date: "2011-05-05" :project: SiSU |