feat: add support for special names (NONE, bg, etc)

This backports:

- chriskempson/base16-vim@c8a7da6

From:

- chriskempson/base16-vim#217

How I did this:

1. Made changes to the template in the submodule in my dotfiles repo (at
   `aspects/nvim/files/.config/nvim/pack/bundle/opt/base16-nvim`).
2. Copied them up to the superproject working area with:
   `cp aspects/nvim/files/.config/nvim/pack/bundle/opt/base16-nvim/templates/default.mustache
   vendor/base16-templates/base16-nvim/templates`.
3. Ran `NO_CLONE=1 support/base16-builder.rb`.

colors/base16-3024.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-apathy.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-apprentice.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-ashes.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-cave-light.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-cave.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-dune-light.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-dune.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-estuary-light.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-estuary.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-forest-light.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-forest.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end
 

colors/base16-atelier-heath-light.lua

@@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
 
   local command = ""
 
-  if guifg ~= "" then
+  -- See `:help highlight-guifg`.
+  if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then
+    command = command .. " guifg=" .. guifg
+  elseif guifg ~= "" then
     command = command .. " guifg=#" .. guifg
   end
-  if guibg ~= "" then
+  if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then
+    command = command .. " guibg=" .. guibg
+  elseif guibg ~= "" then
     command = command .. " guibg=#" .. guibg
   end
   if ctermfg ~= "" then
@@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
   if attr ~= "" then
     command = command .. " gui=" .. attr .. " cterm=" .. attr
   end
-  if guisp ~= "" then
+  if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then
+    command = command .. " guisp=" .. guisp
+  elseif guisp ~= "" then
     command = command .. " guisp=#" .. guisp
   end