From 85c0cbed3520ddb102d428497f4fbcf177831eb9 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Fri, 2 Jun 2023 22:32:01 +0200 Subject: [PATCH] Avoid generating ctermul attributes. --- colors/solarized8.vim | 178 +++++++++++------------- colors/solarized8_flat.vim | 100 ++++++------- colors/solarized8_high.vim | 51 ++++--- colors/solarized8_low.vim | 59 ++++---- templates/_extra.colortemplate | 15 +- templates/solarized8.colortemplate | 95 ++++++------- templates/solarized8_flat.colortemplate | 41 +++--- templates/solarized8_high.colortemplate | 2 +- templates/solarized8_low.colortemplate | 4 +- 9 files changed, 253 insertions(+), 292 deletions(-) diff --git a/colors/solarized8.vim b/colors/solarized8.vim index 5e905f5..a389848 100644 --- a/colors/solarized8.vim +++ b/colors/solarized8.vim @@ -4,18 +4,19 @@ " Maintainers: Lifepillar " URLs: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Fri Jun 2 13:13:22 2023 +" Last Updated: Fri Jun 2 22:29:27 2023 " Generated by Colortemplate v3.0.0-alpha0 hi clear let g:colors_name = 'solarized8' - let hs_highlight_boolean=1 let hs_highlight_delimiters=1 if &background == 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -29,8 +30,6 @@ if &background == 'dark' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -81,10 +80,10 @@ if &background == 'dark' hi CursorIM guifg=NONE guibg=fg guisp=NONE gui=NONE hi CursorLine guifg=NONE guibg=#073642 guisp=NONE gui=NONE hi CursorLineNr guifg=#839496 guibg=#073642 guisp=NONE gui=bold - hi DiffAdd guifg=#859900 guibg=#073642 guisp=#859900 gui=NONE - hi DiffChange guifg=#b58900 guibg=#073642 guisp=#b58900 gui=NONE + hi DiffAdd guifg=#859900 guibg=#073642 guisp=NONE gui=NONE + hi DiffChange guifg=#b58900 guibg=#073642 guisp=NONE gui=NONE hi DiffDelete guifg=#dc322f guibg=#073642 guisp=NONE gui=bold - hi DiffText guifg=#268bd2 guibg=#073642 guisp=#268bd2 gui=NONE + hi DiffText guifg=#268bd2 guibg=#073642 guisp=NONE gui=NONE hi Directory guifg=#268bd2 guibg=NONE guisp=NONE gui=NONE hi EndOfBuffer guifg=NONE guibg=NONE guisp=NONE gui=NONE hi Error guifg=#dc322f guibg=#fdf6e3 guisp=NONE gui=bold,reverse @@ -112,10 +111,10 @@ if &background == 'dark' hi SignColumn guifg=#839496 guibg=NONE guisp=NONE gui=NONE hi Special guifg=#cb4b16 guibg=NONE guisp=NONE gui=NONE hi SpecialKey guifg=#657b83 guibg=#073642 guisp=NONE gui=bold - hi SpellBad guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellCap guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellLocal guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl - hi SpellRare guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl + hi SpellBad guifg=#6c71c4 guibg=NONE guisp=NONE gui=underline + hi SpellCap guifg=#6c71c4 guibg=NONE guisp=NONE gui=underline + hi SpellLocal guifg=#b58900 guibg=NONE guisp=NONE gui=underline + hi SpellRare guifg=#2aa198 guibg=NONE guisp=NONE gui=underline hi Statement guifg=#859900 guibg=NONE guisp=NONE gui=NONE hi StatusLine guifg=#839496 guibg=#073642 guisp=NONE gui=reverse hi StatusLineNC guifg=#586e75 guibg=#073642 guisp=NONE gui=reverse @@ -138,6 +137,13 @@ if &background == 'dark' hi WildMenu guifg=#eee8d5 guibg=#073642 guisp=NONE gui=reverse if has('gui_running') + hi DiffAdd guisp=#859900 gui=NONE + hi DiffChange guisp=#b58900 gui=NONE + hi DiffText guisp=#268bd2 gui=NONE + hi SpellBad guisp=#6c71c4 gui=undercurl + hi SpellCap guisp=#6c71c4 gui=undercurl + hi SpellLocal guisp=#b58900 gui=undercurl + hi SpellRare guisp=#2aa198 gui=undercurl if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse @@ -405,18 +411,14 @@ if &background == 'dark' if s:visibility == "high" hi NonText guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold hi SpecialKey guifg=#cb4b16 guibg=NONE guisp=NONE gui=reverse - hi SpellBad guifg=#6c71c4 guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl - hi SpellCap guifg=#6c71c4 guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl - hi SpellLocal guifg=#b58900 guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl - hi SpellRare guifg=#2aa198 guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl + hi SpellBad guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl + hi SpellCap guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl + hi SpellLocal guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl + hi SpellRare guibg=#fdf6e3 guisp=#dc322f gui=reverse,undercurl hi Title guifg=#b58900 guibg=NONE guisp=NONE gui=bold elseif s:visibility == "low" hi NonText guifg=#073642 guibg=NONE guisp=NONE gui=bold hi SpecialKey guifg=#073642 guibg=NONE guisp=NONE gui=reverse - hi SpellBad guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellCap guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellLocal guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl - hi SpellRare guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl hi Title guifg=#586e75 guibg=NONE guisp=NONE gui=bold endif endif @@ -497,12 +499,12 @@ if &background == 'dark' hi DiffAdd ctermfg=106 ctermbg=NONE cterm=NONE hi DiffChange ctermfg=136 ctermbg=NONE cterm=NONE hi DiffDelete ctermfg=160 ctermbg=NONE cterm=bold - hi DiffText ctermfg=32 ctermbg=NONE ctermul=32 cterm=NONE + hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -510,7 +512,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -598,13 +600,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=242 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=66 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=242 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkTitleDelim ctermfg=242 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=66 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -763,18 +765,15 @@ if &background == 'dark' if s:visibility == "high" hi NonText ctermfg=166 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=166 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=61 ctermbg=230 cterm=reverse,underline - hi SpellCap ctermfg=61 ctermbg=230 cterm=reverse,underline - hi SpellLocal ctermfg=136 ctermbg=230 cterm=reverse,underline - hi SpellRare ctermfg=37 ctermbg=230 cterm=reverse,underline + hi SpellBad ctermbg=230 cterm=reverse,underline + hi SpellCap ctermbg=230 cterm=reverse,underline + hi SpellLocal ctermbg=230 cterm=reverse,underline + hi SpellRare ctermbg=230 cterm=reverse,underline hi Title ctermfg=136 ctermbg=NONE cterm=bold elseif s:visibility == "low" hi NonText ctermfg=236 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=236 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=61 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=61 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=136 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline + hi SpellCap cterm=underline hi Title ctermfg=242 ctermbg=NONE cterm=bold endif unlet s:italics @@ -868,12 +867,12 @@ if &background == 'dark' hi DiffAdd ctermfg=2 ctermbg=NONE cterm=NONE hi DiffChange ctermfg=3 ctermbg=NONE cterm=NONE hi DiffDelete ctermfg=1 ctermbg=NONE cterm=bold - hi DiffText ctermfg=4 ctermbg=NONE ctermul=4 cterm=NONE + hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -881,7 +880,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -969,13 +968,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=10 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=11 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=10 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkTitleDelim ctermfg=10 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=11 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE @@ -1134,18 +1133,15 @@ if &background == 'dark' if s:visibility == "high" hi NonText ctermfg=9 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=9 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=13 ctermbg=15 cterm=reverse,underline - hi SpellCap ctermfg=13 ctermbg=15 cterm=reverse,underline - hi SpellLocal ctermfg=3 ctermbg=15 cterm=reverse,underline - hi SpellRare ctermfg=6 ctermbg=15 cterm=reverse,underline + hi SpellBad ctermbg=15 cterm=reverse,underline + hi SpellCap ctermbg=15 cterm=reverse,underline + hi SpellLocal ctermbg=15 cterm=reverse,underline + hi SpellRare ctermbg=15 cterm=reverse,underline hi Title ctermfg=3 ctermbg=NONE cterm=bold elseif s:visibility == "low" hi NonText ctermfg=0 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=13 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=13 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=3 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline + hi SpellCap cterm=underline hi Title ctermfg=10 ctermbg=NONE cterm=bold endif unlet s:italics @@ -1301,6 +1297,8 @@ if &background == 'dark' endif if &background == 'light' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -1314,8 +1312,6 @@ if &background == 'light' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -1397,10 +1393,10 @@ if &background == 'light' hi SignColumn guifg=#657b83 guibg=NONE guisp=NONE gui=NONE hi Special guifg=#cb4b16 guibg=NONE guisp=NONE gui=NONE hi SpecialKey guifg=#839496 guibg=#eee8d5 guisp=NONE gui=bold - hi SpellBad guifg=#d33682 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellCap guifg=#d33682 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellLocal guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl - hi SpellRare guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl + hi SpellBad guifg=#d33682 guibg=NONE guisp=NONE gui=underline + hi SpellCap guifg=#d33682 guibg=NONE guisp=NONE gui=underline + hi SpellLocal guifg=#b58900 guibg=NONE guisp=NONE gui=underline + hi SpellRare guifg=#2aa198 guibg=NONE guisp=NONE gui=underline hi Statement guifg=#859900 guibg=NONE guisp=NONE gui=NONE hi StatusLine guifg=#586e75 guibg=#eee8d5 guisp=NONE gui=reverse hi StatusLineNC guifg=#839496 guibg=#eee8d5 guisp=NONE gui=reverse @@ -1423,6 +1419,10 @@ if &background == 'light' hi WildMenu guifg=#073642 guibg=#eee8d5 guisp=NONE gui=reverse if has('gui_running') + hi SpellBad guisp=#6c71c4 gui=undercurl + hi SpellCap guisp=#6c71c4 gui=undercurl + hi SpellLocal guisp=#b58900 gui=undercurl + hi SpellRare guisp=#2aa198 gui=undercurl if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse @@ -1701,19 +1701,15 @@ if &background == 'light' hi MatchParen guifg=#fdf6e3 guibg=#839496 guisp=NONE gui=bold hi NonText guifg=#dc322f guibg=NONE guisp=NONE gui=bold hi SpecialKey guifg=#dc322f guibg=NONE guisp=NONE gui=reverse - hi SpellBad guifg=#d33682 guibg=#fdf6e3 guisp=#6c71c4 gui=reverse,undercurl - hi SpellCap guifg=#d33682 guibg=#fdf6e3 guisp=#6c71c4 gui=reverse,undercurl - hi SpellLocal guifg=#b58900 guibg=#fdf6e3 guisp=#cb4b16 gui=reverse,undercurl - hi SpellRare guifg=#2aa198 guibg=#fdf6e3 guisp=#cb4b16 gui=reverse,undercurl + hi SpellBad guibg=#fdf6e3 guisp=#6c71c4 gui=reverse,undercurl + hi SpellCap guibg=#fdf6e3 guisp=#6c71c4 gui=reverse,undercurl + hi SpellLocal guibg=#fdf6e3 guisp=#cb4b16 gui=reverse,undercurl + hi SpellRare guibg=#fdf6e3 guisp=#cb4b16 gui=reverse,undercurl hi Title guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold elseif s:visibility == "low" hi MatchParen guifg=#dc322f guibg=#eee8d5 guisp=NONE gui=bold,underline hi NonText guifg=#eee8d5 guibg=NONE guisp=NONE gui=bold hi SpecialKey guifg=#eee8d5 guibg=NONE guisp=NONE gui=bold - hi SpellBad guifg=#d33682 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellCap guifg=#d33682 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellLocal guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl - hi SpellRare guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl hi Title guifg=#93a1a1 guibg=NONE guisp=NONE gui=bold endif endif @@ -1761,10 +1757,10 @@ if &background == 'light' hi SignColumn ctermfg=66 ctermbg=NONE cterm=NONE hi Special ctermfg=166 ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=246 ctermbg=254 cterm=bold - hi SpellBad ctermfg=162 ctermbg=NONE ctermul=61 cterm=underline - hi SpellCap ctermfg=162 ctermbg=NONE ctermul=61 cterm=underline - hi SpellLocal ctermfg=136 ctermbg=NONE ctermul=136 cterm=underline - hi SpellRare ctermfg=37 ctermbg=NONE ctermul=37 cterm=underline + hi SpellBad ctermfg=162 ctermbg=NONE cterm=underline + hi SpellCap ctermfg=162 ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=136 ctermbg=NONE cterm=underline + hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline hi Statement ctermfg=106 ctermbg=NONE cterm=NONE hi StatusLine ctermfg=242 ctermbg=254 cterm=reverse hi StatusLineNC ctermfg=246 ctermbg=254 cterm=reverse @@ -1797,9 +1793,9 @@ if &background == 'light' hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -1807,7 +1803,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -1895,13 +1891,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=246 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=246 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -2071,19 +2067,15 @@ if &background == 'light' hi MatchParen ctermfg=230 ctermbg=246 cterm=bold hi NonText ctermfg=160 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=160 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=162 ctermbg=230 ctermul=61 cterm=reverse,underline - hi SpellCap ctermfg=162 ctermbg=230 ctermul=61 cterm=reverse,underline - hi SpellLocal ctermfg=136 ctermbg=230 ctermul=166 cterm=reverse,underline - hi SpellRare ctermfg=37 ctermbg=230 ctermul=166 cterm=reverse,underline + hi SpellBad ctermbg=230 cterm=reverse,underline + hi SpellCap ctermbg=230 cterm=reverse,underline + hi SpellLocal ctermbg=230 cterm=reverse,underline + hi SpellRare ctermbg=230 cterm=reverse,underline hi Title ctermfg=166 ctermbg=NONE cterm=bold elseif s:visibility == "low" hi MatchParen ctermfg=160 ctermbg=254 cterm=bold,underline hi NonText ctermfg=254 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=254 ctermbg=NONE cterm=bold - hi SpellBad ctermfg=162 ctermbg=NONE ctermul=61 cterm=underline - hi SpellCap ctermfg=162 ctermbg=NONE ctermul=61 cterm=underline - hi SpellLocal ctermfg=136 ctermbg=NONE ctermul=136 cterm=underline - hi SpellRare ctermfg=37 ctermbg=NONE ctermul=37 cterm=underline hi Title ctermfg=247 ctermbg=NONE cterm=bold endif unlet s:italics @@ -2144,10 +2136,10 @@ if &background == 'light' hi SignColumn ctermfg=11 ctermbg=NONE cterm=NONE hi Special ctermfg=9 ctermbg=NONE cterm=NONE hi SpecialKey ctermfg=12 ctermbg=7 cterm=bold - hi SpellBad ctermfg=5 ctermbg=NONE ctermul=13 cterm=underline - hi SpellCap ctermfg=5 ctermbg=NONE ctermul=13 cterm=underline - hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=underline + hi SpellBad ctermfg=5 ctermbg=NONE cterm=underline + hi SpellCap ctermfg=5 ctermbg=NONE cterm=underline + hi SpellLocal ctermfg=3 ctermbg=NONE cterm=underline + hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline hi Statement ctermfg=2 ctermbg=NONE cterm=NONE hi StatusLine ctermfg=10 ctermbg=7 cterm=reverse hi StatusLineNC ctermfg=12 ctermbg=7 cterm=reverse @@ -2180,9 +2172,9 @@ if &background == 'light' hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -2190,7 +2182,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -2278,13 +2270,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=12 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=12 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE @@ -2454,19 +2446,15 @@ if &background == 'light' hi MatchParen ctermfg=15 ctermbg=12 cterm=bold hi NonText ctermfg=1 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=1 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=5 ctermbg=15 ctermul=13 cterm=reverse,underline - hi SpellCap ctermfg=5 ctermbg=15 ctermul=13 cterm=reverse,underline - hi SpellLocal ctermfg=3 ctermbg=15 ctermul=9 cterm=reverse,underline - hi SpellRare ctermfg=6 ctermbg=15 ctermul=9 cterm=reverse,underline + hi SpellBad ctermbg=15 cterm=reverse,underline + hi SpellCap ctermbg=15 cterm=reverse,underline + hi SpellLocal ctermbg=15 cterm=reverse,underline + hi SpellRare ctermbg=15 cterm=reverse,underline hi Title ctermfg=9 ctermbg=NONE cterm=bold elseif s:visibility == "low" hi MatchParen ctermfg=1 ctermbg=7 cterm=bold,underline hi NonText ctermfg=7 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=7 ctermbg=NONE cterm=bold - hi SpellBad ctermfg=5 ctermbg=NONE ctermul=13 cterm=underline - hi SpellCap ctermfg=5 ctermbg=NONE ctermul=13 cterm=underline - hi SpellLocal ctermfg=3 ctermbg=NONE ctermul=3 cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE ctermul=6 cterm=underline hi Title ctermfg=14 ctermbg=NONE cterm=bold endif unlet s:italics diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim index 2e74c26..3fb0514 100644 --- a/colors/solarized8_flat.vim +++ b/colors/solarized8_flat.vim @@ -4,18 +4,19 @@ " Maintainers: Lifepillar " URLs: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Fri Jun 2 13:13:23 2023 +" Last Updated: Fri Jun 2 22:29:27 2023 " Generated by Colortemplate v3.0.0-alpha0 hi clear let g:colors_name = 'solarized8_flat' - let hs_highlight_boolean=1 let hs_highlight_delimiters=1 if &background == 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -29,8 +30,6 @@ if &background == 'dark' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -112,10 +111,10 @@ if &background == 'dark' hi SignColumn guifg=#839496 guibg=NONE guisp=NONE gui=NONE hi Special guifg=#cb4b16 guibg=NONE guisp=NONE gui=NONE hi SpecialKey guifg=#657b83 guibg=#073642 guisp=NONE gui=bold - hi SpellBad guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellCap guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellLocal guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl - hi SpellRare guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl + hi SpellBad guifg=#6c71c4 guibg=NONE guisp=NONE gui=underline + hi SpellCap guifg=#6c71c4 guibg=NONE guisp=NONE gui=underline + hi SpellLocal guifg=#b58900 guibg=NONE guisp=NONE gui=underline + hi SpellRare guifg=#2aa198 guibg=NONE guisp=NONE gui=underline hi Statement guifg=#859900 guibg=NONE guisp=NONE gui=NONE hi StatusLine guifg=#073642 guibg=#eee8d5 guisp=NONE gui=reverse hi StatusLineNC guifg=#073642 guibg=#93a1a1 guisp=NONE gui=reverse @@ -138,6 +137,10 @@ if &background == 'dark' hi WildMenu guifg=#657b83 guibg=#eee8d5 guisp=NONE gui=reverse if has('gui_running') + hi SpellBad guisp=#6c71c4 gui=undercurl + hi SpellCap guisp=#6c71c4 gui=undercurl + hi SpellLocal guisp=#b58900 gui=undercurl + hi SpellRare guisp=#2aa198 gui=undercurl if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse @@ -381,19 +384,16 @@ if &background == 'dark' hi CursorLineNr guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold hi NonText guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold hi SpecialKey guifg=#cb4b16 guibg=NONE guisp=NONE gui=reverse - hi SpellBad guifg=#6c71c4 guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl - hi SpellCap guifg=#6c71c4 guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl - hi SpellLocal guifg=#b58900 guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl - hi SpellRare guifg=#2aa198 guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl + hi SpellBad guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl + hi SpellCap guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl + hi SpellLocal guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl + hi SpellRare guibg=#eee8d5 guisp=#dc322f gui=reverse,undercurl hi Title guifg=#b58900 guibg=NONE guisp=NONE gui=bold elseif s:visibility == "low" hi CursorLineNr guifg=#586e75 guibg=NONE guisp=NONE gui=bold hi NonText guifg=#073642 guibg=NONE guisp=NONE gui=bold hi SpecialKey guifg=#073642 guibg=NONE guisp=NONE gui=reverse - hi SpellBad guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellCap guifg=#6c71c4 guibg=NONE guisp=#6c71c4 gui=undercurl - hi SpellLocal guifg=#b58900 guibg=NONE guisp=#b58900 gui=undercurl - hi SpellRare guifg=#2aa198 guibg=NONE guisp=#2aa198 gui=undercurl + hi SpellCap guibg=NONE guisp=#6c71c4 gui=undercurl hi Title guifg=#586e75 guibg=NONE guisp=NONE gui=bold endif endif @@ -477,9 +477,9 @@ if &background == 'dark' hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -487,7 +487,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -575,13 +575,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=242 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=66 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=242 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkTitleDelim ctermfg=242 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=66 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -715,19 +715,15 @@ if &background == 'dark' hi CursorLineNr ctermfg=166 ctermbg=NONE cterm=bold hi NonText ctermfg=166 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=166 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=61 ctermbg=254 cterm=reverse,underline - hi SpellCap ctermfg=61 ctermbg=254 cterm=reverse,underline - hi SpellLocal ctermfg=136 ctermbg=254 cterm=reverse,underline - hi SpellRare ctermfg=37 ctermbg=254 cterm=reverse,underline + hi SpellBad ctermbg=254 cterm=reverse,underline + hi SpellCap ctermbg=254 cterm=reverse,underline + hi SpellLocal ctermbg=254 cterm=reverse,underline + hi SpellRare ctermbg=254 cterm=reverse,underline hi Title ctermfg=136 ctermbg=NONE cterm=bold elseif s:visibility == "low" hi CursorLineNr ctermfg=242 ctermbg=NONE cterm=bold hi NonText ctermfg=236 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=236 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=61 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=61 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=136 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline hi Title ctermfg=242 ctermbg=NONE cterm=bold endif unlet s:italics @@ -824,9 +820,9 @@ if &background == 'dark' hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -834,7 +830,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -922,13 +918,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=10 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=11 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=10 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkTitleDelim ctermfg=10 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=11 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE @@ -1062,19 +1058,15 @@ if &background == 'dark' hi CursorLineNr ctermfg=9 ctermbg=NONE cterm=bold hi NonText ctermfg=9 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=9 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=13 ctermbg=7 cterm=reverse,underline - hi SpellCap ctermfg=13 ctermbg=7 cterm=reverse,underline - hi SpellLocal ctermfg=3 ctermbg=7 cterm=reverse,underline - hi SpellRare ctermfg=6 ctermbg=7 cterm=reverse,underline + hi SpellBad ctermbg=7 cterm=reverse,underline + hi SpellCap ctermbg=7 cterm=reverse,underline + hi SpellLocal ctermbg=7 cterm=reverse,underline + hi SpellRare ctermbg=7 cterm=reverse,underline hi Title ctermfg=3 ctermbg=NONE cterm=bold elseif s:visibility == "low" hi CursorLineNr ctermfg=10 ctermbg=NONE cterm=bold hi NonText ctermfg=0 ctermbg=NONE cterm=bold hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse - hi SpellBad ctermfg=13 ctermbg=NONE cterm=underline - hi SpellCap ctermfg=13 ctermbg=NONE cterm=underline - hi SpellLocal ctermfg=3 ctermbg=NONE cterm=underline - hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline hi Title ctermfg=10 ctermbg=NONE cterm=bold endif unlet s:italics @@ -1207,6 +1199,8 @@ if &background == 'dark' endif if &background == 'light' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -1220,8 +1214,6 @@ if &background == 'light' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -1677,9 +1669,9 @@ if &background == 'light' hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -1687,7 +1679,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -1775,13 +1767,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=246 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=246 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -2033,9 +2025,9 @@ if &background == 'light' hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -2043,7 +2035,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -2131,13 +2123,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=12 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=12 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim index 22b912c..d92923b 100644 --- a/colors/solarized8_high.vim +++ b/colors/solarized8_high.vim @@ -4,18 +4,19 @@ " Maintainers: Lifepillar " URLs: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Fri Jun 2 13:13:23 2023 +" Last Updated: Fri Jun 2 22:29:28 2023 " Generated by Colortemplate v3.0.0-alpha0 hi clear let g:colors_name = 'solarized8_high' - let hs_highlight_boolean=1 let hs_highlight_delimiters=1 if &background == 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#fdf6e3', '#002b36', '#cb4b16', '#657b83', '#839496', '#93a1a1', '#6c71c4', '#eee8d5', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -29,8 +30,6 @@ if &background == 'dark' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#fdf6e3', '#002b36', '#cb4b16', '#657b83', '#839496', '#93a1a1', '#6c71c4', '#eee8d5', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -492,9 +491,9 @@ if &background == 'dark' hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -502,7 +501,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -590,13 +589,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=243 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=246 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=243 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkTitleDelim ctermfg=243 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=246 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -854,9 +853,9 @@ if &background == 'dark' hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -864,7 +863,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -952,13 +951,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=11 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=12 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=11 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkTitleDelim ctermfg=11 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=12 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE @@ -1267,6 +1266,8 @@ if &background == 'dark' endif if &background == 'light' + let g:terminal_ansi_colors = ['#002b36', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#073642', '#586e75', '#657b83', '#6c71c4', '#93a1a1', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -1280,8 +1281,6 @@ if &background == 'light' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#002b36', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#073642', '#586e75', '#657b83', '#6c71c4', '#93a1a1', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -1755,9 +1754,9 @@ if &background == 'light' hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -1765,7 +1764,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -1853,13 +1852,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=66 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=66 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -2129,9 +2128,9 @@ if &background == 'light' hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -2139,7 +2138,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -2227,13 +2226,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=11 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=11 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim index 1c40f54..a581562 100644 --- a/colors/solarized8_low.vim +++ b/colors/solarized8_low.vim @@ -4,18 +4,19 @@ " Maintainers: Lifepillar " URLs: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Fri Jun 2 13:13:24 2023 +" Last Updated: Fri Jun 2 22:29:28 2023 " Generated by Colortemplate v3.0.0-alpha0 hi clear let g:colors_name = 'solarized8_low' - let hs_highlight_boolean=1 let hs_highlight_delimiters=1 if &background == 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -29,8 +30,6 @@ if &background == 'dark' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -485,12 +484,12 @@ if &background == 'dark' hi DiffAdd ctermfg=106 ctermbg=NONE cterm=NONE hi DiffChange ctermfg=136 ctermbg=NONE cterm=NONE hi DiffDelete ctermfg=160 ctermbg=NONE cterm=bold - hi DiffText ctermfg=32 ctermbg=NONE ctermul=32 cterm=NONE + hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -498,7 +497,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -586,13 +585,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=242 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=66 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=242 ctermbg=NONE ctermul=66 cterm=NONE + hi pandocLinkTitleDelim ctermfg=242 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=66 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -847,12 +846,12 @@ if &background == 'dark' hi DiffAdd ctermfg=2 ctermbg=NONE cterm=NONE hi DiffChange ctermfg=3 ctermbg=NONE cterm=NONE hi DiffDelete ctermfg=1 ctermbg=NONE cterm=bold - hi DiffText ctermfg=4 ctermbg=NONE ctermul=4 cterm=NONE + hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -860,7 +859,7 @@ if &background == 'dark' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -948,13 +947,13 @@ if &background == 'dark' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=10 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=11 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=10 ctermbg=NONE ctermul=11 cterm=NONE + hi pandocLinkTitleDelim ctermfg=10 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=11 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE @@ -1262,6 +1261,8 @@ if &background == 'dark' endif if &background == 'light' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] + let s:italics = get(g:, 'solarized_italics', 1) && ((&t_ZH != '' && &t_ZH != '') || has('gui_running') || has('nvim')) let s:termtrans = get(g:, 'solarized_termtrans', 0) && !has('gui_running') let s:visibility = get(g:, 'solarized_visibility', 'normal') @@ -1275,8 +1276,6 @@ if &background == 'light' let s:extra_stl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') let s:extra_stl_hl = get(g:, 'solarized_extra_hi_groups', 1) + 2 * (get(g:, 'solarized_statusline', '') == 'flat') + 4 * get(g:, 'ale_sign_highlight_linenrs', '') - let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] - hi! link Boolean Constant hi! link Character Constant hi! link Conditional Statement @@ -1746,12 +1745,12 @@ if &background == 'light' hi DiffAdd ctermfg=106 ctermbg=NONE cterm=NONE hi DiffChange ctermfg=136 ctermbg=NONE cterm=NONE hi DiffDelete ctermfg=160 ctermbg=NONE cterm=bold - hi DiffText ctermfg=32 ctermbg=NONE ctermul=32 cterm=NONE + hi DiffText ctermfg=32 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=160 ctermbg=NONE ctermul=160 cterm=undercurl + hi ALEError ctermfg=160 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=37 ctermbg=NONE ctermul=37 cterm=undercurl + hi ALEInfo ctermfg=37 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -1759,7 +1758,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=136 ctermbg=NONE ctermul=136 cterm=undercurl + hi ALEWarning ctermfg=136 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=136 ctermbg=NONE cterm=NONE hi VarId ctermfg=32 ctermbg=NONE cterm=NONE @@ -1847,13 +1846,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=166 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=61 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=37 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkDefinition ctermfg=37 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=32 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=32 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=246 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE ctermul=246 cterm=NONE + hi pandocLinkTitleDelim ctermfg=247 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=246 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=162 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=162 ctermbg=NONE cterm=NONE @@ -2121,12 +2120,12 @@ if &background == 'light' hi DiffAdd ctermfg=2 ctermbg=NONE cterm=NONE hi DiffChange ctermfg=3 ctermbg=NONE cterm=NONE hi DiffDelete ctermfg=1 ctermbg=NONE cterm=bold - hi DiffText ctermfg=4 ctermbg=NONE ctermul=4 cterm=NONE + hi DiffText ctermfg=4 ctermbg=NONE cterm=NONE endif if s:extra == 1 - hi ALEError ctermfg=1 ctermbg=NONE ctermul=1 cterm=undercurl + hi ALEError ctermfg=1 ctermbg=NONE cterm=underline hi ALEErrorLine ctermfg=NONE ctermbg=NONE cterm=NONE - hi ALEInfo ctermfg=6 ctermbg=NONE ctermul=6 cterm=undercurl + hi ALEInfo ctermfg=6 ctermbg=NONE cterm=underline hi ALEInfoLine ctermfg=NONE ctermbg=NONE cterm=NONE hi! link ALEStyleError ALEError hi! link ALEStyleErrorSign ALEErrorSign @@ -2134,7 +2133,7 @@ if &background == 'light' hi! link ALEStyleWarning ALEWarning hi! link ALEStyleWarningSign ALEWarningSign hi! link ALEStyleWarningSignLineNr ALEWarningSignLineNr - hi ALEWarning ctermfg=3 ctermbg=NONE ctermul=3 cterm=undercurl + hi ALEWarning ctermfg=3 ctermbg=NONE cterm=underline hi ALEWarningLine ctermfg=NONE ctermbg=NONE cterm=NONE hi ConId ctermfg=3 ctermbg=NONE cterm=NONE hi VarId ctermfg=4 ctermbg=NONE cterm=NONE @@ -2222,13 +2221,13 @@ if &background == 'light' hi pandocHeadingMarker ctermfg=9 ctermbg=NONE cterm=bold hi pandocImageCaption ctermfg=13 ctermbg=NONE cterm=bold hi! link pandocLineBreak pandocEscapePair - hi pandocLinkDefinition ctermfg=6 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkDefinition ctermfg=6 ctermbg=NONE cterm=NONE hi pandocLinkDefinitionID ctermfg=4 ctermbg=NONE cterm=bold hi pandocLinkDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkLabel ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkText ctermfg=4 ctermbg=NONE cterm=NONE hi pandocLinkTitle ctermfg=12 ctermbg=NONE cterm=NONE - hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE ctermul=12 cterm=NONE + hi pandocLinkTitleDelim ctermfg=14 ctermbg=NONE cterm=NONE hi pandocLinkURL ctermfg=12 ctermbg=NONE cterm=NONE hi pandocListMarker ctermfg=5 ctermbg=NONE cterm=NONE hi pandocListReference ctermfg=5 ctermbg=NONE cterm=NONE diff --git a/templates/_extra.colortemplate b/templates/_extra.colortemplate index 04c5b42..ffc3c9a 100644 --- a/templates/_extra.colortemplate +++ b/templates/_extra.colortemplate @@ -363,8 +363,10 @@ pandocLinkLabel /gui/256/16 +extra 1 blue no pandocLinkText /gui/256/16 +extra 1 blue none pandocLinkURL /gui/256/16 +extra 1 base00 none pandocLinkTitle /gui/256/16 +extra 1 base00 none -pandocLinkTitleDelim /gui/256/16 +extra 1 base01 none s=base00 -pandocLinkDefinition /gui/256/16 +extra 1 cyan none s=base00 +pandocLinkTitleDelim /256/16 +extra 1 base01 none +pandocLinkTitleDelim /gui +extra 1 base01 none s=base00 +pandocLinkDefinition /256/16 +extra 1 cyan none +pandocLinkDefinition /gui +extra 1 cyan none s=base00 pandocLinkDefinitionID /gui/256/16 +extra 1 blue none bold pandocImageCaption /gui/256/16 +extra 1 violet none bold pandocFootnoteLink /gui/256/16 +extra 1 green none @@ -442,11 +444,14 @@ ALEErrorSign /gui/256/16 +extra_stl_hl 5 base02 red ALEInfoSign /gui/256/16 +extra_stl_hl 5 base02 cyan bold ALEWarningSign /gui/256/16 +extra_stl_hl 5 base02 yellow bold -ALEError /gui/256/16 +extra 1 red none s=red undercurl +ALEError /256/16 +extra 1 red none underline +ALEError /gui +extra 1 red none s=red undercurl ALEErrorLine /gui/256/16 +extra 1 none none -ALEInfo /gui/256/16 +extra 1 cyan none s=cyan undercurl +ALEInfo /256/16 +extra 1 cyan none underline +ALEInfo /gui +extra 1 cyan none s=cyan undercurl ALEInfoLine /gui/256/16 +extra 1 none none -ALEWarning /gui/256/16 +extra 1 yellow none s=yellow undercurl +ALEWarning /256/16 +extra 1 yellow none underline +ALEWarning /gui +extra 1 yellow none s=yellow undercurl ALEWarningLine /gui/256/16 +extra 1 none none ALEStyleError /gui/256/16 +extra 1 -> ALEError diff --git a/templates/solarized8.colortemplate b/templates/solarized8.colortemplate index 6c58427..8f823c2 100644 --- a/templates/solarized8.colortemplate +++ b/templates/solarized8.colortemplate @@ -73,33 +73,26 @@ SpecialKey base00 base02 bold +visibility "high" orange none reverse "low" base02 none reverse -SpellBad violet none s=violet undercurl - /256/16 violet none s=none underline - +visibility "high" violet base3 s=none underline,reverse - "low" violet none s=none underline - /gui +visibility "high" violet base3 s=red undercurl,reverse - "low" violet none s=violet undercurl +SpellBad violet none underline + /256/16+visibility "high" omit base3 underline,reverse + /gui omit omit s=violet undercurl + +visibility "high" omit base3 s=red undercurl,reverse -SpellCap violet none s=violet undercurl - /256/16 violet none s=none underline - +visibility "high" violet base3 s=none underline,reverse - "low" violet none s=none underline - /gui +visibility "high" violet base3 s=red undercurl,reverse - "low" violet none s=violet undercurl +SpellCap violet none underline + /256/16+visibility "high" omit base3 underline,reverse + "low" omit omit underline + /gui omit omit s=violet undercurl + +visibility "high" omit base3 s=red undercurl,reverse -SpellLocal yellow none s=yellow undercurl - /256/16 yellow none s=none underline - +visibility "high" yellow base3 s=none underline,reverse - "low" yellow none s=none underline - /gui +visibility "high" yellow base3 s=red undercurl,reverse - "low" yellow none s=yellow undercurl +SpellLocal yellow none underline + /256/16+visibility "high" omit base3 underline,reverse + /gui omit omit s=yellow undercurl + +visibility "high" omit base3 s=red undercurl,reverse -SpellRare cyan none s=cyan undercurl - /256/16 cyan none s=none underline - +visibility "high" cyan base3 s=none underline,reverse - "low" cyan none s=none underline - /gui +visibility "high" cyan base3 s=red undercurl,reverse - "low" cyan none s=cyan undercurl +SpellRare cyan none underline + /256/16+visibility "high" omit base3 underline,reverse + /gui omit omit s=cyan undercurl + +visibility "high" omit base3 s=red undercurl,reverse Title orange none bold +visibility "high" yellow none bold @@ -110,13 +103,13 @@ Cursor base3 blue +oldcursor 1 base03 base0 ; }}} ; Diff mode (dark) {{{ -DiffAdd green base02 s=green - /256/16 green base02 s=none -DiffChange yellow base02 s=yellow - /256/16 yellow base02 s=none +DiffAdd green base02 + /gui omit omit s=green +DiffChange yellow base02 s=none + /gui omit omit s=yellow DiffDelete red base02 bold -DiffText blue base02 s=blue - /256/16 blue base02 s=none +DiffText blue base02 + /gui omit omit s=blue DiffAdd +diffmode "high" green none reverse DiffChange +diffmode "high" yellow none reverse @@ -129,7 +122,7 @@ DiffChange/gui +diffmode "low" yellow none s=yellow DiffChange/256/16+diffmode "low" yellow none s=none DiffDelete +diffmode "low" red none bold DiffText /gui +diffmode "low" blue none s=blue -DiffText /256/16+diffmode "low" blue none s=blue +DiffText /256/16+diffmode "low" blue none s=none ; }}} ; Structural elements (dark) {{{ StatusLine base0 base02 reverse @@ -267,33 +260,25 @@ Title orange none bold +visibility "high" orange none bold "low" base01 none bold -SpellBad magenta none s=violet undercurl - /256/16 magenta none s=violet underline - +visibility "high" magenta base03 s=violet underline,reverse - "low" magenta none s=violet underline - /gui +visibility "high" magenta base03 s=violet undercurl,reverse - "low" magenta none s=violet undercurl +SpellBad magenta none underline + /256/16+visibility "high" omit base03 underline,reverse + /gui omit omit s=violet undercurl + +visibility "high" omit base03 s=violet undercurl,reverse -SpellCap magenta none s=violet undercurl - /256/16 magenta none s=violet underline - +visibility "high" magenta base03 s=violet underline,reverse - +visibility "low" magenta none s=violet underline - /gui +visibility "high" magenta base03 s=violet undercurl,reverse - "low" magenta none s=violet undercurl +SpellCap magenta none underline + /256/16+visibility "high" omit base03 underline,reverse + /gui omit omit s=violet undercurl + +visibility "high" omit base03 s=violet undercurl,reverse -SpellLocal yellow none s=yellow undercurl - /256/16 yellow none s=yellow underline - +visibility "high" yellow base03 s=orange underline,reverse - "low" yellow none s=yellow underline - /gui +visibility "high" yellow base03 s=orange undercurl,reverse - "low" yellow none s=yellow undercurl +SpellLocal yellow none underline + /256/16+visibility "high" omit base03 underline,reverse + /gui omit omit s=yellow undercurl + +visibility "high" omit base03 s=orange undercurl,reverse -SpellRare cyan none s=cyan undercurl - /256/16 cyan none s=cyan underline - +visibility "high" cyan base03 s=orange underline,reverse - "low" cyan none s=cyan underline - /gui +visibility "high" cyan base03 s=orange undercurl,reverse - "low" cyan none s=cyan undercurl +SpellRare cyan none underline + /256/16+visibility "high" omit base03 underline,reverse + /gui omit omit s=cyan undercurl + +visibility "high" omit base03 s=orange undercurl,reverse CursorLineNr base0 base02 bold +transvis 2 red base02 bold diff --git a/templates/solarized8_flat.colortemplate b/templates/solarized8_flat.colortemplate index b02c52e..29d5be1 100644 --- a/templates/solarized8_flat.colortemplate +++ b/templates/solarized8_flat.colortemplate @@ -57,33 +57,26 @@ Title orange none bold +visibility "high" yellow none bold +visibility "low" base01 none bold -SpellBad violet none s=violet undercurl - /256/16 violet none s=none underline - +visibility "high" violet base2 s=none underline,reverse - "low" violet none s=none underline - /gui +visibility "high" violet base2 s=red undercurl,reverse - "low" violet none s=violet undercurl +SpellBad violet none underline + /256/16+visibility "high" omit base2 underline,reverse + /gui omit omit s=violet undercurl + +visibility "high" omit base2 s=red undercurl,reverse -SpellCap violet none s=violet undercurl - /256/16 violet none s=none underline - +visibility "high" violet base2 s=none underline,reverse - "low" violet none s=none underline - /gui +visibility "high" violet base2 s=red undercurl,reverse - "low" violet none s=violet undercurl +SpellCap violet none underline + /256/16+visibility "high" omit base2 underline,reverse + /gui omit omit s=violet undercurl + +visibility "high" omit base2 s=red undercurl,reverse + "low" omit none s=violet undercurl -SpellLocal yellow none s=yellow undercurl - /256/16 yellow none s=none underline - +visibility "high" yellow base2 s=none underline,reverse - "low" yellow none s=none underline - /gui +visibility "high" yellow base2 s=red undercurl,reverse - "low" yellow none s=yellow undercurl +SpellLocal yellow none underline + /256/16+visibility "high" omit base2 underline,reverse + /gui omit omit s=yellow undercurl + +visibility "high" omit base2 s=red undercurl,reverse -SpellRare cyan none s=cyan undercurl - /256/16 cyan none s=none underline - +visibility "high" cyan base2 s=none underline,reverse - "low" cyan none s=none underline - /gui +visibility "high" cyan base2 s=red undercurl,reverse - "low" cyan none s=cyan undercurl +SpellRare cyan none underline + /256/16+visibility "high" omit base2 underline,reverse + /gui omit omit s=cyan undercurl + /gui +visibility "high" omit base2 s=red undercurl,reverse CursorLineNr base0 none bold +visibility "high" orange none bold diff --git a/templates/solarized8_high.colortemplate b/templates/solarized8_high.colortemplate index bc8178b..93a0cd2 100644 --- a/templates/solarized8_high.colortemplate +++ b/templates/solarized8_high.colortemplate @@ -227,7 +227,7 @@ Include: _light_terminal.colortemplate Normal base1 back FoldColumn base0 base02 Folded base0 base02 s=base03 bold - /256/16 base0 base02 bold + /256/16 base0 base02 s=none bold LineNr base01 base02 Terminal fg back diff --git a/templates/solarized8_low.colortemplate b/templates/solarized8_low.colortemplate index 2ea0fb3..30ea390 100644 --- a/templates/solarized8_low.colortemplate +++ b/templates/solarized8_low.colortemplate @@ -121,7 +121,7 @@ DiffChange/gui +diffmode "low" yellow none s=yellow DiffChange/256/16+diffmode "low" yellow none s=none DiffDelete +diffmode "low" red none bold DiffText /gui +diffmode "low" blue none s=blue -DiffText /256/16+diffmode "low" blue none s=blue +DiffText /256/16+diffmode "low" blue none s=none ; }}} ; Structural elements (dark) {{{ StatusLine base0 base02 reverse @@ -315,7 +315,7 @@ DiffChange/gui +diffmode "low" yellow none s=yellow DiffChange/256/16+diffmode "low" yellow none s=none DiffDelete +diffmode "low" red none bold DiffText /gui +diffmode "low" blue none s=blue -DiffText /256/16+diffmode "low" blue none s=blue +DiffText /256/16+diffmode "low" blue none s=none ; }}} ; Structural elements (light) {{{ StatusLine base1 base02 reverse