Ticket #3159: Switch to more standard color names

For the legacy 16 colors, switch to a more standard naming that
better reflects their internal 8+8 logic.

Old names marked with a '-', new names marked with a '+' here:

   black      -gray           ->   black    +brightblack
   red         brightred      ->   red       brightred
   green       brightgreen    ->   green     brightgreen
  -brown      -yellow         ->  +yellow   +brightyellow
   blue        brightblue     ->   blue      brightblue
   magenta     brightmagenta  ->   magenta   brightmagenta
   cyan        brightcyan     ->   cyan      brightcyan
  -lightgray  -white          ->  +white    +brightwhite

This is a backwards incompatible change. Skin and syntax highlight files
need to be updated.

Signed-off-by: Egmont Koblinger <egmont@gmail.com>

Author: egmontkob

doc/man/mcedit.1.in

@@ -292,17 +292,17 @@ file .\e*\e\e.c C\esProgram\esFile (#include|/\e\e\e*)
 wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_
 
 # default colors
-define  comment   brown
+define  comment   yellow
 context default
-  keyword  whole  if       yellow
-  keyword  whole  else     yellow
-  keyword  whole  for      yellow
-  keyword  whole  while    yellow
-  keyword  whole  do       yellow
-  keyword  whole  switch   yellow
-  keyword  whole  case     yellow
-  keyword  whole  static   yellow
-  keyword  whole  extern   yellow
+  keyword  whole  if       brightyellow
+  keyword  whole  else     brightyellow
+  keyword  whole  for      brightyellow
+  keyword  whole  while    brightyellow
+  keyword  whole  do       brightyellow
+  keyword  whole  switch   brightyellow
+  keyword  whole  case     brightyellow
+  keyword  whole  static   brightyellow
+  keyword  whole  extern   brightyellow
   keyword         {        brightcyan
   keyword         }        brightcyan
   keyword         '*'      green
@@ -416,9 +416,9 @@ delimiters, this keyword prevents the context from ending at the end of
 the lines that end in a backslash, thus allowing C preprocessor
 directive to continue across multiple lines.
 .PP
-The possible colors are: black, gray, red, brightred, green,
-brightgreen, brown, yellow, blue, brightblue, magenta, brightmagenta,
-cyan, brightcyan, lightgray and white. The special keyword "default" means
+The possible colors are: black, brightblack, red, brightred, green,
+brightgreen, yellow, brightyellow, blue, brightblue, magenta, brightmagenta,
+cyan, brightcyan, white and brightwhite. The special keyword "default" means
 the terminal's default. Another special keyword "base" means mc's main
 colors, it is useful as a placeholder if you want to specify attributes
 without modifying the background color. When 256 colors are available,

doc/man/sr/mcedit.1.in

@@ -274,17 +274,17 @@ file .\e*\e\e.c C\esProgram\esFile (#include|/\e\e\e*)
 wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_
 
 # подразумеване боје
-define  comment   brown
+define  comment   yellow
 context default
-  keyword  whole  if       yellow
-  keyword  whole  else     yellow
-  keyword  whole  for      yellow
-  keyword  whole  while    yellow
-  keyword  whole  do       yellow
-  keyword  whole  switch   yellow
-  keyword  whole  case     yellow
-  keyword  whole  static   yellow
-  keyword  whole  extern   yellow
+  keyword  whole  if       brightyellow
+  keyword  whole  else     brightyellow
+  keyword  whole  for      brightyellow
+  keyword  whole  while    brightyellow
+  keyword  whole  do       brightyellow
+  keyword  whole  switch   brightyellow
+  keyword  whole  case     brightyellow
+  keyword  whole  static   brightyellow
+  keyword  whole  extern   brightyellow
   keyword         {        brightcyan
   keyword         }        brightcyan
   keyword         '*'      green
@@ -396,8 +396,8 @@ tab\-ове и размаке преко секвенци \et и \es. Знако
 дозвољавајући претпроцесорској директиви C\-а да се простире преко неколико
 линија.
 .PP
-Могуће боје су: black, gray, red, brightred, green, brightgreen, brown, yellow,
-blue, brightblue, magenta, brightmagenta, cyan, brightcyan, lightgray и white.
+Могуће боје су: black, brightblack, red, brightred, green, brightgreen, yellow, brightyellow,
+blue, brightblue, magenta, brightmagenta, cyan, brightcyan, white и brightwhite.
 Посебна кључна реч „default“ значи подразумевану боју терминала. Друга посебна
 кључна реч „base“ значи основну боју ПН\-а, и корисна је као заузимач места ако
 желите да задате атрибуте без измене позадинске боје. Када је доступно 256 боја,

lib/tty/color-internal.c

@@ -58,21 +58,21 @@ typedef struct mc_tty_color_table_struct
 
 static mc_tty_color_table_t const color_table[] = {
     { "black", COLOR_BLACK },
-    { "gray", COLOR_BLACK + COLOR_INTENSITY },
+    { "brightblack", COLOR_BLACK + COLOR_INTENSITY },
     { "red", COLOR_RED },
     { "brightred", COLOR_RED + COLOR_INTENSITY },
     { "green", COLOR_GREEN },
     { "brightgreen", COLOR_GREEN + COLOR_INTENSITY },
-    { "brown", COLOR_YELLOW },
-    { "yellow", COLOR_YELLOW + COLOR_INTENSITY },
+    { "yellow", COLOR_YELLOW },
+    { "brightyellow", COLOR_YELLOW + COLOR_INTENSITY },
     { "blue", COLOR_BLUE },
     { "brightblue", COLOR_BLUE + COLOR_INTENSITY },
     { "magenta", COLOR_MAGENTA },
     { "brightmagenta", COLOR_MAGENTA + COLOR_INTENSITY },
     { "cyan", COLOR_CYAN },
     { "brightcyan", COLOR_CYAN + COLOR_INTENSITY },
-    { "lightgray", COLOR_WHITE },
-    { "white", COLOR_WHITE + COLOR_INTENSITY },
+    { "white", COLOR_WHITE },
+    { "brightwhite", COLOR_WHITE + COLOR_INTENSITY },
     { "default", -1 },  // default color of the terminal
     // End of list
     { NULL, 0 },

misc/skins/README.txt

@@ -467,14 +467,14 @@ your skin to the standard 16 colors (in addition to the terminal's defaults).
 These colors each have two names: the preferred human-friendly one, and a
 technical one referring to their color index.
 
-        black = color0             gray = color8
+        black = color0      brightblack = color8
           red = color1        brightred = color9
         green = color2      brightgreen = color10
-        brown = color3           yellow = color11
+       yellow = color3     brightyellow = color11
          blue = color4       brightblue = color12
       magenta = color5    brightmagenta = color13
          cyan = color6       brightcyan = color14
-    lightgray = color7            white = color15
+        white = color7      brightwhite = color15
 
 With 8 color terminal settings (such as TERM=linux or TERM=xterm), bright
 foreground colors (second column) are emulated in mc by enabling the bold

misc/skins/dark.ini

@@ -25,119 +25,119 @@
     drightmiddle = ┤
 
 [core]
-    _default_ = lightgray;black
+    _default_ = white;black
     selected = black;cyan
-    marked = yellow;black
-    markselect = yellow;cyan
-    gauge = white;black
+    marked = brightyellow;black
+    markselect = brightyellow;cyan
+    gauge = brightwhite;black
     input = black;cyan
-    inputunchanged = gray;cyan
+    inputunchanged = brightblack;cyan
     inputmark = cyan;black
-    disabled = gray;blue
-    reverse = black;lightgray
-    commandlinemark = black;lightgray
-    header = yellow;black
+    disabled = brightblack;blue
+    reverse = black;white
+    commandlinemark = black;white
+    header = brightyellow;black
     inputhistory =
     commandhistory =
-    shadow = gray;black
-    frame = lightgray;black
+    shadow = brightblack;black
+    frame = white;black
 
 [dialog]
     _default_ = brightcyan;blue
     dfocus = blue;cyan
-    dhotnormal = white;
-    dhotfocus = white;cyan
+    dhotnormal = brightwhite;
+    dhotfocus = brightwhite;cyan
     dselnormal = blue;cyan
-    dselfocus = white;cyan
-    dtitle = white;
+    dselfocus = brightwhite;cyan
+    dtitle = brightwhite;
     dframe = brightcyan;blue
 
 [error]
-    _default_ = white;red
-    errdfocus = black;lightgray
-    errdhotnormal = yellow;red
-    errdhotfocus = yellow;lightgray
-    errdtitle = yellow;red
-    errdframe = white;red
+    _default_ = brightwhite;red
+    errdfocus = black;white
+    errdhotnormal = brightyellow;red
+    errdhotfocus = brightyellow;white
+    errdtitle = brightyellow;red
+    errdframe = brightwhite;red
 
 [filehighlight]
     _default_ =
-    directory = white;
+    directory = brightwhite;
     executable = brightmagenta;
-    symlink = lightgray;
+    symlink = white;
     hardlink =
     stalelink = brightred;
     device = brightmagenta;
     special = brightblue;
     core = red;
-    temp = gray;
+    temp = brightblack;
     archive = brightgreen;
-    doc = brown;
+    doc = yellow;
     source = cyan;
     media = green;
     graph = brightcyan;
     database = brightred;
 
 [menu]
-    _default_ = lightgray;blue
+    _default_ = white;blue
     menusel = black;cyan
-    menuhot = white;blue
-    menuhotsel = white;cyan
-    menuinactive = black;lightgray
-    menuframe = lightgray;blue
+    menuhot = brightwhite;blue
+    menuhotsel = brightwhite;cyan
+    menuinactive = black;white
+    menuframe = white;blue
 
 [popupmenu]
-    _default_ = lightgray;blue
+    _default_ = white;blue
     menusel = black;cyan
-    menutitle = lightgray;blue
-    menuframe = lightgray;blue
+    menutitle = white;blue
+    menuframe = white;blue
 
 [buttonbar]
-    hotkey = red;lightgray
-    button = black;lightgray
+    hotkey = red;white
+    button = black;white
 
 [statusbar]
-    _default_ = black;lightgray
+    _default_ = black;white
 
 [help]
-    _default_ = black;lightgray
-    helpitalic = red;lightgray
-    helpbold = blue;lightgray
+    _default_ = black;white
+    helpitalic = red;white
+    helpbold = blue;white
     helplink = black;cyan
-    helpslink = yellow;blue
-    helptitle = blue;lightgray
-    helpframe = black;lightgray
+    helpslink = brightyellow;blue
+    helptitle = blue;white
+    helpframe = black;white
 
 [editor]
-    _default_ = lightgray;black
-    editbold = yellow;green
-    editmarked = black;lightgray
+    _default_ = white;black
+    editbold = brightyellow;green
+    editmarked = black;white
     editwhitespace = brightblue;black
     editnonprintable = ;black
-    editlinestate = white;cyan
-    bookmark = white;red
+    editlinestate = brightwhite;cyan
+    bookmark = brightwhite;red
     bookmarkfound = black;green
-    editrightmargin = white;blue
+    editrightmargin = brightwhite;blue
 #    editbg =
-    editframe = gray;
-    editframeactive = lightgray;
+    editframe = brightblack;
+    editframeactive = white;
     editframedrag = red;
 
 [viewer]
-    _default_ = lightgray;black
-    viewbold = yellow;black
+    _default_ = white;black
+    viewbold = brightyellow;black
     viewunderline = brightred;black
-    viewboldunderline = yellow;black
-    viewselected = yellow;cyan
-    viewframe = lightgray;black
+    viewboldunderline = brightyellow;black
+    viewselected = brightyellow;cyan
+    viewframe = white;black
 
 [diffviewer]
-    added = white;green
+    added = brightwhite;green
     changedline = blue;cyan
     changednew = red;cyan
-    changed = white;cyan
-    removed = white;red
-    error = red;lightgray
+    changed = brightwhite;cyan
+    removed = brightwhite;red
+    error = red;white
 
 [widget-panel]
     sort-up-char = ↑