From b9585ab2b362fa1b828ec408ac95efbd55f2dcf0 Mon Sep 17 00:00:00 2001 From: Chris Kempson Date: Thu, 9 Oct 2014 09:56:38 +0100 Subject: Updated with base16-builder --- colors/base16-bright.vim | 303 +++++++++++++++++++++++++---------------------- 1 file changed, 160 insertions(+), 143 deletions(-) diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 985bdb2..dc2ef7a 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -1,7 +1,17 @@ " Base16 Bright (https://github.com/chriskempson/base16) " Scheme: Chris Kempson (http://chriskempson.com) -" GUI Base16 Color Definitions +" This enables the coresponding base16-shell script to run so that +" :colorscheme works in terminals supported by base16-shell scripts +" User must set this variable in .vimrc +" let g:base16_shell_path=base16-builder/output/shell/ +if !has('gui') + if exists("g:base16_shell_path") + execute "silent !/bin/sh ".g:base16_shell_path."/base16-bright.dark.sh" + endif +endif + +" GUI color definitions let s:gui00 = "000000" let s:gui01 = "303030" let s:gui02 = "505050" @@ -19,7 +29,7 @@ let s:gui0D = "6fb3d2" let s:gui0E = "d381c3" let s:gui0F = "be643c" -" Terminal Base16 Color Definitions +" Terminal color definitions let s:cterm00 = "00" let s:cterm03 = "08" let s:cterm05 = "07" @@ -46,13 +56,13 @@ else let s:cterm0F = "14" endif -" Theme Setup +" Theme setup hi clear syntax reset let g:colors_name = "base16-bright" " Highlighting function -fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) +fun hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif @@ -71,7 +81,7 @@ fun! hi(group, guifg, guibg, ctermfg, ctermbg, attr) endfun " Return GUI color for light/dark variants -fun! s:gui(color) +fun s:gui(color) if &background == "dark" return a:color endif @@ -88,8 +98,6 @@ fun! s:gui(color) return s:gui03 elseif a:color == s:gui05 return s:gui02 - elseif a:color == s:gui05 - return s:gui02 elseif a:color == s:gui06 return s:gui01 elseif a:color == s:gui07 @@ -100,7 +108,7 @@ fun! s:gui(color) endfun " Return terminal color for light/dark variants -fun! s:cterm(color) +fun s:cterm(color) if &background == "dark" return a:color endif @@ -117,8 +125,6 @@ fun! s:cterm(color) return s:cterm03 elseif a:color == s:cterm05 return s:cterm02 - elseif a:color == s:cterm05 - return s:cterm02 elseif a:color == s:cterm06 return s:cterm01 elseif a:color == s:cterm07 @@ -128,156 +134,167 @@ fun! s:cterm(color) return a:color endfun -" Vim Editor Colors -call hi("Bold", "", "", "", "", "bold") -call hi("Debug", s:gui08, "", s:cterm08, "", "") -call hi("Directory", s:gui0D, "", s:cterm0D, "", "") -call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("Exception", s:gui08, "", s:cterm08, "", "") -call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") -call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("IncSearch", s:gui0A, "", s:cterm0A, "", "") -call hi("Italic", "", "", "", "", "none") -call hi("Macro", s:gui08, "", s:cterm08, "", "") -call hi("MatchParen", s:gui03, s:gui00, s:cterm03, s:cterm00, "reverse") -call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") -call hi("Question", s:gui0A, "", s:cterm0A, "", "") -call hi("Search", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "reverse") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("TooLong", s:gui08, "", s:cterm08, "", "") -call hi("Underlined", s:gui08, "", s:cterm08, "", "") -call hi("Visual", "", s:gui02, "", s:cterm02, "") -call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") -call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") -call hi("WildMenu", s:gui08, "", s:cterm08, "", "") -call hi("Title", s:gui0D, "", s:cterm0D, "", "none") +" Vim editor colors +call hi("Bold", "", "", "", "", "bold") +call hi("Debug", s:gui08, "", s:cterm08, "", "") +call hi("Directory", s:gui0D, "", s:cterm0D, "", "") +call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("Exception", s:gui08, "", s:cterm08, "", "") +call hi("FoldColumn", "", s:gui01, "", s:cterm01, "") +call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none") +call hi("Italic", "", "", "", "", "none") +call hi("Macro", s:gui08, "", s:cterm08, "", "") +call hi("MatchParen", s:gui00, s:gui03, s:cterm00, s:cterm03, "") +call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "") +call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "") +call hi("Question", s:gui0D, "", s:cterm0D, "", "") +call hi("Search", s:gui03, s:gui0A, s:cterm03, s:cterm0A, "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") +call hi("TooLong", s:gui08, "", s:cterm08, "", "") +call hi("Underlined", s:gui08, "", s:cterm08, "", "") +call hi("Visual", "", s:gui02, "", s:cterm02, "") +call hi("VisualNOS", s:gui08, "", s:cterm08, "", "") +call hi("WarningMsg", s:gui08, "", s:cterm08, "", "") +call hi("WildMenu", s:gui08, "", s:cterm08, "", "") +call hi("Title", s:gui0D, "", s:cterm0D, "", "none") +call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") +call hi("NonText", s:gui03, "", s:cterm03, "", "") +call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") +call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") +call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") +call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") +call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") +call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") +call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") +call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") +call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") +call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") +call hi("PMenuSel", s:gui01, s:gui04, s:cterm01, s:cterm04, "") +call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") +call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") +call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") -call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "") -call hi("NonText", s:gui03, "", s:cterm03, "", "") -call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "") -call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("SpecialKey", s:gui03, "", s:cterm03, "", "") -call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none") -call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none") -call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLine", "", s:gui01, "", s:cterm01, "none") -call hi("CursorLineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "") -call hi("PMenu", s:gui04, s:gui01, s:cterm04, s:cterm01, "none") -call hi("PMenuSel", s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse") -call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none") -call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none") +" Standard syntax highlighting +call hi("Boolean", s:gui09, "", s:cterm09, "", "") +call hi("Character", s:gui08, "", s:cterm08, "", "") +call hi("Comment", s:gui03, "", s:cterm03, "", "") +call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") +call hi("Constant", s:gui09, "", s:cterm09, "", "") +call hi("Define", s:gui0E, "", s:cterm0E, "", "none") +call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") +call hi("Float", s:gui09, "", s:cterm09, "", "") +call hi("Function", s:gui0D, "", s:cterm0D, "", "") +call hi("Identifier", s:gui08, "", s:cterm08, "", "none") +call hi("Include", s:gui0D, "", s:cterm0D, "", "") +call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") +call hi("Label", s:gui0A, "", s:cterm0A, "", "") +call hi("Number", s:gui09, "", s:cterm09, "", "") +call hi("Operator", s:gui05, "", s:cterm05, "", "none") +call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") +call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") +call hi("Special", s:gui0C, "", s:cterm0C, "", "") +call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") +call hi("Statement", s:gui08, "", s:cterm08, "", "") +call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") +call hi("String", s:gui0B, "", s:cterm0B, "", "") +call hi("Structure", s:gui0E, "", s:cterm0E, "", "") +call hi("Tag", s:gui0A, "", s:cterm0A, "", "") +call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") +call hi("Type", s:gui09, "", s:cterm09, "", "none") +call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") -" Standard Syntax Highlighting -call hi("Boolean", s:gui09, "", s:cterm09, "", "") -call hi("Character", s:gui08, "", s:cterm08, "", "") -call hi("Comment", s:gui03, "", s:cterm03, "", "") -call hi("Conditional", s:gui0E, "", s:cterm0E, "", "") -call hi("Constant", s:gui09, "", s:cterm09, "", "") -call hi("Define", s:gui0E, "", s:cterm0E, "", "none") -call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("Float", s:gui09, "", s:cterm09, "", "") -call hi("Function", s:gui0D, "", s:cterm0D, "", "") -call hi("Identifier", s:gui08, "", s:cterm08, "", "none") -call hi("Include", s:gui0D, "", s:cterm0D, "", "") -call hi("Keyword", s:gui0E, "", s:cterm0E, "", "") -call hi("Label", s:gui0A, "", s:cterm0A, "", "") -call hi("Number", s:gui09, "", s:cterm09, "", "") -call hi("Operator", s:gui05, "", s:cterm05, "", "none") -call hi("PreProc", s:gui0A, "", s:cterm0A, "", "") -call hi("Repeat", s:gui0A, "", s:cterm0A, "", "") -call hi("Special", s:gui0C, "", s:cterm0C, "", "") -call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "") -call hi("Statement", s:gui08, "", s:cterm08, "", "") -call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "") -call hi("String", s:gui0B, "", s:cterm0B, "", "") -call hi("Structure", s:gui0E, "", s:cterm0E, "", "") -call hi("Tag", s:gui0A, "", s:cterm0A, "", "") -call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "") -call hi("Type", s:gui09, "", s:cterm09, "", "none") -call hi("Typedef", s:gui0A, "", s:cterm0A, "", "") +" Spelling highlighting +call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") -" Spelling Highlighting -call hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") -call hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") +" Additional diff highlighting +call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") +call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") +call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -" Additional Diff Highlighting -call hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffChange", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffDelete", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffText", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "") -call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") -call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "") -call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "") +" Ruby highlighting +call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") +call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") +call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") +call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") +call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") +call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") -" Ruby Highlighting -call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "") -call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "") -call hi("rubyInterpolation", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "") -call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "") -call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "") -call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "") +" PHP highlighting +call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") +call hi("phpComparison", s:gui05, "", s:cterm05, "", "") +call hi("phpParent", s:gui05, "", s:cterm05, "", "") -" PHP Highlighting -call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "") -call hi("phpComparison", s:gui05, "", s:cterm05, "", "") -call hi("phpParent", s:gui05, "", s:cterm05, "", "") +" HTML highlighting +call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") +call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") +call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") +call hi("htmlTag", s:gui05, "", s:cterm05, "", "") -" HTML Highlighting -call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "") -call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "") -call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "") -call hi("htmlTag", s:gui05, "", s:cterm05, "", "") +" CSS highlighting +call hi("cssBraces", s:gui05, "", s:cterm05, "", "") +call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") +call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") -" CSS Highlighting -call hi("cssBraces", s:gui05, "", s:cterm05, "", "") -call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "") -call hi("cssColor", s:gui0C, "", s:cterm0C, "", "") +" SASS highlighting +call hi("sassidChar", s:gui08, "", s:cterm08, "", "") +call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") +call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") +call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") +call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") -" SASS Highlighting -call hi("sassIdChar", s:gui08, "", s:cterm08, "", "") -call hi("sassClassChar", s:gui09, "", s:cterm09, "", "") -call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "") -call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "") +" JavaScript highlighting +call hi("javaScript", s:gui05, "", s:cterm05, "", "") +call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") +call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") -" JavaScript Highlighting -call hi("javaScript", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "") -call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "") +" Python highlighting +call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "") +call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "") -" Markdown Highlighting -call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") -call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") +" Markdown highlighting +call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "") +call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "") +call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "") +call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "") -" Git Highlighting -call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") -call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") +" Git highlighting +call hi("gitCommitOverflow", s:gui08, "", s:cterm08, "", "") +call hi("gitCommitSummary", s:gui0B, "", s:cterm0B, "", "") -" GitGutter Highlighting -call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") -call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") -call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +" GitGutter highlighting +call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") +call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "") +" Signify highlighting +call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "") +call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "") +call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "") -" GitGutter Highlighting -call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") -call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") +" NERDTree highlighting +call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "") +call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "") -" remove highlighting function +" Remove functions delf hi +delf gui +delf cterm -" Remove Colour Variables +" Remove color variables unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F -- cgit v1.2.3