]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

- fix bad readability of CursorLine in diffs
authorStefan Wimmer <wimstefan@gmail.com>
Thu, 15 Aug 2019 21:52:57 +0000 (23:52 +0200)
committerStefan Wimmer <wimstefan@gmail.com>
Thu, 15 Aug 2019 21:52:57 +0000 (23:52 +0200)
colors/artesanal.vim
doc/artesanal.txt
templates/_common.colortemplate

index 4a225b27012b160704e94e429c40fd446697ffa5..e3369d7bdb78d809d820b93a543b2359024c3eb3 100644 (file)
@@ -4,9 +4,9 @@
 " Maintainer:   Stefan Wimmer <wimstefan@gmail.com>
 " Website:      https://github.com/wimstefan/vim-artesanal
 " License:      Vim License (see `:help license`)
-" Last Updated: Wed 12 Jun 2019 12:15:55 AM CEST
+" Last Updated: Thu 15 Aug 2019 10:57:02 PM CEST
 
-" Generated by Colortemplate v2.0.0b3
+" Generated by Colortemplate v2.0.0
 
 hi clear
 if exists('syntax_on')
@@ -54,11 +54,11 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
       hi SignColumn guifg=#cdd2db guibg=#37474f guisp=NONE gui=NONE cterm=NONE
       hi VertSplit guifg=#546e7a guibg=#2e3440 guisp=NONE gui=NONE cterm=NONE
     endif
-    hi ColorColumn guifg=NONE guibg=#37474f guisp=NONE gui=NONE cterm=NONE
+    hi ColorColumn guifg=NONE guibg=#37474f guisp=NONE gui=bold cterm=bold
     hi Conceal guifg=#6699cc guibg=NONE guisp=NONE gui=NONE cterm=NONE
-    hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi! link CursorColumn ColorColumn
-    hi! link CursorLine ColorColumn
+    hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi CursorColumn guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
+    hi CursorLine guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
     hi DiffAdd guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
     hi DiffAdded guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
     hi DiffChange guifg=#aec0e0 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
@@ -147,6 +147,8 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi CommandMode guifg=#fa75e2 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
     hi Warnings guifg=#fff176 guibg=#2e3440 guisp=NONE gui=reverse cterm=reverse
     if !s:italics
+      hi CursorColumn gui=bold cterm=bold
+      hi CursorLine gui=bold cterm=bold
       hi Folded gui=NONE cterm=NONE
       hi SpellBad gui=undercurl cterm=undercurl
       hi SpellCap gui=undercurl cterm=undercurl
@@ -195,11 +197,11 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
     hi SignColumn guifg=#455a64 guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
     hi VertSplit guifg=#b6bdcb guibg=#eff1f4 guisp=NONE gui=NONE cterm=NONE
   endif
-  hi ColorColumn guifg=NONE guibg=#e4e6eb guisp=NONE gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e6eb guisp=NONE gui=bold cterm=bold
   hi Conceal guifg=#004bb4 guibg=NONE guisp=NONE gui=NONE cterm=NONE
-  hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi! link CursorColumn ColorColumn
-  hi! link CursorLine ColorColumn
+  hi Cursor guifg=NONE guibg=NONE guisp=NONE gui=bold,reverse ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi CursorColumn guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
+  hi CursorLine guifg=NONE guibg=NONE guisp=NONE gui=bold,italic ctermfg=NONE ctermbg=NONE cterm=bold,italic
   hi DiffAdd guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
   hi DiffAdded guifg=#abddcc guibg=#121419 guisp=NONE gui=reverse cterm=reverse
   hi DiffChange guifg=#aec0e0 guibg=#121419 guisp=NONE gui=reverse cterm=reverse
@@ -288,6 +290,8 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
   hi CommandMode guifg=#b300a4 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
   hi Warnings guifg=#ff8c00 guibg=#eff1f4 guisp=NONE gui=reverse cterm=reverse
   if !s:italics
+    hi CursorColumn gui=bold cterm=bold
+    hi CursorLine gui=bold cterm=bold
     hi Folded gui=NONE cterm=NONE
     hi SpellBad gui=undercurl cterm=undercurl
     hi SpellCap gui=undercurl cterm=undercurl
@@ -320,11 +324,11 @@ if s:t_Co >= 256
       hi SignColumn ctermfg=252 ctermbg=238 cterm=NONE
       hi VertSplit ctermfg=242 ctermbg=236 cterm=NONE
     endif
-    hi ColorColumn ctermfg=NONE ctermbg=238 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=238 cterm=bold
     hi Conceal ctermfg=67 ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi! link CursorColumn ColorColumn
-    hi! link CursorLine ColorColumn
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
     hi DiffAdd ctermfg=152 ctermbg=233 cterm=reverse
     hi DiffAdded ctermfg=152 ctermbg=233 cterm=reverse
     hi DiffChange ctermfg=153 ctermbg=233 cterm=reverse
@@ -412,6 +416,10 @@ if s:t_Co >= 256
     hi VisualMode ctermfg=228 ctermbg=236 cterm=reverse
     hi CommandMode ctermfg=206 ctermbg=236 cterm=reverse
     hi Warnings ctermfg=228 ctermbg=236 cterm=reverse
+    if !s:italics
+      hi CursorColumn cterm=bold
+      hi CursorLine cterm=bold
+    endif
     if has('nvim')
       hi! link TermCursor Cursor
       hi TermCursorNC ctermfg=238 ctermbg=254 cterm=NONE
@@ -433,11 +441,11 @@ if s:t_Co >= 256
     hi SignColumn ctermfg=240 ctermbg=254 cterm=NONE
     hi VertSplit ctermfg=250 ctermbg=255 cterm=NONE
   endif
-  hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=254 cterm=bold
   hi Conceal ctermfg=26 ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi! link CursorColumn ColorColumn
-  hi! link CursorLine ColorColumn
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
   hi DiffAdd ctermfg=152 ctermbg=233 cterm=reverse
   hi DiffAdded ctermfg=152 ctermbg=233 cterm=reverse
   hi DiffChange ctermfg=153 ctermbg=233 cterm=reverse
@@ -525,6 +533,10 @@ if s:t_Co >= 256
   hi VisualMode ctermfg=208 ctermbg=255 cterm=reverse
   hi CommandMode ctermfg=127 ctermbg=255 cterm=reverse
   hi Warnings ctermfg=208 ctermbg=255 cterm=reverse
+  if !s:italics
+    hi CursorColumn cterm=bold
+    hi CursorLine cterm=bold
+  endif
   if has('nvim')
     hi! link TermCursor Cursor
     hi TermCursorNC ctermfg=254 ctermbg=238 cterm=NONE
@@ -548,11 +560,11 @@ if s:t_Co >= 16
       hi SignColumn ctermfg=LightGrey ctermbg=Black cterm=NONE
       hi VertSplit ctermfg=DarkGrey ctermbg=Black cterm=NONE
     endif
-    hi ColorColumn ctermfg=NONE ctermbg=Black cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=Black cterm=bold
     hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi! link CursorColumn ColorColumn
-    hi! link CursorLine ColorColumn
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
     hi DiffAdd ctermfg=LightGreen ctermbg=Black cterm=reverse
     hi DiffAdded ctermfg=LightGreen ctermbg=Black cterm=reverse
     hi DiffChange ctermfg=LightBlue ctermbg=Black cterm=reverse
@@ -640,6 +652,10 @@ if s:t_Co >= 16
     hi VisualMode ctermfg=Yellow ctermbg=Black cterm=reverse
     hi CommandMode ctermfg=Magenta ctermbg=Black cterm=reverse
     hi Warnings ctermfg=Yellow ctermbg=Black cterm=reverse
+    if !s:italics
+      hi CursorColumn cterm=bold
+      hi CursorLine cterm=bold
+    endif
     if has('nvim')
       hi! link TermCursor Cursor
       hi TermCursorNC ctermfg=Black ctermbg=White cterm=NONE
@@ -661,11 +677,11 @@ if s:t_Co >= 16
     hi SignColumn ctermfg=DarkGrey ctermbg=White cterm=NONE
     hi VertSplit ctermfg=DarkGrey ctermbg=White cterm=NONE
   endif
-  hi ColorColumn ctermfg=NONE ctermbg=White cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=White cterm=bold
   hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi! link CursorColumn ColorColumn
-  hi! link CursorLine ColorColumn
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=bold,italic
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=bold,italic
   hi DiffAdd ctermfg=LightGreen ctermbg=Black cterm=reverse
   hi DiffAdded ctermfg=LightGreen ctermbg=Black cterm=reverse
   hi DiffChange ctermfg=LightBlue ctermbg=Black cterm=reverse
@@ -753,6 +769,10 @@ if s:t_Co >= 16
   hi VisualMode ctermfg=Yellow ctermbg=White cterm=reverse
   hi CommandMode ctermfg=Magenta ctermbg=White cterm=reverse
   hi Warnings ctermfg=Yellow ctermbg=White cterm=reverse
+  if !s:italics
+    hi CursorColumn cterm=bold
+    hi CursorLine cterm=bold
+  endif
   if has('nvim')
     hi! link TermCursor Cursor
     hi TermCursorNC ctermfg=White ctermbg=Black cterm=NONE
@@ -761,9 +781,7 @@ if s:t_Co >= 16
   finish
 endif
 
-" Variant:         gui 256 16
 " Background: light
-" Variant:   gui     256 16
 " Color: fg0 #2e3440 ~   Black
 " Color: fg1 #37474f ~   Black
 " Color: fg2 #455a64 ~   DarkGrey
@@ -798,115 +816,7 @@ endif
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan white
 " Term Colors: darkgray red green yellow blue magenta cyan brightwhite
-" if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0)
-"   Normal       fg1           none
-"   CursorLineNr yellow        none
-"   FoldColumn   darkgray      none
-"   SignColumn   fg2           none
-"   VertSplit    bg3           none
-" else
-"   Normal       fg1           bg0
-"   CursorLineNr yellow        bg1
-"   FoldColumn   darkgray      bg1
-"   SignColumn   fg2           bg1
-"   VertSplit    bg3           bg0
-" endif
-" ColorColumn                      none         bg1
-" Conceal                          blue         none
-" Cursor                           none         none    reverse
-" CursorColumn                  -> ColorColumn
-" CursorLine                    -> ColorColumn
-" DiffAdd                          brightgreen  black   reverse
-" DiffAdded                        brightgreen  black   reverse
-" DiffChange                       brightblue   black   reverse
-" DiffDelete                       brightred    black   reverse
-" DiffRemoved                      brightred    black   reverse
-" DiffText                         brightgreen  black   reverse
-" Directory                        blue         none    bold
-" EndOfBuffer                      bg0          none
-" Error                            red          none    t=reverse,bold g=standout,bold
-" ErrorMsg                      -> Error
-" Folded                           bg3          bg1     g=italic
-" IncSearch                     -> Search
-" LineNr                           bg3          bg1
-" MatchParen                       none         bg2     bold
-" ModeMsg                          blue         none
-" MoreMsg                          green        none
-" NonText                          bg4          none
-" Pmenu                            fg1          bg2
-" PmenuSbar                        none         bg2
-" PmenuSel                         bg1          fg2    bold
-" PmenuThumb                       none         bg4
-" Question                         darkyellow   none
-" QuickFixLine                  -> Search
-" Search                           brightyellow black   reverse
-" SpecialKey                       bg4          none
-" SpellBad                         red          none    t=underline g=italic,undercurl s=red
-" SpellCap                         blue         none    t=underline g=italic,undercurl s=blue
-" SpellLocal                       cyan         none    t=underline g=italic,undercurl s=cyan
-" SpellRare                        magenta      none    t=underline g=italic,undercurl s=magenta
-" StatusLine                       bg2          fg1     reverse
-" StatusLineNC                     bg1          fg2     reverse
-" StatusLineTerm                -> StatusLine
-" StatusLineTermNC              -> StatusLineNC
-" TabLine                       -> TabLineFill
-" TabLineFill                      fg2          bg3
-" TabLineSel                       fg1          bg1
-" Title                            fg0          none    bold
-" Visual                           none         bg1
-" VisualNOS                     -> Visual
-" WarningMsg                       red          none
-" WildMenu                         blue         bg2     bold
-" Boolean                       -> Constant
-" Character                     -> Constant
-" Comment                          fg3          none
-" Conditional                   -> Statement
-" Constant                         green        none
-" Define                        -> PreProc
-" Debug                         -> Special
-" Delimiter                     -> Special
-" Exception                     -> Statement
-" Float                         -> Constant
-" Function                         cyan         none
-" Identifier                       blue         none
-" Ignore                           fg           none
-" Include                       -> PreProc
-" Keyword                       -> Statement
-" Label                         -> Statement
-" Macro                         -> PreProc
-" Number                        -> Constant
-" Operator                      -> Statement
-" PreCondit                     -> PreProc
-" PreProc                          cyan         none
-" Repeat                        -> Statement
-" SpecialChar                   -> Special
-" SpecialComment                -> Special
-" Statement                        red          none
-" StorageClass                  -> Type
-" Special                          yellow       none
-" String                        -> Constant
-" Structure                     -> Type
-" Tag                           -> Special
-" Todo                             cyan         none    reverse
-" Type                             darkcyan     none
-" Typedef                       -> Type
-" Underlined                       none         none    underline
-" lCursor                       -> Cursor
-" CursorIM                         none         none    reverse
-" ToolbarLine                      none         bg3
-" ToolbarButton                    fg0          bg3     bold
-" iCursor                       -> Cursor
-" vCursor                       -> Cursor
-" NormalMode                       fg2          bg0     reverse
-" InsertMode                       blue         bg0     reverse
-" ReplaceMode                      cyan         bg0     reverse
-" VisualMode                       yellow       bg0     reverse
-" CommandMode                      magenta      bg0     reverse
-" Warnings                         yellow       bg0     reverse
-" TermCursor                    -> Cursor
-" TermCursorNC                     bg1          fg1
 " Background: dark
-" Variant:   gui     256 16
 " Color: fg0 #eff1f4 ~   White
 " Color: fg1 #e4e6eb ~   White
 " Color: fg2 #cdd2db ~   LightGrey
@@ -941,110 +851,4 @@ endif
 " Color: brightwhite          #ffffff     ~        White
 " Term Colors: darkgray red green yellow blue magenta cyan brightwhite
 " Term Colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan white
-" if !has('gui_running') && get(g:, '@optionprefix_transp_bg', 0)
-"   Normal       fg1           none
-"   CursorLineNr yellow        none
-"   FoldColumn   darkgray      none
-"   SignColumn   fg2           none
-"   VertSplit    bg3           none
-" else
-"   Normal       fg1           bg0
-"   CursorLineNr yellow        bg1
-"   FoldColumn   darkgray      bg1
-"   SignColumn   fg2           bg1
-"   VertSplit    bg3           bg0
-" endif
-" ColorColumn                      none         bg1
-" Conceal                          blue         none
-" Cursor                           none         none    reverse
-" CursorColumn                  -> ColorColumn
-" CursorLine                    -> ColorColumn
-" DiffAdd                          brightgreen  black   reverse
-" DiffAdded                        brightgreen  black   reverse
-" DiffChange                       brightblue   black   reverse
-" DiffDelete                       brightred    black   reverse
-" DiffRemoved                      brightred    black   reverse
-" DiffText                         brightgreen  black   reverse
-" Directory                        blue         none    bold
-" EndOfBuffer                      bg0          none
-" Error                            red          none    t=reverse,bold g=standout,bold
-" ErrorMsg                      -> Error
-" Folded                           bg3          bg1     g=italic
-" IncSearch                     -> Search
-" LineNr                           bg3          bg1
-" MatchParen                       none         bg2     bold
-" ModeMsg                          blue         none
-" MoreMsg                          green        none
-" NonText                          bg4          none
-" Pmenu                            fg1          bg2
-" PmenuSbar                        none         bg2
-" PmenuSel                         bg1          fg2    bold
-" PmenuThumb                       none         bg4
-" Question                         darkyellow   none
-" QuickFixLine                  -> Search
-" Search                           brightyellow black   reverse
-" SpecialKey                       bg4          none
-" SpellBad                         red          none    t=underline g=italic,undercurl s=red
-" SpellCap                         blue         none    t=underline g=italic,undercurl s=blue
-" SpellLocal                       cyan         none    t=underline g=italic,undercurl s=cyan
-" SpellRare                        magenta      none    t=underline g=italic,undercurl s=magenta
-" StatusLine                       bg2          fg1     reverse
-" StatusLineNC                     bg1          fg2     reverse
-" StatusLineTerm                -> StatusLine
-" StatusLineTermNC              -> StatusLineNC
-" TabLine                       -> TabLineFill
-" TabLineFill                      fg2          bg3
-" TabLineSel                       fg1          bg1
-" Title                            fg0          none    bold
-" Visual                           none         bg1
-" VisualNOS                     -> Visual
-" WarningMsg                       red          none
-" WildMenu                         blue         bg2     bold
-" Boolean                       -> Constant
-" Character                     -> Constant
-" Comment                          fg3          none
-" Conditional                   -> Statement
-" Constant                         green        none
-" Define                        -> PreProc
-" Debug                         -> Special
-" Delimiter                     -> Special
-" Exception                     -> Statement
-" Float                         -> Constant
-" Function                         cyan         none
-" Identifier                       blue         none
-" Ignore                           fg           none
-" Include                       -> PreProc
-" Keyword                       -> Statement
-" Label                         -> Statement
-" Macro                         -> PreProc
-" Number                        -> Constant
-" Operator                      -> Statement
-" PreCondit                     -> PreProc
-" PreProc                          cyan         none
-" Repeat                        -> Statement
-" SpecialChar                   -> Special
-" SpecialComment                -> Special
-" Statement                        red          none
-" StorageClass                  -> Type
-" Special                          yellow       none
-" String                        -> Constant
-" Structure                     -> Type
-" Tag                           -> Special
-" Todo                             cyan         none    reverse
-" Type                             darkcyan     none
-" Typedef                       -> Type
-" Underlined                       none         none    underline
-" lCursor                       -> Cursor
-" CursorIM                         none         none    reverse
-" ToolbarLine                      none         bg3
-" ToolbarButton                    fg0          bg3     bold
-" iCursor                       -> Cursor
-" vCursor                       -> Cursor
-" NormalMode                       fg2          bg0     reverse
-" InsertMode                       blue         bg0     reverse
-" ReplaceMode                      cyan         bg0     reverse
-" VisualMode                       yellow       bg0     reverse
-" CommandMode                      magenta      bg0     reverse
-" Warnings                         yellow       bg0     reverse
-" TermCursor                    -> Cursor
-" TermCursorNC                     bg1          fg1
+" vim: et ts=2 sw=2
index bf7eb74e062b5c112e07704081bfca8191f3367b..f13cb89d5d0b2749517963988ccce1cc1dd102b4 100644 (file)
@@ -1,4 +1,4 @@
-*artesanal.txt*       For Vim version 8.1       Last change: 2019 Jun 12
+*artesanal.txt*       For Vim version 8.1       Last change: 2019 Aug 15
 
 
                 Artesanal color scheme    by Stefan Wimmer <wimstefan@gmail.com>
index f9d1f16644772e3efc0f819cb754ea6fbd9e9c77..46790f1dc4bd233f09c1b61675ac825497d6ae1d 100644 (file)
 #endif
 
 # Group                          Fg           Bg      Attributes
-ColorColumn                      none         bg1
+ColorColumn                      none         bg1     bold
 Conceal                          blue         none
-Cursor                           none         none    reverse
-CursorColumn                  -> ColorColumn
-CursorLine                    -> ColorColumn
+Cursor                           none         none    reverse,bold
+CursorColumn                     none         none    italic,bold
+CursorLine                       none         none    italic,bold
 DiffAdd                          brightgreen  black   reverse
 DiffAdded                        brightgreen  black   reverse
 DiffChange                       brightblue   black   reverse