From 06fb3a0f97a814290498540cdd47324be9e2da31 Mon Sep 17 00:00:00 2001 From: Lifepillar Date: Mon, 9 Apr 2018 21:54:53 +0200 Subject: [PATCH] Define g:terminal_ansi_colors. --- colors/solarized8.vim | 10 +++++++++- colors/solarized8_flat.vim | 10 +++++++++- colors/solarized8_high.vim | 10 +++++++++- colors/solarized8_low.vim | 10 +++++++++- templates/_terminal_ansi_colors.colortemplate | 5 +++++ templates/solarized8.colortemplate | 8 ++++++++ templates/solarized8_flat.colortemplate | 8 ++++++++ templates/solarized8_high.colortemplate | 8 ++++++++ templates/solarized8_low.colortemplate | 8 ++++++++ 9 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 templates/_terminal_ansi_colors.colortemplate diff --git a/colors/solarized8.vim b/colors/solarized8.vim index 95f8ecf..26f4efa 100644 --- a/colors/solarized8.vim +++ b/colors/solarized8.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Mar 25 12:43:30 2018 +" Last Updated: Mon Apr 9 21:50:21 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -40,6 +40,8 @@ if !get(g:, 'solarized_use16', 0) " back: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -415,6 +417,8 @@ if !get(g:, 'solarized_use16', 0) " base1: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base2: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -786,6 +790,8 @@ endif " 16-color variant if &background ==# 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1143,6 +1149,8 @@ if &background ==# 'dark' finish endif +let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/colors/solarized8_flat.vim b/colors/solarized8_flat.vim index 1334f2b..2208790 100644 --- a/colors/solarized8_flat.vim +++ b/colors/solarized8_flat.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Mar 25 12:43:34 2018 +" Last Updated: Mon Apr 9 21:50:25 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -40,6 +40,8 @@ if !get(g:, 'solarized_use16', 0) " back: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -409,6 +411,8 @@ if !get(g:, 'solarized_use16', 0) " base1: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base2: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -774,6 +778,8 @@ endif " 16-color variant if &background ==# 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1125,6 +1131,8 @@ if &background ==# 'dark' finish endif +let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi Terminal ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/colors/solarized8_high.vim b/colors/solarized8_high.vim index df824fe..453a233 100644 --- a/colors/solarized8_high.vim +++ b/colors/solarized8_high.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Mar 25 12:43:37 2018 +" Last Updated: Mon Apr 9 21:50:28 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -40,6 +40,8 @@ if !get(g:, 'solarized_use16', 0) " back: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#fdf6e3', + \ '#002b36', '#cb4b16', '#657b83', '#839496', '#93a1a1', '#6c71c4', '#eee8d5', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=247 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -415,6 +417,8 @@ if !get(g:, 'solarized_use16', 0) " base2: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base1: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#002b36', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#657b83', '#586e75', '#6c71c4', '#073642', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=242 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -786,6 +790,8 @@ endif " 16-color variant if &background ==# 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#fdf6e3', + \ '#002b36', '#cb4b16', '#657b83', '#839496', '#93a1a1', '#6c71c4', '#eee8d5', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=14 ctermbg=NONE guifg=#93a1a1 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1143,6 +1149,8 @@ if &background ==# 'dark' finish endif +let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#002b36', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#657b83', '#586e75', '#6c71c4', '#073642', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=10 ctermbg=NONE guifg=#586e75 guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/colors/solarized8_low.vim b/colors/solarized8_low.vim index c3ce218..80d1086 100644 --- a/colors/solarized8_low.vim +++ b/colors/solarized8_low.vim @@ -4,7 +4,7 @@ " Maintainer: Lifepillar " Website: https://github.com/lifepillar/vim-solarized8 " License: OSI approved MIT license -" Last Updated: Sun Mar 25 12:43:41 2018 +" Last Updated: Mon Apr 9 21:50:32 2018 if !(has('termguicolors') && &termguicolors) && !has('gui_running') \ && (!exists('&t_Co') || &t_Co < (get(g:, 'solarized_use16', 0) ? 16 : 256)) @@ -40,6 +40,8 @@ if !get(g:, 'solarized_use16', 0) " base03: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " back: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] " base02: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=246 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -415,6 +417,8 @@ if !get(g:, 'solarized_use16', 0) " base1: GUI=#586e75/rgb( 88,110,117) Term=242 #6c6c6c/rgb(108,108,108) [delta=9.227744] " base3: GUI=#002b36/rgb( 0, 43, 54) Term=235 #262626/rgb( 38, 38, 38) [delta=12.727247] " base2: GUI=#073642/rgb( 7, 54, 66) Term=236 #303030/rgb( 48, 48, 48) [delta=13.434724] + let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=66 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -786,6 +790,8 @@ endif " 16-color variant if &background ==# 'dark' + let g:terminal_ansi_colors = ['#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', + \ '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=12 ctermbg=NONE guifg=#839496 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=fg ctermbg=NONE guifg=fg guibg=NONE guisp=NONE cterm=NONE gui=NONE @@ -1143,6 +1149,8 @@ if &background ==# 'dark' finish endif +let g:terminal_ansi_colors = ['#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642', + \ '#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'] if !has('gui_running') && get(g:, 'solarized_termtrans', 0) hi Normal ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE hi FoldColumn ctermfg=11 ctermbg=NONE guifg=#657b83 guibg=NONE guisp=NONE cterm=NONE gui=NONE diff --git a/templates/_terminal_ansi_colors.colortemplate b/templates/_terminal_ansi_colors.colortemplate new file mode 100644 index 0000000..35ed5ce --- /dev/null +++ b/templates/_terminal_ansi_colors.colortemplate @@ -0,0 +1,5 @@ +verbatim +let g:terminal_ansi_colors = ['@guibase02', '@guired', '@guigreen', '@guiyellow', '@guiblue', '@guimagenta', '@guicyan', '@guibase2', +\ '@guibase03', '@guiorange', '@guibase01', '@guibase00', '@guibase0', '@guiviolet', '@guibase1', '@guibase3'] +endverbatim + diff --git a/templates/solarized8.colortemplate b/templates/solarized8.colortemplate index 7ff0762..0c5fe2a 100644 --- a/templates/solarized8.colortemplate +++ b/templates/solarized8.colortemplate @@ -40,6 +40,10 @@ Color: green #859900 ~ 2 Color: back #002b36 ~ 8 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Fix 256-color palette in supported terminals {{{ Include: _fix-256-palette.colortemplate # }}} @@ -279,6 +283,10 @@ Color: green #859900 ~ 2 Color: back #fdf6e3 ~ 15 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Default highlight groups {{{ verbatim if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0) diff --git a/templates/solarized8_flat.colortemplate b/templates/solarized8_flat.colortemplate index 1e8059a..b235725 100644 --- a/templates/solarized8_flat.colortemplate +++ b/templates/solarized8_flat.colortemplate @@ -40,6 +40,10 @@ Color: green #859900 ~ 2 Color: back #002b36 ~ 8 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Default highlight groups {{{ verbatim if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0) @@ -266,6 +270,10 @@ Color: green #859900 ~ 2 Color: back #fdf6e3 ~ 15 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Default highlight groups {{{ verbatim if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0) diff --git a/templates/solarized8_high.colortemplate b/templates/solarized8_high.colortemplate index fa4fca6..a094f7b 100644 --- a/templates/solarized8_high.colortemplate +++ b/templates/solarized8_high.colortemplate @@ -40,6 +40,10 @@ Color: green #859900 ~ 2 Color: back #002b36 ~ 8 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Default highlight groups {{{ verbatim if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0) @@ -275,6 +279,10 @@ Color: green #859900 ~ 2 Color: back #fdf6e3 ~ 15 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Default highlight groups {{{ verbatim if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0) diff --git a/templates/solarized8_low.colortemplate b/templates/solarized8_low.colortemplate index 8e56805..9d282e4 100644 --- a/templates/solarized8_low.colortemplate +++ b/templates/solarized8_low.colortemplate @@ -40,6 +40,10 @@ Color: green #859900 ~ 2 Color: back #073642 ~ 0 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Default highlight groups {{{ verbatim if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0) @@ -275,6 +279,10 @@ Color: green #859900 ~ 2 Color: back #eee8d5 ~ 7 # }}} +# Terminal ANSI colors {{{ +Include: _terminal_ansi_colors.colortemplate +# }}} + # Default highlight groups {{{ verbatim if !has('gui_running') && get(g:, '@optionprefix_termtrans', 0)