baseline

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index c0e0f5dd9e1d41a91033b111490e3940fef807e0..443ba5463c4cef7118b240e95a28dae29daa18e2 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -3,13 +3,15 @@ CFLAGS = -Wall -g -O0
 try: try.o inkpot_scheme.o inkpot_xlate.o inkpot_value.o
 
 inkpot_scheme.o: inkpot_scheme.c inkpot_scheme.h inkpot.h inkpot_define.h \
-       inkpot_value.c inkpot_xlate.c inkpot_table.h
+       inkpot_value.c inkpot_xlate.c inkpot_scheme_table.h
 
 inkpot_xlate.o: inkpot_xlate.c inkpot_xlate.h inkpot.h
 
-inkpot_value.o: inkpot_value.c inkpot_value.h inkpot.h
+inkpot_value.o: inkpot_value.c inkpot_value.h inkpot.h inkpot_value_table.h
 
-inkpot_table.h: inkpot_define.h
+inkpot_value_table.h: inkpot_define.h
+
+inkpot_scheme_table.h: inkpot_define.h
 
 inkpot_define.h: x11.lib scripts/lib_2_h.tcl
        scripts/lib_2_h.tcl
@@ -17,5 +19,8 @@ inkpot_define.h: x11.lib scripts/lib_2_h.tcl
 x11.lib: data/rgb.txt scripts/rgb_txt_2_x11_lib.tcl
        scripts/rgb_txt_2_x11_lib.tcl data/rgb.txt
 
+svg.lib: data/types.html scripts/types_html_t_svg_lib.tcl
+       scripts/types_html_t_svg_lib.tcl data/types.html
+
 clean:
        rm -rf *.o try *.lib inkpot_table.h inkpot_define.h

diff --git a/lib/inkpot/data/POSTER b/lib/inkpot/data/POSTER
new file mode 100644 (file)
index 0000000..a7c30f3
--- /dev/null
+++ b/lib/inkpot/data/POSTER
@@ -0,0 +1,5 @@
+These files were obtained from:
+
+       rgb.txt :  /usr/share/X11/rgb.txt from xorg-x11-server-utils-7.4-3.fc10.x86_64
+       types.html : http://www.w3.org/TR/SVG/types.html
+       brewer_color : ?

diff --git a/lib/inkpot/data/svgcolor_names b/lib/inkpot/data/svgcolor_names
deleted file mode 100644 (file)
index da0648c..0000000
--- a/lib/inkpot/data/svgcolor_names
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# This data was obtained by cut&paste from a firefox rendering of:
-#      http://www.w3.org/TR/SVG/types.html#ColorKeywords
-#
-
-aliceblue color-patch  aliceblue       rgb(240, 248, 255)
-antiquewhite color-patch       antiquewhite    rgb(250, 235, 215)
-aqua color-patch       aqua    rgb( 0, 255, 255)
-aquamarine color-patch         aquamarine      rgb(127, 255, 212)
-azure color-patch      azure   rgb(240, 255, 255)
-beige color-patch      beige   rgb(245, 245, 220)
-bisque color-patch     bisque  rgb(255, 228, 196)
-black color-patch      black   rgb( 0, 0, 0)
-blanchedalmond color-patch     blanchedalmond  rgb(255, 235, 205)
-blue color-patch       blue    rgb( 0, 0, 255)
-blueviolet color-patch         blueviolet      rgb(138, 43, 226)
-brown color-patch      brown   rgb(165, 42, 42)
-burlywood color-patch  burlywood       rgb(222, 184, 135)
-cadetblue color-patch  cadetblue       rgb( 95, 158, 160)
-chartreuse color-patch         chartreuse      rgb(127, 255, 0)
-chocolate color-patch  chocolate       rgb(210, 105, 30)
-coral color-patch      coral   rgb(255, 127, 80)
-cornflowerblue color-patch     cornflowerblue  rgb(100, 149, 237)
-cornsilk color-patch   cornsilk        rgb(255, 248, 220)
-crimson color-patch    crimson         rgb(220, 20, 60)
-cyan color-patch       cyan    rgb( 0, 255, 255)
-darkblue color-patch   darkblue        rgb( 0, 0, 139)
-darkcyan color-patch   darkcyan        rgb( 0, 139, 139)
-darkgoldenrod color-patch      darkgoldenrod   rgb(184, 134, 11)
-darkgray color-patch   darkgray        rgb(169, 169, 169)
-darkgreen color-patch  darkgreen       rgb( 0, 100, 0)
-darkgrey color-patch   darkgrey        rgb(169, 169, 169)
-darkkhaki color-patch  darkkhaki       rgb(189, 183, 107)
-darkmagenta color-patch        darkmagenta     rgb(139, 0, 139)
-darkolivegreen color-patch     darkolivegreen  rgb( 85, 107, 47)
-darkorange color-patch         darkorange      rgb(255, 140, 0)
-darkorchid color-patch         darkorchid      rgb(153, 50, 204)
-darkred color-patch    darkred         rgb(139, 0, 0)
-darksalmon color-patch         darksalmon      rgb(233, 150, 122)
-darkseagreen color-patch       darkseagreen    rgb(143, 188, 143)
-darkslateblue color-patch      darkslateblue   rgb( 72, 61, 139)
-darkslategray color-patch      darkslategray   rgb( 47, 79, 79)
-darkslategrey color-patch      darkslategrey   rgb( 47, 79, 79)
-darkturquoise color-patch      darkturquoise   rgb( 0, 206, 209)
-darkviolet color-patch         darkviolet      rgb(148, 0, 211)
-deeppink color-patch   deeppink        rgb(255, 20, 147)
-deepskyblue color-patch        deepskyblue     rgb( 0, 191, 255)
-dimgray color-patch    dimgray         rgb(105, 105, 105)
-dimgrey color-patch    dimgrey         rgb(105, 105, 105)
-dodgerblue color-patch         dodgerblue      rgb( 30, 144, 255)
-firebrick color-patch  firebrick       rgb(178, 34, 34)
-floralwhite color-patch        floralwhite     rgb(255, 250, 240)
-forestgreen color-patch        forestgreen     rgb( 34, 139, 34)
-fuchsia color-patch    fuchsia         rgb(255, 0, 255)
-gainsboro color-patch  gainsboro       rgb(220, 220, 220)
-ghostwhite color-patch         ghostwhite      rgb(248, 248, 255)
-gold color-patch       gold    rgb(255, 215, 0)
-goldenrod color-patch  goldenrod       rgb(218, 165, 32)
-gray color-patch       gray    rgb(128, 128, 128)
-grey color-patch       grey    rgb(128, 128, 128)
-green color-patch      green   rgb( 0, 128, 0)
-greenyellow color-patch        greenyellow     rgb(173, 255, 47)
-honeydew color-patch   honeydew        rgb(240, 255, 240)
-hotpink color-patch    hotpink         rgb(255, 105, 180)
-indianred color-patch  indianred       rgb(205, 92, 92)
-indigo color-patch     indigo  rgb( 75, 0, 130)
-ivory color-patch      ivory   rgb(255, 255, 240)
-khaki color-patch      khaki   rgb(240, 230, 140)
-lavender color-patch   lavender        rgb(230, 230, 250)
-lavenderblush color-patch      lavenderblush   rgb(255, 240, 245)
-lawngreen color-patch  lawngreen       rgb(124, 252, 0)
-lemonchiffon color-patch       lemonchiffon    rgb(255, 250, 205)
-lightblue color-patch  lightblue       rgb(173, 216, 230)
-lightcoral color-patch         lightcoral      rgb(240, 128, 128)
-lightcyan color-patch  lightcyan       rgb(224, 255, 255)
-lightgoldenrodyellow color-patch       lightgoldenrodyellow    rgb(250, 250, 210)
-lightgray color-patch  lightgray       rgb(211, 211, 211)
-lightgreen color-patch         lightgreen      rgb(144, 238, 144)
-lightgrey color-patch  lightgrey       rgb(211, 211, 211)
-               
-lightpink color-patch  lightpink       rgb(255, 182, 193)
-lightsalmon color-patch        lightsalmon     rgb(255, 160, 122)
-lightseagreen color-patch      lightseagreen   rgb( 32, 178, 170)
-lightskyblue color-patch       lightskyblue    rgb(135, 206, 250)
-lightslategray color-patch     lightslategray  rgb(119, 136, 153)
-lightslategrey color-patch     lightslategrey  rgb(119, 136, 153)
-lightsteelblue color-patch     lightsteelblue  rgb(176, 196, 222)
-lightyellow color-patch        lightyellow     rgb(255, 255, 224)
-lime color-patch       lime    rgb( 0, 255, 0)
-limegreen color-patch  limegreen       rgb( 50, 205, 50)
-linen color-patch      linen   rgb(250, 240, 230)
-magenta color-patch    magenta         rgb(255, 0, 255)
-maroon color-patch     maroon  rgb(128, 0, 0)
-mediumaquamarine color-patch   mediumaquamarine        rgb(102, 205, 170)
-mediumblue color-patch         mediumblue      rgb( 0, 0, 205)
-mediumorchid color-patch       mediumorchid    rgb(186, 85, 211)
-mediumpurple color-patch       mediumpurple    rgb(147, 112, 219)
-mediumseagreen color-patch     mediumseagreen  rgb( 60, 179, 113)
-mediumslateblue color-patch    mediumslateblue         rgb(123, 104, 238)
-mediumspringgreen color-patch  mediumspringgreen       rgb( 0, 250, 154)
-mediumturquoise color-patch    mediumturquoise         rgb( 72, 209, 204)
-mediumvioletred color-patch    mediumvioletred         rgb(199, 21, 133)
-midnightblue color-patch       midnightblue    rgb( 25, 25, 112)
-mintcream color-patch  mintcream       rgb(245, 255, 250)
-mistyrose color-patch  mistyrose       rgb(255, 228, 225)
-moccasin color-patch   moccasin        rgb(255, 228, 181)
-navajowhite color-patch        navajowhite     rgb(255, 222, 173)
-navy color-patch       navy    rgb( 0, 0, 128)
-oldlace color-patch    oldlace         rgb(253, 245, 230)
-olive color-patch      olive   rgb(128, 128, 0)
-olivedrab color-patch  olivedrab       rgb(107, 142, 35)
-orange color-patch     orange  rgb(255, 165, 0)
-orangered color-patch  orangered       rgb(255, 69, 0)
-orchid color-patch     orchid  rgb(218, 112, 214)
-palegoldenrod color-patch      palegoldenrod   rgb(238, 232, 170)
-palegreen color-patch  palegreen       rgb(152, 251, 152)
-paleturquoise color-patch      paleturquoise   rgb(175, 238, 238)
-palevioletred color-patch      palevioletred   rgb(219, 112, 147)
-papayawhip color-patch         papayawhip      rgb(255, 239, 213)
-peachpuff color-patch  peachpuff       rgb(255, 218, 185)
-peru color-patch       peru    rgb(205, 133, 63)
-pink color-patch       pink    rgb(255, 192, 203)
-plum color-patch       plum    rgb(221, 160, 221)
-powderblue color-patch         powderblue      rgb(176, 224, 230)
-purple color-patch     purple  rgb(128, 0, 128)
-red color-patch        red     rgb(255, 0, 0)
-rosybrown color-patch  rosybrown       rgb(188, 143, 143)
-royalblue color-patch  royalblue       rgb( 65, 105, 225)
-saddlebrown color-patch        saddlebrown     rgb(139, 69, 19)
-salmon color-patch     salmon  rgb(250, 128, 114)
-sandybrown color-patch         sandybrown      rgb(244, 164, 96)
-seagreen color-patch   seagreen        rgb( 46, 139, 87)
-seashell color-patch   seashell        rgb(255, 245, 238)
-sienna color-patch     sienna  rgb(160, 82, 45)
-silver color-patch     silver  rgb(192, 192, 192)
-skyblue color-patch    skyblue         rgb(135, 206, 235)
-slateblue color-patch  slateblue       rgb(106, 90, 205)
-slategray color-patch  slategray       rgb(112, 128, 144)
-slategrey color-patch  slategrey       rgb(112, 128, 144)
-snow color-patch       snow    rgb(255, 250, 250)
-springgreen color-patch        springgreen     rgb( 0, 255, 127)
-steelblue color-patch  steelblue       rgb( 70, 130, 180)
-tan color-patch        tan     rgb(210, 180, 140)
-teal color-patch       teal    rgb( 0, 128, 128)
-thistle color-patch    thistle         rgb(216, 191, 216)
-tomato color-patch     tomato  rgb(255, 99, 71)
-turquoise color-patch  turquoise       rgb( 64, 224, 208)
-violet color-patch     violet  rgb(238, 130, 238)
-wheat color-patch      wheat   rgb(245, 222, 179)
-white color-patch      white   rgb(255, 255, 255)
-whitesmoke color-patch         whitesmoke      rgb(245, 245, 245)
-yellow color-patch     yellow  rgb(255, 255, 0)
-yellowgreen color-patch        yellowgreen     rgb(154, 205, 50)
-

diff --git a/lib/inkpot/inkpot_scheme.c b/lib/inkpot/inkpot_scheme.c
index 1739d17c993de51b5fa378c033f8a98bc3c1dfe8..6b2ee5d9f611601313117e4023d4e204ac754a1e 100644 (file)
--- a/lib/inkpot/inkpot_scheme.c
+++ b/lib/inkpot/inkpot_scheme.c
@@ -751,28 +751,27 @@ inkpot_status_t inkpot_debug_schemes( inkpot_t *inkpot )
         if ((1<<i) & inkpot->scheme_bits) {
             errputs(inkpot, " ");
             errputs(inkpot, &TAB_STRINGS[TAB_SCHEMES[i].string_idx]);
-            errputs(inkpot, " (in)");
+            errputs(inkpot, "(names) (in)");
            found++;
         }
         if ((1<<i) & inkpot->out_scheme_bit) {
            if (! found) {
                 errputs(inkpot, " ");
                 errputs(inkpot, &TAB_STRINGS[TAB_SCHEMES[i].string_idx]);
+                errputs(inkpot, "(names)");
            }
             errputs(inkpot, " (out)");
         }
-       if (found) 
-            errputs(inkpot, " (names)\n");
     }
     for (j = 0; j < inkpot->active_schemes; j++) {
         errputs(inkpot, " ");
         errputs(inkpot, &TAB_STRINGS[TAB_SCHEMES_INDEX[inkpot->scheme_list[j]].string_idx]);
-        errputs(inkpot, " (in) (index)\n");
+        errputs(inkpot, "(index) (in)\n");
     }
     for (j = 0; j < inkpot->active_out_schemes; j++) {
         errputs(inkpot, " ");
         errputs(inkpot, &TAB_STRINGS[TAB_SCHEMES_INDEX[inkpot->out_scheme_list[j]].string_idx]);
-        errputs(inkpot, " (out) (index)\n");
+        errputs(inkpot, "(index) (out)\n");
     }
     errputs(inkpot, "\n");