diff --git a/mozilla/content/shared/src/nsCSSKeywords.cpp b/mozilla/content/shared/src/nsCSSKeywords.cpp index e5f8c9b2654..eefdfa68880 100644 --- a/mozilla/content/shared/src/nsCSSKeywords.cpp +++ b/mozilla/content/shared/src/nsCSSKeywords.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSKeywords.h" -#define TOTAL_KEYWORDS 86 +#define TOTAL_KEYWORDS 91 #define MIN_WORD_LENGTH 2 #define MAX_WORD_LENGTH 12 -#define MIN_HASH_VALUE 8 -#define MAX_HASH_VALUE 322 -/* maximum key range = 315, duplicates = 0 */ +#define MIN_HASH_VALUE 12 +#define MAX_HASH_VALUE 312 +/* maximum key range = 301, duplicates = 0 */ struct StaticNameTable { @@ -50,201 +50,206 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) { static unsigned short asso_values[] = { - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 15, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 5, 125, 115, - 35, 0, 5, 55, 60, 110, 0, 5, 0, 5, - 75, 0, 90, 5, 0, 25, 0, 27, 0, 90, - 10, 0, 323, 323, 323, 323, 323, 323, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 7, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 5, 125, 117, + 67, 0, 10, 55, 15, 20, 5, 35, 0, 25, + 75, 0, 10, 0, 106, 25, 0, 30, 10, 90, + 10, 0, 313, 313, 313, 313, 313, 313, }; static unsigned char lengthtable[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 5, 6, 2, 0, - 0, 0, 0, 2, 0, 0, 0, 11, 2, 0, 0, 0, 11, 0, - 0, 0, 0, 0, 7, 6, 7, 0, 4, 0, 0, 0, 5, 0, - 7, 8, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, - 0, 7, 0, 7, 0, 6, 0, 6, 0, 5, 0, 0, 6, 0, - 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 6, 0, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 6, 0, - 8, 9, 0, 0, 0, 0, 9, 0, 6, 7, 8, 0, 0, 11, - 2, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, - 0, 2, 0, 0, 0, 6, 7, 0, 0, 5, 6, 0, 0, 0, - 0, 0, 7, 0, 0, 0, 6, 5, 0, 9, 5, 6, 0, 0, - 4, 0, 6, 7, 0, 0, 0, 0, 0, 8, 4, 5, 0, 0, - 0, 9, 5, 0, 7, 0, 0, 0, 11, 0, 0, 0, 5, 0, - 0, 3, 0, 10, 0, 0, 0, 4, 0, 6, 0, 0, 0, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 9, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 6, 0, 0, 0, 0, 6, 0, - 8, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 4, 0, 0, - 7, 0, 0, 0, 9, 0, 0, 0, 0, 6, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 6, 0, 0, 4, 0, 0, 0, 11, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 2, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7, 0, 0, 0, + 8, 0, 0, 0, 2, 0, 0, 8, 6, 7, 0, 4, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 7, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 5, 6, 7, 0, 9, 0, 0, 7, 0, 0, + 0, 11, 0, 0, 0, 5, 0, 2, 0, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 8, 9, 0, 8, 0, 0, 0, 5, + 0, 0, 0, 6, 0, 6, 9, 0, 0, 7, 0, 3, 0, 11, + 5, 0, 4, 0, 5, 7, 6, 3, 0, 0, 6, 6, 8, 5, + 6, 11, 0, 0, 0, 8, 7, 0, 0, 0, 0, 12, 0, 0, + 6, 8, 10, 0, 4, 0, 0, 0, 6, 0, 9, 0, 0, 6, + 4, 0, 6, 0, 0, 0, 0, 0, 0, 8, 0, 5, 4, 6, + 0, 2, 6, 0, 2, 0, 0, 5, 5, 0, 0, 0, 0, 6, + 0, 6, 0, 5, 5, 6, 0, 0, 0, 7, 0, 0, 0, 0, + 4, 0, 5, 0, 0, 9, 0, 0, 0, 0, 0, 10, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 6, + 8, 0, 0, 0, 11, 0, 0, 0, 2, 0, 0, 6, 0, 0, + 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, + 3, 0, 0, 0, 5, }; static struct StaticNameTable wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"relative", 56}, - {"left", 32}, - {"large", 30}, - {"larger", 31}, - {"em", 18}, - {"",}, {"",}, {"",}, {"",}, - {"mm", 41}, - {"",}, {"",}, {"",}, - {"transparent", 76}, - {"ex", 19}, - {"",}, {"",}, {"",}, - {"text-bottom", 71}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"x-large", 82}, - {"outset", 48}, - {"outside", 49}, - {"",}, - {"auto", 1}, - {"",}, {"",}, {"",}, - {"small", 63}, - {"",}, - {"smaller", 65}, - {"xx-small", 85}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"medium", 39}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"x-small", 83}, - {"",}, - {"justify", 29}, - {"",}, - {"groove", 21}, - {"",}, - {"square", 67}, - {"",}, - {"solid", 66}, - {"",}, {"",}, - {"double", 17}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"dotted", 16}, - {"",}, {"",}, {"",}, {"",}, - {"normal", 44}, - {"",}, - {"overline", 50}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pt", 54}, - {"pre", 53}, - {"",}, {"",}, - {"repeat", 57}, - {"",}, - {"xx-large", 84}, - {"no-repeat", 42}, - {"",}, {"",}, {"",}, {"",}, - {"lowercase", 38}, - {"",}, - {"dashed", 13}, - {"noshade", 45}, - {"text-top", 72}, - {"",}, {"",}, - {"lower-alpha", 36}, - {"px", 55}, - {"repeat-y", 59}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"repeat-x", 58}, {"",}, {"",}, {"",}, - {"cm", 12}, - {"",}, {"",}, {"",}, - {"bolder", 6}, - {"oblique", 47}, - {"",}, {"",}, - {"block", 4}, - {"bottom", 8}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"visible", 81}, - {"",}, {"",}, {"",}, - {"scroll", 62}, - {"super", 70}, + {"pt", 58}, {"",}, - {"list-item", 35}, - {"ridge", 60}, - {"static", 68}, + {"left", 35}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"ex", 20}, + {"top", 80}, + {"x-large", 87}, + {"",}, {"",}, {"",}, + {"text-top", 77}, + {"",}, {"",}, {"",}, + {"px", 59}, {"",}, {"",}, - {"none", 43}, + {"xx-small", 90}, + {"outset", 52}, + {"outside", 53}, {"",}, - {"middle", 40}, - {"decimal", 14}, - {"",}, {"",}, {"",}, {"",}, {"",}, + {"auto", 2}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-bottom", 76}, + {"",}, {"",}, + {"x-small", 88}, + {"",}, {"",}, + {"em", 19}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"small", 68}, + {"square", 72}, + {"visible", 86}, + {"",}, + {"uppercase", 85}, + {"",}, {"",}, + {"justify", 32}, + {"",}, {"",}, {"",}, + {"upper-alpha", 83}, + {"",}, {"",}, {"",}, + {"thick", 78}, + {"",}, + {"mm", 45}, + {"",}, + {"list-item", 38}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"xx-large", 89}, + {"no-repeat", 46}, + {"",}, + {"overline", 54}, + {"",}, {"",}, {"",}, + {"solid", 71}, + {"",}, {"",}, {"",}, + {"inline", 28}, + {"",}, + {"double", 18}, + {"lowercase", 41}, + {"",}, {"",}, + {"noshade", 49}, + {"",}, + {"rtl", 66}, + {"",}, + {"lower-alpha", 39}, + {"fixed", 21}, + {"",}, + {"thin", 79}, + {"",}, + {"large", 33}, + {"inherit", 27}, + {"middle", 44}, + {"pre", 57}, + {"",}, {"",}, + {"repeat", 61}, + {"medium", 43}, + {"relative", 60}, + {"inset", 29}, + {"inside", 30}, + {"transparent", 81}, + {"",}, {"",}, {"",}, + {"repeat-y", 63}, + {"oblique", 51}, + {"",}, {"",}, {"",}, {"",}, + {"line-through", 37}, + {"",}, {"",}, + {"dotted", 17}, + {"repeat-x", 62}, + {"capitalize", 10}, + {"",}, + {"both", 8}, + {"",}, {"",}, {"",}, + {"italic", 31}, + {"",}, + {"paragraph", 55}, + {"",}, {"",}, + {"static", 73}, + {"none", 47}, + {"",}, + {"bottom", 9}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"absolute", 0}, - {"bold", 5}, - {"fixed", 20}, - {"",}, {"",}, {"",}, - {"paragraph", 51}, - {"right", 61}, {"",}, - {"lighter", 33}, - {"",}, {"",}, {"",}, - {"lower-roman", 37}, - {"",}, {"",}, {"",}, - {"thick", 73}, + {"block", 5}, + {"hand", 23}, + {"groove", 22}, + {"",}, + {"cm", 13}, + {"dashed", 14}, + {"",}, + {"in", 26}, {"",}, {"",}, - {"top", 75}, - {"",}, - {"small-caps", 64}, - {"",}, {"",}, {"",}, - {"both", 7}, - {"",}, - {"inline", 25}, + {"ibeam", 25}, + {"super", 75}, {"",}, {"",}, {"",}, {"",}, - {"center", 10}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - - {"inset", 26}, - {"inside", 27}, + {"nowrap", 50}, + {"",}, + {"hidden", 24}, + {"",}, + {"blink", 4}, + {"right", 65}, + {"normal", 48}, {"",}, {"",}, {"",}, - {"capitalize", 9}, - {"uppercase", 80}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"upper-alpha", 78}, + {"decimal", 15}, + {"",}, {"",}, {"",}, {"",}, + {"bold", 6}, + {"",}, + {"ridge", 64}, {"",}, {"",}, - {"circle", 11}, - {"",}, {"",}, {"",}, {"",}, - {"italic", 28}, - {"",}, - {"baseline", 2}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"blink", 3}, - {"",}, {"",}, {"",}, - {"thin", 74}, - {"",}, {"",}, - {"inherit", 24}, - {"",}, {"",}, {"",}, - {"underline", 77}, - {"",}, {"",}, {"",}, {"",}, - {"nowrap", 46}, - {"in", 23}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"underline", 82}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"hidden", 22}, - {"",}, {"",}, - {"disc", 15}, + {"small-caps", 69}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"ltr", 42}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"larger", 34}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"disc", 16}, {"",}, {"",}, {"",}, - {"upper-roman", 79}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"bolder", 7}, + {"baseline", 3}, + {"",}, {"",}, {"",}, + {"upper-roman", 84}, + {"",}, {"",}, {"",}, + {"pc", 56}, {"",}, {"",}, - {"sub", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"line-through", 34}, + {"circle", 12}, {"",}, {"",}, {"",}, {"",}, - {"pc", 52}, + {"scroll", 67}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"smaller", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"lower-roman", 40}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"lighter", 36}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"center", 11}, + {"",}, {"",}, {"",}, + {"sub", 74}, + {"",}, {"",}, {"",}, + {"arrow", 1}, }; if (str != NULL) { @@ -301,89 +306,94 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) const nsCSSKeywords::NameTableEntry nsCSSKeywords::kNameTable[] = { { "absolute", 0 }, - { "auto", 1 }, - { "baseline", 2 }, - { "blink", 3 }, - { "block", 4 }, - { "bold", 5 }, - { "bolder", 6 }, - { "both", 7 }, - { "bottom", 8 }, - { "capitalize", 9 }, - { "center", 10 }, - { "circle", 11 }, - { "cm", 12 }, - { "dashed", 13 }, - { "decimal", 14 }, - { "disc", 15 }, - { "dotted", 16 }, - { "double", 17 }, - { "em", 18 }, - { "ex", 19 }, - { "fixed", 20 }, - { "groove", 21 }, - { "hidden", 22 }, - { "in", 23 }, - { "inherit", 24 }, - { "inline", 25 }, - { "inset", 26 }, - { "inside", 27 }, - { "italic", 28 }, - { "justify", 29 }, - { "large", 30 }, - { "larger", 31 }, - { "left", 32 }, - { "lighter", 33 }, - { "line-through", 34 }, - { "list-item", 35 }, - { "lower-alpha", 36 }, - { "lower-roman", 37 }, - { "lowercase", 38 }, - { "medium", 39 }, - { "middle", 40 }, - { "mm", 41 }, - { "no-repeat", 42 }, - { "none", 43 }, - { "normal", 44 }, - { "noshade", 45 }, - { "nowrap", 46 }, - { "oblique", 47 }, - { "outset", 48 }, - { "outside", 49 }, - { "overline", 50 }, - { "paragraph", 51 }, - { "pc", 52 }, - { "pre", 53 }, - { "pt", 54 }, - { "px", 55 }, - { "relative", 56 }, - { "repeat", 57 }, - { "repeat-x", 58 }, - { "repeat-y", 59 }, - { "ridge", 60 }, - { "right", 61 }, - { "scroll", 62 }, - { "small", 63 }, - { "small-caps", 64 }, - { "smaller", 65 }, - { "solid", 66 }, - { "square", 67 }, - { "static", 68 }, - { "sub", 69 }, - { "super", 70 }, - { "text-bottom", 71 }, - { "text-top", 72 }, - { "thick", 73 }, - { "thin", 74 }, - { "top", 75 }, - { "transparent", 76 }, - { "underline", 77 }, - { "upper-alpha", 78 }, - { "upper-roman", 79 }, - { "uppercase", 80 }, - { "visible", 81 }, - { "x-large", 82 }, - { "x-small", 83 }, - { "xx-large", 84 }, - { "xx-small", 85 }, + { "arrow", 1 }, + { "auto", 2 }, + { "baseline", 3 }, + { "blink", 4 }, + { "block", 5 }, + { "bold", 6 }, + { "bolder", 7 }, + { "both", 8 }, + { "bottom", 9 }, + { "capitalize", 10 }, + { "center", 11 }, + { "circle", 12 }, + { "cm", 13 }, + { "dashed", 14 }, + { "decimal", 15 }, + { "disc", 16 }, + { "dotted", 17 }, + { "double", 18 }, + { "em", 19 }, + { "ex", 20 }, + { "fixed", 21 }, + { "groove", 22 }, + { "hand", 23 }, + { "hidden", 24 }, + { "ibeam", 25 }, + { "in", 26 }, + { "inherit", 27 }, + { "inline", 28 }, + { "inset", 29 }, + { "inside", 30 }, + { "italic", 31 }, + { "justify", 32 }, + { "large", 33 }, + { "larger", 34 }, + { "left", 35 }, + { "lighter", 36 }, + { "line-through", 37 }, + { "list-item", 38 }, + { "lower-alpha", 39 }, + { "lower-roman", 40 }, + { "lowercase", 41 }, + { "ltr", 42 }, + { "medium", 43 }, + { "middle", 44 }, + { "mm", 45 }, + { "no-repeat", 46 }, + { "none", 47 }, + { "normal", 48 }, + { "noshade", 49 }, + { "nowrap", 50 }, + { "oblique", 51 }, + { "outset", 52 }, + { "outside", 53 }, + { "overline", 54 }, + { "paragraph", 55 }, + { "pc", 56 }, + { "pre", 57 }, + { "pt", 58 }, + { "px", 59 }, + { "relative", 60 }, + { "repeat", 61 }, + { "repeat-x", 62 }, + { "repeat-y", 63 }, + { "ridge", 64 }, + { "right", 65 }, + { "rtl", 66 }, + { "scroll", 67 }, + { "small", 68 }, + { "small-caps", 69 }, + { "smaller", 70 }, + { "solid", 71 }, + { "square", 72 }, + { "static", 73 }, + { "sub", 74 }, + { "super", 75 }, + { "text-bottom", 76 }, + { "text-top", 77 }, + { "thick", 78 }, + { "thin", 79 }, + { "top", 80 }, + { "transparent", 81 }, + { "underline", 82 }, + { "upper-alpha", 83 }, + { "upper-roman", 84 }, + { "uppercase", 85 }, + { "visible", 86 }, + { "x-large", 87 }, + { "x-small", 88 }, + { "xx-large", 89 }, + { "xx-small", 90 }, }; diff --git a/mozilla/layout/html/style/src/nsCSSKeywordIDs.h b/mozilla/layout/html/style/src/nsCSSKeywordIDs.h index 35b51399756..959eeb953db 100644 --- a/mozilla/layout/html/style/src/nsCSSKeywordIDs.h +++ b/mozilla/layout/html/style/src/nsCSSKeywordIDs.h @@ -1,88 +1,93 @@ /* Do not edit - generated by genhash.pl */ #define KEYWORD_ABSOLUTE 0 -#define KEYWORD_AUTO 1 -#define KEYWORD_BASELINE 2 -#define KEYWORD_BLINK 3 -#define KEYWORD_BLOCK 4 -#define KEYWORD_BOLD 5 -#define KEYWORD_BOLDER 6 -#define KEYWORD_BOTH 7 -#define KEYWORD_BOTTOM 8 -#define KEYWORD_CAPITALIZE 9 -#define KEYWORD_CENTER 10 -#define KEYWORD_CIRCLE 11 -#define KEYWORD_CM 12 -#define KEYWORD_DASHED 13 -#define KEYWORD_DECIMAL 14 -#define KEYWORD_DISC 15 -#define KEYWORD_DOTTED 16 -#define KEYWORD_DOUBLE 17 -#define KEYWORD_EM 18 -#define KEYWORD_EX 19 -#define KEYWORD_FIXED 20 -#define KEYWORD_GROOVE 21 -#define KEYWORD_HIDDEN 22 -#define KEYWORD_IN 23 -#define KEYWORD_INHERIT 24 -#define KEYWORD_INLINE 25 -#define KEYWORD_INSET 26 -#define KEYWORD_INSIDE 27 -#define KEYWORD_ITALIC 28 -#define KEYWORD_JUSTIFY 29 -#define KEYWORD_LARGE 30 -#define KEYWORD_LARGER 31 -#define KEYWORD_LEFT 32 -#define KEYWORD_LIGHTER 33 -#define KEYWORD_LINE_THROUGH 34 -#define KEYWORD_LIST_ITEM 35 -#define KEYWORD_LOWER_ALPHA 36 -#define KEYWORD_LOWER_ROMAN 37 -#define KEYWORD_LOWERCASE 38 -#define KEYWORD_MEDIUM 39 -#define KEYWORD_MIDDLE 40 -#define KEYWORD_MM 41 -#define KEYWORD_NO_REPEAT 42 -#define KEYWORD_NONE 43 -#define KEYWORD_NORMAL 44 -#define KEYWORD_NOSHADE 45 -#define KEYWORD_NOWRAP 46 -#define KEYWORD_OBLIQUE 47 -#define KEYWORD_OUTSET 48 -#define KEYWORD_OUTSIDE 49 -#define KEYWORD_OVERLINE 50 -#define KEYWORD_PARAGRAPH 51 -#define KEYWORD_PC 52 -#define KEYWORD_PRE 53 -#define KEYWORD_PT 54 -#define KEYWORD_PX 55 -#define KEYWORD_RELATIVE 56 -#define KEYWORD_REPEAT 57 -#define KEYWORD_REPEAT_X 58 -#define KEYWORD_REPEAT_Y 59 -#define KEYWORD_RIDGE 60 -#define KEYWORD_RIGHT 61 -#define KEYWORD_SCROLL 62 -#define KEYWORD_SMALL 63 -#define KEYWORD_SMALL_CAPS 64 -#define KEYWORD_SMALLER 65 -#define KEYWORD_SOLID 66 -#define KEYWORD_SQUARE 67 -#define KEYWORD_STATIC 68 -#define KEYWORD_SUB 69 -#define KEYWORD_SUPER 70 -#define KEYWORD_TEXT_BOTTOM 71 -#define KEYWORD_TEXT_TOP 72 -#define KEYWORD_THICK 73 -#define KEYWORD_THIN 74 -#define KEYWORD_TOP 75 -#define KEYWORD_TRANSPARENT 76 -#define KEYWORD_UNDERLINE 77 -#define KEYWORD_UPPER_ALPHA 78 -#define KEYWORD_UPPER_ROMAN 79 -#define KEYWORD_UPPERCASE 80 -#define KEYWORD_VISIBLE 81 -#define KEYWORD_X_LARGE 82 -#define KEYWORD_X_SMALL 83 -#define KEYWORD_XX_LARGE 84 -#define KEYWORD_XX_SMALL 85 -#define KEYWORD_MAX 86 +#define KEYWORD_ARROW 1 +#define KEYWORD_AUTO 2 +#define KEYWORD_BASELINE 3 +#define KEYWORD_BLINK 4 +#define KEYWORD_BLOCK 5 +#define KEYWORD_BOLD 6 +#define KEYWORD_BOLDER 7 +#define KEYWORD_BOTH 8 +#define KEYWORD_BOTTOM 9 +#define KEYWORD_CAPITALIZE 10 +#define KEYWORD_CENTER 11 +#define KEYWORD_CIRCLE 12 +#define KEYWORD_CM 13 +#define KEYWORD_DASHED 14 +#define KEYWORD_DECIMAL 15 +#define KEYWORD_DISC 16 +#define KEYWORD_DOTTED 17 +#define KEYWORD_DOUBLE 18 +#define KEYWORD_EM 19 +#define KEYWORD_EX 20 +#define KEYWORD_FIXED 21 +#define KEYWORD_GROOVE 22 +#define KEYWORD_HAND 23 +#define KEYWORD_HIDDEN 24 +#define KEYWORD_IBEAM 25 +#define KEYWORD_IN 26 +#define KEYWORD_INHERIT 27 +#define KEYWORD_INLINE 28 +#define KEYWORD_INSET 29 +#define KEYWORD_INSIDE 30 +#define KEYWORD_ITALIC 31 +#define KEYWORD_JUSTIFY 32 +#define KEYWORD_LARGE 33 +#define KEYWORD_LARGER 34 +#define KEYWORD_LEFT 35 +#define KEYWORD_LIGHTER 36 +#define KEYWORD_LINE_THROUGH 37 +#define KEYWORD_LIST_ITEM 38 +#define KEYWORD_LOWER_ALPHA 39 +#define KEYWORD_LOWER_ROMAN 40 +#define KEYWORD_LOWERCASE 41 +#define KEYWORD_LTR 42 +#define KEYWORD_MEDIUM 43 +#define KEYWORD_MIDDLE 44 +#define KEYWORD_MM 45 +#define KEYWORD_NO_REPEAT 46 +#define KEYWORD_NONE 47 +#define KEYWORD_NORMAL 48 +#define KEYWORD_NOSHADE 49 +#define KEYWORD_NOWRAP 50 +#define KEYWORD_OBLIQUE 51 +#define KEYWORD_OUTSET 52 +#define KEYWORD_OUTSIDE 53 +#define KEYWORD_OVERLINE 54 +#define KEYWORD_PARAGRAPH 55 +#define KEYWORD_PC 56 +#define KEYWORD_PRE 57 +#define KEYWORD_PT 58 +#define KEYWORD_PX 59 +#define KEYWORD_RELATIVE 60 +#define KEYWORD_REPEAT 61 +#define KEYWORD_REPEAT_X 62 +#define KEYWORD_REPEAT_Y 63 +#define KEYWORD_RIDGE 64 +#define KEYWORD_RIGHT 65 +#define KEYWORD_RTL 66 +#define KEYWORD_SCROLL 67 +#define KEYWORD_SMALL 68 +#define KEYWORD_SMALL_CAPS 69 +#define KEYWORD_SMALLER 70 +#define KEYWORD_SOLID 71 +#define KEYWORD_SQUARE 72 +#define KEYWORD_STATIC 73 +#define KEYWORD_SUB 74 +#define KEYWORD_SUPER 75 +#define KEYWORD_TEXT_BOTTOM 76 +#define KEYWORD_TEXT_TOP 77 +#define KEYWORD_THICK 78 +#define KEYWORD_THIN 79 +#define KEYWORD_TOP 80 +#define KEYWORD_TRANSPARENT 81 +#define KEYWORD_UNDERLINE 82 +#define KEYWORD_UPPER_ALPHA 83 +#define KEYWORD_UPPER_ROMAN 84 +#define KEYWORD_UPPERCASE 85 +#define KEYWORD_VISIBLE 86 +#define KEYWORD_X_LARGE 87 +#define KEYWORD_X_SMALL 88 +#define KEYWORD_XX_LARGE 89 +#define KEYWORD_XX_SMALL 90 +#define KEYWORD_MAX 91 diff --git a/mozilla/layout/html/style/src/nsCSSKeywords.cpp b/mozilla/layout/html/style/src/nsCSSKeywords.cpp index e5f8c9b2654..eefdfa68880 100644 --- a/mozilla/layout/html/style/src/nsCSSKeywords.cpp +++ b/mozilla/layout/html/style/src/nsCSSKeywords.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSKeywords.h" -#define TOTAL_KEYWORDS 86 +#define TOTAL_KEYWORDS 91 #define MIN_WORD_LENGTH 2 #define MAX_WORD_LENGTH 12 -#define MIN_HASH_VALUE 8 -#define MAX_HASH_VALUE 322 -/* maximum key range = 315, duplicates = 0 */ +#define MIN_HASH_VALUE 12 +#define MAX_HASH_VALUE 312 +/* maximum key range = 301, duplicates = 0 */ struct StaticNameTable { @@ -50,201 +50,206 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) { static unsigned short asso_values[] = { - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 15, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 5, 125, 115, - 35, 0, 5, 55, 60, 110, 0, 5, 0, 5, - 75, 0, 90, 5, 0, 25, 0, 27, 0, 90, - 10, 0, 323, 323, 323, 323, 323, 323, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 7, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 5, 125, 117, + 67, 0, 10, 55, 15, 20, 5, 35, 0, 25, + 75, 0, 10, 0, 106, 25, 0, 30, 10, 90, + 10, 0, 313, 313, 313, 313, 313, 313, }; static unsigned char lengthtable[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 5, 6, 2, 0, - 0, 0, 0, 2, 0, 0, 0, 11, 2, 0, 0, 0, 11, 0, - 0, 0, 0, 0, 7, 6, 7, 0, 4, 0, 0, 0, 5, 0, - 7, 8, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, - 0, 7, 0, 7, 0, 6, 0, 6, 0, 5, 0, 0, 6, 0, - 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 6, 0, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 6, 0, - 8, 9, 0, 0, 0, 0, 9, 0, 6, 7, 8, 0, 0, 11, - 2, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, - 0, 2, 0, 0, 0, 6, 7, 0, 0, 5, 6, 0, 0, 0, - 0, 0, 7, 0, 0, 0, 6, 5, 0, 9, 5, 6, 0, 0, - 4, 0, 6, 7, 0, 0, 0, 0, 0, 8, 4, 5, 0, 0, - 0, 9, 5, 0, 7, 0, 0, 0, 11, 0, 0, 0, 5, 0, - 0, 3, 0, 10, 0, 0, 0, 4, 0, 6, 0, 0, 0, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 9, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 6, 0, 0, 0, 0, 6, 0, - 8, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 4, 0, 0, - 7, 0, 0, 0, 9, 0, 0, 0, 0, 6, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 6, 0, 0, 4, 0, 0, 0, 11, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 2, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7, 0, 0, 0, + 8, 0, 0, 0, 2, 0, 0, 8, 6, 7, 0, 4, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 7, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 5, 6, 7, 0, 9, 0, 0, 7, 0, 0, + 0, 11, 0, 0, 0, 5, 0, 2, 0, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 8, 9, 0, 8, 0, 0, 0, 5, + 0, 0, 0, 6, 0, 6, 9, 0, 0, 7, 0, 3, 0, 11, + 5, 0, 4, 0, 5, 7, 6, 3, 0, 0, 6, 6, 8, 5, + 6, 11, 0, 0, 0, 8, 7, 0, 0, 0, 0, 12, 0, 0, + 6, 8, 10, 0, 4, 0, 0, 0, 6, 0, 9, 0, 0, 6, + 4, 0, 6, 0, 0, 0, 0, 0, 0, 8, 0, 5, 4, 6, + 0, 2, 6, 0, 2, 0, 0, 5, 5, 0, 0, 0, 0, 6, + 0, 6, 0, 5, 5, 6, 0, 0, 0, 7, 0, 0, 0, 0, + 4, 0, 5, 0, 0, 9, 0, 0, 0, 0, 0, 10, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 6, + 8, 0, 0, 0, 11, 0, 0, 0, 2, 0, 0, 6, 0, 0, + 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, + 3, 0, 0, 0, 5, }; static struct StaticNameTable wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"relative", 56}, - {"left", 32}, - {"large", 30}, - {"larger", 31}, - {"em", 18}, - {"",}, {"",}, {"",}, {"",}, - {"mm", 41}, - {"",}, {"",}, {"",}, - {"transparent", 76}, - {"ex", 19}, - {"",}, {"",}, {"",}, - {"text-bottom", 71}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"x-large", 82}, - {"outset", 48}, - {"outside", 49}, - {"",}, - {"auto", 1}, - {"",}, {"",}, {"",}, - {"small", 63}, - {"",}, - {"smaller", 65}, - {"xx-small", 85}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"medium", 39}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"x-small", 83}, - {"",}, - {"justify", 29}, - {"",}, - {"groove", 21}, - {"",}, - {"square", 67}, - {"",}, - {"solid", 66}, - {"",}, {"",}, - {"double", 17}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"dotted", 16}, - {"",}, {"",}, {"",}, {"",}, - {"normal", 44}, - {"",}, - {"overline", 50}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pt", 54}, - {"pre", 53}, - {"",}, {"",}, - {"repeat", 57}, - {"",}, - {"xx-large", 84}, - {"no-repeat", 42}, - {"",}, {"",}, {"",}, {"",}, - {"lowercase", 38}, - {"",}, - {"dashed", 13}, - {"noshade", 45}, - {"text-top", 72}, - {"",}, {"",}, - {"lower-alpha", 36}, - {"px", 55}, - {"repeat-y", 59}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"repeat-x", 58}, {"",}, {"",}, {"",}, - {"cm", 12}, - {"",}, {"",}, {"",}, - {"bolder", 6}, - {"oblique", 47}, - {"",}, {"",}, - {"block", 4}, - {"bottom", 8}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"visible", 81}, - {"",}, {"",}, {"",}, - {"scroll", 62}, - {"super", 70}, + {"pt", 58}, {"",}, - {"list-item", 35}, - {"ridge", 60}, - {"static", 68}, + {"left", 35}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"ex", 20}, + {"top", 80}, + {"x-large", 87}, + {"",}, {"",}, {"",}, + {"text-top", 77}, + {"",}, {"",}, {"",}, + {"px", 59}, {"",}, {"",}, - {"none", 43}, + {"xx-small", 90}, + {"outset", 52}, + {"outside", 53}, {"",}, - {"middle", 40}, - {"decimal", 14}, - {"",}, {"",}, {"",}, {"",}, {"",}, + {"auto", 2}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-bottom", 76}, + {"",}, {"",}, + {"x-small", 88}, + {"",}, {"",}, + {"em", 19}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"small", 68}, + {"square", 72}, + {"visible", 86}, + {"",}, + {"uppercase", 85}, + {"",}, {"",}, + {"justify", 32}, + {"",}, {"",}, {"",}, + {"upper-alpha", 83}, + {"",}, {"",}, {"",}, + {"thick", 78}, + {"",}, + {"mm", 45}, + {"",}, + {"list-item", 38}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"xx-large", 89}, + {"no-repeat", 46}, + {"",}, + {"overline", 54}, + {"",}, {"",}, {"",}, + {"solid", 71}, + {"",}, {"",}, {"",}, + {"inline", 28}, + {"",}, + {"double", 18}, + {"lowercase", 41}, + {"",}, {"",}, + {"noshade", 49}, + {"",}, + {"rtl", 66}, + {"",}, + {"lower-alpha", 39}, + {"fixed", 21}, + {"",}, + {"thin", 79}, + {"",}, + {"large", 33}, + {"inherit", 27}, + {"middle", 44}, + {"pre", 57}, + {"",}, {"",}, + {"repeat", 61}, + {"medium", 43}, + {"relative", 60}, + {"inset", 29}, + {"inside", 30}, + {"transparent", 81}, + {"",}, {"",}, {"",}, + {"repeat-y", 63}, + {"oblique", 51}, + {"",}, {"",}, {"",}, {"",}, + {"line-through", 37}, + {"",}, {"",}, + {"dotted", 17}, + {"repeat-x", 62}, + {"capitalize", 10}, + {"",}, + {"both", 8}, + {"",}, {"",}, {"",}, + {"italic", 31}, + {"",}, + {"paragraph", 55}, + {"",}, {"",}, + {"static", 73}, + {"none", 47}, + {"",}, + {"bottom", 9}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"absolute", 0}, - {"bold", 5}, - {"fixed", 20}, - {"",}, {"",}, {"",}, - {"paragraph", 51}, - {"right", 61}, {"",}, - {"lighter", 33}, - {"",}, {"",}, {"",}, - {"lower-roman", 37}, - {"",}, {"",}, {"",}, - {"thick", 73}, + {"block", 5}, + {"hand", 23}, + {"groove", 22}, + {"",}, + {"cm", 13}, + {"dashed", 14}, + {"",}, + {"in", 26}, {"",}, {"",}, - {"top", 75}, - {"",}, - {"small-caps", 64}, - {"",}, {"",}, {"",}, - {"both", 7}, - {"",}, - {"inline", 25}, + {"ibeam", 25}, + {"super", 75}, {"",}, {"",}, {"",}, {"",}, - {"center", 10}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - - {"inset", 26}, - {"inside", 27}, + {"nowrap", 50}, + {"",}, + {"hidden", 24}, + {"",}, + {"blink", 4}, + {"right", 65}, + {"normal", 48}, {"",}, {"",}, {"",}, - {"capitalize", 9}, - {"uppercase", 80}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"upper-alpha", 78}, + {"decimal", 15}, + {"",}, {"",}, {"",}, {"",}, + {"bold", 6}, + {"",}, + {"ridge", 64}, {"",}, {"",}, - {"circle", 11}, - {"",}, {"",}, {"",}, {"",}, - {"italic", 28}, - {"",}, - {"baseline", 2}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"blink", 3}, - {"",}, {"",}, {"",}, - {"thin", 74}, - {"",}, {"",}, - {"inherit", 24}, - {"",}, {"",}, {"",}, - {"underline", 77}, - {"",}, {"",}, {"",}, {"",}, - {"nowrap", 46}, - {"in", 23}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"underline", 82}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"hidden", 22}, - {"",}, {"",}, - {"disc", 15}, + {"small-caps", 69}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"ltr", 42}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"larger", 34}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"disc", 16}, {"",}, {"",}, {"",}, - {"upper-roman", 79}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"bolder", 7}, + {"baseline", 3}, + {"",}, {"",}, {"",}, + {"upper-roman", 84}, + {"",}, {"",}, {"",}, + {"pc", 56}, {"",}, {"",}, - {"sub", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"line-through", 34}, + {"circle", 12}, {"",}, {"",}, {"",}, {"",}, - {"pc", 52}, + {"scroll", 67}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"smaller", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"lower-roman", 40}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"lighter", 36}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"center", 11}, + {"",}, {"",}, {"",}, + {"sub", 74}, + {"",}, {"",}, {"",}, + {"arrow", 1}, }; if (str != NULL) { @@ -301,89 +306,94 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) const nsCSSKeywords::NameTableEntry nsCSSKeywords::kNameTable[] = { { "absolute", 0 }, - { "auto", 1 }, - { "baseline", 2 }, - { "blink", 3 }, - { "block", 4 }, - { "bold", 5 }, - { "bolder", 6 }, - { "both", 7 }, - { "bottom", 8 }, - { "capitalize", 9 }, - { "center", 10 }, - { "circle", 11 }, - { "cm", 12 }, - { "dashed", 13 }, - { "decimal", 14 }, - { "disc", 15 }, - { "dotted", 16 }, - { "double", 17 }, - { "em", 18 }, - { "ex", 19 }, - { "fixed", 20 }, - { "groove", 21 }, - { "hidden", 22 }, - { "in", 23 }, - { "inherit", 24 }, - { "inline", 25 }, - { "inset", 26 }, - { "inside", 27 }, - { "italic", 28 }, - { "justify", 29 }, - { "large", 30 }, - { "larger", 31 }, - { "left", 32 }, - { "lighter", 33 }, - { "line-through", 34 }, - { "list-item", 35 }, - { "lower-alpha", 36 }, - { "lower-roman", 37 }, - { "lowercase", 38 }, - { "medium", 39 }, - { "middle", 40 }, - { "mm", 41 }, - { "no-repeat", 42 }, - { "none", 43 }, - { "normal", 44 }, - { "noshade", 45 }, - { "nowrap", 46 }, - { "oblique", 47 }, - { "outset", 48 }, - { "outside", 49 }, - { "overline", 50 }, - { "paragraph", 51 }, - { "pc", 52 }, - { "pre", 53 }, - { "pt", 54 }, - { "px", 55 }, - { "relative", 56 }, - { "repeat", 57 }, - { "repeat-x", 58 }, - { "repeat-y", 59 }, - { "ridge", 60 }, - { "right", 61 }, - { "scroll", 62 }, - { "small", 63 }, - { "small-caps", 64 }, - { "smaller", 65 }, - { "solid", 66 }, - { "square", 67 }, - { "static", 68 }, - { "sub", 69 }, - { "super", 70 }, - { "text-bottom", 71 }, - { "text-top", 72 }, - { "thick", 73 }, - { "thin", 74 }, - { "top", 75 }, - { "transparent", 76 }, - { "underline", 77 }, - { "upper-alpha", 78 }, - { "upper-roman", 79 }, - { "uppercase", 80 }, - { "visible", 81 }, - { "x-large", 82 }, - { "x-small", 83 }, - { "xx-large", 84 }, - { "xx-small", 85 }, + { "arrow", 1 }, + { "auto", 2 }, + { "baseline", 3 }, + { "blink", 4 }, + { "block", 5 }, + { "bold", 6 }, + { "bolder", 7 }, + { "both", 8 }, + { "bottom", 9 }, + { "capitalize", 10 }, + { "center", 11 }, + { "circle", 12 }, + { "cm", 13 }, + { "dashed", 14 }, + { "decimal", 15 }, + { "disc", 16 }, + { "dotted", 17 }, + { "double", 18 }, + { "em", 19 }, + { "ex", 20 }, + { "fixed", 21 }, + { "groove", 22 }, + { "hand", 23 }, + { "hidden", 24 }, + { "ibeam", 25 }, + { "in", 26 }, + { "inherit", 27 }, + { "inline", 28 }, + { "inset", 29 }, + { "inside", 30 }, + { "italic", 31 }, + { "justify", 32 }, + { "large", 33 }, + { "larger", 34 }, + { "left", 35 }, + { "lighter", 36 }, + { "line-through", 37 }, + { "list-item", 38 }, + { "lower-alpha", 39 }, + { "lower-roman", 40 }, + { "lowercase", 41 }, + { "ltr", 42 }, + { "medium", 43 }, + { "middle", 44 }, + { "mm", 45 }, + { "no-repeat", 46 }, + { "none", 47 }, + { "normal", 48 }, + { "noshade", 49 }, + { "nowrap", 50 }, + { "oblique", 51 }, + { "outset", 52 }, + { "outside", 53 }, + { "overline", 54 }, + { "paragraph", 55 }, + { "pc", 56 }, + { "pre", 57 }, + { "pt", 58 }, + { "px", 59 }, + { "relative", 60 }, + { "repeat", 61 }, + { "repeat-x", 62 }, + { "repeat-y", 63 }, + { "ridge", 64 }, + { "right", 65 }, + { "rtl", 66 }, + { "scroll", 67 }, + { "small", 68 }, + { "small-caps", 69 }, + { "smaller", 70 }, + { "solid", 71 }, + { "square", 72 }, + { "static", 73 }, + { "sub", 74 }, + { "super", 75 }, + { "text-bottom", 76 }, + { "text-top", 77 }, + { "thick", 78 }, + { "thin", 79 }, + { "top", 80 }, + { "transparent", 81 }, + { "underline", 82 }, + { "upper-alpha", 83 }, + { "upper-roman", 84 }, + { "uppercase", 85 }, + { "visible", 86 }, + { "x-large", 87 }, + { "x-small", 88 }, + { "xx-large", 89 }, + { "xx-small", 90 }, }; diff --git a/mozilla/layout/style/nsCSSKeywords.cpp b/mozilla/layout/style/nsCSSKeywords.cpp index e5f8c9b2654..eefdfa68880 100644 --- a/mozilla/layout/style/nsCSSKeywords.cpp +++ b/mozilla/layout/style/nsCSSKeywords.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSKeywords.h" -#define TOTAL_KEYWORDS 86 +#define TOTAL_KEYWORDS 91 #define MIN_WORD_LENGTH 2 #define MAX_WORD_LENGTH 12 -#define MIN_HASH_VALUE 8 -#define MAX_HASH_VALUE 322 -/* maximum key range = 315, duplicates = 0 */ +#define MIN_HASH_VALUE 12 +#define MAX_HASH_VALUE 312 +/* maximum key range = 301, duplicates = 0 */ struct StaticNameTable { @@ -50,201 +50,206 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) { static unsigned short asso_values[] = { - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 15, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 323, 323, 323, - 323, 323, 323, 323, 323, 323, 323, 5, 125, 115, - 35, 0, 5, 55, 60, 110, 0, 5, 0, 5, - 75, 0, 90, 5, 0, 25, 0, 27, 0, 90, - 10, 0, 323, 323, 323, 323, 323, 323, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 7, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 5, 125, 117, + 67, 0, 10, 55, 15, 20, 5, 35, 0, 25, + 75, 0, 10, 0, 106, 25, 0, 30, 10, 90, + 10, 0, 313, 313, 313, 313, 313, 313, }; static unsigned char lengthtable[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 5, 6, 2, 0, - 0, 0, 0, 2, 0, 0, 0, 11, 2, 0, 0, 0, 11, 0, - 0, 0, 0, 0, 7, 6, 7, 0, 4, 0, 0, 0, 5, 0, - 7, 8, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, - 0, 7, 0, 7, 0, 6, 0, 6, 0, 5, 0, 0, 6, 0, - 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 6, 0, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 0, 0, 6, 0, - 8, 9, 0, 0, 0, 0, 9, 0, 6, 7, 8, 0, 0, 11, - 2, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, - 0, 2, 0, 0, 0, 6, 7, 0, 0, 5, 6, 0, 0, 0, - 0, 0, 7, 0, 0, 0, 6, 5, 0, 9, 5, 6, 0, 0, - 4, 0, 6, 7, 0, 0, 0, 0, 0, 8, 4, 5, 0, 0, - 0, 9, 5, 0, 7, 0, 0, 0, 11, 0, 0, 0, 5, 0, - 0, 3, 0, 10, 0, 0, 0, 4, 0, 6, 0, 0, 0, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 9, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 6, 0, 0, 0, 0, 6, 0, - 8, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 4, 0, 0, - 7, 0, 0, 0, 9, 0, 0, 0, 0, 6, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 6, 0, 0, 4, 0, 0, 0, 11, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 2, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7, 0, 0, 0, + 8, 0, 0, 0, 2, 0, 0, 8, 6, 7, 0, 4, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 7, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 5, 6, 7, 0, 9, 0, 0, 7, 0, 0, + 0, 11, 0, 0, 0, 5, 0, 2, 0, 9, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 8, 9, 0, 8, 0, 0, 0, 5, + 0, 0, 0, 6, 0, 6, 9, 0, 0, 7, 0, 3, 0, 11, + 5, 0, 4, 0, 5, 7, 6, 3, 0, 0, 6, 6, 8, 5, + 6, 11, 0, 0, 0, 8, 7, 0, 0, 0, 0, 12, 0, 0, + 6, 8, 10, 0, 4, 0, 0, 0, 6, 0, 9, 0, 0, 6, + 4, 0, 6, 0, 0, 0, 0, 0, 0, 8, 0, 5, 4, 6, + 0, 2, 6, 0, 2, 0, 0, 5, 5, 0, 0, 0, 0, 6, + 0, 6, 0, 5, 5, 6, 0, 0, 0, 7, 0, 0, 0, 0, + 4, 0, 5, 0, 0, 9, 0, 0, 0, 0, 0, 10, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 6, + 8, 0, 0, 0, 11, 0, 0, 0, 2, 0, 0, 6, 0, 0, + 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, + 3, 0, 0, 0, 5, }; static struct StaticNameTable wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"relative", 56}, - {"left", 32}, - {"large", 30}, - {"larger", 31}, - {"em", 18}, - {"",}, {"",}, {"",}, {"",}, - {"mm", 41}, - {"",}, {"",}, {"",}, - {"transparent", 76}, - {"ex", 19}, - {"",}, {"",}, {"",}, - {"text-bottom", 71}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"x-large", 82}, - {"outset", 48}, - {"outside", 49}, - {"",}, - {"auto", 1}, - {"",}, {"",}, {"",}, - {"small", 63}, - {"",}, - {"smaller", 65}, - {"xx-small", 85}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"medium", 39}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"x-small", 83}, - {"",}, - {"justify", 29}, - {"",}, - {"groove", 21}, - {"",}, - {"square", 67}, - {"",}, - {"solid", 66}, - {"",}, {"",}, - {"double", 17}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"dotted", 16}, - {"",}, {"",}, {"",}, {"",}, - {"normal", 44}, - {"",}, - {"overline", 50}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pt", 54}, - {"pre", 53}, - {"",}, {"",}, - {"repeat", 57}, - {"",}, - {"xx-large", 84}, - {"no-repeat", 42}, - {"",}, {"",}, {"",}, {"",}, - {"lowercase", 38}, - {"",}, - {"dashed", 13}, - {"noshade", 45}, - {"text-top", 72}, - {"",}, {"",}, - {"lower-alpha", 36}, - {"px", 55}, - {"repeat-y", 59}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"repeat-x", 58}, {"",}, {"",}, {"",}, - {"cm", 12}, - {"",}, {"",}, {"",}, - {"bolder", 6}, - {"oblique", 47}, - {"",}, {"",}, - {"block", 4}, - {"bottom", 8}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"visible", 81}, - {"",}, {"",}, {"",}, - {"scroll", 62}, - {"super", 70}, + {"pt", 58}, {"",}, - {"list-item", 35}, - {"ridge", 60}, - {"static", 68}, + {"left", 35}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"ex", 20}, + {"top", 80}, + {"x-large", 87}, + {"",}, {"",}, {"",}, + {"text-top", 77}, + {"",}, {"",}, {"",}, + {"px", 59}, {"",}, {"",}, - {"none", 43}, + {"xx-small", 90}, + {"outset", 52}, + {"outside", 53}, {"",}, - {"middle", 40}, - {"decimal", 14}, - {"",}, {"",}, {"",}, {"",}, {"",}, + {"auto", 2}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-bottom", 76}, + {"",}, {"",}, + {"x-small", 88}, + {"",}, {"",}, + {"em", 19}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"small", 68}, + {"square", 72}, + {"visible", 86}, + {"",}, + {"uppercase", 85}, + {"",}, {"",}, + {"justify", 32}, + {"",}, {"",}, {"",}, + {"upper-alpha", 83}, + {"",}, {"",}, {"",}, + {"thick", 78}, + {"",}, + {"mm", 45}, + {"",}, + {"list-item", 38}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"xx-large", 89}, + {"no-repeat", 46}, + {"",}, + {"overline", 54}, + {"",}, {"",}, {"",}, + {"solid", 71}, + {"",}, {"",}, {"",}, + {"inline", 28}, + {"",}, + {"double", 18}, + {"lowercase", 41}, + {"",}, {"",}, + {"noshade", 49}, + {"",}, + {"rtl", 66}, + {"",}, + {"lower-alpha", 39}, + {"fixed", 21}, + {"",}, + {"thin", 79}, + {"",}, + {"large", 33}, + {"inherit", 27}, + {"middle", 44}, + {"pre", 57}, + {"",}, {"",}, + {"repeat", 61}, + {"medium", 43}, + {"relative", 60}, + {"inset", 29}, + {"inside", 30}, + {"transparent", 81}, + {"",}, {"",}, {"",}, + {"repeat-y", 63}, + {"oblique", 51}, + {"",}, {"",}, {"",}, {"",}, + {"line-through", 37}, + {"",}, {"",}, + {"dotted", 17}, + {"repeat-x", 62}, + {"capitalize", 10}, + {"",}, + {"both", 8}, + {"",}, {"",}, {"",}, + {"italic", 31}, + {"",}, + {"paragraph", 55}, + {"",}, {"",}, + {"static", 73}, + {"none", 47}, + {"",}, + {"bottom", 9}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"absolute", 0}, - {"bold", 5}, - {"fixed", 20}, - {"",}, {"",}, {"",}, - {"paragraph", 51}, - {"right", 61}, {"",}, - {"lighter", 33}, - {"",}, {"",}, {"",}, - {"lower-roman", 37}, - {"",}, {"",}, {"",}, - {"thick", 73}, + {"block", 5}, + {"hand", 23}, + {"groove", 22}, + {"",}, + {"cm", 13}, + {"dashed", 14}, + {"",}, + {"in", 26}, {"",}, {"",}, - {"top", 75}, - {"",}, - {"small-caps", 64}, - {"",}, {"",}, {"",}, - {"both", 7}, - {"",}, - {"inline", 25}, + {"ibeam", 25}, + {"super", 75}, {"",}, {"",}, {"",}, {"",}, - {"center", 10}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - - {"inset", 26}, - {"inside", 27}, + {"nowrap", 50}, + {"",}, + {"hidden", 24}, + {"",}, + {"blink", 4}, + {"right", 65}, + {"normal", 48}, {"",}, {"",}, {"",}, - {"capitalize", 9}, - {"uppercase", 80}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"upper-alpha", 78}, + {"decimal", 15}, + {"",}, {"",}, {"",}, {"",}, + {"bold", 6}, + {"",}, + {"ridge", 64}, {"",}, {"",}, - {"circle", 11}, - {"",}, {"",}, {"",}, {"",}, - {"italic", 28}, - {"",}, - {"baseline", 2}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"blink", 3}, - {"",}, {"",}, {"",}, - {"thin", 74}, - {"",}, {"",}, - {"inherit", 24}, - {"",}, {"",}, {"",}, - {"underline", 77}, - {"",}, {"",}, {"",}, {"",}, - {"nowrap", 46}, - {"in", 23}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"underline", 82}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"hidden", 22}, - {"",}, {"",}, - {"disc", 15}, + {"small-caps", 69}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"ltr", 42}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"larger", 34}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"disc", 16}, {"",}, {"",}, {"",}, - {"upper-roman", 79}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"bolder", 7}, + {"baseline", 3}, + {"",}, {"",}, {"",}, + {"upper-roman", 84}, + {"",}, {"",}, {"",}, + {"pc", 56}, {"",}, {"",}, - {"sub", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"line-through", 34}, + {"circle", 12}, {"",}, {"",}, {"",}, {"",}, - {"pc", 52}, + {"scroll", 67}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"smaller", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"lower-roman", 40}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"lighter", 36}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"center", 11}, + {"",}, {"",}, {"",}, + {"sub", 74}, + {"",}, {"",}, {"",}, + {"arrow", 1}, }; if (str != NULL) { @@ -301,89 +306,94 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) const nsCSSKeywords::NameTableEntry nsCSSKeywords::kNameTable[] = { { "absolute", 0 }, - { "auto", 1 }, - { "baseline", 2 }, - { "blink", 3 }, - { "block", 4 }, - { "bold", 5 }, - { "bolder", 6 }, - { "both", 7 }, - { "bottom", 8 }, - { "capitalize", 9 }, - { "center", 10 }, - { "circle", 11 }, - { "cm", 12 }, - { "dashed", 13 }, - { "decimal", 14 }, - { "disc", 15 }, - { "dotted", 16 }, - { "double", 17 }, - { "em", 18 }, - { "ex", 19 }, - { "fixed", 20 }, - { "groove", 21 }, - { "hidden", 22 }, - { "in", 23 }, - { "inherit", 24 }, - { "inline", 25 }, - { "inset", 26 }, - { "inside", 27 }, - { "italic", 28 }, - { "justify", 29 }, - { "large", 30 }, - { "larger", 31 }, - { "left", 32 }, - { "lighter", 33 }, - { "line-through", 34 }, - { "list-item", 35 }, - { "lower-alpha", 36 }, - { "lower-roman", 37 }, - { "lowercase", 38 }, - { "medium", 39 }, - { "middle", 40 }, - { "mm", 41 }, - { "no-repeat", 42 }, - { "none", 43 }, - { "normal", 44 }, - { "noshade", 45 }, - { "nowrap", 46 }, - { "oblique", 47 }, - { "outset", 48 }, - { "outside", 49 }, - { "overline", 50 }, - { "paragraph", 51 }, - { "pc", 52 }, - { "pre", 53 }, - { "pt", 54 }, - { "px", 55 }, - { "relative", 56 }, - { "repeat", 57 }, - { "repeat-x", 58 }, - { "repeat-y", 59 }, - { "ridge", 60 }, - { "right", 61 }, - { "scroll", 62 }, - { "small", 63 }, - { "small-caps", 64 }, - { "smaller", 65 }, - { "solid", 66 }, - { "square", 67 }, - { "static", 68 }, - { "sub", 69 }, - { "super", 70 }, - { "text-bottom", 71 }, - { "text-top", 72 }, - { "thick", 73 }, - { "thin", 74 }, - { "top", 75 }, - { "transparent", 76 }, - { "underline", 77 }, - { "upper-alpha", 78 }, - { "upper-roman", 79 }, - { "uppercase", 80 }, - { "visible", 81 }, - { "x-large", 82 }, - { "x-small", 83 }, - { "xx-large", 84 }, - { "xx-small", 85 }, + { "arrow", 1 }, + { "auto", 2 }, + { "baseline", 3 }, + { "blink", 4 }, + { "block", 5 }, + { "bold", 6 }, + { "bolder", 7 }, + { "both", 8 }, + { "bottom", 9 }, + { "capitalize", 10 }, + { "center", 11 }, + { "circle", 12 }, + { "cm", 13 }, + { "dashed", 14 }, + { "decimal", 15 }, + { "disc", 16 }, + { "dotted", 17 }, + { "double", 18 }, + { "em", 19 }, + { "ex", 20 }, + { "fixed", 21 }, + { "groove", 22 }, + { "hand", 23 }, + { "hidden", 24 }, + { "ibeam", 25 }, + { "in", 26 }, + { "inherit", 27 }, + { "inline", 28 }, + { "inset", 29 }, + { "inside", 30 }, + { "italic", 31 }, + { "justify", 32 }, + { "large", 33 }, + { "larger", 34 }, + { "left", 35 }, + { "lighter", 36 }, + { "line-through", 37 }, + { "list-item", 38 }, + { "lower-alpha", 39 }, + { "lower-roman", 40 }, + { "lowercase", 41 }, + { "ltr", 42 }, + { "medium", 43 }, + { "middle", 44 }, + { "mm", 45 }, + { "no-repeat", 46 }, + { "none", 47 }, + { "normal", 48 }, + { "noshade", 49 }, + { "nowrap", 50 }, + { "oblique", 51 }, + { "outset", 52 }, + { "outside", 53 }, + { "overline", 54 }, + { "paragraph", 55 }, + { "pc", 56 }, + { "pre", 57 }, + { "pt", 58 }, + { "px", 59 }, + { "relative", 60 }, + { "repeat", 61 }, + { "repeat-x", 62 }, + { "repeat-y", 63 }, + { "ridge", 64 }, + { "right", 65 }, + { "rtl", 66 }, + { "scroll", 67 }, + { "small", 68 }, + { "small-caps", 69 }, + { "smaller", 70 }, + { "solid", 71 }, + { "square", 72 }, + { "static", 73 }, + { "sub", 74 }, + { "super", 75 }, + { "text-bottom", 76 }, + { "text-top", 77 }, + { "thick", 78 }, + { "thin", 79 }, + { "top", 80 }, + { "transparent", 81 }, + { "underline", 82 }, + { "upper-alpha", 83 }, + { "upper-roman", 84 }, + { "uppercase", 85 }, + { "visible", 86 }, + { "x-large", 87 }, + { "x-small", 88 }, + { "xx-large", 89 }, + { "xx-small", 90 }, };