Commit ae160d36 authored by Stephen C. North's avatar Stephen C. North 🙀

added some missing X11 color names found in freedesktop.org

and enable definition of clusters by setting an attribute in
subgraphs instead of relying on subgraph name prefix.
these features still need to be documented.
parent d065da99
Pipeline #36021039 passed with stages
in 14 minutes and 27 seconds
......@@ -4,6 +4,7 @@ antiquewhite1 255 239 219 255
antiquewhite2 238 223 204 255
antiquewhite3 205 192 176 255
antiquewhite4 139 131 120 255
aqua 0 255 255 255
aquamarine 127 255 212 255
aquamarine1 127 255 212 255
aquamarine2 118 238 198 255
......@@ -70,13 +71,18 @@ cyan1 0 255 255 255
cyan2 0 238 238 255
cyan3 0 205 205 255
cyan4 0 139 139 255
darkblue 0 0 139 255
darkcyan 0 139 139 255
darkgoldenrod 184 134 11 255
darkgoldenrod1 255 185 15 255
darkgoldenrod2 238 173 14 255
darkgoldenrod3 205 149 12 255
darkgoldenrod4 139 101 8 255
darkgray 169 169 169 255
darkgreen 0 100 0 255
darkgrey 169 169 169 255
darkkhaki 189 183 107 255
darkmagenta 139 0 139 255
darkolivegreen 85 107 47 255
darkolivegreen1 202 255 112 255
darkolivegreen2 188 238 104 255
......@@ -92,6 +98,7 @@ darkorchid1 191 62 255 255
darkorchid2 178 58 238 255
darkorchid3 154 50 205 255
darkorchid4 104 34 139 255
darkred 139 0 0 255
darksalmon 233 150 122 255
darkseagreen 143 188 143 255
darkseagreen1 193 255 193 255
......@@ -131,6 +138,7 @@ firebrick3 205 38 38 255
firebrick4 139 26 26 255
floralwhite 255 250 240 255
forestgreen 34 139 34 255
fuchsia 255 0 255 255
gainsboro 220 220 220 255
ghostwhite 248 248 255 255
gold 255 215 0 255
......@@ -410,6 +418,7 @@ lightgoldenrod3 205 190 112 255
lightgoldenrod4 139 129 76 255
lightgoldenrodyellow 250 250 210 255
lightgray 211 211 211 255
lightgreen 144 238 144 255
lightgrey 211 211 211 255
lightpink 255 182 193 255
lightpink1 255 174 185 255
......@@ -440,6 +449,7 @@ lightyellow1 255 255 224 255
lightyellow2 238 238 209 255
lightyellow3 205 205 180 255
lightyellow4 139 139 122 255
lime 0 255 0 255
limegreen 50 205 50 255
linen 250 240 230 255
magenta 255 0 255 255
......@@ -486,6 +496,7 @@ navy 0 0 128 255
navyblue 0 0 128 255
none 255 255 254 0
oldlace 253 245 230 255
olive 128 128 0 255
olivedrab 107 142 35 255
olivedrab1 192 255 62 255
olivedrab2 179 238 58 255
......@@ -545,6 +556,7 @@ purple1 155 48 255 255
purple2 145 44 238 255
purple3 125 38 205 255
purple4 85 26 139 255
rebeccapurple 102 51 153 255
red 255 0 0 255
red1 255 0 0 255
red2 238 0 0 255
......@@ -582,6 +594,7 @@ sienna1 255 130 71 255
sienna2 238 121 66 255
sienna3 205 104 57 255
sienna4 139 71 38 255
silver 192 192 192 255
skyblue 135 206 235 255
skyblue1 135 206 255 255
skyblue2 126 192 238 255
......@@ -618,6 +631,7 @@ tan1 255 165 79 255
tan2 238 154 73 255
tan3 205 133 63 255
tan4 139 90 43 255
teal 0 128 128 255
thistle 216 191 216 255
thistle1 255 225 255 255
thistle2 238 210 238 255
......@@ -640,6 +654,11 @@ violetred1 255 62 150 255
violetred2 238 58 140 255
violetred3 205 50 120 255
violetred4 139 34 82 255
webgray 128 128 128 255
webgreen 0 128 0 255
webgrey 128 128 128 255
webmaroon 128 0 0 255
webpurple 128 0 128 255
wheat 245 222 179 255
wheat1 255 231 186 255
wheat2 238 216 174 255
......@@ -647,6 +666,11 @@ wheat3 205 186 150 255
wheat4 139 126 102 255
white 255 255 255 255
whitesmoke 245 245 245 255
x11gray 190 190 190 255
x11green 0 255 0 255
x11grey 190 190 190 255
x11maroon 176 48 96 255
x11purple 160 32 240 255
yellow 255 255 0 255
yellow1 255 255 0 255
yellow2 238 238 0 255
......
......@@ -914,7 +914,7 @@ void compute_bb(graph_t * g)
int is_a_cluster (Agraph_t* g)
{
return ((g == g->root) || (!strncasecmp(agnameof(g), "cluster", 7)));
return ((g == g->root) || (!strncasecmp(agnameof(g), "cluster", 7)) || mapBool(agget(g,"cluster"),FALSE));
}
/* setAttr:
......
......@@ -584,7 +584,8 @@ void dot_rank(graph_t * g, aspect_t* asp)
int is_cluster(graph_t * g)
{
return (strncmp(agnameof(g), "cluster", 7) == 0);
//return (strncmp(agnameof(g), "cluster", 7) == 0);
return is_a_cluster(g); // from utils.c
}
#ifdef OBSOLETE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment