Skip to content

Commit ba69b9e

Browse files
authored
Support extended color names in HTML 5 validation (htacg#914)
Fixes htacg#908
1 parent 4cf1693 commit ba69b9e

File tree

2 files changed

+441
-30
lines changed

2 files changed

+441
-30
lines changed

src/access.c

+290-26
Original file line numberDiff line numberDiff line change
@@ -64,45 +64,309 @@ static const ctmbstr frameExtensions[] =
6464
/* List of possible colour values */
6565
static const int colorValues[][3] =
6666
{
67-
{ 0, 0, 0},
68-
{128,128,128},
69-
{192,192,192},
70-
{255,255,255},
71-
{192, 0, 0},
72-
{255, 0, 0},
73-
{128, 0,128},
74-
{255, 0,255},
75-
{ 0,128, 0},
76-
{ 0,255, 0},
77-
{128,128, 0},
78-
{255,255, 0},
79-
{ 0, 0,128},
80-
{ 0, 0,255},
81-
{ 0,128,128},
82-
{ 0,255,255}
67+
{240, 248, 255 },
68+
{250, 235, 215 },
69+
{0, 255, 255 },
70+
{127, 255, 212 },
71+
{240, 255, 255 },
72+
{245, 245, 220 },
73+
{255, 228, 196 },
74+
{0, 0, 0 },
75+
{255, 235, 205 },
76+
{0, 0, 255 },
77+
{138, 43, 226 },
78+
{165, 42, 42 },
79+
{222, 184, 135 },
80+
{95, 158, 160 },
81+
{127, 255, 0 },
82+
{210, 105, 30 },
83+
{255, 127, 80 },
84+
{100, 149, 237 },
85+
{255, 248, 220 },
86+
{220, 20, 60 },
87+
{0, 255, 255 },
88+
{0, 0, 139 },
89+
{0, 139, 139 },
90+
{184, 134, 11 },
91+
{169, 169, 169 },
92+
{0, 100, 0 },
93+
{169, 169, 169 },
94+
{189, 183, 107 },
95+
{139, 0, 139 },
96+
{85, 107, 47 },
97+
{255, 140, 0 },
98+
{153, 50, 204 },
99+
{139, 0, 0 },
100+
{233, 150, 122 },
101+
{143, 188, 143 },
102+
{72, 61, 139 },
103+
{47, 79, 79 },
104+
{47, 79, 79 },
105+
{0, 206, 209 },
106+
{148, 0, 211 },
107+
{255, 20, 147 },
108+
{0, 191, 255 },
109+
{105, 105, 105 },
110+
{105, 105, 105 },
111+
{30, 144, 255 },
112+
{178, 34, 34 },
113+
{255, 250, 240 },
114+
{34, 139, 34 },
115+
{255, 0, 255 },
116+
{220, 220, 220 },
117+
{248, 248, 255 },
118+
{255, 215, 0 },
119+
{218, 165, 32 },
120+
{128, 128, 128 },
121+
{0, 128, 0 },
122+
{173, 255, 47 },
123+
{128, 128, 128 },
124+
{240, 255, 240 },
125+
{255, 105, 180 },
126+
{205, 92, 92 },
127+
{75, 0, 130 },
128+
{255, 255, 240 },
129+
{240, 230, 140 },
130+
{230, 230, 250 },
131+
{255, 240, 245 },
132+
{124, 252, 0 },
133+
{255, 250, 205 },
134+
{173, 216, 230 },
135+
{240, 128, 128 },
136+
{224, 255, 255 },
137+
{250, 250, 210 },
138+
{211, 211, 211 },
139+
{144, 238, 144 },
140+
{211, 211, 211 },
141+
{255, 182, 193 },
142+
{255, 160, 122 },
143+
{32, 178, 170 },
144+
{135, 206, 250 },
145+
{119, 136, 153 },
146+
{119, 136, 153 },
147+
{176, 196, 222 },
148+
{255, 255, 224 },
149+
{0, 255, 0 },
150+
{50, 205, 50 },
151+
{250, 240, 230 },
152+
{255, 0, 255 },
153+
{128, 0, 0 },
154+
{102, 205, 170 },
155+
{0, 0, 205 },
156+
{186, 85, 211 },
157+
{147, 112, 219 },
158+
{60, 179, 113 },
159+
{123, 104, 238 },
160+
{0, 250, 154 },
161+
{72, 209, 204 },
162+
{199, 21, 133 },
163+
{25, 25, 112 },
164+
{245, 255, 250 },
165+
{255, 228, 225 },
166+
{255, 228, 181 },
167+
{255, 222, 173 },
168+
{0, 0, 128 },
169+
{253, 245, 230 },
170+
{128, 128, 0 },
171+
{107, 142, 35 },
172+
{255, 165, 0 },
173+
{255, 69, 0 },
174+
{218, 112, 214 },
175+
{238, 232, 170 },
176+
{152, 251, 152 },
177+
{175, 238, 238 },
178+
{219, 112, 147 },
179+
{255, 239, 213 },
180+
{255, 218, 185 },
181+
{205, 133, 63 },
182+
{255, 192, 203 },
183+
{221, 160, 221 },
184+
{176, 224, 230 },
185+
{128, 0, 128 },
186+
{102, 51, 153 },
187+
{255, 0, 0 },
188+
{188, 143, 143 },
189+
{65, 105, 225 },
190+
{139, 69, 19 },
191+
{250, 128, 114 },
192+
{244, 164, 96 },
193+
{46, 139, 87 },
194+
{255, 245, 238 },
195+
{160, 82, 45 },
196+
{192, 192, 192 },
197+
{135, 206, 235 },
198+
{106, 90, 205 },
199+
{112, 128, 144 },
200+
{112, 128, 144 },
201+
{255, 250, 250 },
202+
{0, 255, 127 },
203+
{70, 130, 180 },
204+
{210, 180, 140 },
205+
{0, 128, 128 },
206+
{216, 191, 216 },
207+
{255, 99, 71 },
208+
{64, 224, 208 },
209+
{238, 130, 238 },
210+
{245, 222, 179 },
211+
{255, 255, 255 },
212+
{245, 245, 245 },
213+
{255, 255, 0 },
214+
{154, 205, 50 }
83215
};
84216

85217
#define N_COLOR_VALS (sizeof(colorValues)/(sizeof(int[3]))
86218

87219
/* These arrays are used to convert color names to their RGB values */
88220
static const ctmbstr colorNames[] =
89221
{
222+
"aliceblue",
223+
"antiquewhite",
224+
"aqua",
225+
"aquamarine",
226+
"azure",
227+
"beige",
228+
"bisque",
90229
"black",
91-
"silver",
92-
"grey",
93-
"white",
94-
"maroon",
95-
"red",
96-
"purple",
230+
"blanchedalmond",
231+
"blue",
232+
"blueviolet",
233+
"brown",
234+
"burlywood",
235+
"cadetblue",
236+
"chartreuse",
237+
"chocolate",
238+
"coral",
239+
"cornflowerblue",
240+
"cornsilk",
241+
"crimson",
242+
"cyan",
243+
"darkblue",
244+
"darkcyan",
245+
"darkgoldenrod",
246+
"darkgray",
247+
"darkgreen",
248+
"darkgrey",
249+
"darkkhaki",
250+
"darkmagenta",
251+
"darkolivegreen",
252+
"darkorange",
253+
"darkorchid",
254+
"darkred",
255+
"darksalmon",
256+
"darkseagreen",
257+
"darkslateblue",
258+
"darkslategray",
259+
"darkslategrey",
260+
"darkturquoise",
261+
"darkviolet",
262+
"deeppink",
263+
"deepskyblue",
264+
"dimgray",
265+
"dimgrey",
266+
"dodgerblue",
267+
"firebrick",
268+
"floralwhite",
269+
"forestgreen",
97270
"fuchsia",
271+
"gainsboro",
272+
"ghostwhite",
273+
"gold",
274+
"goldenrod",
275+
"gray",
98276
"green",
277+
"greenyellow",
278+
"grey",
279+
"honeydew",
280+
"hotpink",
281+
"indianred",
282+
"indigo",
283+
"ivory",
284+
"khaki",
285+
"lavender",
286+
"lavenderblush",
287+
"lawngreen",
288+
"lemonchiffon",
289+
"lightblue",
290+
"lightcoral",
291+
"lightcyan",
292+
"lightgoldenrodyellow",
293+
"lightgray",
294+
"lightgreen",
295+
"lightgrey",
296+
"lightpink",
297+
"lightsalmon",
298+
"lightseagreen",
299+
"lightskyblue",
300+
"lightslategray",
301+
"lightslategrey",
302+
"lightsteelblue",
303+
"lightyellow",
99304
"lime",
100-
"olive",
101-
"yellow",
305+
"limegreen",
306+
"linen",
307+
"magenta",
308+
"maroon",
309+
"mediumaquamarine",
310+
"mediumblue",
311+
"mediumorchid",
312+
"mediumpurple",
313+
"mediumseagreen",
314+
"mediumslateblue",
315+
"mediumspringgreen",
316+
"mediumturquoise",
317+
"mediumvioletred",
318+
"midnightblue",
319+
"mintcream",
320+
"mistyrose",
321+
"moccasin",
322+
"navajowhite",
102323
"navy",
103-
"blue",
324+
"oldlace",
325+
"olive",
326+
"olivedrab",
327+
"orange",
328+
"orangered",
329+
"orchid",
330+
"palegoldenrod",
331+
"palegreen",
332+
"paleturquoise",
333+
"palevioletred",
334+
"papayawhip",
335+
"peachpuff",
336+
"peru",
337+
"pink",
338+
"plum",
339+
"powderblue",
340+
"purple",
341+
"rebeccapurple",
342+
"red",
343+
"rosybrown",
344+
"royalblue",
345+
"saddlebrown",
346+
"salmon",
347+
"sandybrown",
348+
"seagreen",
349+
"seashell",
350+
"sienna",
351+
"silver",
352+
"skyblue",
353+
"slateblue",
354+
"slategray",
355+
"slategrey",
356+
"snow",
357+
"springgreen",
358+
"steelblue",
359+
"tan",
104360
"teal",
105-
"aqua"
361+
"thistle",
362+
"tomato",
363+
"turquoise",
364+
"violet",
365+
"wheat",
366+
"white",
367+
"whitesmoke",
368+
"yellow",
369+
"yellowgreen",
106370
};
107371

108372
#define N_COLOR_NAMES (sizeof(colorNames)/sizeof(ctmbstr))

0 commit comments

Comments
 (0)