From 19fd5a93162e1014e8ea8c0fedce26392e63f7ae Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Tue, 18 Nov 2025 18:37:29 +0100 Subject: [PATCH] Fix regression causing transparent backgrounds not working in tmux sometimes. Fix a regression causing `g:solarized_termtrans` not to be honored inside tmux when `termguicolors` is set. Fixes https://github.com/lifepillar/vim-solarized8/issues/118 --- colors/solarized8.vim | 125 +++++------------------ colors/solarized8_flat.vim | 123 ++++------------------- colors/solarized8_high.vim | 123 ++++------------------- colors/solarized8_low.vim | 127 +++++------------------- doc/solarized8.txt | 2 +- templates/solarized8.colortemplate | 24 ++--- templates/solarized8_flat.colortemplate | 20 ++-- templates/solarized8_high.colortemplate | 20 ++-- templates/solarized8_low.colortemplate | 28 +++--- 9 files changed, 137 insertions(+), 455 deletions(-) diff --git a/colors/solarized8.vim b/colors/solarized8.vim index a3a6981..5dea816 100644 --- a/colors/solarized8.vim +++ b/colors/solarized8.vim @@ -4,9 +4,9 @@ " Maintainer: Lifepillar " URL: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Change: 2025 Jun 02 +" Last Change: 2025 Nov 18 -" Generated by Colortemplate v3.0.0-beta5 +" Generated by Colortemplate v3.0.0-beta9 hi clear let g:colors_name = 'solarized8' @@ -15,6 +15,7 @@ let hs_highlight_boolean=1 let hs_highlight_delimiters=1 let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co) +let s:tgc = has('termguicolors') && &termguicolors hi! link Boolean Constant hi! link Character Constant @@ -144,7 +145,7 @@ if &background == 'dark' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#eee8d5 guibg=#073642 guisp=NONE gui=reverse ctermfg=254 ctermbg=236 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -393,6 +394,14 @@ if &background == 'dark' hi TabLineSel guifg=#839496 guibg=#fdf6e3 guisp=NONE gui=reverse cterm=reverse hi VertSplit guifg=#073642 guibg=#586e75 guisp=NONE gui=NONE cterm=NONE endif + if s:termtrans == 1 + hi Normal guifg=#93a1a1 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Folded guifg=fg guibg=NONE guisp=NONE gui=bold cterm=bold + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ToolbarButton guifg=#93a1a1 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:transvis == 1 hi CursorLineNr guifg=#839496 guibg=NONE guisp=NONE gui=bold cterm=bold hi LineNr guifg=#657b83 guibg=NONE guisp=NONE gui=NONE cterm=NONE @@ -424,7 +433,7 @@ if &background == 'dark' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -710,18 +719,6 @@ if &background == 'dark' hi SpecialKey ctermfg=236 ctermbg=NONE cterm=reverse hi Title ctermfg=242 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1079,18 +1076,6 @@ if &background == 'dark' hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse hi Title ctermfg=10 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1217,18 +1202,6 @@ if &background == 'dark' hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse hi Title ctermfg=10 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1244,18 +1217,6 @@ if &background == 'dark' if s:italics == 0 hi Comment term=NONE endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1347,7 +1308,7 @@ if &background == 'light' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#073642 guibg=#eee8d5 guisp=NONE gui=reverse ctermfg=236 ctermbg=254 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -1595,6 +1556,14 @@ if &background == 'light' hi VertSplit guifg=#586e75 guibg=#93a1a1 guisp=NONE gui=NONE cterm=NONE hi WildMenu guifg=#586e75 guibg=#fdf6e3 guisp=NONE gui=reverse cterm=reverse endif + if s:termtrans == 1 + hi Normal guifg=#586e75 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=#657b83 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Folded guifg=#657b83 guibg=NONE guisp=NONE gui=bold cterm=bold + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ToolbarButton guifg=#586e75 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:transvis == 1 hi CursorLineNr guifg=#657b83 guibg=NONE guisp=NONE gui=bold cterm=bold hi LineNr guifg=#839496 guibg=NONE guisp=NONE gui=NONE cterm=NONE @@ -1639,7 +1608,7 @@ if &background == 'light' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -1937,18 +1906,6 @@ if &background == 'light' hi SpecialKey ctermfg=254 ctermbg=NONE cterm=bold hi Title ctermfg=247 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2318,18 +2275,6 @@ if &background == 'light' hi SpecialKey ctermfg=7 ctermbg=NONE cterm=bold hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2468,18 +2413,6 @@ if &background == 'light' hi SpecialKey ctermfg=7 ctermbg=NONE cterm=bold hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2495,18 +2428,6 @@ if &background == 'light' if s:italics == 0 hi Comment term=NONE endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim index 857b248..626b9b1 100644 --- a/colors/solarized8_flat.vim +++ b/colors/solarized8_flat.vim @@ -4,9 +4,9 @@ " Maintainer: Lifepillar " URL: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Change: 2025 Jun 02 +" Last Change: 2025 Nov 18 -" Generated by Colortemplate v3.0.0-beta5 +" Generated by Colortemplate v3.0.0-beta9 hi clear let g:colors_name = 'solarized8_flat' @@ -15,6 +15,7 @@ let hs_highlight_boolean=1 let hs_highlight_delimiters=1 let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co) +let s:tgc = has('termguicolors') && &termguicolors hi! link Boolean Constant hi! link Character Constant @@ -144,7 +145,7 @@ if &background == 'dark' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#657b83 guibg=#eee8d5 guisp=NONE gui=reverse ctermfg=66 ctermbg=254 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -384,6 +385,13 @@ if &background == 'dark' hi StatusLineNC guifg=#073642 guibg=#586e75 guisp=NONE gui=reverse cterm=reverse hi TabLineSel guifg=#93a1a1 guibg=#073642 guisp=NONE gui=NONE cterm=NONE endif + if s:termtrans == 1 + hi Normal guifg=#839496 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ToolbarButton guifg=#93a1a1 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:visibility == "high" hi CursorLineNr guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold cterm=bold hi NonText guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold cterm=bold @@ -401,7 +409,7 @@ if &background == 'dark' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -663,18 +671,6 @@ if &background == 'dark' hi SpecialKey ctermfg=236 ctermbg=NONE cterm=reverse hi Title ctermfg=242 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1008,18 +1004,6 @@ if &background == 'dark' hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse hi Title ctermfg=10 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1123,18 +1107,6 @@ if &background == 'dark' hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse hi Title ctermfg=10 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1150,18 +1122,6 @@ if &background == 'dark' if s:italics == 0 hi Comment term=NONE endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1253,7 +1213,7 @@ if &background == 'light' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#93a1a1 guibg=#fdf6e3 guisp=NONE gui=reverse ctermfg=247 ctermbg=230 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -1490,6 +1450,13 @@ if &background == 'light' hi StatusLineNC guifg=#eee8d5 guibg=#93a1a1 guisp=NONE gui=reverse cterm=reverse hi TabLineSel guifg=#586e75 guibg=#eee8d5 guisp=NONE gui=NONE cterm=NONE endif + if s:termtrans == 1 + hi Normal guifg=#657b83 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi CursorLine guifg=NONE guibg=NONE guisp=NONE gui=underline cterm=underline + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ToolbarButton guifg=#586e75 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:viscurs == 1 hi Cursor guifg=#fdf6e3 guibg=#657b83 guisp=NONE gui=NONE cterm=NONE elseif s:viscurs == 2 @@ -1524,7 +1491,7 @@ if &background == 'light' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -1799,18 +1766,6 @@ if &background == 'light' hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline hi Title ctermfg=247 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2157,18 +2112,6 @@ if &background == 'light' hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2280,18 +2223,6 @@ if &background == 'light' hi SpecialKey ctermfg=7 ctermbg=NONE cterm=bold hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2307,18 +2238,6 @@ if &background == 'light' if s:italics == 0 hi Comment term=NONE endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim index 3493a4b..4163dc0 100644 --- a/colors/solarized8_high.vim +++ b/colors/solarized8_high.vim @@ -4,9 +4,9 @@ " Maintainer: Lifepillar " URL: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Change: 2025 Jun 02 +" Last Change: 2025 Nov 18 -" Generated by Colortemplate v3.0.0-beta5 +" Generated by Colortemplate v3.0.0-beta9 hi clear let g:colors_name = 'solarized8_high' @@ -15,6 +15,7 @@ let hs_highlight_boolean=1 let hs_highlight_delimiters=1 let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co) +let s:tgc = has('termguicolors') && &termguicolors hi! link Boolean Constant hi! link Character Constant @@ -144,7 +145,7 @@ if &background == 'dark' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#fdf6e3 guibg=#073642 guisp=NONE gui=reverse ctermfg=230 ctermbg=236 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -390,6 +391,13 @@ if &background == 'dark' hi TabLineSel guifg=#93a1a1 guibg=#fdf6e3 guisp=NONE gui=reverse cterm=reverse hi VertSplit guifg=#073642 guibg=#657b83 guisp=NONE gui=NONE cterm=NONE endif + if s:termtrans == 1 + hi Normal guifg=#eee8d5 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Folded guifg=fg guibg=NONE guisp=NONE gui=bold cterm=bold + hi LineNr guifg=#657b83 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:transvis == 1 hi CursorLineNr guifg=#93a1a1 guibg=NONE guisp=NONE gui=bold cterm=bold elseif s:transvis == 2 @@ -420,7 +428,7 @@ if &background == 'dark' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -701,18 +709,6 @@ if &background == 'dark' hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline hi Title ctermfg=243 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1065,18 +1061,6 @@ if &background == 'dark' hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline hi Title ctermfg=11 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1195,18 +1179,6 @@ if &background == 'dark' hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse hi Title ctermfg=11 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1219,18 +1191,6 @@ if &background == 'dark' hi TabPanel term=italic,reverse,underline hi TabPanelFill term=reverse,underline hi TabPanelSel term=bold - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1322,7 +1282,7 @@ if &background == 'light' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#657b83 guibg=#fdf6e3 guisp=NONE gui=reverse ctermfg=66 ctermbg=230 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -1567,6 +1527,13 @@ if &background == 'light' hi VertSplit guifg=#073642 guibg=#93a1a1 guisp=NONE gui=NONE cterm=NONE hi WildMenu guifg=#073642 guibg=#fdf6e3 guisp=NONE gui=reverse cterm=reverse endif + if s:termtrans == 1 + hi Normal guifg=#073642 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=#586e75 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Folded guifg=#586e75 guibg=NONE guisp=NONE gui=bold cterm=bold + hi LineNr guifg=#93a1a1 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:transvis == 1 hi CursorLineNr guifg=#586e75 guibg=NONE guisp=NONE gui=bold cterm=bold elseif s:transvis == 2 @@ -1606,7 +1573,7 @@ if &background == 'light' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -1895,18 +1862,6 @@ if &background == 'light' hi SpecialKey ctermfg=254 ctermbg=NONE cterm=bold hi Title ctermfg=247 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2267,18 +2222,6 @@ if &background == 'light' hi SpecialKey ctermfg=7 ctermbg=NONE cterm=bold hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2409,18 +2352,6 @@ if &background == 'light' hi SpecialKey ctermfg=7 ctermbg=NONE cterm=bold hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2433,18 +2364,6 @@ if &background == 'light' hi TabPanel term=italic,reverse,underline hi TabPanelFill term=reverse,underline hi TabPanelSel term=bold - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim index b605923..c1579f2 100644 --- a/colors/solarized8_low.vim +++ b/colors/solarized8_low.vim @@ -4,9 +4,9 @@ " Maintainer: Lifepillar " URL: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Change: 2025 Jun 02 +" Last Change: 2025 Nov 18 -" Generated by Colortemplate v3.0.0-beta5 +" Generated by Colortemplate v3.0.0-beta9 hi clear let g:colors_name = 'solarized8_low' @@ -15,6 +15,7 @@ let hs_highlight_boolean=1 let hs_highlight_delimiters=1 let s:t_Co = has('gui_running') ? 16777216 : str2nr(&t_Co) +let s:tgc = has('termguicolors') && &termguicolors hi! link Boolean Constant hi! link Character Constant @@ -144,7 +145,7 @@ if &background == 'dark' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#eee8d5 guibg=#073642 guisp=NONE gui=reverse ctermfg=254 ctermbg=239 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -389,6 +390,15 @@ if &background == 'dark' hi TabLineFill guifg=#586e75 guibg=#93a1a1 guisp=NONE gui=reverse cterm=reverse hi TabLineSel guifg=#586e75 guibg=#eee8d5 guisp=NONE gui=reverse cterm=reverse endif + if s:termtrans == 1 + hi Normal guifg=#839496 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Folded guifg=fg guibg=NONE guisp=NONE gui=bold cterm=bold + hi LineNr guifg=#586e75 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ToolbarButton guifg=#93a1a1 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:transvis == 1 hi CursorLineNr guifg=#839496 guibg=NONE guisp=NONE gui=bold cterm=bold elseif s:transvis == 2 @@ -415,7 +425,7 @@ if &background == 'dark' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -693,18 +703,6 @@ if &background == 'dark' hi SpecialKey ctermfg=239 ctermbg=NONE cterm=reverse hi Title ctermfg=242 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1054,18 +1052,6 @@ if &background == 'dark' hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse hi Title ctermfg=10 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1183,18 +1169,6 @@ if &background == 'dark' hi SpecialKey ctermfg=0 ctermbg=NONE cterm=reverse hi Title ctermfg=10 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1207,18 +1181,6 @@ if &background == 'dark' hi TabPanel term=italic,reverse,underline hi TabPanelFill term=reverse,underline hi TabPanelSel term=bold - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:oldcursor - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:visibility - unlet s:vismap finish endif @@ -1310,7 +1272,7 @@ if &background == 'light' hi WarningMsg guifg=#cb4b16 guibg=NONE guisp=NONE gui=bold ctermfg=166 ctermbg=NONE cterm=bold term=standout hi WildMenu guifg=#839496 guibg=#eee8d5 guisp=NONE gui=reverse ctermfg=246 ctermbg=254 cterm=reverse term=bold - if has('gui_running') || (has('termguicolors') && &termguicolors) + if has('gui_running') || s:tgc if s:diffmode == "high" hi DiffAdd guifg=#859900 guibg=NONE guisp=NONE gui=reverse cterm=reverse hi DiffChange guifg=#b58900 guibg=NONE guisp=NONE gui=reverse cterm=reverse @@ -1554,6 +1516,15 @@ if &background == 'light' hi TabLineSel guifg=#93a1a1 guibg=#eee8d5 guisp=NONE gui=reverse cterm=reverse hi WildMenu guifg=#657b83 guibg=#eee8d5 guisp=NONE gui=reverse cterm=reverse endif + if s:termtrans == 1 + hi Normal guifg=#657b83 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi FoldColumn guifg=#657b83 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Folded guifg=#657b83 guibg=NONE guisp=NONE gui=bold cterm=bold + hi LineNr guifg=#93a1a1 guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi Terminal guifg=fg guibg=NONE guisp=NONE gui=NONE cterm=NONE + hi ToolbarButton guifg=#586e75 guibg=NONE guisp=NONE gui=bold cterm=bold + hi ToolbarLine guifg=NONE guibg=NONE guisp=NONE gui=NONE cterm=NONE + endif if s:transvis == 1 hi CursorLineNr guifg=#657b83 guibg=NONE guisp=NONE gui=bold cterm=bold elseif s:transvis == 2 @@ -1597,7 +1568,7 @@ if &background == 'light' endif endif - if s:t_Co >= 256 + if s:tgc || s:t_Co >= 256 if s:diffmode == "high" hi DiffAdd ctermfg=106 ctermbg=NONE cterm=reverse hi DiffChange ctermfg=136 ctermbg=NONE cterm=reverse @@ -1891,18 +1862,6 @@ if &background == 'light' hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline hi Title ctermfg=247 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2268,18 +2227,6 @@ if &background == 'light' hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2409,18 +2356,6 @@ if &background == 'light' hi SpecialKey ctermfg=7 ctermbg=NONE cterm=bold hi Title ctermfg=14 ctermbg=NONE cterm=bold endif - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif @@ -2433,18 +2368,6 @@ if &background == 'light' hi TabPanel term=italic,reverse,underline hi TabPanelFill term=reverse,underline hi TabPanelSel term=bold - unlet s:diffmode - unlet s:extra - unlet s:extra_italic - unlet s:extra_stl - unlet s:extra_stl_hl - unlet s:italics - unlet s:stl - unlet s:termtrans - unlet s:transvis - unlet s:viscurs - unlet s:visibility - unlet s:vismap finish endif diff --git a/doc/solarized8.txt b/doc/solarized8.txt index 56bb206..e54a797 100644 --- a/doc/solarized8.txt +++ b/doc/solarized8.txt @@ -1,4 +1,4 @@ -*solarized8.txt* For Vim version 9 Last change: 2025 Jun 02 +*solarized8.txt* For Vim version 9 Last change: 2025 Nov 18 Solarized 8 color scheme diff --git a/templates/solarized8.colortemplate b/templates/solarized8.colortemplate index 5b26f2e..18ebd8d 100644 --- a/templates/solarized8.colortemplate +++ b/templates/solarized8.colortemplate @@ -44,12 +44,12 @@ Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 -Normal /256/16+termtrans 1 base1 none -FoldColumn /256/16+termtrans 1 fg none -Folded /256/16+termtrans 1 fg none bold -Terminal /256/16+termtrans 1 fg none -ToolbarButton/256/16+termtrans 1 base1 none bold -ToolbarLine /256/16+termtrans 1 none none +Normal /gui/256/16+termtrans 1 base1 none +FoldColumn /gui/256/16+termtrans 1 fg none +Folded /gui/256/16+termtrans 1 fg none bold +Terminal /gui/256/16+termtrans 1 fg none +ToolbarButton/gui/256/16+termtrans 1 base1 none bold +ToolbarLine /gui/256/16+termtrans 1 none none CursorLineNr base0 base02 bold ; no transparency, normal visibility /gui/256/16/8+transvis 2 orange base02 bold ; no transparency, high visibility @@ -241,12 +241,12 @@ Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 -Normal /256/16+termtrans 1 base1 none -FoldColumn /256/16+termtrans 1 base0 none -Folded /256/16+termtrans 1 base0 none bold -Terminal /256/16+termtrans 1 fg none -ToolbarButton/256/16+termtrans 1 base1 none bold -ToolbarLine /256/16+termtrans 1 none none +Normal /gui/256/16+termtrans 1 base1 none +FoldColumn /gui/256/16+termtrans 1 base0 none +Folded /gui/256/16+termtrans 1 base0 none bold +Terminal /gui/256/16+termtrans 1 fg none +ToolbarButton/gui/256/16+termtrans 1 base1 none bold +ToolbarLine /gui/256/16+termtrans 1 none none MatchParen red base02 bold,underline /gui/256/16/8 +visibility "high" base03 base00 bold diff --git a/templates/solarized8_flat.colortemplate b/templates/solarized8_flat.colortemplate index 652ffa7..f37eda4 100644 --- a/templates/solarized8_flat.colortemplate +++ b/templates/solarized8_flat.colortemplate @@ -39,11 +39,11 @@ Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 -Normal /256/16+termtrans 1 base0 none -CursorLine /256/16+termtrans 1 none none underline -Terminal /256/16+termtrans 1 fg none -ToolbarButton/256/16+termtrans 1 base1 none bold -ToolbarLine /256/16+termtrans 1 none none +Normal /gui/256/16+termtrans 1 base0 none +CursorLine /gui/256/16+termtrans 1 none none underline +Terminal /gui/256/16+termtrans 1 fg none +ToolbarButton/gui/256/16+termtrans 1 base1 none bold +ToolbarLine /gui/256/16+termtrans 1 none none NonText base00 none bold /gui/256/16/8+visibility "high" orange none bold @@ -214,11 +214,11 @@ Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 -Normal /256/16+termtrans 1 base0 none -CursorLine /256/16+termtrans 1 none none underline -Terminal /256/16+termtrans 1 fg none -ToolbarButton/256/16+termtrans 1 base1 none bold -ToolbarLine /256/16+termtrans 1 none none +Normal /gui/256/16+termtrans 1 base0 none +CursorLine /gui/256/16+termtrans 1 none none underline +Terminal /gui/256/16+termtrans 1 fg none +ToolbarButton/gui/256/16+termtrans 1 base1 none bold +ToolbarLine /gui/256/16+termtrans 1 none none CursorLineNr base0 none bold /gui/256/16/8+visibility "high" red none bold diff --git a/templates/solarized8_high.colortemplate b/templates/solarized8_high.colortemplate index eb0d064..5cd3aca 100644 --- a/templates/solarized8_high.colortemplate +++ b/templates/solarized8_high.colortemplate @@ -40,11 +40,11 @@ Folded base0 base02 s=base03 bold LineNr base01 base02 Terminal fg back -Normal /256/16+termtrans 1 base1 none -FoldColumn /256/16+termtrans 1 fg none -Folded /256/16+termtrans 1 fg none bold -LineNr /256/16+termtrans 1 base01 none -Terminal /256/16+termtrans 1 fg none +Normal /gui/256/16+termtrans 1 base1 none +FoldColumn /gui/256/16+termtrans 1 fg none +Folded /gui/256/16+termtrans 1 fg none bold +LineNr /gui/256/16+termtrans 1 base01 none +Terminal /gui/256/16+termtrans 1 fg none CursorLineNr base0 base02 bold /gui/256/16/8+transvis 2 orange base02 bold @@ -248,11 +248,11 @@ Folded base0 base02 s=base03 bold LineNr base01 base02 Terminal fg back -Normal /256/16+termtrans 1 base1 none -FoldColumn /256/16+termtrans 1 base0 none -Folded /256/16+termtrans 1 base0 none bold -LineNr /256/16+termtrans 1 base01 none -Terminal /256/16+termtrans 1 fg none +Normal /gui/256/16+termtrans 1 base1 none +FoldColumn /gui/256/16+termtrans 1 base0 none +Folded /gui/256/16+termtrans 1 base0 none bold +LineNr /gui/256/16+termtrans 1 base01 none +Terminal /gui/256/16+termtrans 1 fg none ; }}} ; Visibility and cursor style (light) {{{ MatchParen red base02 bold,underline diff --git a/templates/solarized8_low.colortemplate b/templates/solarized8_low.colortemplate index 03de98c..9bb29ec 100644 --- a/templates/solarized8_low.colortemplate +++ b/templates/solarized8_low.colortemplate @@ -42,13 +42,13 @@ Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 -Normal /256/16+termtrans 1 base0 none -FoldColumn /256/16+termtrans 1 fg none -Folded /256/16+termtrans 1 fg none bold -LineNr /256/16+termtrans 1 base01 none -Terminal /256/16+termtrans 1 fg none -ToolbarButton/256/16+termtrans 1 base1 none bold -ToolbarLine /256/16+termtrans 1 none none +Normal /gui/256/16+termtrans 1 base0 none +FoldColumn /gui/256/16+termtrans 1 fg none +Folded /gui/256/16+termtrans 1 fg none bold +LineNr /gui/256/16+termtrans 1 base01 none +Terminal /gui/256/16+termtrans 1 fg none +ToolbarButton/gui/256/16+termtrans 1 base1 none bold +ToolbarLine /gui/256/16+termtrans 1 none none CursorLineNr base0 base02 bold /gui/256/16/8+transvis 2 orange base02 bold @@ -241,13 +241,13 @@ Terminal fg back ToolbarButton base1 base02 bold ToolbarLine none base02 -Normal /256/16+termtrans 1 base0 none -FoldColumn /256/16+termtrans 1 base0 none -Folded /256/16+termtrans 1 base0 none bold -LineNr /256/16+termtrans 1 base01 none -Terminal /256/16+termtrans 1 fg none -ToolbarButton/256/16+termtrans 1 base1 none bold -ToolbarLine /256/16+termtrans 1 none none +Normal /gui/256/16+termtrans 1 base0 none +FoldColumn /gui/256/16+termtrans 1 base0 none +Folded /gui/256/16+termtrans 1 base0 none bold +LineNr /gui/256/16+termtrans 1 base01 none +Terminal /gui/256/16+termtrans 1 fg none +ToolbarButton/gui/256/16+termtrans 1 base1 none bold +ToolbarLine /gui/256/16+termtrans 1 none none CursorLineNr base0 base02 bold /gui/256/16/8+transvis 2 red base02 bold