diff --git a/mozilla/content/shared/src/nsCSSKeywords.cpp b/mozilla/content/shared/src/nsCSSKeywords.cpp index eefdfa68880..880159cb8b0 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 91 +#define TOTAL_KEYWORDS 104 #define MIN_WORD_LENGTH 2 -#define MAX_WORD_LENGTH 12 +#define MAX_WORD_LENGTH 18 #define MIN_HASH_VALUE 12 -#define MAX_HASH_VALUE 312 -/* maximum key range = 301, duplicates = 0 */ +#define MAX_HASH_VALUE 437 +/* maximum key range = 426, duplicates = 0 */ struct StaticNameTable { @@ -50,206 +50,246 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) { static unsigned short asso_values[] = { - 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, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 5, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 40, 103, 125, + 57, 0, 25, 35, 75, 110, 10, 15, 124, 30, + 5, 0, 25, 0, 0, 5, 0, 122, 10, 110, + 5, 10, 438, 438, 438, 438, 438, 438, }; static unsigned char lengthtable[] = { 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, + 4, 0, 0, 7, 0, 9, 0, 0, 0, 8, 0, 0, 0, 2, + 3, 0, 0, 6, 0, 0, 0, 0, 0, 2, 8, 0, 0, 6, + 0, 8, 0, 0, 11, 0, 8, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 2, 0, 0, 0, 0, 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, 2, 6, 0, 5, + 6, 3, 6, 7, 0, 0, 7, 6, 0, 6, 6, 0, 6, 6, + 0, 7, 8, 0, 0, 0, 6, 0, 5, 0, 5, 0, 0, 4, + 0, 5, 8, 5, 0, 0, 0, 8, 7, 0, 7, 6, 4, 0, + 0, 5, 6, 0, 5, 0, 0, 0, 6, 0, 0, 0, 0, 4, + 4, 15, 0, 6, 0, 2, 11, 9, 0, 5, 0, 0, 4, 0, + 0, 7, 0, 0, 0, 0, 5, 6, 5, 5, 0, 0, 0, 0, + 0, 18, 0, 0, 0, 10, 0, 0, 0, 0, 0, 9, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, + 0, 0, 0, 6, 0, 0, 0, 6, 0, 5, 5, 0, 11, 3, + 0, 6, 0, 0, 12, 0, 0, 0, 6, 18, 9, 11, 0, 0, + 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 7, 2, 9, 0, + 0, 6, 0, 9, 0, 12, 13, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, 0, 9, 0, 0, 0, 0, + 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 10, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 7, }; static struct StaticNameTable wordlist[] = { {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pt", 58}, + {"ex", 21}, {"",}, - {"left", 35}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"ex", 20}, - {"top", 80}, - {"x-large", 87}, - {"",}, {"",}, {"",}, - {"text-top", 77}, - {"",}, {"",}, {"",}, - {"px", 59}, + {"none", 50}, {"",}, {"",}, - {"xx-small", 90}, - {"outset", 52}, - {"outside", 53}, + {"noshade", 52}, {"",}, - {"auto", 2}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"text-bottom", 76}, - {"",}, {"",}, - {"x-small", 88}, - {"",}, {"",}, - {"em", 19}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"small", 68}, - {"square", 72}, - {"visible", 86}, - {"",}, - {"uppercase", 85}, - {"",}, {"",}, - {"justify", 32}, + {"no-repeat", 49}, {"",}, {"",}, {"",}, - {"upper-alpha", 83}, + {"overline", 57}, {"",}, {"",}, {"",}, - {"thick", 78}, - {"",}, - {"mm", 45}, - {"",}, - {"list-item", 38}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"xx-large", 89}, - {"no-repeat", 46}, - {"",}, - {"overline", 54}, - {"",}, {"",}, {"",}, - {"solid", 71}, - {"",}, {"",}, {"",}, - {"inline", 28}, - {"",}, - {"double", 18}, - {"lowercase", 41}, + {"pt", 61}, + {"pre", 60}, {"",}, {"",}, - {"noshade", 49}, - {"",}, - {"rtl", 66}, - {"",}, - {"lower-alpha", 39}, - {"fixed", 21}, - {"",}, - {"thin", 79}, - {"",}, - {"large", 33}, - {"inherit", 27}, - {"middle", 44}, - {"pre", 57}, + {"repeat", 64}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"px", 62}, + {"text-top", 90}, {"",}, {"",}, - {"repeat", 61}, - {"medium", 43}, - {"relative", 60}, - {"inset", 29}, - {"inside", 30}, - {"transparent", 81}, - {"",}, {"",}, {"",}, - {"repeat-y", 63}, - {"oblique", 51}, + {"groove", 23}, + {"",}, + {"repeat-x", 65}, + {"",}, {"",}, + {"text-bottom", 89}, + {"",}, + {"repeat-y", 66}, {"",}, {"",}, {"",}, {"",}, - {"line-through", 37}, - {"",}, {"",}, - {"dotted", 17}, - {"repeat-x", 62}, - {"capitalize", 10}, - {"",}, - {"both", 8}, + {"top", 93}, + {"",}, {"",}, {"",}, {"",}, + {"xx-large", 102}, {"",}, {"",}, {"",}, - {"italic", 31}, + {"em", 20}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"marker", 45}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"smaller", 74}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"transparent", 94}, + {"mm", 48}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + + {"dotted", 18}, {"",}, - {"paragraph", 55}, + {"in", 27}, + {"medium", 46}, + {"",}, + {"inset", 31}, + {"inside", 32}, + {"ltr", 44}, + {"outset", 55}, + {"outside", 56}, {"",}, {"",}, - {"static", 73}, - {"none", 47}, + {"visible", 99}, + {"square", 76}, {"",}, + {"normal", 51}, + {"center", 11}, + {"",}, + {"run-in", 70}, {"bottom", 9}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"absolute", 0}, {"",}, - {"block", 5}, - {"hand", 23}, - {"groove", 22}, + {"x-large", 100}, + {"relative", 63}, + {"",}, {"",}, {"",}, + {"nowrap", 53}, + {"",}, + {"table", 80}, + {"",}, + {"right", 68}, + {"",}, {"",}, + {"left", 37}, + {"",}, + {"arrow", 1}, + {"absolute", 0}, + {"super", 79}, + {"",}, {"",}, {"",}, + {"baseline", 3}, + {"compact", 14}, + {"",}, + {"justify", 34}, + {"dashed", 15}, + {"auto", 2}, + {"",}, {"",}, + {"large", 35}, + {"larger", 36}, + {"",}, + {"ridge", 67}, + {"",}, {"",}, {"",}, + {"static", 77}, + {"",}, {"",}, {"",}, {"",}, + {"hand", 24}, + {"both", 8}, + {"table-row-group", 88}, + {"",}, + {"double", 19}, {"",}, {"cm", 13}, - {"dashed", 14}, + {"upper-roman", 97}, + {"paragraph", 58}, {"",}, - {"in", 26}, + {"solid", 75}, {"",}, {"",}, - {"ibeam", 25}, - {"super", 75}, - {"",}, {"",}, {"",}, {"",}, - {"nowrap", 50}, - {"",}, - {"hidden", 24}, - {"",}, - {"blink", 4}, - {"right", 65}, - {"normal", 48}, - {"",}, {"",}, {"",}, - {"decimal", 15}, - {"",}, {"",}, {"",}, {"",}, - {"bold", 6}, - {"",}, - {"ridge", 64}, + {"thin", 92}, {"",}, {"",}, - {"underline", 82}, + {"inherit", 28}, + {"",}, {"",}, {"",}, {"",}, + {"fixed", 22}, + {"middle", 47}, + {"small", 72}, + {"thick", 91}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"small-caps", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"ltr", 42}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"larger", 34}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"disc", 16}, + {"table-footer-group", 85}, {"",}, {"",}, {"",}, + {"small-caps", 73}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"uppercase", 98}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"bolder", 7}, - {"baseline", 3}, - {"",}, {"",}, {"",}, - {"upper-roman", 84}, - {"",}, {"",}, {"",}, - {"pc", 56}, - {"",}, {"",}, + {"oblique", 54}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"circle", 12}, + {"",}, {"",}, {"",}, + {"inline", 29}, + {"",}, + {"block", 5}, + {"ibeam", 26}, + {"",}, + {"lower-roman", 42}, + {"rtl", 69}, + {"",}, + {"hidden", 25}, + {"",}, {"",}, + {"inline-table", 30}, + {"",}, {"",}, {"",}, + {"scroll", 71}, + {"table-header-group", 86}, + {"table-row", 87}, + {"upper-alpha", 96}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"x-small", 101}, + {"xx-small", 103}, {"",}, {"",}, {"",}, {"",}, - {"scroll", 67}, + {"lighter", 38}, + {"pc", 59}, + {"list-item", 40}, + {"",}, {"",}, + {"italic", 33}, + {"",}, + {"lowercase", 43}, + {"",}, + {"table-column", 83}, + {"table-caption", 81}, + {"",}, + {"bold", 6}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"smaller", 70}, + {"",}, {"",}, {"",}, + {"disc", 17}, + {"",}, + {"underline", 95}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"lower-roman", 40}, + {"table-column-group", 84}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"capitalize", 10}, + {"lower-alpha", 41}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"sub", 78}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"lighter", 36}, + {"blink", 4}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"center", 11}, - {"",}, {"",}, {"",}, - {"sub", 74}, - {"",}, {"",}, {"",}, - {"arrow", 1}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"line-through", 39}, + {"table-cell", 82}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"decimal", 16}, }; if (str != NULL) { @@ -319,81 +359,94 @@ const nsCSSKeywords::NameTableEntry nsCSSKeywords::kNameTable[] = { { "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 }, + { "compact", 14 }, + { "dashed", 15 }, + { "decimal", 16 }, + { "disc", 17 }, + { "dotted", 18 }, + { "double", 19 }, + { "em", 20 }, + { "ex", 21 }, + { "fixed", 22 }, + { "groove", 23 }, + { "hand", 24 }, + { "hidden", 25 }, + { "ibeam", 26 }, + { "in", 27 }, + { "inherit", 28 }, + { "inline", 29 }, + { "inline-table", 30 }, + { "inset", 31 }, + { "inside", 32 }, + { "italic", 33 }, + { "justify", 34 }, + { "large", 35 }, + { "larger", 36 }, + { "left", 37 }, + { "lighter", 38 }, + { "line-through", 39 }, + { "list-item", 40 }, + { "lower-alpha", 41 }, + { "lower-roman", 42 }, + { "lowercase", 43 }, + { "ltr", 44 }, + { "marker", 45 }, + { "medium", 46 }, + { "middle", 47 }, + { "mm", 48 }, + { "no-repeat", 49 }, + { "none", 50 }, + { "normal", 51 }, + { "noshade", 52 }, + { "nowrap", 53 }, + { "oblique", 54 }, + { "outset", 55 }, + { "outside", 56 }, + { "overline", 57 }, + { "paragraph", 58 }, + { "pc", 59 }, + { "pre", 60 }, + { "pt", 61 }, + { "px", 62 }, + { "relative", 63 }, + { "repeat", 64 }, + { "repeat-x", 65 }, + { "repeat-y", 66 }, + { "ridge", 67 }, + { "right", 68 }, + { "rtl", 69 }, + { "run-in", 70 }, + { "scroll", 71 }, + { "small", 72 }, + { "small-caps", 73 }, + { "smaller", 74 }, + { "solid", 75 }, + { "square", 76 }, + { "static", 77 }, + { "sub", 78 }, + { "super", 79 }, + { "table", 80 }, + { "table-caption", 81 }, + { "table-cell", 82 }, + { "table-column", 83 }, + { "table-column-group", 84 }, + { "table-footer-group", 85 }, + { "table-header-group", 86 }, + { "table-row", 87 }, + { "table-row-group", 88 }, + { "text-bottom", 89 }, + { "text-top", 90 }, + { "thick", 91 }, + { "thin", 92 }, + { "top", 93 }, + { "transparent", 94 }, + { "underline", 95 }, + { "upper-alpha", 96 }, + { "upper-roman", 97 }, + { "uppercase", 98 }, + { "visible", 99 }, + { "x-large", 100 }, + { "x-small", 101 }, + { "xx-large", 102 }, + { "xx-small", 103 }, }; diff --git a/mozilla/layout/html/style/src/nsCSSKeywordIDs.h b/mozilla/layout/html/style/src/nsCSSKeywordIDs.h index 959eeb953db..5ea01952a10 100644 --- a/mozilla/layout/html/style/src/nsCSSKeywordIDs.h +++ b/mozilla/layout/html/style/src/nsCSSKeywordIDs.h @@ -13,81 +13,94 @@ #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 +#define KEYWORD_COMPACT 14 +#define KEYWORD_DASHED 15 +#define KEYWORD_DECIMAL 16 +#define KEYWORD_DISC 17 +#define KEYWORD_DOTTED 18 +#define KEYWORD_DOUBLE 19 +#define KEYWORD_EM 20 +#define KEYWORD_EX 21 +#define KEYWORD_FIXED 22 +#define KEYWORD_GROOVE 23 +#define KEYWORD_HAND 24 +#define KEYWORD_HIDDEN 25 +#define KEYWORD_IBEAM 26 +#define KEYWORD_IN 27 +#define KEYWORD_INHERIT 28 +#define KEYWORD_INLINE 29 +#define KEYWORD_INLINE_TABLE 30 +#define KEYWORD_INSET 31 +#define KEYWORD_INSIDE 32 +#define KEYWORD_ITALIC 33 +#define KEYWORD_JUSTIFY 34 +#define KEYWORD_LARGE 35 +#define KEYWORD_LARGER 36 +#define KEYWORD_LEFT 37 +#define KEYWORD_LIGHTER 38 +#define KEYWORD_LINE_THROUGH 39 +#define KEYWORD_LIST_ITEM 40 +#define KEYWORD_LOWER_ALPHA 41 +#define KEYWORD_LOWER_ROMAN 42 +#define KEYWORD_LOWERCASE 43 +#define KEYWORD_LTR 44 +#define KEYWORD_MARKER 45 +#define KEYWORD_MEDIUM 46 +#define KEYWORD_MIDDLE 47 +#define KEYWORD_MM 48 +#define KEYWORD_NO_REPEAT 49 +#define KEYWORD_NONE 50 +#define KEYWORD_NORMAL 51 +#define KEYWORD_NOSHADE 52 +#define KEYWORD_NOWRAP 53 +#define KEYWORD_OBLIQUE 54 +#define KEYWORD_OUTSET 55 +#define KEYWORD_OUTSIDE 56 +#define KEYWORD_OVERLINE 57 +#define KEYWORD_PARAGRAPH 58 +#define KEYWORD_PC 59 +#define KEYWORD_PRE 60 +#define KEYWORD_PT 61 +#define KEYWORD_PX 62 +#define KEYWORD_RELATIVE 63 +#define KEYWORD_REPEAT 64 +#define KEYWORD_REPEAT_X 65 +#define KEYWORD_REPEAT_Y 66 +#define KEYWORD_RIDGE 67 +#define KEYWORD_RIGHT 68 +#define KEYWORD_RTL 69 +#define KEYWORD_RUN_IN 70 +#define KEYWORD_SCROLL 71 +#define KEYWORD_SMALL 72 +#define KEYWORD_SMALL_CAPS 73 +#define KEYWORD_SMALLER 74 +#define KEYWORD_SOLID 75 +#define KEYWORD_SQUARE 76 +#define KEYWORD_STATIC 77 +#define KEYWORD_SUB 78 +#define KEYWORD_SUPER 79 +#define KEYWORD_TABLE 80 +#define KEYWORD_TABLE_CAPTION 81 +#define KEYWORD_TABLE_CELL 82 +#define KEYWORD_TABLE_COLUMN 83 +#define KEYWORD_TABLE_COLUMN_GROUP 84 +#define KEYWORD_TABLE_FOOTER_GROUP 85 +#define KEYWORD_TABLE_HEADER_GROUP 86 +#define KEYWORD_TABLE_ROW 87 +#define KEYWORD_TABLE_ROW_GROUP 88 +#define KEYWORD_TEXT_BOTTOM 89 +#define KEYWORD_TEXT_TOP 90 +#define KEYWORD_THICK 91 +#define KEYWORD_THIN 92 +#define KEYWORD_TOP 93 +#define KEYWORD_TRANSPARENT 94 +#define KEYWORD_UNDERLINE 95 +#define KEYWORD_UPPER_ALPHA 96 +#define KEYWORD_UPPER_ROMAN 97 +#define KEYWORD_UPPERCASE 98 +#define KEYWORD_VISIBLE 99 +#define KEYWORD_X_LARGE 100 +#define KEYWORD_X_SMALL 101 +#define KEYWORD_XX_LARGE 102 +#define KEYWORD_XX_SMALL 103 +#define KEYWORD_MAX 104 diff --git a/mozilla/layout/html/style/src/nsCSSKeywords.cpp b/mozilla/layout/html/style/src/nsCSSKeywords.cpp index eefdfa68880..880159cb8b0 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 91 +#define TOTAL_KEYWORDS 104 #define MIN_WORD_LENGTH 2 -#define MAX_WORD_LENGTH 12 +#define MAX_WORD_LENGTH 18 #define MIN_HASH_VALUE 12 -#define MAX_HASH_VALUE 312 -/* maximum key range = 301, duplicates = 0 */ +#define MAX_HASH_VALUE 437 +/* maximum key range = 426, duplicates = 0 */ struct StaticNameTable { @@ -50,206 +50,246 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) { static unsigned short asso_values[] = { - 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, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 5, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 40, 103, 125, + 57, 0, 25, 35, 75, 110, 10, 15, 124, 30, + 5, 0, 25, 0, 0, 5, 0, 122, 10, 110, + 5, 10, 438, 438, 438, 438, 438, 438, }; static unsigned char lengthtable[] = { 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, + 4, 0, 0, 7, 0, 9, 0, 0, 0, 8, 0, 0, 0, 2, + 3, 0, 0, 6, 0, 0, 0, 0, 0, 2, 8, 0, 0, 6, + 0, 8, 0, 0, 11, 0, 8, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 2, 0, 0, 0, 0, 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, 2, 6, 0, 5, + 6, 3, 6, 7, 0, 0, 7, 6, 0, 6, 6, 0, 6, 6, + 0, 7, 8, 0, 0, 0, 6, 0, 5, 0, 5, 0, 0, 4, + 0, 5, 8, 5, 0, 0, 0, 8, 7, 0, 7, 6, 4, 0, + 0, 5, 6, 0, 5, 0, 0, 0, 6, 0, 0, 0, 0, 4, + 4, 15, 0, 6, 0, 2, 11, 9, 0, 5, 0, 0, 4, 0, + 0, 7, 0, 0, 0, 0, 5, 6, 5, 5, 0, 0, 0, 0, + 0, 18, 0, 0, 0, 10, 0, 0, 0, 0, 0, 9, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, + 0, 0, 0, 6, 0, 0, 0, 6, 0, 5, 5, 0, 11, 3, + 0, 6, 0, 0, 12, 0, 0, 0, 6, 18, 9, 11, 0, 0, + 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 7, 2, 9, 0, + 0, 6, 0, 9, 0, 12, 13, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, 0, 9, 0, 0, 0, 0, + 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 10, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 7, }; static struct StaticNameTable wordlist[] = { {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pt", 58}, + {"ex", 21}, {"",}, - {"left", 35}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"ex", 20}, - {"top", 80}, - {"x-large", 87}, - {"",}, {"",}, {"",}, - {"text-top", 77}, - {"",}, {"",}, {"",}, - {"px", 59}, + {"none", 50}, {"",}, {"",}, - {"xx-small", 90}, - {"outset", 52}, - {"outside", 53}, + {"noshade", 52}, {"",}, - {"auto", 2}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"text-bottom", 76}, - {"",}, {"",}, - {"x-small", 88}, - {"",}, {"",}, - {"em", 19}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"small", 68}, - {"square", 72}, - {"visible", 86}, - {"",}, - {"uppercase", 85}, - {"",}, {"",}, - {"justify", 32}, + {"no-repeat", 49}, {"",}, {"",}, {"",}, - {"upper-alpha", 83}, + {"overline", 57}, {"",}, {"",}, {"",}, - {"thick", 78}, - {"",}, - {"mm", 45}, - {"",}, - {"list-item", 38}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"xx-large", 89}, - {"no-repeat", 46}, - {"",}, - {"overline", 54}, - {"",}, {"",}, {"",}, - {"solid", 71}, - {"",}, {"",}, {"",}, - {"inline", 28}, - {"",}, - {"double", 18}, - {"lowercase", 41}, + {"pt", 61}, + {"pre", 60}, {"",}, {"",}, - {"noshade", 49}, - {"",}, - {"rtl", 66}, - {"",}, - {"lower-alpha", 39}, - {"fixed", 21}, - {"",}, - {"thin", 79}, - {"",}, - {"large", 33}, - {"inherit", 27}, - {"middle", 44}, - {"pre", 57}, + {"repeat", 64}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"px", 62}, + {"text-top", 90}, {"",}, {"",}, - {"repeat", 61}, - {"medium", 43}, - {"relative", 60}, - {"inset", 29}, - {"inside", 30}, - {"transparent", 81}, - {"",}, {"",}, {"",}, - {"repeat-y", 63}, - {"oblique", 51}, + {"groove", 23}, + {"",}, + {"repeat-x", 65}, + {"",}, {"",}, + {"text-bottom", 89}, + {"",}, + {"repeat-y", 66}, {"",}, {"",}, {"",}, {"",}, - {"line-through", 37}, - {"",}, {"",}, - {"dotted", 17}, - {"repeat-x", 62}, - {"capitalize", 10}, - {"",}, - {"both", 8}, + {"top", 93}, + {"",}, {"",}, {"",}, {"",}, + {"xx-large", 102}, {"",}, {"",}, {"",}, - {"italic", 31}, + {"em", 20}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"marker", 45}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"smaller", 74}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"transparent", 94}, + {"mm", 48}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + + {"dotted", 18}, {"",}, - {"paragraph", 55}, + {"in", 27}, + {"medium", 46}, + {"",}, + {"inset", 31}, + {"inside", 32}, + {"ltr", 44}, + {"outset", 55}, + {"outside", 56}, {"",}, {"",}, - {"static", 73}, - {"none", 47}, + {"visible", 99}, + {"square", 76}, {"",}, + {"normal", 51}, + {"center", 11}, + {"",}, + {"run-in", 70}, {"bottom", 9}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"absolute", 0}, {"",}, - {"block", 5}, - {"hand", 23}, - {"groove", 22}, + {"x-large", 100}, + {"relative", 63}, + {"",}, {"",}, {"",}, + {"nowrap", 53}, + {"",}, + {"table", 80}, + {"",}, + {"right", 68}, + {"",}, {"",}, + {"left", 37}, + {"",}, + {"arrow", 1}, + {"absolute", 0}, + {"super", 79}, + {"",}, {"",}, {"",}, + {"baseline", 3}, + {"compact", 14}, + {"",}, + {"justify", 34}, + {"dashed", 15}, + {"auto", 2}, + {"",}, {"",}, + {"large", 35}, + {"larger", 36}, + {"",}, + {"ridge", 67}, + {"",}, {"",}, {"",}, + {"static", 77}, + {"",}, {"",}, {"",}, {"",}, + {"hand", 24}, + {"both", 8}, + {"table-row-group", 88}, + {"",}, + {"double", 19}, {"",}, {"cm", 13}, - {"dashed", 14}, + {"upper-roman", 97}, + {"paragraph", 58}, {"",}, - {"in", 26}, + {"solid", 75}, {"",}, {"",}, - {"ibeam", 25}, - {"super", 75}, - {"",}, {"",}, {"",}, {"",}, - {"nowrap", 50}, - {"",}, - {"hidden", 24}, - {"",}, - {"blink", 4}, - {"right", 65}, - {"normal", 48}, - {"",}, {"",}, {"",}, - {"decimal", 15}, - {"",}, {"",}, {"",}, {"",}, - {"bold", 6}, - {"",}, - {"ridge", 64}, + {"thin", 92}, {"",}, {"",}, - {"underline", 82}, + {"inherit", 28}, + {"",}, {"",}, {"",}, {"",}, + {"fixed", 22}, + {"middle", 47}, + {"small", 72}, + {"thick", 91}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"small-caps", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"ltr", 42}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"larger", 34}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"disc", 16}, + {"table-footer-group", 85}, {"",}, {"",}, {"",}, + {"small-caps", 73}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"uppercase", 98}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"bolder", 7}, - {"baseline", 3}, - {"",}, {"",}, {"",}, - {"upper-roman", 84}, - {"",}, {"",}, {"",}, - {"pc", 56}, - {"",}, {"",}, + {"oblique", 54}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"circle", 12}, + {"",}, {"",}, {"",}, + {"inline", 29}, + {"",}, + {"block", 5}, + {"ibeam", 26}, + {"",}, + {"lower-roman", 42}, + {"rtl", 69}, + {"",}, + {"hidden", 25}, + {"",}, {"",}, + {"inline-table", 30}, + {"",}, {"",}, {"",}, + {"scroll", 71}, + {"table-header-group", 86}, + {"table-row", 87}, + {"upper-alpha", 96}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"x-small", 101}, + {"xx-small", 103}, {"",}, {"",}, {"",}, {"",}, - {"scroll", 67}, + {"lighter", 38}, + {"pc", 59}, + {"list-item", 40}, + {"",}, {"",}, + {"italic", 33}, + {"",}, + {"lowercase", 43}, + {"",}, + {"table-column", 83}, + {"table-caption", 81}, + {"",}, + {"bold", 6}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"smaller", 70}, + {"",}, {"",}, {"",}, + {"disc", 17}, + {"",}, + {"underline", 95}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"lower-roman", 40}, + {"table-column-group", 84}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"capitalize", 10}, + {"lower-alpha", 41}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"sub", 78}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"lighter", 36}, + {"blink", 4}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"center", 11}, - {"",}, {"",}, {"",}, - {"sub", 74}, - {"",}, {"",}, {"",}, - {"arrow", 1}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"line-through", 39}, + {"table-cell", 82}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"decimal", 16}, }; if (str != NULL) { @@ -319,81 +359,94 @@ const nsCSSKeywords::NameTableEntry nsCSSKeywords::kNameTable[] = { { "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 }, + { "compact", 14 }, + { "dashed", 15 }, + { "decimal", 16 }, + { "disc", 17 }, + { "dotted", 18 }, + { "double", 19 }, + { "em", 20 }, + { "ex", 21 }, + { "fixed", 22 }, + { "groove", 23 }, + { "hand", 24 }, + { "hidden", 25 }, + { "ibeam", 26 }, + { "in", 27 }, + { "inherit", 28 }, + { "inline", 29 }, + { "inline-table", 30 }, + { "inset", 31 }, + { "inside", 32 }, + { "italic", 33 }, + { "justify", 34 }, + { "large", 35 }, + { "larger", 36 }, + { "left", 37 }, + { "lighter", 38 }, + { "line-through", 39 }, + { "list-item", 40 }, + { "lower-alpha", 41 }, + { "lower-roman", 42 }, + { "lowercase", 43 }, + { "ltr", 44 }, + { "marker", 45 }, + { "medium", 46 }, + { "middle", 47 }, + { "mm", 48 }, + { "no-repeat", 49 }, + { "none", 50 }, + { "normal", 51 }, + { "noshade", 52 }, + { "nowrap", 53 }, + { "oblique", 54 }, + { "outset", 55 }, + { "outside", 56 }, + { "overline", 57 }, + { "paragraph", 58 }, + { "pc", 59 }, + { "pre", 60 }, + { "pt", 61 }, + { "px", 62 }, + { "relative", 63 }, + { "repeat", 64 }, + { "repeat-x", 65 }, + { "repeat-y", 66 }, + { "ridge", 67 }, + { "right", 68 }, + { "rtl", 69 }, + { "run-in", 70 }, + { "scroll", 71 }, + { "small", 72 }, + { "small-caps", 73 }, + { "smaller", 74 }, + { "solid", 75 }, + { "square", 76 }, + { "static", 77 }, + { "sub", 78 }, + { "super", 79 }, + { "table", 80 }, + { "table-caption", 81 }, + { "table-cell", 82 }, + { "table-column", 83 }, + { "table-column-group", 84 }, + { "table-footer-group", 85 }, + { "table-header-group", 86 }, + { "table-row", 87 }, + { "table-row-group", 88 }, + { "text-bottom", 89 }, + { "text-top", 90 }, + { "thick", 91 }, + { "thin", 92 }, + { "top", 93 }, + { "transparent", 94 }, + { "underline", 95 }, + { "upper-alpha", 96 }, + { "upper-roman", 97 }, + { "uppercase", 98 }, + { "visible", 99 }, + { "x-large", 100 }, + { "x-small", 101 }, + { "xx-large", 102 }, + { "xx-small", 103 }, }; diff --git a/mozilla/layout/style/nsCSSKeywords.cpp b/mozilla/layout/style/nsCSSKeywords.cpp index eefdfa68880..880159cb8b0 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 91 +#define TOTAL_KEYWORDS 104 #define MIN_WORD_LENGTH 2 -#define MAX_WORD_LENGTH 12 +#define MAX_WORD_LENGTH 18 #define MIN_HASH_VALUE 12 -#define MAX_HASH_VALUE 312 -/* maximum key range = 301, duplicates = 0 */ +#define MAX_HASH_VALUE 437 +/* maximum key range = 426, duplicates = 0 */ struct StaticNameTable { @@ -50,206 +50,246 @@ PRInt32 nsCSSKeywords::LookupName(const char* str) { static unsigned short asso_values[] = { - 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, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 5, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 40, 103, 125, + 57, 0, 25, 35, 75, 110, 10, 15, 124, 30, + 5, 0, 25, 0, 0, 5, 0, 122, 10, 110, + 5, 10, 438, 438, 438, 438, 438, 438, }; static unsigned char lengthtable[] = { 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, + 4, 0, 0, 7, 0, 9, 0, 0, 0, 8, 0, 0, 0, 2, + 3, 0, 0, 6, 0, 0, 0, 0, 0, 2, 8, 0, 0, 6, + 0, 8, 0, 0, 11, 0, 8, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 7, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 2, 0, 0, 0, 0, 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, 2, 6, 0, 5, + 6, 3, 6, 7, 0, 0, 7, 6, 0, 6, 6, 0, 6, 6, + 0, 7, 8, 0, 0, 0, 6, 0, 5, 0, 5, 0, 0, 4, + 0, 5, 8, 5, 0, 0, 0, 8, 7, 0, 7, 6, 4, 0, + 0, 5, 6, 0, 5, 0, 0, 0, 6, 0, 0, 0, 0, 4, + 4, 15, 0, 6, 0, 2, 11, 9, 0, 5, 0, 0, 4, 0, + 0, 7, 0, 0, 0, 0, 5, 6, 5, 5, 0, 0, 0, 0, + 0, 18, 0, 0, 0, 10, 0, 0, 0, 0, 0, 9, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 0, 0, 0, + 0, 0, 0, 6, 0, 0, 0, 6, 0, 5, 5, 0, 11, 3, + 0, 6, 0, 0, 12, 0, 0, 0, 6, 18, 9, 11, 0, 0, + 0, 0, 0, 0, 7, 8, 0, 0, 0, 0, 7, 2, 9, 0, + 0, 6, 0, 9, 0, 12, 13, 0, 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, 0, 9, 0, 0, 0, 0, + 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 10, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 10, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 7, }; static struct StaticNameTable wordlist[] = { {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pt", 58}, + {"ex", 21}, {"",}, - {"left", 35}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"ex", 20}, - {"top", 80}, - {"x-large", 87}, - {"",}, {"",}, {"",}, - {"text-top", 77}, - {"",}, {"",}, {"",}, - {"px", 59}, + {"none", 50}, {"",}, {"",}, - {"xx-small", 90}, - {"outset", 52}, - {"outside", 53}, + {"noshade", 52}, {"",}, - {"auto", 2}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"text-bottom", 76}, - {"",}, {"",}, - {"x-small", 88}, - {"",}, {"",}, - {"em", 19}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"small", 68}, - {"square", 72}, - {"visible", 86}, - {"",}, - {"uppercase", 85}, - {"",}, {"",}, - {"justify", 32}, + {"no-repeat", 49}, {"",}, {"",}, {"",}, - {"upper-alpha", 83}, + {"overline", 57}, {"",}, {"",}, {"",}, - {"thick", 78}, - {"",}, - {"mm", 45}, - {"",}, - {"list-item", 38}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"xx-large", 89}, - {"no-repeat", 46}, - {"",}, - {"overline", 54}, - {"",}, {"",}, {"",}, - {"solid", 71}, - {"",}, {"",}, {"",}, - {"inline", 28}, - {"",}, - {"double", 18}, - {"lowercase", 41}, + {"pt", 61}, + {"pre", 60}, {"",}, {"",}, - {"noshade", 49}, - {"",}, - {"rtl", 66}, - {"",}, - {"lower-alpha", 39}, - {"fixed", 21}, - {"",}, - {"thin", 79}, - {"",}, - {"large", 33}, - {"inherit", 27}, - {"middle", 44}, - {"pre", 57}, + {"repeat", 64}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"px", 62}, + {"text-top", 90}, {"",}, {"",}, - {"repeat", 61}, - {"medium", 43}, - {"relative", 60}, - {"inset", 29}, - {"inside", 30}, - {"transparent", 81}, - {"",}, {"",}, {"",}, - {"repeat-y", 63}, - {"oblique", 51}, + {"groove", 23}, + {"",}, + {"repeat-x", 65}, + {"",}, {"",}, + {"text-bottom", 89}, + {"",}, + {"repeat-y", 66}, {"",}, {"",}, {"",}, {"",}, - {"line-through", 37}, - {"",}, {"",}, - {"dotted", 17}, - {"repeat-x", 62}, - {"capitalize", 10}, - {"",}, - {"both", 8}, + {"top", 93}, + {"",}, {"",}, {"",}, {"",}, + {"xx-large", 102}, {"",}, {"",}, {"",}, - {"italic", 31}, + {"em", 20}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"marker", 45}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"smaller", 74}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"transparent", 94}, + {"mm", 48}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + + {"dotted", 18}, {"",}, - {"paragraph", 55}, + {"in", 27}, + {"medium", 46}, + {"",}, + {"inset", 31}, + {"inside", 32}, + {"ltr", 44}, + {"outset", 55}, + {"outside", 56}, {"",}, {"",}, - {"static", 73}, - {"none", 47}, + {"visible", 99}, + {"square", 76}, {"",}, + {"normal", 51}, + {"center", 11}, + {"",}, + {"run-in", 70}, {"bottom", 9}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"absolute", 0}, {"",}, - {"block", 5}, - {"hand", 23}, - {"groove", 22}, + {"x-large", 100}, + {"relative", 63}, + {"",}, {"",}, {"",}, + {"nowrap", 53}, + {"",}, + {"table", 80}, + {"",}, + {"right", 68}, + {"",}, {"",}, + {"left", 37}, + {"",}, + {"arrow", 1}, + {"absolute", 0}, + {"super", 79}, + {"",}, {"",}, {"",}, + {"baseline", 3}, + {"compact", 14}, + {"",}, + {"justify", 34}, + {"dashed", 15}, + {"auto", 2}, + {"",}, {"",}, + {"large", 35}, + {"larger", 36}, + {"",}, + {"ridge", 67}, + {"",}, {"",}, {"",}, + {"static", 77}, + {"",}, {"",}, {"",}, {"",}, + {"hand", 24}, + {"both", 8}, + {"table-row-group", 88}, + {"",}, + {"double", 19}, {"",}, {"cm", 13}, - {"dashed", 14}, + {"upper-roman", 97}, + {"paragraph", 58}, {"",}, - {"in", 26}, + {"solid", 75}, {"",}, {"",}, - {"ibeam", 25}, - {"super", 75}, - {"",}, {"",}, {"",}, {"",}, - {"nowrap", 50}, - {"",}, - {"hidden", 24}, - {"",}, - {"blink", 4}, - {"right", 65}, - {"normal", 48}, - {"",}, {"",}, {"",}, - {"decimal", 15}, - {"",}, {"",}, {"",}, {"",}, - {"bold", 6}, - {"",}, - {"ridge", 64}, + {"thin", 92}, {"",}, {"",}, - {"underline", 82}, + {"inherit", 28}, + {"",}, {"",}, {"",}, {"",}, + {"fixed", 22}, + {"middle", 47}, + {"small", 72}, + {"thick", 91}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"small-caps", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"ltr", 42}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"larger", 34}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"disc", 16}, + {"table-footer-group", 85}, {"",}, {"",}, {"",}, + {"small-caps", 73}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"uppercase", 98}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"bolder", 7}, - {"baseline", 3}, - {"",}, {"",}, {"",}, - {"upper-roman", 84}, - {"",}, {"",}, {"",}, - {"pc", 56}, - {"",}, {"",}, + {"oblique", 54}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"circle", 12}, + {"",}, {"",}, {"",}, + {"inline", 29}, + {"",}, + {"block", 5}, + {"ibeam", 26}, + {"",}, + {"lower-roman", 42}, + {"rtl", 69}, + {"",}, + {"hidden", 25}, + {"",}, {"",}, + {"inline-table", 30}, + {"",}, {"",}, {"",}, + {"scroll", 71}, + {"table-header-group", 86}, + {"table-row", 87}, + {"upper-alpha", 96}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"x-small", 101}, + {"xx-small", 103}, {"",}, {"",}, {"",}, {"",}, - {"scroll", 67}, + {"lighter", 38}, + {"pc", 59}, + {"list-item", 40}, + {"",}, {"",}, + {"italic", 33}, + {"",}, + {"lowercase", 43}, + {"",}, + {"table-column", 83}, + {"table-caption", 81}, + {"",}, + {"bold", 6}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"smaller", 70}, + {"",}, {"",}, {"",}, + {"disc", 17}, + {"",}, + {"underline", 95}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"lower-roman", 40}, + {"table-column-group", 84}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"capitalize", 10}, + {"lower-alpha", 41}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"sub", 78}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"lighter", 36}, + {"blink", 4}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"center", 11}, - {"",}, {"",}, {"",}, - {"sub", 74}, - {"",}, {"",}, {"",}, - {"arrow", 1}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"line-through", 39}, + {"table-cell", 82}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"decimal", 16}, }; if (str != NULL) { @@ -319,81 +359,94 @@ const nsCSSKeywords::NameTableEntry nsCSSKeywords::kNameTable[] = { { "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 }, + { "compact", 14 }, + { "dashed", 15 }, + { "decimal", 16 }, + { "disc", 17 }, + { "dotted", 18 }, + { "double", 19 }, + { "em", 20 }, + { "ex", 21 }, + { "fixed", 22 }, + { "groove", 23 }, + { "hand", 24 }, + { "hidden", 25 }, + { "ibeam", 26 }, + { "in", 27 }, + { "inherit", 28 }, + { "inline", 29 }, + { "inline-table", 30 }, + { "inset", 31 }, + { "inside", 32 }, + { "italic", 33 }, + { "justify", 34 }, + { "large", 35 }, + { "larger", 36 }, + { "left", 37 }, + { "lighter", 38 }, + { "line-through", 39 }, + { "list-item", 40 }, + { "lower-alpha", 41 }, + { "lower-roman", 42 }, + { "lowercase", 43 }, + { "ltr", 44 }, + { "marker", 45 }, + { "medium", 46 }, + { "middle", 47 }, + { "mm", 48 }, + { "no-repeat", 49 }, + { "none", 50 }, + { "normal", 51 }, + { "noshade", 52 }, + { "nowrap", 53 }, + { "oblique", 54 }, + { "outset", 55 }, + { "outside", 56 }, + { "overline", 57 }, + { "paragraph", 58 }, + { "pc", 59 }, + { "pre", 60 }, + { "pt", 61 }, + { "px", 62 }, + { "relative", 63 }, + { "repeat", 64 }, + { "repeat-x", 65 }, + { "repeat-y", 66 }, + { "ridge", 67 }, + { "right", 68 }, + { "rtl", 69 }, + { "run-in", 70 }, + { "scroll", 71 }, + { "small", 72 }, + { "small-caps", 73 }, + { "smaller", 74 }, + { "solid", 75 }, + { "square", 76 }, + { "static", 77 }, + { "sub", 78 }, + { "super", 79 }, + { "table", 80 }, + { "table-caption", 81 }, + { "table-cell", 82 }, + { "table-column", 83 }, + { "table-column-group", 84 }, + { "table-footer-group", 85 }, + { "table-header-group", 86 }, + { "table-row", 87 }, + { "table-row-group", 88 }, + { "text-bottom", 89 }, + { "text-top", 90 }, + { "thick", 91 }, + { "thin", 92 }, + { "top", 93 }, + { "transparent", 94 }, + { "underline", 95 }, + { "upper-alpha", 96 }, + { "upper-roman", 97 }, + { "uppercase", 98 }, + { "visible", 99 }, + { "x-large", 100 }, + { "x-small", 101 }, + { "xx-large", 102 }, + { "xx-small", 103 }, };