From a71cb1e714e12d4cd6a8ab82de55ca00da3a0a5f Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 24 Jan 2014 12:17:40 +0100 Subject: Colors, Syntax, fuckup. --- colors/red.vim | 94 +++++++++++++++++++++++++++++++++------------------------ syntax/todo.vim | 35 ++++++++------------- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/colors/red.vim b/colors/red.vim index 25231e3..a349603 100644 --- a/colors/red.vim +++ b/colors/red.vim @@ -1,6 +1,6 @@ " local syntax file - set colors on a per-machine basis: " vim: tw=0 ts=4 sw=4 -" Vim color file inspired from pablo +" Vim color file inspi01 from pablo " Maintainer: Hugues Hiegel " Last Change: 2008 July 04 @@ -11,64 +11,78 @@ if exists("syntax_on") endif let g:colors_name = "red" -highlight Comment ctermfg=black cterm=bold -highlight Constant ctermfg=blue cterm=none -highlight Number ctermfg=blue cterm=bold -highlight String ctermfg=red ctermbg=black cterm=none -highlight Identifier ctermfg=red cterm=bold -highlight Function ctermfg=red cterm=bold -highlight Statement ctermfg=cyan cterm=none -highlight cConditional ctermfg=red cterm=bold +highlight Comment ctermfg=81 cterm=bold +highlight Constant ctermfg=04 cterm=none +highlight Number ctermfg=04 cterm=bold +highlight String ctermfg=32 ctermbg=00 cterm=none +highlight Identifier ctermfg=01 cterm=bold +highlight Function ctermfg=01 cterm=bold +highlight Statement ctermfg=07 cterm=none +highlight cConditional ctermfg=01 cterm=bold highlight clear cStatement highlight link cStatement Statement -highlight Label ctermfg=red cterm=bold,underline +highlight Label ctermfg=01 cterm=bold highlight clear cLabel highlight link cLabel Label -highlight PreProc ctermfg=red cterm=bold,underline -highlight Type ctermfg=blue cterm=none -highlight Special ctermfg=blue cterm=none -highlight cFormat ctermfg=red cterm=bold +highlight PreProc ctermfg=01 cterm=bold +highlight Type ctermfg=04 cterm=none +highlight Special ctermfg=04 cterm=none +highlight cFormat ctermfg=01 cterm=bold highlight Error cterm=bold -highlight Todo ctermfg=black ctermbg=yellow cterm=bold -highlight Directory ctermfg=green +highlight Todo ctermfg=20 ctermbg=24 cterm=bold +highlight Directory ctermfg=02 "highlight Normal -highlight Search ctermfg=yellow ctermbg=none cterm=bold -highlight IncSearch ctermfg=yellow ctermbg=none cterm=bold,underline -highlight Title ctermfg=yellow cterm=bold +highlight Search ctermfg=03 ctermbg=none cterm=bold +highlight IncSearch ctermfg=03 ctermbg=20 cterm=bold +highlight Title ctermfg=03 cterm=bold -highlight Visual ctermfg=none ctermbg=black cterm=none +highlight Visual ctermfg=none ctermbg=00 cterm=none -highlight MatchParen ctermfg=yellow ctermbg=none cterm=bold +highlight MatchParen ctermfg=03 ctermbg=none cterm=bold -highlight DiffAdd term=bold ctermfg=none cterm=none ctermbg=black -highlight DiffChange term=bold ctermfg=none cterm=none ctermbg=black -highlight DiffDelete term=reverse ctermfg=black cterm=none ctermbg=none -highlight DiffText term=underline ctermfg=green cterm=none ctermbg=none +highlight DiffAdd term=bold ctermfg=none cterm=none ctermbg=00 +highlight DiffChange term=bold ctermfg=none cterm=none ctermbg=00 +highlight DiffDelete term=reverse ctermfg=00 cterm=none ctermbg=none +highlight DiffText term=none ctermfg=02 cterm=none ctermbg=none -hi StatusLine term=reverse,bold ctermfg=yellow ctermbg=black cterm=bold guifg=#ffff00 guibg=#0000ff gui=none -hi StatusLineNC term=reverse ctermfg=none ctermbg=black cterm=none -hi VertSplit term=reverse ctermfg=black ctermbg=black cterm=none -hi FoldColumn term=reverse ctermfg=red ctermbg=none cterm=bold +hi StatusLine term=reverse,bold ctermfg=03 ctermbg=00 cterm=bold guifg=#ffff00 guibg=#0000ff gui=none +hi StatusLineNC term=reverse ctermfg=none ctermbg=00 cterm=none +hi VertSplit term=reverse ctermfg=00 ctermbg=00 cterm=none +hi FoldColumn term=reverse ctermfg=01 ctermbg=none cterm=bold hi clear Folded hi link Folded FoldColumn -hi LineNR term=reverse,bold ctermbg=none ctermfg=yellow cterm=bold +hi LineNR term=reverse,bold ctermbg=none ctermfg=03 cterm=bold hi clear TabLine -hi TabLine term=underline cterm=none,underline ctermbg=none ctermfg=black +hi TabLine term=underline cterm=none,underline ctermbg=none ctermfg=00 hi clear TabLineFill hi link TabLineFill TabLine hi clear TabLineSel -hi TabLineSel term=bold ctermbg=black ctermfg=yellow cterm=bold +hi TabLineSel term=bold ctermbg=00 ctermfg=03 cterm=bold -hi CursorLine ctermbg=black cterm=none +hi CursorLine ctermbg=08 cterm=none -hi SpellBad term=reverse cterm=bold ctermbg=red ctermfg=red gui=undercurl guisp=Red -hi SpellCap term=reverse ctermbg=none cterm=none ctermfg=red gui=undercurl guisp=Blue -hi SpellRare term=reverse cterm=bold ctermfg=magenta gui=undercurl guisp=Magenta -hi SpellLocal term=underline cterm=bold ctermfg=green gui=undercurl guisp=Cyan +hi SpellBad term=reverse cterm=bold ctermbg=01 ctermfg=01 gui=undercurl guisp=Red +hi SpellCap term=reverse cterm=none ctermbg=none ctermfg=01 gui=undercurl guisp=Blue +hi SpellRare term=reverse cterm=bold ctermbg=64 ctermfg=68 gui=undercurl guisp=Magenta +hi SpellLocal term=underline cterm=bold ctermfg=02 gui=undercurl guisp=Cyan -hi WildMenu term=reverse cterm=bold ctermbg=black ctermfg=yellow +hi WildMenu term=reverse cterm=bold ctermbg=00 ctermfg=03 -highlight NonText ctermfg=black cterm=bold -highlight SpecialKey ctermfg=black cterm=none +highlight NonText ctermfg=00 cterm=bold +highlight SpecialKey ctermfg=00 cterm=none + + +" TODO +hi todoTitle ctermfg=11 cterm=bold +hi todoTask1 ctermfg=36 cterm=bold +hi todoTask2 ctermfg=24 +hi todoTask3 ctermfg=77 + +hi rtTicket ctermfg=22 ctermbg=18 cterm=bold + +hi link todoDone DiffDelete +hi link todoTaskDone DiffDelete + +hi todoKeyWord ctermfg=64 ctermbg=32 cterm=bold diff --git a/syntax/todo.vim b/syntax/todo.vim index 2824481..47524cc 100644 --- a/syntax/todo.vim +++ b/syntax/todo.vim @@ -11,32 +11,23 @@ endif setlocal iskeyword+=- syntax case ignore -syn match Todo /([^)]*)/ containedin=ALLBUT,todoDone,todoTaskDone -syn match String /\[[^\]]*\]/ containedin=ALL +syn match Todo /→ .*/ containedin=ALLBUT,todoDone,todoTaskDone +"syn match String /{[^}]*}/ containedin=ALL +syn match String /'[^']*'\|"[^"]*"/ containedin=ALL -syn match todoKeyWord /[A-Z_-]\+:/ +syn match todoKeyWord /^\s*\([A-Z _-]*\w\+\):/ -syn region todoTitle start=/^\z\(\s*\)\*/ end=/$/ -syn region todoTask1 start=/^\z\(\s*\)+/ end=/$/ -syn region todoTask2 start=/^\z\(\s*\)→/ end=/$/ -syn region todoTask3 start=/^\z\(\s*\):/ end=/$/ -syn region todoDone start=/^-/ end=/^\(\S\|$\)/me=s-1 contains=todoTaskDone -syn region todoTaskDone start=/^\z\(\s\+\)-/ skip=/^\z1\s\+/ end=/^/me=s-1 +syn region todoTask3 start=/^\(\s*\)\W/ end=/$/ contains=todoKeyWord +syn region todoTask2 start=/^\(\s*\)-/ end=/$/ contains=todoKeyWord +syn region todoTask1 start=/^\(\s*\)+/ end=/$/ contains=todoKeyWord +syn region todoTitle start=/^\(\s*\)\*/ end=/$/ contains=todoKeyWord -syn match rtTicket /\#\d\+/ containedin=ALLBUT,todoDone,todoTaskDone +syn region todoDone start=/^x/ end=/^\(\S\|$\)/me=s-1 contains=todoTaskDone +syn region todoTaskDone start=/^\z\(\s\+\)x/ skip=/^\z1\s\+/ end=/^/me=s-1 -syn region Comment start=/^\%^\|=/ end=/=$/ +syn match rtTicket /\(RTC *\)\?\#\d\+/ containedin=ALLBUT,todoDone,todoTaskDone -hi link todoTitle Title -hi link todoTask1 DiffText -hi link todoTask2 Number -hi link todoTask3 Statement - -hi link rtTicket SpellRare - -hi link todoDone NonText -hi link todoTaskDone NonText - -hi link todoKeyWord PreProc +"syn region Comment start=/^\%^/ end=/=$/ +syn region Comment start=/^ *==/ end=/$/ let b:current_syntax="todo" -- cgit v1.2.3