From 59caf847183261bf31ac75e5e1ab7d819480ffee Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 1 Apr 2009 17:35:29 +0000 Subject: Support named colours. Fix malformed declaration test data -- everything up to and including the next semicolon is dropped on the floor. svn path=/trunk/libcss/; revision=7020 --- src/parse/propstrings.h | 184 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 183 insertions(+), 1 deletion(-) (limited to 'src/parse/propstrings.h') diff --git a/src/parse/propstrings.h b/src/parse/propstrings.h index 10c394a..884fe75 100644 --- a/src/parse/propstrings.h +++ b/src/parse/propstrings.h @@ -82,6 +82,37 @@ enum { FANTASY, MONOSPACE, MALE, FEMALE, CHILD, MIX, UNDERLINE, OVERLINE, LINE_THROUGH, BLINK, RGB, + /* Named colours */ + FIRST_COLOUR, + + ALICEBLUE = FIRST_COLOUR, ANTIQUEWHITE, AQUA, AQUAMARINE, AZURE, + BEIGE, BISQUE, BLACK, BLANCHEDALMOND, BLUE, BLUEVIOLET, BROWN, + BURLYWOOD, CADETBLUE, CHARTREUSE, CHOCOLATE, CORAL, CORNFLOWERBLUE, + CORNSILK, CRIMSON, CYAN, DARKBLUE, DARKCYAN, DARKGOLDENROD, DARKGRAY, + DARKGREEN, DARKGREY, DARKKHAKI, DARKMAGENTA, DARKOLIVEGREEN, DARKORANGE, + DARKORCHID, DARKRED, DARKSALMON, DARKSEAGREEN, DARKSLATEBLUE, + DARKSLATEGRAY, DARKSLATEGREY, DARKTURQUOISE, DARKVIOLET, DEEPPINK, + DEEPSKYBLUE, DIMGRAY, DIMGREY, DODGERBLUE, FELDSPAR, FIREBRICK, + FLORALWHITE, FORESTGREEN, FUCHSIA, GAINSBORO, GHOSTWHITE, GOLD, + GOLDENROD, GRAY, GREEN, GREENYELLOW, GREY, HONEYDEW, HOTPINK, + INDIANRED, INDIGO, IVORY, KHAKI, LAVENDER, LAVENDERBLUSH, LAWNGREEN, + LEMONCHIFFON, LIGHTBLUE, LIGHTCORAL, LIGHTCYAN, LIGHTGOLDENRODYELLOW, + LIGHTGRAY, LIGHTGREEN, LIGHTGREY, LIGHTPINK, LIGHTSALMON, LIGHTSEAGREEN, + LIGHTSKYBLUE, LIGHTSLATEBLUE, LIGHTSLATEGRAY, LIGHTSLATEGREY, + LIGHTSTEELBLUE, LIGHTYELLOW, LIME, LIMEGREEN, LINEN, MAGENTA, MAROON, + MEDIUMAQUAMARINE, MEDIUMBLUE, MEDIUMORCHID, MEDIUMPURPLE, + MEDIUMSEAGREEN, MEDIUMSLATEBLUE, MEDIUMSPRINGGREEN, MEDIUMTURQUOISE, + MEDIUMVIOLETRED, MIDNIGHTBLUE, MINTCREAM, MISTYROSE, MOCCASIN, + NAVAJOWHITE, NAVY, OLDLACE, OLIVE, OLIVEDRAB, ORANGE, ORANGERED, + ORCHID, PALEGOLDENROD, PALEGREEN, PALETURQUOISE, PALEVIOLETRED, + PAPAYAWHIP, PEACHPUFF, PERU, PINK, PLUM, POWDERBLUE, PURPLE, RED, + ROSYBROWN, ROYALBLUE, SADDLEBROWN, SALMON, SANDYBROWN, SEAGREEN, + SEASHELL, SIENNA, SILVER, SKYBLUE, SLATEBLUE, SLATEGRAY, SLATEGREY, + SNOW, SPRINGGREEN, STEELBLUE, TAN, TEAL, THISTLE, TOMATO, TURQUOISE, + VIOLET, VIOLETRED, WHEAT, WHITE, WHITESMOKE, YELLOW, YELLOWGREEN, + + LAST_COLOUR = YELLOWGREEN, + LAST_KNOWN }; @@ -394,7 +425,158 @@ static struct { { "overline", SLEN("overline") }, { "line-through", SLEN("line-through") }, { "blink", SLEN("blink") }, - { "rgb", SLEN("rgb") } + { "rgb", SLEN("rgb") }, + + { "aliceblue", SLEN("aliceblue") }, + { "antiquewhite", SLEN("antiquewhite") }, + { "aqua", SLEN("aqua") }, + { "aquamarine", SLEN("aquamarine") }, + { "azure", SLEN("azure") }, + { "beige", SLEN("beige") }, + { "bisque", SLEN("bisque") }, + { "black", SLEN("black") }, + { "blanchedalmond", SLEN("blanchedalmond") }, + { "blue", SLEN("blue") }, + { "blueviolet", SLEN("blueviolet") }, + { "brown", SLEN("brown") }, + { "burlywood", SLEN("burlywood") }, + { "cadetblue", SLEN("cadetblue") }, + { "chartreuse", SLEN("chartreuse") }, + { "chocolate", SLEN("chocolate") }, + { "coral", SLEN("coral") }, + { "cornflowerblue", SLEN("cornflowerblue") }, + { "cornsilk", SLEN("cornsilk") }, + { "crimson", SLEN("crimson") }, + { "cyan", SLEN("cyan") }, + { "darkblue", SLEN("darkblue") }, + { "darkcyan", SLEN("darkcyan") }, + { "darkgoldenrod", SLEN("darkgoldenrod") }, + { "darkgray", SLEN("darkgray") }, + { "darkgreen", SLEN("darkgreen") }, + { "darkgrey", SLEN("darkgrey") }, + { "darkkhaki", SLEN("darkkhaki") }, + { "darkmagenta", SLEN("darkmagenta") }, + { "darkolivegreen", SLEN("darkolivegreen") }, + { "darkorange", SLEN("darkorange") }, + { "darkorchid", SLEN("darkorchid") }, + { "darkred", SLEN("darkred") }, + { "darksalmon", SLEN("darksalmon") }, + { "darkseagreen", SLEN("darkseagreen") }, + { "darkslateblue", SLEN("darkslateblue") }, + { "darkslategray", SLEN("darkslategray") }, + { "darkslategrey", SLEN("darkslategrey") }, + { "darkturquoise", SLEN("darkturquoise") }, + { "darkviolet", SLEN("darkviolet") }, + { "deeppink", SLEN("deeppink") }, + { "deepskyblue", SLEN("deepskyblue") }, + { "dimgray", SLEN("dimgray") }, + { "dimgrey", SLEN("dimgrey") }, + { "dodgerblue", SLEN("dodgerblue") }, + { "feldspar", SLEN("feldspar") }, + { "firebrick", SLEN("firebrick") }, + { "floralwhite", SLEN("floralwhite") }, + { "forestgreen", SLEN("forestgreen") }, + { "fuchsia", SLEN("fuchsia") }, + { "gainsboro", SLEN("gainsboro") }, + { "ghostwhite", SLEN("ghostwhite") }, + { "gold", SLEN("gold") }, + { "goldenrod", SLEN("goldenrod") }, + { "gray", SLEN("gray") }, + { "green", SLEN("green") }, + { "greenyellow", SLEN("greenyellow") }, + { "grey", SLEN("grey") }, + { "honeydew", SLEN("honeydew") }, + { "hotpink", SLEN("hotpink") }, + { "indianred", SLEN("indianred") }, + { "indigo", SLEN("indigo") }, + { "ivory", SLEN("ivory") }, + { "khaki", SLEN("khaki") }, + { "lavender", SLEN("lavender") }, + { "lavenderblush", SLEN("lavenderblush") }, + { "lawngreen", SLEN("lawngreen") }, + { "lemonchiffon", SLEN("lemonchiffon") }, + { "lightblue", SLEN("lightblue") }, + { "lightcoral", SLEN("lightcoral") }, + { "lightcyan", SLEN("lightcyan") }, + { "lightgoldenrodyellow", SLEN("lightgoldenrodyellow") }, + { "lightgray", SLEN("lightgray") }, + { "lightgreen", SLEN("lightgreen") }, + { "lightgrey", SLEN("lightgrey") }, + { "lightpink", SLEN("lightpink") }, + { "lightsalmon", SLEN("lightsalmon") }, + { "lightseagreen", SLEN("lightseagreen") }, + { "lightskyblue", SLEN("lightskyblue") }, + { "lightslateblue", SLEN("lightslateblue") }, + { "lightslategray", SLEN("lightslategray") }, + { "lightslategrey", SLEN("lightslategrey") }, + { "lightsteelblue", SLEN("lightsteelblue") }, + { "lightyellow", SLEN("lightyellow") }, + { "lime", SLEN("lime") }, + { "limegreen", SLEN("limegreen") }, + { "linen", SLEN("linen") }, + { "magenta", SLEN("magenta") }, + { "maroon", SLEN("maroon") }, + { "mediumaquamarine", SLEN("mediumaquamarine") }, + { "mediumblue", SLEN("mediumblue") }, + { "mediumorchid", SLEN("mediumorchid") }, + { "mediumpurple", SLEN("mediumpurple") }, + { "mediumseagreen", SLEN("mediumseagreen") }, + { "mediumslateblue", SLEN("mediumslateblue") }, + { "mediumspringgreen", SLEN("mediumspringgreen") }, + { "mediumturquoise", SLEN("mediumturquoise") }, + { "mediumvioletred", SLEN("mediumvioletred") }, + { "midnightblue", SLEN("midnightblue") }, + { "mintcream", SLEN("mintcream") }, + { "mistyrose", SLEN("mistyrose") }, + { "moccasin", SLEN("moccasin") }, + { "navajowhite", SLEN("navajowhite") }, + { "navy", SLEN("navy") }, + { "oldlace", SLEN("oldlace") }, + { "olive", SLEN("olive") }, + { "olivedrab", SLEN("olivedrab") }, + { "orange", SLEN("orange") }, + { "orangered", SLEN("orangered") }, + { "orchid", SLEN("orchid") }, + { "palegoldenrod", SLEN("palegoldenrod") }, + { "palegreen", SLEN("palegreen") }, + { "paleturquoise", SLEN("paleturquoise") }, + { "palevioletred", SLEN("palevioletred") }, + { "papayawhip", SLEN("papayawhip") }, + { "peachpuff", SLEN("peachpuff") }, + { "peru", SLEN("peru") }, + { "pink", SLEN("pink") }, + { "plum", SLEN("plum") }, + { "powderblue", SLEN("powderblue") }, + { "purple", SLEN("purple") }, + { "red", SLEN("red") }, + { "rosybrown", SLEN("rosybrown") }, + { "royalblue", SLEN("royalblue") }, + { "saddlebrown", SLEN("saddlebrown") }, + { "salmon", SLEN("salmon") }, + { "sandybrown", SLEN("sandybrown") }, + { "seagreen", SLEN("seagreen") }, + { "seashell", SLEN("seashell") }, + { "sienna", SLEN("sienna") }, + { "silver", SLEN("silver") }, + { "skyblue", SLEN("skyblue") }, + { "slateblue", SLEN("slateblue") }, + { "slategray", SLEN("slategray") }, + { "slategrey", SLEN("slategrey") }, + { "snow", SLEN("snow") }, + { "springgreen", SLEN("springgreen") }, + { "steelblue", SLEN("steelblue") }, + { "tan", SLEN("tan") }, + { "teal", SLEN("teal") }, + { "thistle", SLEN("thistle") }, + { "tomato", SLEN("tomato") }, + { "turquoise", SLEN("turquoise") }, + { "violet", SLEN("violet") }, + { "violetred", SLEN("violetred") }, + { "wheat", SLEN("wheat") }, + { "white", SLEN("white") }, + { "whitesmoke", SLEN("whitesmoke") }, + { "yellow", SLEN("yellow") }, + { "yellowgreen", SLEN("yellowgreen") } }; #endif -- cgit v1.2.3