diff options
| -rw-r--r-- | colors/base16-bright.vim | 22 | ||||
| -rw-r--r-- | colors/base16-chalk.vim | 22 | ||||
| -rw-r--r-- | colors/base16-default.vim | 22 | ||||
| -rw-r--r-- | colors/base16-eighties.vim | 22 | ||||
| -rw-r--r-- | colors/base16-greenscreen.vim | 22 | ||||
| -rw-r--r-- | colors/base16-mocha.vim | 22 | ||||
| -rw-r--r-- | colors/base16-monokai.vim | 22 | ||||
| -rw-r--r-- | colors/base16-ocean.vim | 22 | ||||
| -rw-r--r-- | colors/base16-railscasts.vim | 22 | ||||
| -rw-r--r-- | colors/base16-solarized.vim | 22 | ||||
| -rw-r--r-- | colors/base16-tomorrow.vim | 22 |
11 files changed, 132 insertions, 110 deletions
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim index 343d7d8..985bdb2 100644 --- a/colors/base16-bright.vim +++ b/colors/base16-bright.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-bright" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim index 9d1b995..57e2dd2 100644 --- a/colors/base16-chalk.vim +++ b/colors/base16-chalk.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-chalk" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-default.vim b/colors/base16-default.vim index 5db7036..eda4a3e 100644 --- a/colors/base16-default.vim +++ b/colors/base16-default.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-default" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim index e64789e..b7aed5e 100644 --- a/colors/base16-eighties.vim +++ b/colors/base16-eighties.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-eighties" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim index 435af33..175cd09 100644 --- a/colors/base16-greenscreen.vim +++ b/colors/base16-greenscreen.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-greenscreen" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim index 28a21f4..30cd786 100644 --- a/colors/base16-mocha.vim +++ b/colors/base16-mocha.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-mocha" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim index 6fca04a..b53f133 100644 --- a/colors/base16-monokai.vim +++ b/colors/base16-monokai.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-monokai" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim index d405a55..90e4179 100644 --- a/colors/base16-ocean.vim +++ b/colors/base16-ocean.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-ocean" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim index 38ac7f5..f31ee97 100644 --- a/colors/base16-railscasts.vim +++ b/colors/base16-railscasts.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-railscasts" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim index d3a137d..3ed15d0 100644 --- a/colors/base16-solarized.vim +++ b/colors/base16-solarized.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-solarized" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim index 9b10b1b..a6674a7 100644 --- a/colors/base16-tomorrow.vim +++ b/colors/base16-tomorrow.vim @@ -54,23 +54,24 @@ let g:colors_name = "base16-tomorrow" " Highlighting function fun! <SID>hi(group, guifg, guibg, ctermfg, ctermbg, attr) if a:guifg != "" - exec "hi " . a:group . " guifg=#" . s:DarkOrLightGui(a:guifg) + exec "hi " . a:group . " guifg=#" . s:gui(a:guifg) endif if a:guibg != "" - exec "hi " . a:group . " guibg=#" . s:DarkOrLightGui(a:guibg) + exec "hi " . a:group . " guibg=#" . s:gui(a:guibg) endif if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . s:DarkOrLightCterm(a:ctermfg) + exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg) endif if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . s:DarkOrLightCterm(a:ctermbg) + exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg) endif if a:attr != "" exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr endif endfun -fun s:DarkOrLightGui(color) +" Return GUI color for light/dark variants +fun! s:gui(color) if &background == "dark" return a:color endif @@ -98,7 +99,8 @@ fun s:DarkOrLightGui(color) return a:color endfun -fun s:DarkOrLightCterm(color) +" Return terminal color for light/dark variants +fun! s:cterm(color) if &background == "dark" return a:color endif @@ -201,10 +203,10 @@ call <SID>hi("Type", s:gui09, "", s:cterm09, "", "none") call <SID>hi("Typedef", s:gui0A, "", s:cterm0A, "", "") " Spelling Highlighting -call <SID>hi("SpellBad", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellLocal", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellCap", "", "NONE", "", "NONE", "undercurl") -call <SID>hi("SpellRare", "", "NONE", "", "NONE", "undercurl") +call <SID>hi("SpellBad", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellLocal", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellCap", "", s:gui00, "", s:cterm00, "undercurl") +call <SID>hi("SpellRare", "", s:gui00, "", s:cterm00, "undercurl") " Additional Diff Highlighting call <SID>hi("DiffAdd", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "") |