Fix XPM having white as color key (transparency)
authorpudim
Wed, 29 Jan 2020 20:32:29 +0000
changeset 750082214c629d1
parent 749 ec1f8032810e
child 751 59a4c1ea96f3
Fix XPM having white as color key (transparency)

XPM files with transparency were having white set as their color key,
causing unexpected blitting results.

Instead of white, use alpha=0 since the type is Uint32 anyway.
IMG_xpm.c
     1.1 --- a/IMG_xpm.c	Thu Jan 16 20:51:54 2020 -0800
     1.2 +++ b/IMG_xpm.c	Wed Jan 29 20:32:29 2020 +0000
     1.3 @@ -180,700 +180,699 @@
     1.4  }
     1.5  
     1.6  /*
     1.7 - * convert colour spec to RGB (in 0xrrggbb format).
     1.8 + * convert colour spec to RGB (in 0xaarrggbb format).
     1.9   * return 1 if successful.
    1.10   */
    1.11 -static int color_to_rgb(char *spec, int speclen, Uint32 *rgb)
    1.12 +static int color_to_argb(char *spec, int speclen, Uint32 *argb)
    1.13  {
    1.14      /* poor man's rgb.txt */
    1.15 -    static struct { char *name; Uint32 rgb; } known[] = {
    1.16 -        { "none",                 0xFFFFFFFF },
    1.17 -        { "black",                0x000000 },
    1.18 -        { "white",                0xFFFFFF },
    1.19 -        { "red",                  0xFF0000 },
    1.20 -        { "green",                0x00FF00 },
    1.21 -        { "blue",                 0x0000FF },
    1.22 +    static struct { char *name; Uint32 argb; } known[] = {
    1.23 +        { "none",                 0x00000000 },
    1.24 +        { "black",                0xff000000 },
    1.25 +        { "white",                0xffFFFFFF },
    1.26 +        { "red",                  0xffFF0000 },
    1.27 +        { "green",                0xff00FF00 },
    1.28 +        { "blue",                 0xff0000FF },
    1.29  /* This table increases the size of the library by 40K, so it's disabled by default */
    1.30  #ifdef EXTENDED_XPM_COLORS
    1.31 -        { "aliceblue",            0xf0f8ff },
    1.32 -        { "antiquewhite",         0xfaebd7 },
    1.33 -        { "antiquewhite1",        0xffefdb },
    1.34 -        { "antiquewhite2",        0xeedfcc },
    1.35 -        { "antiquewhite3",        0xcdc0b0 },
    1.36 -        { "antiquewhite4",        0x8b8378 },
    1.37 -        { "aqua",                 0x00ffff },
    1.38 -        { "aquamarine",           0x7fffd4 },
    1.39 -        { "aquamarine1",          0x7fffd4 },
    1.40 -        { "aquamarine2",          0x76eec6 },
    1.41 -        { "aquamarine3",          0x66cdaa },
    1.42 -        { "aquamarine4",          0x458b74 },
    1.43 -        { "azure",                0xf0ffff },
    1.44 -        { "azure1",               0xf0ffff },
    1.45 -        { "azure2",               0xe0eeee },
    1.46 -        { "azure3",               0xc1cdcd },
    1.47 -        { "azure4",               0x838b8b },
    1.48 -        { "beige",                0xf5f5dc },
    1.49 -        { "bisque",               0xffe4c4 },
    1.50 -        { "bisque1",              0xffe4c4 },
    1.51 -        { "bisque2",              0xeed5b7 },
    1.52 -        { "bisque3",              0xcdb79e },
    1.53 -        { "bisque4",              0x8b7d6b },
    1.54 -        { "black",                0x000000 },
    1.55 -        { "blanchedalmond",       0xffebcd },
    1.56 -        { "blue",                 0x0000ff },
    1.57 -        { "blue1",                0x0000ff },
    1.58 -        { "blue2",                0x0000ee },
    1.59 -        { "blue3",                0x0000cd },
    1.60 -        { "blue4",                0x00008B },
    1.61 -        { "blueviolet",           0x8a2be2 },
    1.62 -        { "brown",                0xA52A2A },
    1.63 -        { "brown1",               0xFF4040 },
    1.64 -        { "brown2",               0xEE3B3B },
    1.65 -        { "brown3",               0xCD3333 },
    1.66 -        { "brown4",               0x8B2323 },
    1.67 -        { "burlywood",            0xDEB887 },
    1.68 -        { "burlywood1",           0xFFD39B },
    1.69 -        { "burlywood2",           0xEEC591 },
    1.70 -        { "burlywood3",           0xCDAA7D },
    1.71 -        { "burlywood4",           0x8B7355 },
    1.72 -        { "cadetblue",            0x5F9EA0 },
    1.73 -        { "cadetblue",            0x5f9ea0 },
    1.74 -        { "cadetblue1",           0x98f5ff },
    1.75 -        { "cadetblue2",           0x8ee5ee },
    1.76 -        { "cadetblue3",           0x7ac5cd },
    1.77 -        { "cadetblue4",           0x53868b },
    1.78 -        { "chartreuse",           0x7FFF00 },
    1.79 -        { "chartreuse1",          0x7FFF00 },
    1.80 -        { "chartreuse2",          0x76EE00 },
    1.81 -        { "chartreuse3",          0x66CD00 },
    1.82 -        { "chartreuse4",          0x458B00 },
    1.83 -        { "chocolate",            0xD2691E },
    1.84 -        { "chocolate1",           0xFF7F24 },
    1.85 -        { "chocolate2",           0xEE7621 },
    1.86 -        { "chocolate3",           0xCD661D },
    1.87 -        { "chocolate4",           0x8B4513 },
    1.88 -        { "coral",                0xFF7F50 },
    1.89 -        { "coral1",               0xFF7256 },
    1.90 -        { "coral2",               0xEE6A50 },
    1.91 -        { "coral3",               0xCD5B45 },
    1.92 -        { "coral4",               0x8B3E2F },
    1.93 -        { "cornflowerblue",       0x6495ed },
    1.94 -        { "cornsilk",             0xFFF8DC },
    1.95 -        { "cornsilk1",            0xFFF8DC },
    1.96 -        { "cornsilk2",            0xEEE8CD },
    1.97 -        { "cornsilk3",            0xCDC8B1 },
    1.98 -        { "cornsilk4",            0x8B8878 },
    1.99 -        { "crimson",              0xDC143C },
   1.100 -        { "cyan",                 0x00FFFF },
   1.101 -        { "cyan1",                0x00FFFF },
   1.102 -        { "cyan2",                0x00EEEE },
   1.103 -        { "cyan3",                0x00CDCD },
   1.104 -        { "cyan4",                0x008B8B },
   1.105 -        { "darkblue",             0x00008b },
   1.106 -        { "darkcyan",             0x008b8b },
   1.107 -        { "darkgoldenrod",        0xb8860b },
   1.108 -        { "darkgoldenrod1",       0xffb90f },
   1.109 -        { "darkgoldenrod2",       0xeead0e },
   1.110 -        { "darkgoldenrod3",       0xcd950c },
   1.111 -        { "darkgoldenrod4",       0x8b6508 },
   1.112 -        { "darkgray",             0xa9a9a9 },
   1.113 -        { "darkgreen",            0x006400 },
   1.114 -        { "darkgrey",             0xa9a9a9 },
   1.115 -        { "darkkhaki",            0xbdb76b },
   1.116 -        { "darkmagenta",          0x8b008b },
   1.117 -        { "darkolivegreen",       0x556b2f },
   1.118 -        { "darkolivegreen1",      0xcaff70 },
   1.119 -        { "darkolivegreen2",      0xbcee68 },
   1.120 -        { "darkolivegreen3",      0xa2cd5a },
   1.121 -        { "darkolivegreen4",      0x6e8b3d },
   1.122 -        { "darkorange",           0xff8c00 },
   1.123 -        { "darkorange1",          0xff7f00 },
   1.124 -        { "darkorange2",          0xee7600 },
   1.125 -        { "darkorange3",          0xcd6600 },
   1.126 -        { "darkorange4",          0x8b4500 },
   1.127 -        { "darkorchid",           0x9932cc },
   1.128 -        { "darkorchid1",          0xbf3eff },
   1.129 -        { "darkorchid2",          0xb23aee },
   1.130 -        { "darkorchid3",          0x9a32cd },
   1.131 -        { "darkorchid4",          0x68228b },
   1.132 -        { "darkred",              0x8b0000 },
   1.133 -        { "darksalmon",           0xe9967a },
   1.134 -        { "darkseagreen",         0x8fbc8f },
   1.135 -        { "darkseagreen1",        0xc1ffc1 },
   1.136 -        { "darkseagreen2",        0xb4eeb4 },
   1.137 -        { "darkseagreen3",        0x9bcd9b },
   1.138 -        { "darkseagreen4",        0x698b69 },
   1.139 -        { "darkslateblue",        0x483d8b },
   1.140 -        { "darkslategray",        0x2f4f4f },
   1.141 -        { "darkslategray1",       0x97ffff },
   1.142 -        { "darkslategray2",       0x8deeee },
   1.143 -        { "darkslategray3",       0x79cdcd },
   1.144 -        { "darkslategray4",       0x528b8b },
   1.145 -        { "darkslategrey",        0x2f4f4f },
   1.146 -        { "darkturquoise",        0x00ced1 },
   1.147 -        { "darkviolet",           0x9400D3 },
   1.148 -        { "darkviolet",           0x9400d3 },
   1.149 -        { "deeppink",             0xff1493 },
   1.150 -        { "deeppink1",            0xff1493 },
   1.151 -        { "deeppink2",            0xee1289 },
   1.152 -        { "deeppink3",            0xcd1076 },
   1.153 -        { "deeppink4",            0x8b0a50 },
   1.154 -        { "deepskyblue",          0x00bfff },
   1.155 -        { "deepskyblue1",         0x00bfff },
   1.156 -        { "deepskyblue2",         0x00b2ee },
   1.157 -        { "deepskyblue3",         0x009acd },
   1.158 -        { "deepskyblue4",         0x00688b },
   1.159 -        { "dimgray",              0x696969 },
   1.160 -        { "dimgrey",              0x696969 },
   1.161 -        { "dodgerblue",           0x1e90ff },
   1.162 -        { "dodgerblue1",          0x1e90ff },
   1.163 -        { "dodgerblue2",          0x1c86ee },
   1.164 -        { "dodgerblue3",          0x1874cd },
   1.165 -        { "dodgerblue4",          0x104e8b },
   1.166 -        { "firebrick",            0xB22222 },
   1.167 -        { "firebrick1",           0xFF3030 },
   1.168 -        { "firebrick2",           0xEE2C2C },
   1.169 -        { "firebrick3",           0xCD2626 },
   1.170 -        { "firebrick4",           0x8B1A1A },
   1.171 -        { "floralwhite",          0xfffaf0 },
   1.172 -        { "forestgreen",          0x228b22 },
   1.173 -        { "fractal",              0x808080 },
   1.174 -        { "fuchsia",              0xFF00FF },
   1.175 -        { "gainsboro",            0xDCDCDC },
   1.176 -        { "ghostwhite",           0xf8f8ff },
   1.177 -        { "gold",                 0xFFD700 },
   1.178 -        { "gold1",                0xFFD700 },
   1.179 -        { "gold2",                0xEEC900 },
   1.180 -        { "gold3",                0xCDAD00 },
   1.181 -        { "gold4",                0x8B7500 },
   1.182 -        { "goldenrod",            0xDAA520 },
   1.183 -        { "goldenrod1",           0xFFC125 },
   1.184 -        { "goldenrod2",           0xEEB422 },
   1.185 -        { "goldenrod3",           0xCD9B1D },
   1.186 -        { "goldenrod4",           0x8B6914 },
   1.187 -        { "gray",                 0x7E7E7E },
   1.188 -        { "gray",                 0xBEBEBE },
   1.189 -        { "gray0",                0x000000 },
   1.190 -        { "gray1",                0x030303 },
   1.191 -        { "gray10",               0x1A1A1A },
   1.192 -        { "gray100",              0xFFFFFF },
   1.193 -        { "gray11",               0x1C1C1C },
   1.194 -        { "gray12",               0x1F1F1F },
   1.195 -        { "gray13",               0x212121 },
   1.196 -        { "gray14",               0x242424 },
   1.197 -        { "gray15",               0x262626 },
   1.198 -        { "gray16",               0x292929 },
   1.199 -        { "gray17",               0x2B2B2B },
   1.200 -        { "gray18",               0x2E2E2E },
   1.201 -        { "gray19",               0x303030 },
   1.202 -        { "gray2",                0x050505 },
   1.203 -        { "gray20",               0x333333 },
   1.204 -        { "gray21",               0x363636 },
   1.205 -        { "gray22",               0x383838 },
   1.206 -        { "gray23",               0x3B3B3B },
   1.207 -        { "gray24",               0x3D3D3D },
   1.208 -        { "gray25",               0x404040 },
   1.209 -        { "gray26",               0x424242 },
   1.210 -        { "gray27",               0x454545 },
   1.211 -        { "gray28",               0x474747 },
   1.212 -        { "gray29",               0x4A4A4A },
   1.213 -        { "gray3",                0x080808 },
   1.214 -        { "gray30",               0x4D4D4D },
   1.215 -        { "gray31",               0x4F4F4F },
   1.216 -        { "gray32",               0x525252 },
   1.217 -        { "gray33",               0x545454 },
   1.218 -        { "gray34",               0x575757 },
   1.219 -        { "gray35",               0x595959 },
   1.220 -        { "gray36",               0x5C5C5C },
   1.221 -        { "gray37",               0x5E5E5E },
   1.222 -        { "gray38",               0x616161 },
   1.223 -        { "gray39",               0x636363 },
   1.224 -        { "gray4",                0x0A0A0A },
   1.225 -        { "gray40",               0x666666 },
   1.226 -        { "gray41",               0x696969 },
   1.227 -        { "gray42",               0x6B6B6B },
   1.228 -        { "gray43",               0x6E6E6E },
   1.229 -        { "gray44",               0x707070 },
   1.230 -        { "gray45",               0x737373 },
   1.231 -        { "gray46",               0x757575 },
   1.232 -        { "gray47",               0x787878 },
   1.233 -        { "gray48",               0x7A7A7A },
   1.234 -        { "gray49",               0x7D7D7D },
   1.235 -        { "gray5",                0x0D0D0D },
   1.236 -        { "gray50",               0x7F7F7F },
   1.237 -        { "gray51",               0x828282 },
   1.238 -        { "gray52",               0x858585 },
   1.239 -        { "gray53",               0x878787 },
   1.240 -        { "gray54",               0x8A8A8A },
   1.241 -        { "gray55",               0x8C8C8C },
   1.242 -        { "gray56",               0x8F8F8F },
   1.243 -        { "gray57",               0x919191 },
   1.244 -        { "gray58",               0x949494 },
   1.245 -        { "gray59",               0x969696 },
   1.246 -        { "gray6",                0x0F0F0F },
   1.247 -        { "gray60",               0x999999 },
   1.248 -        { "gray61",               0x9C9C9C },
   1.249 -        { "gray62",               0x9E9E9E },
   1.250 -        { "gray63",               0xA1A1A1 },
   1.251 -        { "gray64",               0xA3A3A3 },
   1.252 -        { "gray65",               0xA6A6A6 },
   1.253 -        { "gray66",               0xA8A8A8 },
   1.254 -        { "gray67",               0xABABAB },
   1.255 -        { "gray68",               0xADADAD },
   1.256 -        { "gray69",               0xB0B0B0 },
   1.257 -        { "gray7",                0x121212 },
   1.258 -        { "gray70",               0xB3B3B3 },
   1.259 -        { "gray71",               0xB5B5B5 },
   1.260 -        { "gray72",               0xB8B8B8 },
   1.261 -        { "gray73",               0xBABABA },
   1.262 -        { "gray74",               0xBDBDBD },
   1.263 -        { "gray75",               0xBFBFBF },
   1.264 -        { "gray76",               0xC2C2C2 },
   1.265 -        { "gray77",               0xC4C4C4 },
   1.266 -        { "gray78",               0xC7C7C7 },
   1.267 -        { "gray79",               0xC9C9C9 },
   1.268 -        { "gray8",                0x141414 },
   1.269 -        { "gray80",               0xCCCCCC },
   1.270 -        { "gray81",               0xCFCFCF },
   1.271 -        { "gray82",               0xD1D1D1 },
   1.272 -        { "gray83",               0xD4D4D4 },
   1.273 -        { "gray84",               0xD6D6D6 },
   1.274 -        { "gray85",               0xD9D9D9 },
   1.275 -        { "gray86",               0xDBDBDB },
   1.276 -        { "gray87",               0xDEDEDE },
   1.277 -        { "gray88",               0xE0E0E0 },
   1.278 -        { "gray89",               0xE3E3E3 },
   1.279 -        { "gray9",                0x171717 },
   1.280 -        { "gray90",               0xE5E5E5 },
   1.281 -        { "gray91",               0xE8E8E8 },
   1.282 -        { "gray92",               0xEBEBEB },
   1.283 -        { "gray93",               0xEDEDED },
   1.284 -        { "gray94",               0xF0F0F0 },
   1.285 -        { "gray95",               0xF2F2F2 },
   1.286 -        { "gray96",               0xF5F5F5 },
   1.287 -        { "gray97",               0xF7F7F7 },
   1.288 -        { "gray98",               0xFAFAFA },
   1.289 -        { "gray99",               0xFCFCFC },
   1.290 -        { "green",                0x008000 },
   1.291 -        { "green",                0x00FF00 },
   1.292 -        { "green1",               0x00FF00 },
   1.293 -        { "green2",               0x00EE00 },
   1.294 -        { "green3",               0x00CD00 },
   1.295 -        { "green4",               0x008B00 },
   1.296 -        { "greenyellow",          0xadff2f },
   1.297 -        { "grey",                 0xBEBEBE },
   1.298 -        { "grey0",                0x000000 },
   1.299 -        { "grey1",                0x030303 },
   1.300 -        { "grey10",               0x1A1A1A },
   1.301 -        { "grey100",              0xFFFFFF },
   1.302 -        { "grey11",               0x1C1C1C },
   1.303 -        { "grey12",               0x1F1F1F },
   1.304 -        { "grey13",               0x212121 },
   1.305 -        { "grey14",               0x242424 },
   1.306 -        { "grey15",               0x262626 },
   1.307 -        { "grey16",               0x292929 },
   1.308 -        { "grey17",               0x2B2B2B },
   1.309 -        { "grey18",               0x2E2E2E },
   1.310 -        { "grey19",               0x303030 },
   1.311 -        { "grey2",                0x050505 },
   1.312 -        { "grey20",               0x333333 },
   1.313 -        { "grey21",               0x363636 },
   1.314 -        { "grey22",               0x383838 },
   1.315 -        { "grey23",               0x3B3B3B },
   1.316 -        { "grey24",               0x3D3D3D },
   1.317 -        { "grey25",               0x404040 },
   1.318 -        { "grey26",               0x424242 },
   1.319 -        { "grey27",               0x454545 },
   1.320 -        { "grey28",               0x474747 },
   1.321 -        { "grey29",               0x4A4A4A },
   1.322 -        { "grey3",                0x080808 },
   1.323 -        { "grey30",               0x4D4D4D },
   1.324 -        { "grey31",               0x4F4F4F },
   1.325 -        { "grey32",               0x525252 },
   1.326 -        { "grey33",               0x545454 },
   1.327 -        { "grey34",               0x575757 },
   1.328 -        { "grey35",               0x595959 },
   1.329 -        { "grey36",               0x5C5C5C },
   1.330 -        { "grey37",               0x5E5E5E },
   1.331 -        { "grey38",               0x616161 },
   1.332 -        { "grey39",               0x636363 },
   1.333 -        { "grey4",                0x0A0A0A },
   1.334 -        { "grey40",               0x666666 },
   1.335 -        { "grey41",               0x696969 },
   1.336 -        { "grey42",               0x6B6B6B },
   1.337 -        { "grey43",               0x6E6E6E },
   1.338 -        { "grey44",               0x707070 },
   1.339 -        { "grey45",               0x737373 },
   1.340 -        { "grey46",               0x757575 },
   1.341 -        { "grey47",               0x787878 },
   1.342 -        { "grey48",               0x7A7A7A },
   1.343 -        { "grey49",               0x7D7D7D },
   1.344 -        { "grey5",                0x0D0D0D },
   1.345 -        { "grey50",               0x7F7F7F },
   1.346 -        { "grey51",               0x828282 },
   1.347 -        { "grey52",               0x858585 },
   1.348 -        { "grey53",               0x878787 },
   1.349 -        { "grey54",               0x8A8A8A },
   1.350 -        { "grey55",               0x8C8C8C },
   1.351 -        { "grey56",               0x8F8F8F },
   1.352 -        { "grey57",               0x919191 },
   1.353 -        { "grey58",               0x949494 },
   1.354 -        { "grey59",               0x969696 },
   1.355 -        { "grey6",                0x0F0F0F },
   1.356 -        { "grey60",               0x999999 },
   1.357 -        { "grey61",               0x9C9C9C },
   1.358 -        { "grey62",               0x9E9E9E },
   1.359 -        { "grey63",               0xA1A1A1 },
   1.360 -        { "grey64",               0xA3A3A3 },
   1.361 -        { "grey65",               0xA6A6A6 },
   1.362 -        { "grey66",               0xA8A8A8 },
   1.363 -        { "grey67",               0xABABAB },
   1.364 -        { "grey68",               0xADADAD },
   1.365 -        { "grey69",               0xB0B0B0 },
   1.366 -        { "grey7",                0x121212 },
   1.367 -        { "grey70",               0xB3B3B3 },
   1.368 -        { "grey71",               0xB5B5B5 },
   1.369 -        { "grey72",               0xB8B8B8 },
   1.370 -        { "grey73",               0xBABABA },
   1.371 -        { "grey74",               0xBDBDBD },
   1.372 -        { "grey75",               0xBFBFBF },
   1.373 -        { "grey76",               0xC2C2C2 },
   1.374 -        { "grey77",               0xC4C4C4 },
   1.375 -        { "grey78",               0xC7C7C7 },
   1.376 -        { "grey79",               0xC9C9C9 },
   1.377 -        { "grey8",                0x141414 },
   1.378 -        { "grey80",               0xCCCCCC },
   1.379 -        { "grey81",               0xCFCFCF },
   1.380 -        { "grey82",               0xD1D1D1 },
   1.381 -        { "grey83",               0xD4D4D4 },
   1.382 -        { "grey84",               0xD6D6D6 },
   1.383 -        { "grey85",               0xD9D9D9 },
   1.384 -        { "grey86",               0xDBDBDB },
   1.385 -        { "grey87",               0xDEDEDE },
   1.386 -        { "grey88",               0xE0E0E0 },
   1.387 -        { "grey89",               0xE3E3E3 },
   1.388 -        { "grey9",                0x171717 },
   1.389 -        { "grey90",               0xE5E5E5 },
   1.390 -        { "grey91",               0xE8E8E8 },
   1.391 -        { "grey92",               0xEBEBEB },
   1.392 -        { "grey93",               0xEDEDED },
   1.393 -        { "grey94",               0xF0F0F0 },
   1.394 -        { "grey95",               0xF2F2F2 },
   1.395 -        { "grey96",               0xF5F5F5 },
   1.396 -        { "grey97",               0xF7F7F7 },
   1.397 -        { "grey98",               0xFAFAFA },
   1.398 -        { "grey99",               0xFCFCFC },
   1.399 -        { "honeydew",             0xF0FFF0 },
   1.400 -        { "honeydew1",            0xF0FFF0 },
   1.401 -        { "honeydew2",            0xE0EEE0 },
   1.402 -        { "honeydew3",            0xC1CDC1 },
   1.403 -        { "honeydew4",            0x838B83 },
   1.404 -        { "hotpink",              0xff69b4 },
   1.405 -        { "hotpink1",             0xff6eb4 },
   1.406 -        { "hotpink2",             0xee6aa7 },
   1.407 -        { "hotpink3",             0xcd6090 },
   1.408 -        { "hotpink4",             0x8b3a62 },
   1.409 -        { "indianred",            0xcd5c5c },
   1.410 -        { "indianred1",           0xff6a6a },
   1.411 -        { "indianred2",           0xee6363 },
   1.412 -        { "indianred3",           0xcd5555 },
   1.413 -        { "indianred4",           0x8b3a3a },
   1.414 -        { "indigo",               0x4B0082 },
   1.415 -        { "ivory",                0xFFFFF0 },
   1.416 -        { "ivory1",               0xFFFFF0 },
   1.417 -        { "ivory2",               0xEEEEE0 },
   1.418 -        { "ivory3",               0xCDCDC1 },
   1.419 -        { "ivory4",               0x8B8B83 },
   1.420 -        { "khaki",                0xF0E68C },
   1.421 -        { "khaki1",               0xFFF68F },
   1.422 -        { "khaki2",               0xEEE685 },
   1.423 -        { "khaki3",               0xCDC673 },
   1.424 -        { "khaki4",               0x8B864E },
   1.425 -        { "lavender",             0xE6E6FA },
   1.426 -        { "lavenderblush",        0xfff0f5 },
   1.427 -        { "lavenderblush1",       0xfff0f5 },
   1.428 -        { "lavenderblush2",       0xeee0e5 },
   1.429 -        { "lavenderblush3",       0xcdc1c5 },
   1.430 -        { "lavenderblush4",       0x8b8386 },
   1.431 -        { "lawngreen",            0x7cfc00 },
   1.432 -        { "lemonchiffon",         0xfffacd },
   1.433 -        { "lemonchiffon1",        0xfffacd },
   1.434 -        { "lemonchiffon2",        0xeee9bf },
   1.435 -        { "lemonchiffon3",        0xcdc9a5 },
   1.436 -        { "lemonchiffon4",        0x8b8970 },
   1.437 -        { "lightblue",            0xadd8e6 },
   1.438 -        { "lightblue1",           0xbfefff },
   1.439 -        { "lightblue2",           0xb2dfee },
   1.440 -        { "lightblue3",           0x9ac0cd },
   1.441 -        { "lightblue4",           0x68838b },
   1.442 -        { "lightcoral",           0xf08080 },
   1.443 -        { "lightcyan",            0xe0ffff },
   1.444 -        { "lightcyan1",           0xe0ffff },
   1.445 -        { "lightcyan2",           0xd1eeee },
   1.446 -        { "lightcyan3",           0xb4cdcd },
   1.447 -        { "lightcyan4",           0x7a8b8b },
   1.448 -        { "lightgoldenrod",       0xeedd82 },
   1.449 -        { "lightgoldenrod1",      0xffec8b },
   1.450 -        { "lightgoldenrod2",      0xeedc82 },
   1.451 -        { "lightgoldenrod3",      0xcdbe70 },
   1.452 -        { "lightgoldenrod4",      0x8b814c },
   1.453 -        { "lightgoldenrodyellow", 0xfafad2 },
   1.454 -        { "lightgray",            0xd3d3d3 },
   1.455 -        { "lightgreen",           0x90ee90 },
   1.456 -        { "lightgrey",            0xd3d3d3 },
   1.457 -        { "lightpink",            0xffb6c1 },
   1.458 -        { "lightpink1",           0xffaeb9 },
   1.459 -        { "lightpink2",           0xeea2ad },
   1.460 -        { "lightpink3",           0xcd8c95 },
   1.461 -        { "lightpink4",           0x8b5f65 },
   1.462 -        { "lightsalmon",          0xffa07a },
   1.463 -        { "lightsalmon1",         0xffa07a },
   1.464 -        { "lightsalmon2",         0xee9572 },
   1.465 -        { "lightsalmon3",         0xcd8162 },
   1.466 -        { "lightsalmon4",         0x8b5742 },
   1.467 -        { "lightseagreen",        0x20b2aa },
   1.468 -        { "lightskyblue",         0x87cefa },
   1.469 -        { "lightskyblue1",        0xb0e2ff },
   1.470 -        { "lightskyblue2",        0xa4d3ee },
   1.471 -        { "lightskyblue3",        0x8db6cd },
   1.472 -        { "lightskyblue4",        0x607b8b },
   1.473 -        { "lightslateblue",       0x8470ff },
   1.474 -        { "lightslategray",       0x778899 },
   1.475 -        { "lightslategrey",       0x778899 },
   1.476 -        { "lightsteelblue",       0xb0c4de },
   1.477 -        { "lightsteelblue1",      0xcae1ff },
   1.478 -        { "lightsteelblue2",      0xbcd2ee },
   1.479 -        { "lightsteelblue3",      0xa2b5cd },
   1.480 -        { "lightsteelblue4",      0x6e7b8b },
   1.481 -        { "lightyellow",          0xffffe0 },
   1.482 -        { "lightyellow1",         0xffffe0 },
   1.483 -        { "lightyellow2",         0xeeeed1 },
   1.484 -        { "lightyellow3",         0xcdcdb4 },
   1.485 -        { "lightyellow4",         0x8b8b7a },
   1.486 -        { "lime",                 0x00FF00 },
   1.487 -        { "limegreen",            0x32cd32 },
   1.488 -        { "linen",                0xFAF0E6 },
   1.489 -        { "magenta",              0xFF00FF },
   1.490 -        { "magenta1",             0xFF00FF },
   1.491 -        { "magenta2",             0xEE00EE },
   1.492 -        { "magenta3",             0xCD00CD },
   1.493 -        { "magenta4",             0x8B008B },
   1.494 -        { "maroon",               0x800000 },
   1.495 -        { "maroon",               0xB03060 },
   1.496 -        { "maroon1",              0xFF34B3 },
   1.497 -        { "maroon2",              0xEE30A7 },
   1.498 -        { "maroon3",              0xCD2990 },
   1.499 -        { "maroon4",              0x8B1C62 },
   1.500 -        { "mediumaquamarine",     0x66cdaa },
   1.501 -        { "mediumblue",           0x0000cd },
   1.502 -        { "mediumforestgreen",    0x32814b },
   1.503 -        { "mediumgoldenrod",      0xd1c166 },
   1.504 -        { "mediumorchid",         0xba55d3 },
   1.505 -        { "mediumorchid1",        0xe066ff },
   1.506 -        { "mediumorchid2",        0xd15fee },
   1.507 -        { "mediumorchid3",        0xb452cd },
   1.508 -        { "mediumorchid4",        0x7a378b },
   1.509 -        { "mediumpurple",         0x9370db },
   1.510 -        { "mediumpurple1",        0xab82ff },
   1.511 -        { "mediumpurple2",        0x9f79ee },
   1.512 -        { "mediumpurple3",        0x8968cd },
   1.513 -        { "mediumpurple4",        0x5d478b },
   1.514 -        { "mediumseagreen",       0x3cb371 },
   1.515 -        { "mediumslateblue",      0x7b68ee },
   1.516 -        { "mediumspringgreen",    0x00fa9a },
   1.517 -        { "mediumturquoise",      0x48d1cc },
   1.518 -        { "mediumvioletred",      0xc71585 },
   1.519 -        { "midnightblue",         0x191970 },
   1.520 -        { "mintcream",            0xf5fffa },
   1.521 -        { "mistyrose",            0xffe4e1 },
   1.522 -        { "mistyrose1",           0xffe4e1 },
   1.523 -        { "mistyrose2",           0xeed5d2 },
   1.524 -        { "mistyrose3",           0xcdb7b5 },
   1.525 -        { "mistyrose4",           0x8b7d7b },
   1.526 -        { "moccasin",             0xFFE4B5 },
   1.527 -        { "navajowhite",          0xffdead },
   1.528 -        { "navajowhite1",         0xffdead },
   1.529 -        { "navajowhite2",         0xeecfa1 },
   1.530 -        { "navajowhite3",         0xcdb38b },
   1.531 -        { "navajowhite4",         0x8b795e },
   1.532 -        { "navy",                 0x000080 },
   1.533 -        { "navyblue",             0x000080 },
   1.534 -        { "none",                 0x0000FF },
   1.535 -        { "oldlace",              0xfdf5e6 },
   1.536 -        { "olive",                0x808000 },
   1.537 -        { "olivedrab",            0x6b8e23 },
   1.538 -        { "olivedrab1",           0xc0ff3e },
   1.539 -        { "olivedrab2",           0xb3ee3a },
   1.540 -        { "olivedrab3",           0x9acd32 },
   1.541 -        { "olivedrab4",           0x698b22 },
   1.542 -        { "opaque",               0x000000 },
   1.543 -        { "orange",               0xFFA500 },
   1.544 -        { "orange1",              0xFFA500 },
   1.545 -        { "orange2",              0xEE9A00 },
   1.546 -        { "orange3",              0xCD8500 },
   1.547 -        { "orange4",              0x8B5A00 },
   1.548 -        { "orangered",            0xff4500 },
   1.549 -        { "orangered1",           0xff4500 },
   1.550 -        { "orangered2",           0xee4000 },
   1.551 -        { "orangered3",           0xcd3700 },
   1.552 -        { "orangered4",           0x8b2500 },
   1.553 -        { "orchid",               0xDA70D6 },
   1.554 -        { "orchid1",              0xFF83FA },
   1.555 -        { "orchid2",              0xEE7AE9 },
   1.556 -        { "orchid3",              0xCD69C9 },
   1.557 -        { "orchid4",              0x8B4789 },
   1.558 -        { "palegoldenrod",        0xeee8aa },
   1.559 -        { "palegreen",            0x98fb98 },
   1.560 -        { "palegreen1",           0x9aff9a },
   1.561 -        { "palegreen2",           0x90ee90 },
   1.562 -        { "palegreen3",           0x7ccd7c },
   1.563 -        { "palegreen4",           0x548b54 },
   1.564 -        { "paleturquoise",        0xafeeee },
   1.565 -        { "paleturquoise1",       0xbbffff },
   1.566 -        { "paleturquoise2",       0xaeeeee },
   1.567 -        { "paleturquoise3",       0x96cdcd },
   1.568 -        { "paleturquoise4",       0x668b8b },
   1.569 -        { "palevioletred",        0xdb7093 },
   1.570 -        { "palevioletred1",       0xff82ab },
   1.571 -        { "palevioletred2",       0xee799f },
   1.572 -        { "palevioletred3",       0xcd6889 },
   1.573 -        { "palevioletred4",       0x8b475d },
   1.574 -        { "papayawhip",           0xffefd5 },
   1.575 -        { "peachpuff",            0xffdab9 },
   1.576 -        { "peachpuff1",           0xffdab9 },
   1.577 -        { "peachpuff2",           0xeecbad },
   1.578 -        { "peachpuff3",           0xcdaf95 },
   1.579 -        { "peachpuff4",           0x8b7765 },
   1.580 -        { "peru",                 0xCD853F },
   1.581 -        { "pink",                 0xFFC0CB },
   1.582 -        { "pink1",                0xFFB5C5 },
   1.583 -        { "pink2",                0xEEA9B8 },
   1.584 -        { "pink3",                0xCD919E },
   1.585 -        { "pink4",                0x8B636C },
   1.586 -        { "plum",                 0xDDA0DD },
   1.587 -        { "plum1",                0xFFBBFF },
   1.588 -        { "plum2",                0xEEAEEE },
   1.589 -        { "plum3",                0xCD96CD },
   1.590 -        { "plum4",                0x8B668B },
   1.591 -        { "powderblue",           0xb0e0e6 },
   1.592 -        { "purple",               0x800080 },
   1.593 -        { "purple",               0xA020F0 },
   1.594 -        { "purple1",              0x9B30FF },
   1.595 -        { "purple2",              0x912CEE },
   1.596 -        { "purple3",              0x7D26CD },
   1.597 -        { "purple4",              0x551A8B },
   1.598 -        { "red",                  0xFF0000 },
   1.599 -        { "red1",                 0xFF0000 },
   1.600 -        { "red2",                 0xEE0000 },
   1.601 -        { "red3",                 0xCD0000 },
   1.602 -        { "red4",                 0x8B0000 },
   1.603 -        { "rosybrown",            0xbc8f8f },
   1.604 -        { "rosybrown1",           0xffc1c1 },
   1.605 -        { "rosybrown2",           0xeeb4b4 },
   1.606 -        { "rosybrown3",           0xcd9b9b },
   1.607 -        { "rosybrown4",           0x8b6969 },
   1.608 -        { "royalblue",            0x4169e1 },
   1.609 -        { "royalblue1",           0x4876ff },
   1.610 -        { "royalblue2",           0x436eee },
   1.611 -        { "royalblue3",           0x3a5fcd },
   1.612 -        { "royalblue4",           0x27408b },
   1.613 -        { "saddlebrown",          0x8b4513 },
   1.614 -        { "salmon",               0xFA8072 },
   1.615 -        { "salmon1",              0xFF8C69 },
   1.616 -        { "salmon2",              0xEE8262 },
   1.617 -        { "salmon3",              0xCD7054 },
   1.618 -        { "salmon4",              0x8B4C39 },
   1.619 -        { "sandybrown",           0xf4a460 },
   1.620 -        { "seagreen",             0x2e8b57 },
   1.621 -        { "seagreen1",            0x54ff9f },
   1.622 -        { "seagreen2",            0x4eee94 },
   1.623 -        { "seagreen3",            0x43cd80 },
   1.624 -        { "seagreen4",            0x2e8b57 },
   1.625 -        { "seashell",             0xFFF5EE },
   1.626 -        { "seashell1",            0xFFF5EE },
   1.627 -        { "seashell2",            0xEEE5DE },
   1.628 -        { "seashell3",            0xCDC5BF },
   1.629 -        { "seashell4",            0x8B8682 },
   1.630 -        { "sienna",               0xA0522D },
   1.631 -        { "sienna1",              0xFF8247 },
   1.632 -        { "sienna2",              0xEE7942 },
   1.633 -        { "sienna3",              0xCD6839 },
   1.634 -        { "sienna4",              0x8B4726 },
   1.635 -        { "silver",               0xC0C0C0 },
   1.636 -        { "skyblue",              0x87ceeb },
   1.637 -        { "skyblue1",             0x87ceff },
   1.638 -        { "skyblue2",             0x7ec0ee },
   1.639 -        { "skyblue3",             0x6ca6cd },
   1.640 -        { "skyblue4",             0x4a708b },
   1.641 -        { "slateblue",            0x6a5acd },
   1.642 -        { "slateblue1",           0x836fff },
   1.643 -        { "slateblue2",           0x7a67ee },
   1.644 -        { "slateblue3",           0x6959cd },
   1.645 -        { "slateblue4",           0x473c8b },
   1.646 -        { "slategray",            0x708090 },
   1.647 -        { "slategray1",           0xc6e2ff },
   1.648 -        { "slategray2",           0xb9d3ee },
   1.649 -        { "slategray3",           0x9fb6cd },
   1.650 -        { "slategray4",           0x6c7b8b },
   1.651 -        { "slategrey",            0x708090 },
   1.652 -        { "snow",                 0xFFFAFA },
   1.653 -        { "snow1",                0xFFFAFA },
   1.654 -        { "snow2",                0xEEE9E9 },
   1.655 -        { "snow3",                0xCDC9C9 },
   1.656 -        { "snow4",                0x8B8989 },
   1.657 -        { "springgreen",          0x00ff7f },
   1.658 -        { "springgreen1",         0x00ff7f },
   1.659 -        { "springgreen2",         0x00ee76 },
   1.660 -        { "springgreen3",         0x00cd66 },
   1.661 -        { "springgreen4",         0x008b45 },
   1.662 -        { "steelblue",            0x4682b4 },
   1.663 -        { "steelblue1",           0x63b8ff },
   1.664 -        { "steelblue2",           0x5cacee },
   1.665 -        { "steelblue3",           0x4f94cd },
   1.666 -        { "steelblue4",           0x36648b },
   1.667 -        { "tan",                  0xD2B48C },
   1.668 -        { "tan1",                 0xFFA54F },
   1.669 -        { "tan2",                 0xEE9A49 },
   1.670 -        { "tan3",                 0xCD853F },
   1.671 -        { "tan4",                 0x8B5A2B },
   1.672 -        { "teal",                 0x008080 },
   1.673 -        { "thistle",              0xD8BFD8 },
   1.674 -        { "thistle1",             0xFFE1FF },
   1.675 -        { "thistle2",             0xEED2EE },
   1.676 -        { "thistle3",             0xCDB5CD },
   1.677 -        { "thistle4",             0x8B7B8B },
   1.678 -        { "tomato",               0xFF6347 },
   1.679 -        { "tomato1",              0xFF6347 },
   1.680 -        { "tomato2",              0xEE5C42 },
   1.681 -        { "tomato3",              0xCD4F39 },
   1.682 -        { "tomato4",              0x8B3626 },
   1.683 -        { "transparent",          0x0000FF },
   1.684 -        { "turquoise",            0x40E0D0 },
   1.685 -        { "turquoise1",           0x00F5FF },
   1.686 -        { "turquoise2",           0x00E5EE },
   1.687 -        { "turquoise3",           0x00C5CD },
   1.688 -        { "turquoise4",           0x00868B },
   1.689 -        { "violet",               0xEE82EE },
   1.690 -        { "violetred",            0xd02090 },
   1.691 -        { "violetred1",           0xff3e96 },
   1.692 -        { "violetred2",           0xee3a8c },
   1.693 -        { "violetred3",           0xcd3278 },
   1.694 -        { "violetred4",           0x8b2252 },
   1.695 -        { "wheat",                0xF5DEB3 },
   1.696 -        { "wheat1",               0xFFE7BA },
   1.697 -        { "wheat2",               0xEED8AE },
   1.698 -        { "wheat3",               0xCDBA96 },
   1.699 -        { "wheat4",               0x8B7E66 },
   1.700 -        { "white",                0xFFFFFF },
   1.701 -        { "whitesmoke",           0xf5f5f5 },
   1.702 -        { "yellow",               0xFFFF00 },
   1.703 -        { "yellow1",              0xFFFF00 },
   1.704 -        { "yellow2",              0xEEEE00 },
   1.705 -        { "yellow3",              0xCDCD00 },
   1.706 -        { "yellow4",              0x8B8B00 },
   1.707 -        { "yellowgreen",          0x9acd32 },
   1.708 +        { "aliceblue",            0xfff0f8ff },
   1.709 +        { "antiquewhite",         0xfffaebd7 },
   1.710 +        { "antiquewhite1",        0xffffefdb },
   1.711 +        { "antiquewhite2",        0xffeedfcc },
   1.712 +        { "antiquewhite3",        0xffcdc0b0 },
   1.713 +        { "antiquewhite4",        0xff8b8378 },
   1.714 +        { "aqua",                 0xff00ffff },
   1.715 +        { "aquamarine",           0xff7fffd4 },
   1.716 +        { "aquamarine1",          0xff7fffd4 },
   1.717 +        { "aquamarine2",          0xff76eec6 },
   1.718 +        { "aquamarine3",          0xff66cdaa },
   1.719 +        { "aquamarine4",          0xff458b74 },
   1.720 +        { "azure",                0xfff0ffff },
   1.721 +        { "azure1",               0xfff0ffff },
   1.722 +        { "azure2",               0xffe0eeee },
   1.723 +        { "azure3",               0xffc1cdcd },
   1.724 +        { "azure4",               0xff838b8b },
   1.725 +        { "beige",                0xfff5f5dc },
   1.726 +        { "bisque",               0xffffe4c4 },
   1.727 +        { "bisque1",              0xffffe4c4 },
   1.728 +        { "bisque2",              0xffeed5b7 },
   1.729 +        { "bisque3",              0xffcdb79e },
   1.730 +        { "bisque4",              0xff8b7d6b },
   1.731 +        { "black",                0xff000000 },
   1.732 +        { "blanchedalmond",       0xffffebcd },
   1.733 +        { "blue",                 0xff0000ff },
   1.734 +        { "blue1",                0xff0000ff },
   1.735 +        { "blue2",                0xff0000ee },
   1.736 +        { "blue3",                0xff0000cd },
   1.737 +        { "blue4",                0xff00008B },
   1.738 +        { "blueviolet",           0xff8a2be2 },
   1.739 +        { "brown",                0xffA52A2A },
   1.740 +        { "brown1",               0xffFF4040 },
   1.741 +        { "brown2",               0xffEE3B3B },
   1.742 +        { "brown3",               0xffCD3333 },
   1.743 +        { "brown4",               0xff8B2323 },
   1.744 +        { "burlywood",            0xffDEB887 },
   1.745 +        { "burlywood1",           0xffFFD39B },
   1.746 +        { "burlywood2",           0xffEEC591 },
   1.747 +        { "burlywood3",           0xffCDAA7D },
   1.748 +        { "burlywood4",           0xff8B7355 },
   1.749 +        { "cadetblue",            0xff5F9EA0 },
   1.750 +        { "cadetblue",            0xff5f9ea0 },
   1.751 +        { "cadetblue1",           0xff98f5ff },
   1.752 +        { "cadetblue2",           0xff8ee5ee },
   1.753 +        { "cadetblue3",           0xff7ac5cd },
   1.754 +        { "cadetblue4",           0xff53868b },
   1.755 +        { "chartreuse",           0xff7FFF00 },
   1.756 +        { "chartreuse1",          0xff7FFF00 },
   1.757 +        { "chartreuse2",          0xff76EE00 },
   1.758 +        { "chartreuse3",          0xff66CD00 },
   1.759 +        { "chartreuse4",          0xff458B00 },
   1.760 +        { "chocolate",            0xffD2691E },
   1.761 +        { "chocolate1",           0xffFF7F24 },
   1.762 +        { "chocolate2",           0xffEE7621 },
   1.763 +        { "chocolate3",           0xffCD661D },
   1.764 +        { "chocolate4",           0xff8B4513 },
   1.765 +        { "coral",                0xffFF7F50 },
   1.766 +        { "coral1",               0xffFF7256 },
   1.767 +        { "coral2",               0xffEE6A50 },
   1.768 +        { "coral3",               0xffCD5B45 },
   1.769 +        { "coral4",               0xff8B3E2F },
   1.770 +        { "cornflowerblue",       0xff6495ed },
   1.771 +        { "cornsilk",             0xffFFF8DC },
   1.772 +        { "cornsilk1",            0xffFFF8DC },
   1.773 +        { "cornsilk2",            0xffEEE8CD },
   1.774 +        { "cornsilk3",            0xffCDC8B1 },
   1.775 +        { "cornsilk4",            0xff8B8878 },
   1.776 +        { "crimson",              0xffDC143C },
   1.777 +        { "cyan",                 0xff00FFFF },
   1.778 +        { "cyan1",                0xff00FFFF },
   1.779 +        { "cyan2",                0xff00EEEE },
   1.780 +        { "cyan3",                0xff00CDCD },
   1.781 +        { "cyan4",                0xff008B8B },
   1.782 +        { "darkblue",             0xff00008b },
   1.783 +        { "darkcyan",             0xff008b8b },
   1.784 +        { "darkgoldenrod",        0xffb8860b },
   1.785 +        { "darkgoldenrod1",       0xffffb90f },
   1.786 +        { "darkgoldenrod2",       0xffeead0e },
   1.787 +        { "darkgoldenrod3",       0xffcd950c },
   1.788 +        { "darkgoldenrod4",       0xff8b6508 },
   1.789 +        { "darkgray",             0xffa9a9a9 },
   1.790 +        { "darkgreen",            0xff006400 },
   1.791 +        { "darkgrey",             0xffa9a9a9 },
   1.792 +        { "darkkhaki",            0xffbdb76b },
   1.793 +        { "darkmagenta",          0xff8b008b },
   1.794 +        { "darkolivegreen",       0xff556b2f },
   1.795 +        { "darkolivegreen1",      0xffcaff70 },
   1.796 +        { "darkolivegreen2",      0xffbcee68 },
   1.797 +        { "darkolivegreen3",      0xffa2cd5a },
   1.798 +        { "darkolivegreen4",      0xff6e8b3d },
   1.799 +        { "darkorange",           0xffff8c00 },
   1.800 +        { "darkorange1",          0xffff7f00 },
   1.801 +        { "darkorange2",          0xffee7600 },
   1.802 +        { "darkorange3",          0xffcd6600 },
   1.803 +        { "darkorange4",          0xff8b4500 },
   1.804 +        { "darkorchid",           0xff9932cc },
   1.805 +        { "darkorchid1",          0xffbf3eff },
   1.806 +        { "darkorchid2",          0xffb23aee },
   1.807 +        { "darkorchid3",          0xff9a32cd },
   1.808 +        { "darkorchid4",          0xff68228b },
   1.809 +        { "darkred",              0xff8b0000 },
   1.810 +        { "darksalmon",           0xffe9967a },
   1.811 +        { "darkseagreen",         0xff8fbc8f },
   1.812 +        { "darkseagreen1",        0xffc1ffc1 },
   1.813 +        { "darkseagreen2",        0xffb4eeb4 },
   1.814 +        { "darkseagreen3",        0xff9bcd9b },
   1.815 +        { "darkseagreen4",        0xff698b69 },
   1.816 +        { "darkslateblue",        0xff483d8b },
   1.817 +        { "darkslategray",        0xff2f4f4f },
   1.818 +        { "darkslategray1",       0xff97ffff },
   1.819 +        { "darkslategray2",       0xff8deeee },
   1.820 +        { "darkslategray3",       0xff79cdcd },
   1.821 +        { "darkslategray4",       0xff528b8b },
   1.822 +        { "darkslategrey",        0xff2f4f4f },
   1.823 +        { "darkturquoise",        0xff00ced1 },
   1.824 +        { "darkviolet",           0xff9400D3 },
   1.825 +        { "darkviolet",           0xff9400d3 },
   1.826 +        { "deeppink",             0xffff1493 },
   1.827 +        { "deeppink1",            0xffff1493 },
   1.828 +        { "deeppink2",            0xffee1289 },
   1.829 +        { "deeppink3",            0xffcd1076 },
   1.830 +        { "deeppink4",            0xff8b0a50 },
   1.831 +        { "deepskyblue",          0xff00bfff },
   1.832 +        { "deepskyblue1",         0xff00bfff },
   1.833 +        { "deepskyblue2",         0xff00b2ee },
   1.834 +        { "deepskyblue3",         0xff009acd },
   1.835 +        { "deepskyblue4",         0xff00688b },
   1.836 +        { "dimgray",              0xff696969 },
   1.837 +        { "dimgrey",              0xff696969 },
   1.838 +        { "dodgerblue",           0xff1e90ff },
   1.839 +        { "dodgerblue1",          0xff1e90ff },
   1.840 +        { "dodgerblue2",          0xff1c86ee },
   1.841 +        { "dodgerblue3",          0xff1874cd },
   1.842 +        { "dodgerblue4",          0xff104e8b },
   1.843 +        { "firebrick",            0xffB22222 },
   1.844 +        { "firebrick1",           0xffFF3030 },
   1.845 +        { "firebrick2",           0xffEE2C2C },
   1.846 +        { "firebrick3",           0xffCD2626 },
   1.847 +        { "firebrick4",           0xff8B1A1A },
   1.848 +        { "floralwhite",          0xfffffaf0 },
   1.849 +        { "forestgreen",          0xff228b22 },
   1.850 +        { "fractal",              0xff808080 },
   1.851 +        { "fuchsia",              0xffFF00FF },
   1.852 +        { "gainsboro",            0xffDCDCDC },
   1.853 +        { "ghostwhite",           0xfff8f8ff },
   1.854 +        { "gold",                 0xffFFD700 },
   1.855 +        { "gold1",                0xffFFD700 },
   1.856 +        { "gold2",                0xffEEC900 },
   1.857 +        { "gold3",                0xffCDAD00 },
   1.858 +        { "gold4",                0xff8B7500 },
   1.859 +        { "goldenrod",            0xffDAA520 },
   1.860 +        { "goldenrod1",           0xffFFC125 },
   1.861 +        { "goldenrod2",           0xffEEB422 },
   1.862 +        { "goldenrod3",           0xffCD9B1D },
   1.863 +        { "goldenrod4",           0xff8B6914 },
   1.864 +        { "gray",                 0xff7E7E7E },
   1.865 +        { "gray",                 0xffBEBEBE },
   1.866 +        { "gray0",                0xff000000 },
   1.867 +        { "gray1",                0xff030303 },
   1.868 +        { "gray10",               0xff1A1A1A },
   1.869 +        { "gray100",              0xffFFFFFF },
   1.870 +        { "gray11",               0xff1C1C1C },
   1.871 +        { "gray12",               0xff1F1F1F },
   1.872 +        { "gray13",               0xff212121 },
   1.873 +        { "gray14",               0xff242424 },
   1.874 +        { "gray15",               0xff262626 },
   1.875 +        { "gray16",               0xff292929 },
   1.876 +        { "gray17",               0xff2B2B2B },
   1.877 +        { "gray18",               0xff2E2E2E },
   1.878 +        { "gray19",               0xff303030 },
   1.879 +        { "gray2",                0xff050505 },
   1.880 +        { "gray20",               0xff333333 },
   1.881 +        { "gray21",               0xff363636 },
   1.882 +        { "gray22",               0xff383838 },
   1.883 +        { "gray23",               0xff3B3B3B },
   1.884 +        { "gray24",               0xff3D3D3D },
   1.885 +        { "gray25",               0xff404040 },
   1.886 +        { "gray26",               0xff424242 },
   1.887 +        { "gray27",               0xff454545 },
   1.888 +        { "gray28",               0xff474747 },
   1.889 +        { "gray29",               0xff4A4A4A },
   1.890 +        { "gray3",                0xff080808 },
   1.891 +        { "gray30",               0xff4D4D4D },
   1.892 +        { "gray31",               0xff4F4F4F },
   1.893 +        { "gray32",               0xff525252 },
   1.894 +        { "gray33",               0xff545454 },
   1.895 +        { "gray34",               0xff575757 },
   1.896 +        { "gray35",               0xff595959 },
   1.897 +        { "gray36",               0xff5C5C5C },
   1.898 +        { "gray37",               0xff5E5E5E },
   1.899 +        { "gray38",               0xff616161 },
   1.900 +        { "gray39",               0xff636363 },
   1.901 +        { "gray4",                0xff0A0A0A },
   1.902 +        { "gray40",               0xff666666 },
   1.903 +        { "gray41",               0xff696969 },
   1.904 +        { "gray42",               0xff6B6B6B },
   1.905 +        { "gray43",               0xff6E6E6E },
   1.906 +        { "gray44",               0xff707070 },
   1.907 +        { "gray45",               0xff737373 },
   1.908 +        { "gray46",               0xff757575 },
   1.909 +        { "gray47",               0xff787878 },
   1.910 +        { "gray48",               0xff7A7A7A },
   1.911 +        { "gray49",               0xff7D7D7D },
   1.912 +        { "gray5",                0xff0D0D0D },
   1.913 +        { "gray50",               0xff7F7F7F },
   1.914 +        { "gray51",               0xff828282 },
   1.915 +        { "gray52",               0xff858585 },
   1.916 +        { "gray53",               0xff878787 },
   1.917 +        { "gray54",               0xff8A8A8A },
   1.918 +        { "gray55",               0xff8C8C8C },
   1.919 +        { "gray56",               0xff8F8F8F },
   1.920 +        { "gray57",               0xff919191 },
   1.921 +        { "gray58",               0xff949494 },
   1.922 +        { "gray59",               0xff969696 },
   1.923 +        { "gray6",                0xff0F0F0F },
   1.924 +        { "gray60",               0xff999999 },
   1.925 +        { "gray61",               0xff9C9C9C },
   1.926 +        { "gray62",               0xff9E9E9E },
   1.927 +        { "gray63",               0xffA1A1A1 },
   1.928 +        { "gray64",               0xffA3A3A3 },
   1.929 +        { "gray65",               0xffA6A6A6 },
   1.930 +        { "gray66",               0xffA8A8A8 },
   1.931 +        { "gray67",               0xffABABAB },
   1.932 +        { "gray68",               0xffADADAD },
   1.933 +        { "gray69",               0xffB0B0B0 },
   1.934 +        { "gray7",                0xff121212 },
   1.935 +        { "gray70",               0xffB3B3B3 },
   1.936 +        { "gray71",               0xffB5B5B5 },
   1.937 +        { "gray72",               0xffB8B8B8 },
   1.938 +        { "gray73",               0xffBABABA },
   1.939 +        { "gray74",               0xffBDBDBD },
   1.940 +        { "gray75",               0xffBFBFBF },
   1.941 +        { "gray76",               0xffC2C2C2 },
   1.942 +        { "gray77",               0xffC4C4C4 },
   1.943 +        { "gray78",               0xffC7C7C7 },
   1.944 +        { "gray79",               0xffC9C9C9 },
   1.945 +        { "gray8",                0xff141414 },
   1.946 +        { "gray80",               0xffCCCCCC },
   1.947 +        { "gray81",               0xffCFCFCF },
   1.948 +        { "gray82",               0xffD1D1D1 },
   1.949 +        { "gray83",               0xffD4D4D4 },
   1.950 +        { "gray84",               0xffD6D6D6 },
   1.951 +        { "gray85",               0xffD9D9D9 },
   1.952 +        { "gray86",               0xffDBDBDB },
   1.953 +        { "gray87",               0xffDEDEDE },
   1.954 +        { "gray88",               0xffE0E0E0 },
   1.955 +        { "gray89",               0xffE3E3E3 },
   1.956 +        { "gray9",                0xff171717 },
   1.957 +        { "gray90",               0xffE5E5E5 },
   1.958 +        { "gray91",               0xffE8E8E8 },
   1.959 +        { "gray92",               0xffEBEBEB },
   1.960 +        { "gray93",               0xffEDEDED },
   1.961 +        { "gray94",               0xffF0F0F0 },
   1.962 +        { "gray95",               0xffF2F2F2 },
   1.963 +        { "gray96",               0xffF5F5F5 },
   1.964 +        { "gray97",               0xffF7F7F7 },
   1.965 +        { "gray98",               0xffFAFAFA },
   1.966 +        { "gray99",               0xffFCFCFC },
   1.967 +        { "green",                0xff008000 },
   1.968 +        { "green",                0xff00FF00 },
   1.969 +        { "green1",               0xff00FF00 },
   1.970 +        { "green2",               0xff00EE00 },
   1.971 +        { "green3",               0xff00CD00 },
   1.972 +        { "green4",               0xff008B00 },
   1.973 +        { "greenyellow",          0xffadff2f },
   1.974 +        { "grey",                 0xffBEBEBE },
   1.975 +        { "grey0",                0xff000000 },
   1.976 +        { "grey1",                0xff030303 },
   1.977 +        { "grey10",               0xff1A1A1A },
   1.978 +        { "grey100",              0xffFFFFFF },
   1.979 +        { "grey11",               0xff1C1C1C },
   1.980 +        { "grey12",               0xff1F1F1F },
   1.981 +        { "grey13",               0xff212121 },
   1.982 +        { "grey14",               0xff242424 },
   1.983 +        { "grey15",               0xff262626 },
   1.984 +        { "grey16",               0xff292929 },
   1.985 +        { "grey17",               0xff2B2B2B },
   1.986 +        { "grey18",               0xff2E2E2E },
   1.987 +        { "grey19",               0xff303030 },
   1.988 +        { "grey2",                0xff050505 },
   1.989 +        { "grey20",               0xff333333 },
   1.990 +        { "grey21",               0xff363636 },
   1.991 +        { "grey22",               0xff383838 },
   1.992 +        { "grey23",               0xff3B3B3B },
   1.993 +        { "grey24",               0xff3D3D3D },
   1.994 +        { "grey25",               0xff404040 },
   1.995 +        { "grey26",               0xff424242 },
   1.996 +        { "grey27",               0xff454545 },
   1.997 +        { "grey28",               0xff474747 },
   1.998 +        { "grey29",               0xff4A4A4A },
   1.999 +        { "grey3",                0xff080808 },
  1.1000 +        { "grey30",               0xff4D4D4D },
  1.1001 +        { "grey31",               0xff4F4F4F },
  1.1002 +        { "grey32",               0xff525252 },
  1.1003 +        { "grey33",               0xff545454 },
  1.1004 +        { "grey34",               0xff575757 },
  1.1005 +        { "grey35",               0xff595959 },
  1.1006 +        { "grey36",               0xff5C5C5C },
  1.1007 +        { "grey37",               0xff5E5E5E },
  1.1008 +        { "grey38",               0xff616161 },
  1.1009 +        { "grey39",               0xff636363 },
  1.1010 +        { "grey4",                0xff0A0A0A },
  1.1011 +        { "grey40",               0xff666666 },
  1.1012 +        { "grey41",               0xff696969 },
  1.1013 +        { "grey42",               0xff6B6B6B },
  1.1014 +        { "grey43",               0xff6E6E6E },
  1.1015 +        { "grey44",               0xff707070 },
  1.1016 +        { "grey45",               0xff737373 },
  1.1017 +        { "grey46",               0xff757575 },
  1.1018 +        { "grey47",               0xff787878 },
  1.1019 +        { "grey48",               0xff7A7A7A },
  1.1020 +        { "grey49",               0xff7D7D7D },
  1.1021 +        { "grey5",                0xff0D0D0D },
  1.1022 +        { "grey50",               0xff7F7F7F },
  1.1023 +        { "grey51",               0xff828282 },
  1.1024 +        { "grey52",               0xff858585 },
  1.1025 +        { "grey53",               0xff878787 },
  1.1026 +        { "grey54",               0xff8A8A8A },
  1.1027 +        { "grey55",               0xff8C8C8C },
  1.1028 +        { "grey56",               0xff8F8F8F },
  1.1029 +        { "grey57",               0xff919191 },
  1.1030 +        { "grey58",               0xff949494 },
  1.1031 +        { "grey59",               0xff969696 },
  1.1032 +        { "grey6",                0xff0F0F0F },
  1.1033 +        { "grey60",               0xff999999 },
  1.1034 +        { "grey61",               0xff9C9C9C },
  1.1035 +        { "grey62",               0xff9E9E9E },
  1.1036 +        { "grey63",               0xffA1A1A1 },
  1.1037 +        { "grey64",               0xffA3A3A3 },
  1.1038 +        { "grey65",               0xffA6A6A6 },
  1.1039 +        { "grey66",               0xffA8A8A8 },
  1.1040 +        { "grey67",               0xffABABAB },
  1.1041 +        { "grey68",               0xffADADAD },
  1.1042 +        { "grey69",               0xffB0B0B0 },
  1.1043 +        { "grey7",                0xff121212 },
  1.1044 +        { "grey70",               0xffB3B3B3 },
  1.1045 +        { "grey71",               0xffB5B5B5 },
  1.1046 +        { "grey72",               0xffB8B8B8 },
  1.1047 +        { "grey73",               0xffBABABA },
  1.1048 +        { "grey74",               0xffBDBDBD },
  1.1049 +        { "grey75",               0xffBFBFBF },
  1.1050 +        { "grey76",               0xffC2C2C2 },
  1.1051 +        { "grey77",               0xffC4C4C4 },
  1.1052 +        { "grey78",               0xffC7C7C7 },
  1.1053 +        { "grey79",               0xffC9C9C9 },
  1.1054 +        { "grey8",                0xff141414 },
  1.1055 +        { "grey80",               0xffCCCCCC },
  1.1056 +        { "grey81",               0xffCFCFCF },
  1.1057 +        { "grey82",               0xffD1D1D1 },
  1.1058 +        { "grey83",               0xffD4D4D4 },
  1.1059 +        { "grey84",               0xffD6D6D6 },
  1.1060 +        { "grey85",               0xffD9D9D9 },
  1.1061 +        { "grey86",               0xffDBDBDB },
  1.1062 +        { "grey87",               0xffDEDEDE },
  1.1063 +        { "grey88",               0xffE0E0E0 },
  1.1064 +        { "grey89",               0xffE3E3E3 },
  1.1065 +        { "grey9",                0xff171717 },
  1.1066 +        { "grey90",               0xffE5E5E5 },
  1.1067 +        { "grey91",               0xffE8E8E8 },
  1.1068 +        { "grey92",               0xffEBEBEB },
  1.1069 +        { "grey93",               0xffEDEDED },
  1.1070 +        { "grey94",               0xffF0F0F0 },
  1.1071 +        { "grey95",               0xffF2F2F2 },
  1.1072 +        { "grey96",               0xffF5F5F5 },
  1.1073 +        { "grey97",               0xffF7F7F7 },
  1.1074 +        { "grey98",               0xffFAFAFA },
  1.1075 +        { "grey99",               0xffFCFCFC },
  1.1076 +        { "honeydew",             0xffF0FFF0 },
  1.1077 +        { "honeydew1",            0xffF0FFF0 },
  1.1078 +        { "honeydew2",            0xffE0EEE0 },
  1.1079 +        { "honeydew3",            0xffC1CDC1 },
  1.1080 +        { "honeydew4",            0xff838B83 },
  1.1081 +        { "hotpink",              0xffff69b4 },
  1.1082 +        { "hotpink1",             0xffff6eb4 },
  1.1083 +        { "hotpink2",             0xffee6aa7 },
  1.1084 +        { "hotpink3",             0xffcd6090 },
  1.1085 +        { "hotpink4",             0xff8b3a62 },
  1.1086 +        { "indianred",            0xffcd5c5c },
  1.1087 +        { "indianred1",           0xffff6a6a },
  1.1088 +        { "indianred2",           0xffee6363 },
  1.1089 +        { "indianred3",           0xffcd5555 },
  1.1090 +        { "indianred4",           0xff8b3a3a },
  1.1091 +        { "indigo",               0xff4B0082 },
  1.1092 +        { "ivory",                0xffFFFFF0 },
  1.1093 +        { "ivory1",               0xffFFFFF0 },
  1.1094 +        { "ivory2",               0xffEEEEE0 },
  1.1095 +        { "ivory3",               0xffCDCDC1 },
  1.1096 +        { "ivory4",               0xff8B8B83 },
  1.1097 +        { "khaki",                0xffF0E68C },
  1.1098 +        { "khaki1",               0xffFFF68F },
  1.1099 +        { "khaki2",               0xffEEE685 },
  1.1100 +        { "khaki3",               0xffCDC673 },
  1.1101 +        { "khaki4",               0xff8B864E },
  1.1102 +        { "lavender",             0xffE6E6FA },
  1.1103 +        { "lavenderblush",        0xfffff0f5 },
  1.1104 +        { "lavenderblush1",       0xfffff0f5 },
  1.1105 +        { "lavenderblush2",       0xffeee0e5 },
  1.1106 +        { "lavenderblush3",       0xffcdc1c5 },
  1.1107 +        { "lavenderblush4",       0xff8b8386 },
  1.1108 +        { "lawngreen",            0xff7cfc00 },
  1.1109 +        { "lemonchiffon",         0xfffffacd },
  1.1110 +        { "lemonchiffon1",        0xfffffacd },
  1.1111 +        { "lemonchiffon2",        0xffeee9bf },
  1.1112 +        { "lemonchiffon3",        0xffcdc9a5 },
  1.1113 +        { "lemonchiffon4",        0xff8b8970 },
  1.1114 +        { "lightblue",            0xffadd8e6 },
  1.1115 +        { "lightblue1",           0xffbfefff },
  1.1116 +        { "lightblue2",           0xffb2dfee },
  1.1117 +        { "lightblue3",           0xff9ac0cd },
  1.1118 +        { "lightblue4",           0xff68838b },
  1.1119 +        { "lightcoral",           0xfff08080 },
  1.1120 +        { "lightcyan",            0xffe0ffff },
  1.1121 +        { "lightcyan1",           0xffe0ffff },
  1.1122 +        { "lightcyan2",           0xffd1eeee },
  1.1123 +        { "lightcyan3",           0xffb4cdcd },
  1.1124 +        { "lightcyan4",           0xff7a8b8b },
  1.1125 +        { "lightgoldenrod",       0xffeedd82 },
  1.1126 +        { "lightgoldenrod1",      0xffffec8b },
  1.1127 +        { "lightgoldenrod2",      0xffeedc82 },
  1.1128 +        { "lightgoldenrod3",      0xffcdbe70 },
  1.1129 +        { "lightgoldenrod4",      0xff8b814c },
  1.1130 +        { "lightgoldenrodyellow", 0xfffafad2 },
  1.1131 +        { "lightgray",            0xffd3d3d3 },
  1.1132 +        { "lightgreen",           0xff90ee90 },
  1.1133 +        { "lightgrey",            0xffd3d3d3 },
  1.1134 +        { "lightpink",            0xffffb6c1 },
  1.1135 +        { "lightpink1",           0xffffaeb9 },
  1.1136 +        { "lightpink2",           0xffeea2ad },
  1.1137 +        { "lightpink3",           0xffcd8c95 },
  1.1138 +        { "lightpink4",           0xff8b5f65 },
  1.1139 +        { "lightsalmon",          0xffffa07a },
  1.1140 +        { "lightsalmon1",         0xffffa07a },
  1.1141 +        { "lightsalmon2",         0xffee9572 },
  1.1142 +        { "lightsalmon3",         0xffcd8162 },
  1.1143 +        { "lightsalmon4",         0xff8b5742 },
  1.1144 +        { "lightseagreen",        0xff20b2aa },
  1.1145 +        { "lightskyblue",         0xff87cefa },
  1.1146 +        { "lightskyblue1",        0xffb0e2ff },
  1.1147 +        { "lightskyblue2",        0xffa4d3ee },
  1.1148 +        { "lightskyblue3",        0xff8db6cd },
  1.1149 +        { "lightskyblue4",        0xff607b8b },
  1.1150 +        { "lightslateblue",       0xff8470ff },
  1.1151 +        { "lightslategray",       0xff778899 },
  1.1152 +        { "lightslategrey",       0xff778899 },
  1.1153 +        { "lightsteelblue",       0xffb0c4de },
  1.1154 +        { "lightsteelblue1",      0xffcae1ff },
  1.1155 +        { "lightsteelblue2",      0xffbcd2ee },
  1.1156 +        { "lightsteelblue3",      0xffa2b5cd },
  1.1157 +        { "lightsteelblue4",      0xff6e7b8b },
  1.1158 +        { "lightyellow",          0xffffffe0 },
  1.1159 +        { "lightyellow1",         0xffffffe0 },
  1.1160 +        { "lightyellow2",         0xffeeeed1 },
  1.1161 +        { "lightyellow3",         0xffcdcdb4 },
  1.1162 +        { "lightyellow4",         0xff8b8b7a },
  1.1163 +        { "lime",                 0xff00FF00 },
  1.1164 +        { "limegreen",            0xff32cd32 },
  1.1165 +        { "linen",                0xffFAF0E6 },
  1.1166 +        { "magenta",              0xffFF00FF },
  1.1167 +        { "magenta1",             0xffFF00FF },
  1.1168 +        { "magenta2",             0xffEE00EE },
  1.1169 +        { "magenta3",             0xffCD00CD },
  1.1170 +        { "magenta4",             0xff8B008B },
  1.1171 +        { "maroon",               0xff800000 },
  1.1172 +        { "maroon",               0xffB03060 },
  1.1173 +        { "maroon1",              0xffFF34B3 },
  1.1174 +        { "maroon2",              0xffEE30A7 },
  1.1175 +        { "maroon3",              0xffCD2990 },
  1.1176 +        { "maroon4",              0xff8B1C62 },
  1.1177 +        { "mediumaquamarine",     0xff66cdaa },
  1.1178 +        { "mediumblue",           0xff0000cd },
  1.1179 +        { "mediumforestgreen",    0xff32814b },
  1.1180 +        { "mediumgoldenrod",      0xffd1c166 },
  1.1181 +        { "mediumorchid",         0xffba55d3 },
  1.1182 +        { "mediumorchid1",        0xffe066ff },
  1.1183 +        { "mediumorchid2",        0xffd15fee },
  1.1184 +        { "mediumorchid3",        0xffb452cd },
  1.1185 +        { "mediumorchid4",        0xff7a378b },
  1.1186 +        { "mediumpurple",         0xff9370db },
  1.1187 +        { "mediumpurple1",        0xffab82ff },
  1.1188 +        { "mediumpurple2",        0xff9f79ee },
  1.1189 +        { "mediumpurple3",        0xff8968cd },
  1.1190 +        { "mediumpurple4",        0xff5d478b },
  1.1191 +        { "mediumseagreen",       0xff3cb371 },
  1.1192 +        { "mediumslateblue",      0xff7b68ee },
  1.1193 +        { "mediumspringgreen",    0xff00fa9a },
  1.1194 +        { "mediumturquoise",      0xff48d1cc },
  1.1195 +        { "mediumvioletred",      0xffc71585 },
  1.1196 +        { "midnightblue",         0xff191970 },
  1.1197 +        { "mintcream",            0xfff5fffa },
  1.1198 +        { "mistyrose",            0xffffe4e1 },
  1.1199 +        { "mistyrose1",           0xffffe4e1 },
  1.1200 +        { "mistyrose2",           0xffeed5d2 },
  1.1201 +        { "mistyrose3",           0xffcdb7b5 },
  1.1202 +        { "mistyrose4",           0xff8b7d7b },
  1.1203 +        { "moccasin",             0xffFFE4B5 },
  1.1204 +        { "navajowhite",          0xffffdead },
  1.1205 +        { "navajowhite1",         0xffffdead },
  1.1206 +        { "navajowhite2",         0xffeecfa1 },
  1.1207 +        { "navajowhite3",         0xffcdb38b },
  1.1208 +        { "navajowhite4",         0xff8b795e },
  1.1209 +        { "navy",                 0xff000080 },
  1.1210 +        { "navyblue",             0xff000080 },
  1.1211 +        { "none",                 0xff0000FF },
  1.1212 +        { "oldlace",              0xfffdf5e6 },
  1.1213 +        { "olive",                0xff808000 },
  1.1214 +        { "olivedrab",            0xff6b8e23 },
  1.1215 +        { "olivedrab1",           0xffc0ff3e },
  1.1216 +        { "olivedrab2",           0xffb3ee3a },
  1.1217 +        { "olivedrab3",           0xff9acd32 },
  1.1218 +        { "olivedrab4",           0xff698b22 },
  1.1219 +        { "opaque",               0xff000000 },
  1.1220 +        { "orange",               0xffFFA500 },
  1.1221 +        { "orange1",              0xffFFA500 },
  1.1222 +        { "orange2",              0xffEE9A00 },
  1.1223 +        { "orange3",              0xffCD8500 },
  1.1224 +        { "orange4",              0xff8B5A00 },
  1.1225 +        { "orangered",            0xffff4500 },
  1.1226 +        { "orangered1",           0xffff4500 },
  1.1227 +        { "orangered2",           0xffee4000 },
  1.1228 +        { "orangered3",           0xffcd3700 },
  1.1229 +        { "orangered4",           0xff8b2500 },
  1.1230 +        { "orchid",               0xffDA70D6 },
  1.1231 +        { "orchid1",              0xffFF83FA },
  1.1232 +        { "orchid2",              0xffEE7AE9 },
  1.1233 +        { "orchid3",              0xffCD69C9 },
  1.1234 +        { "orchid4",              0xff8B4789 },
  1.1235 +        { "palegoldenrod",        0xffeee8aa },
  1.1236 +        { "palegreen",            0xff98fb98 },
  1.1237 +        { "palegreen1",           0xff9aff9a },
  1.1238 +        { "palegreen2",           0xff90ee90 },
  1.1239 +        { "palegreen3",           0xff7ccd7c },
  1.1240 +        { "palegreen4",           0xff548b54 },
  1.1241 +        { "paleturquoise",        0xffafeeee },
  1.1242 +        { "paleturquoise1",       0xffbbffff },
  1.1243 +        { "paleturquoise2",       0xffaeeeee },
  1.1244 +        { "paleturquoise3",       0xff96cdcd },
  1.1245 +        { "paleturquoise4",       0xff668b8b },
  1.1246 +        { "palevioletred",        0xffdb7093 },
  1.1247 +        { "palevioletred1",       0xffff82ab },
  1.1248 +        { "palevioletred2",       0xffee799f },
  1.1249 +        { "palevioletred3",       0xffcd6889 },
  1.1250 +        { "palevioletred4",       0xff8b475d },
  1.1251 +        { "papayawhip",           0xffffefd5 },
  1.1252 +        { "peachpuff",            0xffffdab9 },
  1.1253 +        { "peachpuff1",           0xffffdab9 },
  1.1254 +        { "peachpuff2",           0xffeecbad },
  1.1255 +        { "peachpuff3",           0xffcdaf95 },
  1.1256 +        { "peachpuff4",           0xff8b7765 },
  1.1257 +        { "peru",                 0xffCD853F },
  1.1258 +        { "pink",                 0xffFFC0CB },
  1.1259 +        { "pink1",                0xffFFB5C5 },
  1.1260 +        { "pink2",                0xffEEA9B8 },
  1.1261 +        { "pink3",                0xffCD919E },
  1.1262 +        { "pink4",                0xff8B636C },
  1.1263 +        { "plum",                 0xffDDA0DD },
  1.1264 +        { "plum1",                0xffFFBBFF },
  1.1265 +        { "plum2",                0xffEEAEEE },
  1.1266 +        { "plum3",                0xffCD96CD },
  1.1267 +        { "plum4",                0xff8B668B },
  1.1268 +        { "powderblue",           0xffb0e0e6 },
  1.1269 +        { "purple",               0xff800080 },
  1.1270 +        { "purple",               0xffA020F0 },
  1.1271 +        { "purple1",              0xff9B30FF },
  1.1272 +        { "purple2",              0xff912CEE },
  1.1273 +        { "purple3",              0xff7D26CD },
  1.1274 +        { "purple4",              0xff551A8B },
  1.1275 +        { "red",                  0xffFF0000 },
  1.1276 +        { "red1",                 0xffFF0000 },
  1.1277 +        { "red2",                 0xffEE0000 },
  1.1278 +        { "red3",                 0xffCD0000 },
  1.1279 +        { "red4",                 0xff8B0000 },
  1.1280 +        { "rosybrown",            0xffbc8f8f },
  1.1281 +        { "rosybrown1",           0xffffc1c1 },
  1.1282 +        { "rosybrown2",           0xffeeb4b4 },
  1.1283 +        { "rosybrown3",           0xffcd9b9b },
  1.1284 +        { "rosybrown4",           0xff8b6969 },
  1.1285 +        { "royalblue",            0xff4169e1 },
  1.1286 +        { "royalblue1",           0xff4876ff },
  1.1287 +        { "royalblue2",           0xff436eee },
  1.1288 +        { "royalblue3",           0xff3a5fcd },
  1.1289 +        { "royalblue4",           0xff27408b },
  1.1290 +        { "saddlebrown",          0xff8b4513 },
  1.1291 +        { "salmon",               0xffFA8072 },
  1.1292 +        { "salmon1",              0xffFF8C69 },
  1.1293 +        { "salmon2",              0xffEE8262 },
  1.1294 +        { "salmon3",              0xffCD7054 },
  1.1295 +        { "salmon4",              0xff8B4C39 },
  1.1296 +        { "sandybrown",           0xfff4a460 },
  1.1297 +        { "seagreen",             0xff2e8b57 },
  1.1298 +        { "seagreen1",            0xff54ff9f },
  1.1299 +        { "seagreen2",            0xff4eee94 },
  1.1300 +        { "seagreen3",            0xff43cd80 },
  1.1301 +        { "seagreen4",            0xff2e8b57 },
  1.1302 +        { "seashell",             0xffFFF5EE },
  1.1303 +        { "seashell1",            0xffFFF5EE },
  1.1304 +        { "seashell2",            0xffEEE5DE },
  1.1305 +        { "seashell3",            0xffCDC5BF },
  1.1306 +        { "seashell4",            0xff8B8682 },
  1.1307 +        { "sienna",               0xffA0522D },
  1.1308 +        { "sienna1",              0xffFF8247 },
  1.1309 +        { "sienna2",              0xffEE7942 },
  1.1310 +        { "sienna3",              0xffCD6839 },
  1.1311 +        { "sienna4",              0xff8B4726 },
  1.1312 +        { "silver",               0xffC0C0C0 },
  1.1313 +        { "skyblue",              0xff87ceeb },
  1.1314 +        { "skyblue1",             0xff87ceff },
  1.1315 +        { "skyblue2",             0xff7ec0ee },
  1.1316 +        { "skyblue3",             0xff6ca6cd },
  1.1317 +        { "skyblue4",             0xff4a708b },
  1.1318 +        { "slateblue",            0xff6a5acd },
  1.1319 +        { "slateblue1",           0xff836fff },
  1.1320 +        { "slateblue2",           0xff7a67ee },
  1.1321 +        { "slateblue3",           0xff6959cd },
  1.1322 +        { "slateblue4",           0xff473c8b },
  1.1323 +        { "slategray",            0xff708090 },
  1.1324 +        { "slategray1",           0xffc6e2ff },
  1.1325 +        { "slategray2",           0xffb9d3ee },
  1.1326 +        { "slategray3",           0xff9fb6cd },
  1.1327 +        { "slategray4",           0xff6c7b8b },
  1.1328 +        { "slategrey",            0xff708090 },
  1.1329 +        { "snow",                 0xffFFFAFA },
  1.1330 +        { "snow1",                0xffFFFAFA },
  1.1331 +        { "snow2",                0xffEEE9E9 },
  1.1332 +        { "snow3",                0xffCDC9C9 },
  1.1333 +        { "snow4",                0xff8B8989 },
  1.1334 +        { "springgreen",          0xff00ff7f },
  1.1335 +        { "springgreen1",         0xff00ff7f },
  1.1336 +        { "springgreen2",         0xff00ee76 },
  1.1337 +        { "springgreen3",         0xff00cd66 },
  1.1338 +        { "springgreen4",         0xff008b45 },
  1.1339 +        { "steelblue",            0xff4682b4 },
  1.1340 +        { "steelblue1",           0xff63b8ff },
  1.1341 +        { "steelblue2",           0xff5cacee },
  1.1342 +        { "steelblue3",           0xff4f94cd },
  1.1343 +        { "steelblue4",           0xff36648b },
  1.1344 +        { "tan",                  0xffD2B48C },
  1.1345 +        { "tan1",                 0xffFFA54F },
  1.1346 +        { "tan2",                 0xffEE9A49 },
  1.1347 +        { "tan3",                 0xffCD853F },
  1.1348 +        { "tan4",                 0xff8B5A2B },
  1.1349 +        { "teal",                 0xff008080 },
  1.1350 +        { "thistle",              0xffD8BFD8 },
  1.1351 +        { "thistle1",             0xffFFE1FF },
  1.1352 +        { "thistle2",             0xffEED2EE },
  1.1353 +        { "thistle3",             0xffCDB5CD },
  1.1354 +        { "thistle4",             0xff8B7B8B },
  1.1355 +        { "tomato",               0xffFF6347 },
  1.1356 +        { "tomato1",              0xffFF6347 },
  1.1357 +        { "tomato2",              0xffEE5C42 },
  1.1358 +        { "tomato3",              0xffCD4F39 },
  1.1359 +        { "tomato4",              0xff8B3626 },
  1.1360 +        { "transparent",          0xff0000FF },
  1.1361 +        { "turquoise",            0xff40E0D0 },
  1.1362 +        { "turquoise1",           0xff00F5FF },
  1.1363 +        { "turquoise2",           0xff00E5EE },
  1.1364 +        { "turquoise3",           0xff00C5CD },
  1.1365 +        { "turquoise4",           0xff00868B },
  1.1366 +        { "violet",               0xffEE82EE },
  1.1367 +        { "violetred",            0xffd02090 },
  1.1368 +        { "violetred1",           0xffff3e96 },
  1.1369 +        { "violetred2",           0xffee3a8c },
  1.1370 +        { "violetred3",           0xffcd3278 },
  1.1371 +        { "violetred4",           0xff8b2252 },
  1.1372 +        { "wheat",                0xffF5DEB3 },
  1.1373 +        { "wheat1",               0xffFFE7BA },
  1.1374 +        { "wheat2",               0xffEED8AE },
  1.1375 +        { "wheat3",               0xffCDBA96 },
  1.1376 +        { "wheat4",               0xff8B7E66 },
  1.1377 +        { "white",                0xffFFFFFF },
  1.1378 +        { "whitesmoke",           0xfff5f5f5 },
  1.1379 +        { "yellow",               0xffFFFF00 },
  1.1380 +        { "yellow1",              0xffFFFF00 },
  1.1381 +        { "yellow2",              0xffEEEE00 },
  1.1382 +        { "yellow3",              0xffCDCD00 },
  1.1383 +        { "yellow4",              0xff8B8B00 },
  1.1384 +        { "yellowgreen",          0xff9acd32 },
  1.1385  #endif /* EXTENDED_XPM_COLORS */
  1.1386 -        {"none",                  0xFFFFFF}
  1.1387      };
  1.1388  
  1.1389      if (spec[0] == '#') {
  1.1390 @@ -897,13 +896,13 @@
  1.1391              break;
  1.1392          }
  1.1393          buf[6] = '\0';
  1.1394 -        *rgb = (Uint32)SDL_strtol(buf, NULL, 16);
  1.1395 +        *argb = 0xff000000 | (Uint32)SDL_strtol(buf, NULL, 16);
  1.1396          return 1;
  1.1397      } else {
  1.1398          int i;
  1.1399          for (i = 0; i < SDL_arraysize(known); i++) {
  1.1400              if (SDL_strncasecmp(known[i].name, spec, speclen) == 0) {
  1.1401 -                *rgb = known[i].rgb;
  1.1402 +                *argb = known[i].argb;
  1.1403                  return 1;
  1.1404              }
  1.1405          }
  1.1406 @@ -1062,7 +1061,7 @@
  1.1407      } else {
  1.1408          indexed = 0;
  1.1409          image = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, 32,
  1.1410 -                         0xff0000, 0x00ff00, 0x0000ff, 0);
  1.1411 +                         0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
  1.1412      }
  1.1413      if (!image) {
  1.1414          /* Hmm, some SDL error (out of memory?) */
  1.1415 @@ -1087,7 +1086,7 @@
  1.1416          for (;;) {
  1.1417              char nametype;
  1.1418              char *colname;
  1.1419 -            Uint32 rgb, pixel;
  1.1420 +            Uint32 argb, pixel;
  1.1421  
  1.1422              SKIPSPACE(p);
  1.1423              if (!*p) {
  1.1424 @@ -1102,23 +1101,24 @@
  1.1425              if (nametype == 's')
  1.1426                  continue;      /* skip symbolic colour names */
  1.1427  
  1.1428 -            if (!color_to_rgb(colname, (int)(p - colname), &rgb))
  1.1429 +            if (!color_to_argb(colname, (int)(p - colname), &argb))
  1.1430                  continue;
  1.1431  
  1.1432              SDL_memcpy(nextkey, line, cpp);
  1.1433              if (indexed) {
  1.1434                  SDL_Color *c = im_colors + index;
  1.1435 -                c->r = (Uint8)(rgb >> 16);
  1.1436 -                c->g = (Uint8)(rgb >> 8);
  1.1437 -                c->b = (Uint8)(rgb);
  1.1438 +                c->a = (Uint8)(argb >> 24);
  1.1439 +                c->r = (Uint8)(argb >> 16);
  1.1440 +                c->g = (Uint8)(argb >> 8);
  1.1441 +                c->b = (Uint8)(argb);
  1.1442                  pixel = index;
  1.1443 +                if (argb == 0x00000000)
  1.1444 +                        SDL_SetColorKey(image, SDL_TRUE, pixel);
  1.1445              } else {
  1.1446 -                pixel = rgb;
  1.1447 +                pixel = argb;
  1.1448              }
  1.1449              add_colorhash(colors, nextkey, cpp, pixel);
  1.1450              nextkey += cpp;
  1.1451 -            if (rgb == 0xffffffff)
  1.1452 -                SDL_SetColorKey(image, SDL_TRUE, pixel);
  1.1453              break;
  1.1454          }
  1.1455      }