From adfd98fcefcb363e94fa20732eea09b294dc0a5d Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Mon, 26 Oct 1998 23:16:27 +0000 Subject: [PATCH] added CSS2 properties --- content/html/style/src/nsCSSProps.h | 50 ++ content/shared/public/nsCSSProps.h | 50 ++ content/shared/src/nsCSSProps.cpp | 889 ++++++++++++++------------ layout/html/style/src/nsCSSPropIDs.h | 222 +++---- layout/html/style/src/nsCSSProps.cpp | 889 ++++++++++++++------------ layout/html/style/src/nsCSSProps.h | 50 ++ layout/html/style/src/nsCSSProps2.cpp | 610 +++++++++++++++--- layout/style/nsCSSProps.cpp | 889 ++++++++++++++------------ layout/style/nsCSSProps.h | 50 ++ 9 files changed, 2312 insertions(+), 1387 deletions(-) diff --git a/content/html/style/src/nsCSSProps.h b/content/html/style/src/nsCSSProps.h index 402462b3d736..92f3de0b8e8c 100644 --- a/content/html/style/src/nsCSSProps.h +++ b/content/html/style/src/nsCSSProps.h @@ -43,6 +43,56 @@ public: static const NameTableEntry kNameTable[]; static const PRInt32 kHintTable[]; + + // Keyword/Enum value tables + static const PRInt32 kAzimuthKTable[]; + static const PRInt32 kBackgroundAttachmentKTable[]; + static const PRInt32 kBackgroundColorKTable[]; + static const PRInt32 kBackgroundRepeatKTable[]; + static const PRInt32 kBorderCollapseKTable[]; + static const PRInt32 kBorderColorKTable[]; + static const PRInt32 kBorderStyleKTable[]; + static const PRInt32 kBorderWidthKTable[]; + static const PRInt32 kCaptionSideKTable[]; + static const PRInt32 kClearKTable[]; + static const PRInt32 kContentKTable[]; + static const PRInt32 kCursorKTable[]; + static const PRInt32 kDirectionKTable[]; + static const PRInt32 kDisplayKTable[]; + static const PRInt32 kElevationKTable[]; + static const PRInt32 kEmptyCellsKTable[]; + static const PRInt32 kFloatKTable[]; + static const PRInt32 kFontKTable[]; + static const PRInt32 kFontSizeKTable[]; + static const PRInt32 kFontStretchKTable[]; + static const PRInt32 kFontStyleKTable[]; + static const PRInt32 kFontVariantKTable[]; + static const PRInt32 kFontWeightKTable[]; + static const PRInt32 kListStylePositionKTable[]; + static const PRInt32 kListStyleKTable[]; + static const PRInt32 kOutlineColorKTable[]; + static const PRInt32 kOverflowKTable[]; + static const PRInt32 kPageBreakKTable[]; + static const PRInt32 kPageBreakInsideKTable[]; + static const PRInt32 kPageMarksKTable[]; + static const PRInt32 kPageSizeKTable[]; + static const PRInt32 kPitchKTable[]; + static const PRInt32 kPlayDuringKTable[]; + static const PRInt32 kPositionKTable[]; + static const PRInt32 kSpeakKTable[]; + static const PRInt32 kSpeakHeaderKTable[]; + static const PRInt32 kSpeakNumeralKTable[]; + static const PRInt32 kSpeakPunctuationKTable[]; + static const PRInt32 kSpeechRateKTable[]; + static const PRInt32 kTableLayoutKTable[]; + static const PRInt32 kTextAlignKTable[]; + static const PRInt32 kTextDecorationKTable[]; + static const PRInt32 kTextTransformKTable[]; + static const PRInt32 kUnicodeBidiKTable[]; + static const PRInt32 kVerticalAlignKTable[]; + static const PRInt32 kVisibilityKTable[]; + static const PRInt32 kVolumeKTable[]; + static const PRInt32 kWhitespaceKTable[]; }; #endif /* nsCSSProps_h___ */ diff --git a/content/shared/public/nsCSSProps.h b/content/shared/public/nsCSSProps.h index 402462b3d736..92f3de0b8e8c 100644 --- a/content/shared/public/nsCSSProps.h +++ b/content/shared/public/nsCSSProps.h @@ -43,6 +43,56 @@ public: static const NameTableEntry kNameTable[]; static const PRInt32 kHintTable[]; + + // Keyword/Enum value tables + static const PRInt32 kAzimuthKTable[]; + static const PRInt32 kBackgroundAttachmentKTable[]; + static const PRInt32 kBackgroundColorKTable[]; + static const PRInt32 kBackgroundRepeatKTable[]; + static const PRInt32 kBorderCollapseKTable[]; + static const PRInt32 kBorderColorKTable[]; + static const PRInt32 kBorderStyleKTable[]; + static const PRInt32 kBorderWidthKTable[]; + static const PRInt32 kCaptionSideKTable[]; + static const PRInt32 kClearKTable[]; + static const PRInt32 kContentKTable[]; + static const PRInt32 kCursorKTable[]; + static const PRInt32 kDirectionKTable[]; + static const PRInt32 kDisplayKTable[]; + static const PRInt32 kElevationKTable[]; + static const PRInt32 kEmptyCellsKTable[]; + static const PRInt32 kFloatKTable[]; + static const PRInt32 kFontKTable[]; + static const PRInt32 kFontSizeKTable[]; + static const PRInt32 kFontStretchKTable[]; + static const PRInt32 kFontStyleKTable[]; + static const PRInt32 kFontVariantKTable[]; + static const PRInt32 kFontWeightKTable[]; + static const PRInt32 kListStylePositionKTable[]; + static const PRInt32 kListStyleKTable[]; + static const PRInt32 kOutlineColorKTable[]; + static const PRInt32 kOverflowKTable[]; + static const PRInt32 kPageBreakKTable[]; + static const PRInt32 kPageBreakInsideKTable[]; + static const PRInt32 kPageMarksKTable[]; + static const PRInt32 kPageSizeKTable[]; + static const PRInt32 kPitchKTable[]; + static const PRInt32 kPlayDuringKTable[]; + static const PRInt32 kPositionKTable[]; + static const PRInt32 kSpeakKTable[]; + static const PRInt32 kSpeakHeaderKTable[]; + static const PRInt32 kSpeakNumeralKTable[]; + static const PRInt32 kSpeakPunctuationKTable[]; + static const PRInt32 kSpeechRateKTable[]; + static const PRInt32 kTableLayoutKTable[]; + static const PRInt32 kTextAlignKTable[]; + static const PRInt32 kTextDecorationKTable[]; + static const PRInt32 kTextTransformKTable[]; + static const PRInt32 kUnicodeBidiKTable[]; + static const PRInt32 kVerticalAlignKTable[]; + static const PRInt32 kVisibilityKTable[]; + static const PRInt32 kVolumeKTable[]; + static const PRInt32 kWhitespaceKTable[]; }; #endif /* nsCSSProps_h___ */ diff --git a/content/shared/src/nsCSSProps.cpp b/content/shared/src/nsCSSProps.cpp index 097f1c1a7958..bc5230fa7066 100644 --- a/content/shared/src/nsCSSProps.cpp +++ b/content/shared/src/nsCSSProps.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSProps.h" -#define TOTAL_KEYWORDS 136 +#define TOTAL_KEYWORDS 142 #define MIN_WORD_LENGTH 3 #define MAX_WORD_LENGTH 21 -#define MIN_HASH_VALUE 5 -#define MAX_HASH_VALUE 659 -/* maximum key range = 655, duplicates = 0 */ +#define MIN_HASH_VALUE 193 +#define MAX_HASH_VALUE 1155 +/* maximum key range = 963, duplicates = 0 */ struct StaticNameTable { @@ -50,327 +50,425 @@ PRInt32 nsCSSProps::LookupName(const char* str) { static unsigned short asso_values[] = { - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 95, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 5, 0, 150, - 5, 15, 125, 15, 235, 190, 660, 0, 60, 35, - 110, 0, 0, 10, 0, 0, 40, 80, 0, 35, - 15, 110, 45, 660, 660, 660, 660, 660, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 215, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 161, 214, 250, + 226, 174, 146, 217, 246, 141, 1156, 69, 102, 94, + 144, 30, 7, 185, 4, 194, 153, 32, 89, 212, + 176, 245, 60, 1156, 1156, 1156, 1156, 1156, }; static unsigned char lengthtable[] = { - 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 0, 12, 0, - 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 4, 5, 16, 0, - 0, 0, 0, 16, 0, 0, 19, 15, 6, 17, 0, 0, 0, 0, - 12, 3, 0, 5, 6, 0, 13, 0, 0, 11, 0, 0, 0, 0, - 0, 0, 18, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, - 0, 21, 0, 18, 0, 0, 6, 12, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 11, 12, 0, 0, 0, 6, 0, - 0, 0, 0, 11, 0, 8, 0, 10, 0, 12, 13, 0, 0, 11, - 17, 0, 0, 0, 0, 7, 0, 4, 0, 0, 0, 0, 0, 0, - 11, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 7, 0, 0, - 0, 0, 12, 0, 14, 0, 0, 17, 0, 9, 10, 21, 0, 0, - 0, 5, 11, 7, 0, 0, 10, 0, 0, 0, 0, 0, 16, 17, - 18, 4, 0, 16, 0, 13, 0, 0, 0, 7, 13, 0, 10, 0, - 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 12, 13, 0, 0, 11, 0, 13, 14, 0, 0, 12, 0, 4, - 0, 11, 7, 8, 4, 5, 0, 12, 0, 14, 0, 0, 17, 0, - 0, 15, 16, 17, 0, 0, 5, 6, 12, 13, 9, 5, 6, 0, - 0, 0, 0, 0, 12, 0, 0, 0, 21, 0, 3, 0, 0, 0, - 0, 0, 19, 0, 11, 0, 8, 0, 10, 11, 0, 0, 0, 0, - 6, 0, 0, 0, 10, 0, 12, 13, 0, 10, 0, 0, 13, 0, - 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 18, - 14, 0, 11, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 7, - 8, 0, 0, 11, 0, 0, 0, 0, 0, 7, 0, 9, 15, 6, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, - 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 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, 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, 5, 0, 0, 0, 0, 0, 16, 0, 0, 9, 0, - 0, 0, 13, 14, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 11, 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, 0, 0, 0, 0, 0, 0, 0, 12, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 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, 0, 0, 0, 0, 0, 0, 0, - 0, 9, + 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 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, 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, 0, 6, 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, 5, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, 0, 6, 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, 4, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 7, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 0, 6, 0, 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 6, 8, 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, 4, 11, 19, 0, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 11, 11, + 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 10, 12, 0, 0, 0, + 0, 0, 0, 0, 17, 0, 0, 19, 0, 0, 7, 17, 17, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 11, 18, 0, 13, 0, 0, + 0, 0, 5, 0, 0, 0, 0, 0, 12, 6, 9, 9, 0, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 13, + 0, 0, 7, 0, 0, 0, 11, 0, 0, 0, 0, 17, 0, 0, + 0, 0, 0, 10, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 18, 10, 16, + 11, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 19, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 0, 0, 0, 0, 0, 11, 13, 0, 0, 0, + 0, 8, 0, 0, 0, 0, 0, 12, 0, 0, 13, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, 10, 16, 0, 0, 0, 6, + 16, 0, 0, 0, 21, 6, 0, 0, 13, 0, 21, 0, 0, 0, + 17, 19, 0, 0, 0, 0, 9, 0, 0, 17, 0, 10, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 7, 0, 0, 10, + 9, 16, 0, 0, 14, 10, 0, 0, 0, 0, 11, 0, 0, 0, + 0, 10, 0, 0, 12, 0, 9, 0, 0, 0, 0, 10, 0, 0, + 0, 0, 14, 0, 0, 0, 16, 0, 0, 21, 0, 0, 11, 16, + 0, 0, 17, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 17, 0, 12, 14, 0, 15, 0, 0, 0, 19, 0, + 0, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 11, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 11, 16, 17, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, + 0, 12, 0, 0, 14, 0, 0, 12, 17, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 12, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 12, 13, 0, 0, 0, 16, 0, 0, 12, 0, 0, 0, 0, 12, + 0, 0, 15, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 12, 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, 13, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 18, 0, 0, 0, 0, 0, 15, 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, 13, }; static struct StaticNameTable wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, - {"speak", 109}, - {"border", 10}, - {"",}, {"",}, {"",}, - {"border-top", 27}, - {"",}, - {"border-color", 16}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-bottom-color", 12}, - {"background", 1}, - {"",}, {"",}, {"",}, - {"page", 94}, - {"pause", 98}, - {"page-break-after", 95}, - {"",}, {"",}, {"",}, {"",}, - {"border-top-style", 29}, - {"",}, {"",}, - {"border-bottom-style", 13}, - {"border-collapse", 15}, - {"volume", 130}, - {"page-break-before", 96}, - {"",}, {"",}, {"",}, {"",}, - {"border-style", 26}, - {"top", 125}, - {"",}, - {"marks", 77}, - {"stress", 114}, - {"",}, - {"border-bottom", 11}, - {"",}, {"",}, - {"border-left", 17}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-right-color", 22}, - {"",}, {"",}, {"",}, - {"background-repeat", 9}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"background-attachment", 2}, - {"",}, - {"border-right-style", 23}, - {"",}, {"",}, - {"bottom", 32}, - {"word-spacing", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"play-during", 103}, - {"border-right", 21}, + {"top", 131}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"border", 10}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak", 115}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"color", 42}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"cursor", 49}, + {"",}, {"",}, {"",}, {"",}, + {"filter", 54}, + {"",}, + {"right", 111}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"font", 56}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"quotes", 105}, + {"page", 95}, + {"pause", 99}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"text-shadow", 119}, + {"clear", 36}, {"",}, - {"overflow", 88}, - {"",}, - {"max-height", 78}, - {"",}, - {"speak-header", 110}, - {"marker-offset", 76}, + {"clip", 37}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"orphans", 84}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline", 85}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pause-after", 99}, - {"border-left-color", 18}, + {"pitch", 102}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"float", 55}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"border-top", 27}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right-color", 22}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"left", 65}, {"",}, {"",}, {"",}, {"",}, - {"orphans", 83}, + {"bottom", 34}, + {"",}, {"",}, {"",}, + {"opacity", 83}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"marks", 78}, + {"",}, {"",}, {"",}, {"",}, + {"cue", 46}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline-color", 86}, + {"",}, {"",}, {"",}, {"",}, + {"volume", 136}, + {"position", 106}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"size", 112}, + {"border-left", 17}, + {"border-bottom-color", 12}, + {"",}, {"",}, + {"border-color", 16}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-top", 41}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"padding", 90}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-after", 100}, + {"padding-top", 94}, + {"",}, {"",}, {"",}, + {"margin", 72}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"play-during", 104}, {"",}, - {"left", 64}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"padding-top", 93}, - {"border-left-style", 19}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin-top", 76}, + {"border-right", 21}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-filter", 4}, + {"",}, {"",}, {"background-position", 6}, {"",}, {"",}, - {"padding", 89}, - {"",}, {"",}, {"",}, {"",}, - {"pause-before", 100}, - {"",}, - {"text-transform", 124}, - {"",}, {"",}, - {"background-filter", 4}, - {"",}, - {"font-size", 57}, - {"font-style", 60}, - {"background-x-position", 7}, - {"",}, {"",}, {"",}, - {"color", 40}, - {"empty-cells", 52}, - {"opacity", 82}, - {"",}, {"",}, - {"margin-top", 75}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-top-color", 28}, - {"text-shadow-color", 120}, - {"text-shadow-radius", 121}, - {"font", 55}, - {"",}, - {"background-color", 3}, - {"",}, - {"speak-numeral", 111}, - {"",}, {"",}, {"",}, - {"z-index", 135}, - {"text-shadow-x", 122}, - {"",}, - {"text-align", 116}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"font-size-adjust", 58}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"caption-side", 33}, - {"margin-bottom", 72}, - {"",}, {"",}, - {"margin-left", 73}, - {"",}, - {"outline-color", 85}, - {"padding-bottom", 90}, - {"",}, {"",}, - {"padding-left", 91}, - {"",}, - {"size", 108}, - {"",}, - {"font-weight", 62}, - {"outline", 84}, - {"richness", 106}, - {"clip", 35}, - {"clear", 34}, - {"",}, - {"font-variant", 61}, - {"",}, - {"border-spacing", 25}, - {"",}, {"",}, - {"counter-increment", 42}, - {"",}, {"",}, - {"text-decoration", 117}, - {"background-image", 5}, - {"page-break-inside", 97}, - {"",}, {"",}, - {"float", 54}, - {"widows", 132}, - {"table-layout", 115}, - {"counter-reset", 43}, - {"elevation", 51}, - {"right", 107}, - {"cursor", 47}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"margin-right", 74}, - {"",}, {"",}, {"",}, - {"background-y-position", 8}, - {"",}, - {"cue", 44}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-bottom-width", 14}, - {"",}, - {"clip-bottom", 36}, - {"",}, - {"clip-top", 39}, - {"",}, - {"clip-right", 38}, - {"speech-rate", 113}, - {"",}, {"",}, {"",}, {"",}, - {"margin", 71}, - {"",}, {"",}, {"",}, - {"cue-before", 46}, - {"",}, - {"cursor-image", 48}, - {"text-shadow-y", 123}, - {"",}, - {"list-style", 67}, - {"",}, {"",}, - {"outline-style", 86}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-top-width", 30}, - {"",}, {"",}, {"",}, - {"min-height", 80}, - {"",}, {"",}, - {"border-right-width", 24}, - {"letter-spacing", 65}, - {"",}, - {"text-indent", 118}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"speak-punctuation", 112}, - {"",}, {"",}, {"",}, {"",}, - {"content", 41}, - {"position", 104}, - {"",}, {"",}, - {"pitch-range", 102}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"display", 50}, - {"",}, - {"clip-left", 37}, - {"list-style-type", 70}, - {"filter", 53}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"voice-family", 129}, - {"",}, {"",}, {"",}, {"",}, - {"azimuth", 0}, - {"",}, {"",}, {"",}, - {"height", 63}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"border-left-width", 20}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"direction", 49}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"cue-after", 45}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"font-family", 56}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"list-style-position", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"white-space", 131}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"padding-right", 92}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"content", 43}, + {"background-repeat", 7}, + {"border-left-color", 18}, + {"font-variant", 62}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pitch", 101}, + {"quotes-open", 109}, + {"border-right-style", 23}, + {"",}, + {"border-bottom", 11}, + {"",}, {"",}, {"",}, {"",}, + {"width", 139}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak-header", 116}, + {"quotes", 107}, + {"elevation", 52}, + {"font-size", 58}, + {"",}, + {"cue-after", 47}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"azimuth", 0}, + {"",}, + {"marker-offset", 77}, + {"",}, {"",}, + {"z-index", 141}, + {"",}, {"",}, {"",}, + {"speech-rate", 119}, + {"",}, {"",}, {"",}, {"",}, + {"speak-punctuation", 118}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"background", 1}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"overflow", 89}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"margin-left", 74}, + {"",}, {"",}, {"",}, + {"border-right-width", 24}, + {"cue-before", 48}, + {"border-top-color", 28}, + {"font-family", 57}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-color", 3}, + {"",}, {"",}, {"",}, + {"border-bottom-style", 13}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-weight", 63}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"direction", 50}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch-range", 103}, + {"outline-style", 87}, + {"",}, {"",}, {"",}, {"",}, + {"richness", 110}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin-right", 75}, + {"",}, {"",}, + {"speak-numeral", 117}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"height", 64}, + {"",}, {"",}, {"",}, + {"clip-right", 40}, + {"page-break-after", 96}, + {"",}, {"",}, {"",}, + {"stress", 120}, + {"background-image", 5}, + {"",}, {"",}, {"",}, + {"background-attachment", 2}, + {"widows", 138}, + {"",}, {"",}, + {"margin-bottom", 73}, + {"",}, + {"background-x-position", 8}, + {"",}, {"",}, {"",}, + {"border-left-style", 19}, + {"border-bottom-width", 14}, + {"",}, {"",}, {"",}, {"",}, + {"clip-left", 39}, + {"",}, {"",}, + {"play-during-flags", 105}, + {"",}, + {"visibility", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"text-transform", 130}, + {"display", 51}, + {"",}, {"",}, + {"text-align", 122}, + {"min-width", 82}, + {"border-top-style", 29}, + {"",}, {"",}, + {"padding-bottom", 91}, + {"min-height", 81}, + {"",}, {"",}, {"",}, {"",}, + {"line-height", 67}, + {"",}, {"",}, {"",}, {"",}, + {"font-style", 61}, + {"",}, {"",}, + {"border-style", 26}, + {"",}, + {"max-width", 80}, + {"",}, {"",}, {"",}, {"",}, + {"max-height", 79}, + {"",}, {"",}, {"",}, {"",}, + {"border-spacing", 25}, + {"",}, {"",}, {"",}, + {"border-x-spacing", 32}, + {"",}, {"",}, + {"background-y-position", 9}, + {"",}, {"",}, + {"clip-bottom", 38}, + {"font-size-adjust", 59}, + {"",}, {"",}, + {"border-left-width", 20}, + {"",}, {"",}, {"",}, {"",}, + {"outline-width", 88}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"counter-increment", 44}, + {"",}, + {"padding-left", 92}, + {"letter-spacing", 66}, + {"",}, + {"border-collapse", 15}, + {"",}, {"",}, {"",}, + {"list-style-position", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-indent", 124}, + {"",}, {"",}, {"",}, + {"empty-cells", 53}, + {"",}, {"",}, + {"white-space", 137}, + {"list-style", 68}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-top-width", 30}, + {"",}, {"",}, + {"font-stretch", 60}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"size-height", 113}, + {"border-y-spacing", 33}, + {"page-break-inside", 98}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"width", 133}, + {"text-shadow", 125}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"list-style-image", 68}, + {"unicode-bidi", 132}, {"",}, {"",}, - {"max-width", 79}, + {"vertical-align", 133}, + {"",}, {"",}, + {"pause-before", 101}, + {"text-shadow-color", 126}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"padding-right", 93}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"outline-width", 87}, - {"vertical-align", 127}, + {"page-break-before", 97}, {"",}, {"",}, {"border-width", 31}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"visibility", 128}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"line-height", 66}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"unicode-bidi", 126}, + {"voice-family", 135}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"table-layout", 121}, + {"counter-reset", 45}, + {"",}, {"",}, {"",}, + {"list-style-image", 69}, + {"",}, {"",}, + {"caption-side", 35}, + {"",}, {"",}, {"",}, {"",}, + {"quotes-close", 108}, + {"",}, {"",}, + {"list-style-type", 71}, + {"",}, {"",}, {"",}, {"",}, + {"size-width", 114}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"font-stretch", 59}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"word-spacing", 140}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"min-width", 81}, + {"text-shadow-x", 128}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"text-shadow-radius", 127}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-decoration", 123}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"text-shadow-y", 129}, }; if (str != NULL) { @@ -387,6 +485,7 @@ PRInt32 nsCSSProps::LookupName(const char* str) case 10: case 9: case 8: + hval += asso_values[MYLOWER(str[7])]; case 7: case 6: hval += asso_values[MYLOWER(str[5])]; @@ -438,9 +537,9 @@ const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { { "background-filter", 4 }, { "background-image", 5 }, { "background-position", 6 }, - { "background-x-position", 7 }, - { "background-y-position", 8 }, - { "background-repeat", 9 }, + { "background-repeat", 7 }, + { "background-x-position", 8 }, + { "background-y-position", 9 }, { "border", 10 }, { "border-bottom", 11 }, { "border-bottom-color", 12 }, @@ -463,108 +562,114 @@ const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { { "border-top-style", 29 }, { "border-top-width", 30 }, { "border-width", 31 }, - { "bottom", 32 }, - { "caption-side", 33 }, - { "clear", 34 }, - { "clip", 35 }, - { "clip-bottom", 36 }, - { "clip-left", 37 }, - { "clip-right", 38 }, - { "clip-top", 39 }, - { "color", 40 }, - { "content", 41 }, - { "counter-increment", 42 }, - { "counter-reset", 43 }, - { "cue", 44 }, - { "cue-after", 45 }, - { "cue-before", 46 }, - { "cursor", 47 }, - { "cursor-image", 48 }, - { "direction", 49 }, - { "display", 50 }, - { "elevation", 51 }, - { "empty-cells", 52 }, - { "filter", 53 }, - { "float", 54 }, - { "font", 55 }, - { "font-family", 56 }, - { "font-size", 57 }, - { "font-size-adjust", 58 }, - { "font-stretch", 59 }, - { "font-style", 60 }, - { "font-variant", 61 }, - { "font-weight", 62 }, - { "height", 63 }, - { "left", 64 }, - { "letter-spacing", 65 }, - { "line-height", 66 }, - { "list-style", 67 }, - { "list-style-image", 68 }, - { "list-style-position", 69 }, - { "list-style-type", 70 }, - { "margin", 71 }, - { "margin-bottom", 72 }, - { "margin-left", 73 }, - { "margin-right", 74 }, - { "margin-top", 75 }, - { "marker-offset", 76 }, - { "marks", 77 }, - { "max-height", 78 }, - { "max-width", 79 }, - { "min-height", 80 }, - { "min-width", 81 }, - { "opacity", 82 }, - { "orphans", 83 }, - { "outline", 84 }, - { "outline-color", 85 }, - { "outline-style", 86 }, - { "outline-width", 87 }, - { "overflow", 88 }, - { "padding", 89 }, - { "padding-bottom", 90 }, - { "padding-left", 91 }, - { "padding-right", 92 }, - { "padding-top", 93 }, - { "page", 94 }, - { "page-break-after", 95 }, - { "page-break-before", 96 }, - { "page-break-inside", 97 }, - { "pause", 98 }, - { "pause-after", 99 }, - { "pause-before", 100 }, - { "pitch", 101 }, - { "pitch-range", 102 }, - { "play-during", 103 }, - { "position", 104 }, - { "quotes", 105 }, - { "richness", 106 }, - { "right", 107 }, - { "size", 108 }, - { "speak", 109 }, - { "speak-header", 110 }, - { "speak-numeral", 111 }, - { "speak-punctuation", 112 }, - { "speech-rate", 113 }, - { "stress", 114 }, - { "table-layout", 115 }, - { "text-align", 116 }, - { "text-decoration", 117 }, - { "text-indent", 118 }, - { "text-shadow", 119 }, - { "text-shadow-color", 120 }, - { "text-shadow-radius", 121 }, - { "text-shadow-x", 122 }, - { "text-shadow-y", 123 }, - { "text-transform", 124 }, - { "top", 125 }, - { "unicode-bidi", 126 }, - { "vertical-align", 127 }, - { "visibility", 128 }, - { "voice-family", 129 }, - { "volume", 130 }, - { "white-space", 131 }, - { "widows", 132 }, - { "width", 133 }, - { "word-spacing", 134 }, - { "z-index", 135 }, + { "border-x-spacing", 32 }, + { "border-y-spacing", 33 }, + { "bottom", 34 }, + { "caption-side", 35 }, + { "clear", 36 }, + { "clip", 37 }, + { "clip-bottom", 38 }, + { "clip-left", 39 }, + { "clip-right", 40 }, + { "clip-top", 41 }, + { "color", 42 }, + { "content", 43 }, + { "counter-increment", 44 }, + { "counter-reset", 45 }, + { "cue", 46 }, + { "cue-after", 47 }, + { "cue-before", 48 }, + { "cursor", 49 }, + { "direction", 50 }, + { "display", 51 }, + { "elevation", 52 }, + { "empty-cells", 53 }, + { "filter", 54 }, + { "float", 55 }, + { "font", 56 }, + { "font-family", 57 }, + { "font-size", 58 }, + { "font-size-adjust", 59 }, + { "font-stretch", 60 }, + { "font-style", 61 }, + { "font-variant", 62 }, + { "font-weight", 63 }, + { "height", 64 }, + { "left", 65 }, + { "letter-spacing", 66 }, + { "line-height", 67 }, + { "list-style", 68 }, + { "list-style-image", 69 }, + { "list-style-position", 70 }, + { "list-style-type", 71 }, + { "margin", 72 }, + { "margin-bottom", 73 }, + { "margin-left", 74 }, + { "margin-right", 75 }, + { "margin-top", 76 }, + { "marker-offset", 77 }, + { "marks", 78 }, + { "max-height", 79 }, + { "max-width", 80 }, + { "min-height", 81 }, + { "min-width", 82 }, + { "opacity", 83 }, + { "orphans", 84 }, + { "outline", 85 }, + { "outline-color", 86 }, + { "outline-style", 87 }, + { "outline-width", 88 }, + { "overflow", 89 }, + { "padding", 90 }, + { "padding-bottom", 91 }, + { "padding-left", 92 }, + { "padding-right", 93 }, + { "padding-top", 94 }, + { "page", 95 }, + { "page-break-after", 96 }, + { "page-break-before", 97 }, + { "page-break-inside", 98 }, + { "pause", 99 }, + { "pause-after", 100 }, + { "pause-before", 101 }, + { "pitch", 102 }, + { "pitch-range", 103 }, + { "play-during", 104 }, + { "play-during-flags", 105 }, + { "position", 106 }, + { "quotes", 107 }, + { "quotes-close", 108 }, + { "quotes-open", 109 }, + { "richness", 110 }, + { "right", 111 }, + { "size", 112 }, + { "size-height", 113 }, + { "size-width", 114 }, + { "speak", 115 }, + { "speak-header", 116 }, + { "speak-numeral", 117 }, + { "speak-punctuation", 118 }, + { "speech-rate", 119 }, + { "stress", 120 }, + { "table-layout", 121 }, + { "text-align", 122 }, + { "text-decoration", 123 }, + { "text-indent", 124 }, + { "text-shadow", 125 }, + { "text-shadow-color", 126 }, + { "text-shadow-radius", 127 }, + { "text-shadow-x", 128 }, + { "text-shadow-y", 129 }, + { "text-transform", 130 }, + { "top", 131 }, + { "unicode-bidi", 132 }, + { "vertical-align", 133 }, + { "visibility", 134 }, + { "voice-family", 135 }, + { "volume", 136 }, + { "white-space", 137 }, + { "widows", 138 }, + { "width", 139 }, + { "word-spacing", 140 }, + { "z-index", 141 }, }; diff --git a/layout/html/style/src/nsCSSPropIDs.h b/layout/html/style/src/nsCSSPropIDs.h index 9613229ce275..ced7d4cbb2f6 100644 --- a/layout/html/style/src/nsCSSPropIDs.h +++ b/layout/html/style/src/nsCSSPropIDs.h @@ -6,9 +6,9 @@ #define PROP_BACKGROUND_FILTER 4 #define PROP_BACKGROUND_IMAGE 5 #define PROP_BACKGROUND_POSITION 6 -#define PROP_BACKGROUND_X_POSITION 7 -#define PROP_BACKGROUND_Y_POSITION 8 -#define PROP_BACKGROUND_REPEAT 9 +#define PROP_BACKGROUND_REPEAT 7 +#define PROP_BACKGROUND_X_POSITION 8 +#define PROP_BACKGROUND_Y_POSITION 9 #define PROP_BORDER 10 #define PROP_BORDER_BOTTOM 11 #define PROP_BORDER_BOTTOM_COLOR 12 @@ -31,108 +31,114 @@ #define PROP_BORDER_TOP_STYLE 29 #define PROP_BORDER_TOP_WIDTH 30 #define PROP_BORDER_WIDTH 31 -#define PROP_BOTTOM 32 -#define PROP_CAPTION_SIDE 33 -#define PROP_CLEAR 34 -#define PROP_CLIP 35 -#define PROP_CLIP_BOTTOM 36 -#define PROP_CLIP_LEFT 37 -#define PROP_CLIP_RIGHT 38 -#define PROP_CLIP_TOP 39 -#define PROP_COLOR 40 -#define PROP_CONTENT 41 -#define PROP_COUNTER_INCREMENT 42 -#define PROP_COUNTER_RESET 43 -#define PROP_CUE 44 -#define PROP_CUE_AFTER 45 -#define PROP_CUE_BEFORE 46 -#define PROP_CURSOR 47 -#define PROP_CURSOR_IMAGE 48 -#define PROP_DIRECTION 49 -#define PROP_DISPLAY 50 -#define PROP_ELEVATION 51 -#define PROP_EMPTY_CELLS 52 -#define PROP_FILTER 53 -#define PROP_FLOAT 54 -#define PROP_FONT 55 -#define PROP_FONT_FAMILY 56 -#define PROP_FONT_SIZE 57 -#define PROP_FONT_SIZE_ADJUST 58 -#define PROP_FONT_STRETCH 59 -#define PROP_FONT_STYLE 60 -#define PROP_FONT_VARIANT 61 -#define PROP_FONT_WEIGHT 62 -#define PROP_HEIGHT 63 -#define PROP_LEFT 64 -#define PROP_LETTER_SPACING 65 -#define PROP_LINE_HEIGHT 66 -#define PROP_LIST_STYLE 67 -#define PROP_LIST_STYLE_IMAGE 68 -#define PROP_LIST_STYLE_POSITION 69 -#define PROP_LIST_STYLE_TYPE 70 -#define PROP_MARGIN 71 -#define PROP_MARGIN_BOTTOM 72 -#define PROP_MARGIN_LEFT 73 -#define PROP_MARGIN_RIGHT 74 -#define PROP_MARGIN_TOP 75 -#define PROP_MARKER_OFFSET 76 -#define PROP_MARKS 77 -#define PROP_MAX_HEIGHT 78 -#define PROP_MAX_WIDTH 79 -#define PROP_MIN_HEIGHT 80 -#define PROP_MIN_WIDTH 81 -#define PROP_OPACITY 82 -#define PROP_ORPHANS 83 -#define PROP_OUTLINE 84 -#define PROP_OUTLINE_COLOR 85 -#define PROP_OUTLINE_STYLE 86 -#define PROP_OUTLINE_WIDTH 87 -#define PROP_OVERFLOW 88 -#define PROP_PADDING 89 -#define PROP_PADDING_BOTTOM 90 -#define PROP_PADDING_LEFT 91 -#define PROP_PADDING_RIGHT 92 -#define PROP_PADDING_TOP 93 -#define PROP_PAGE 94 -#define PROP_PAGE_BREAK_AFTER 95 -#define PROP_PAGE_BREAK_BEFORE 96 -#define PROP_PAGE_BREAK_INSIDE 97 -#define PROP_PAUSE 98 -#define PROP_PAUSE_AFTER 99 -#define PROP_PAUSE_BEFORE 100 -#define PROP_PITCH 101 -#define PROP_PITCH_RANGE 102 -#define PROP_PLAY_DURING 103 -#define PROP_POSITION 104 -#define PROP_QUOTES 105 -#define PROP_RICHNESS 106 -#define PROP_RIGHT 107 -#define PROP_SIZE 108 -#define PROP_SPEAK 109 -#define PROP_SPEAK_HEADER 110 -#define PROP_SPEAK_NUMERAL 111 -#define PROP_SPEAK_PUNCTUATION 112 -#define PROP_SPEECH_RATE 113 -#define PROP_STRESS 114 -#define PROP_TABLE_LAYOUT 115 -#define PROP_TEXT_ALIGN 116 -#define PROP_TEXT_DECORATION 117 -#define PROP_TEXT_INDENT 118 -#define PROP_TEXT_SHADOW 119 -#define PROP_TEXT_SHADOW_COLOR 120 -#define PROP_TEXT_SHADOW_RADIUS 121 -#define PROP_TEXT_SHADOW_X 122 -#define PROP_TEXT_SHADOW_Y 123 -#define PROP_TEXT_TRANSFORM 124 -#define PROP_TOP 125 -#define PROP_UNICODE_BIDI 126 -#define PROP_VERTICAL_ALIGN 127 -#define PROP_VISIBILITY 128 -#define PROP_VOICE_FAMILY 129 -#define PROP_VOLUME 130 -#define PROP_WHITE_SPACE 131 -#define PROP_WIDOWS 132 -#define PROP_WIDTH 133 -#define PROP_WORD_SPACING 134 -#define PROP_Z_INDEX 135 -#define PROP_MAX 136 +#define PROP_BORDER_X_SPACING 32 +#define PROP_BORDER_Y_SPACING 33 +#define PROP_BOTTOM 34 +#define PROP_CAPTION_SIDE 35 +#define PROP_CLEAR 36 +#define PROP_CLIP 37 +#define PROP_CLIP_BOTTOM 38 +#define PROP_CLIP_LEFT 39 +#define PROP_CLIP_RIGHT 40 +#define PROP_CLIP_TOP 41 +#define PROP_COLOR 42 +#define PROP_CONTENT 43 +#define PROP_COUNTER_INCREMENT 44 +#define PROP_COUNTER_RESET 45 +#define PROP_CUE 46 +#define PROP_CUE_AFTER 47 +#define PROP_CUE_BEFORE 48 +#define PROP_CURSOR 49 +#define PROP_DIRECTION 50 +#define PROP_DISPLAY 51 +#define PROP_ELEVATION 52 +#define PROP_EMPTY_CELLS 53 +#define PROP_FILTER 54 +#define PROP_FLOAT 55 +#define PROP_FONT 56 +#define PROP_FONT_FAMILY 57 +#define PROP_FONT_SIZE 58 +#define PROP_FONT_SIZE_ADJUST 59 +#define PROP_FONT_STRETCH 60 +#define PROP_FONT_STYLE 61 +#define PROP_FONT_VARIANT 62 +#define PROP_FONT_WEIGHT 63 +#define PROP_HEIGHT 64 +#define PROP_LEFT 65 +#define PROP_LETTER_SPACING 66 +#define PROP_LINE_HEIGHT 67 +#define PROP_LIST_STYLE 68 +#define PROP_LIST_STYLE_IMAGE 69 +#define PROP_LIST_STYLE_POSITION 70 +#define PROP_LIST_STYLE_TYPE 71 +#define PROP_MARGIN 72 +#define PROP_MARGIN_BOTTOM 73 +#define PROP_MARGIN_LEFT 74 +#define PROP_MARGIN_RIGHT 75 +#define PROP_MARGIN_TOP 76 +#define PROP_MARKER_OFFSET 77 +#define PROP_MARKS 78 +#define PROP_MAX_HEIGHT 79 +#define PROP_MAX_WIDTH 80 +#define PROP_MIN_HEIGHT 81 +#define PROP_MIN_WIDTH 82 +#define PROP_OPACITY 83 +#define PROP_ORPHANS 84 +#define PROP_OUTLINE 85 +#define PROP_OUTLINE_COLOR 86 +#define PROP_OUTLINE_STYLE 87 +#define PROP_OUTLINE_WIDTH 88 +#define PROP_OVERFLOW 89 +#define PROP_PADDING 90 +#define PROP_PADDING_BOTTOM 91 +#define PROP_PADDING_LEFT 92 +#define PROP_PADDING_RIGHT 93 +#define PROP_PADDING_TOP 94 +#define PROP_PAGE 95 +#define PROP_PAGE_BREAK_AFTER 96 +#define PROP_PAGE_BREAK_BEFORE 97 +#define PROP_PAGE_BREAK_INSIDE 98 +#define PROP_PAUSE 99 +#define PROP_PAUSE_AFTER 100 +#define PROP_PAUSE_BEFORE 101 +#define PROP_PITCH 102 +#define PROP_PITCH_RANGE 103 +#define PROP_PLAY_DURING 104 +#define PROP_PLAY_DURING_FLAGS 105 +#define PROP_POSITION 106 +#define PROP_QUOTES 107 +#define PROP_QUOTES_CLOSE 108 +#define PROP_QUOTES_OPEN 109 +#define PROP_RICHNESS 110 +#define PROP_RIGHT 111 +#define PROP_SIZE 112 +#define PROP_SIZE_HEIGHT 113 +#define PROP_SIZE_WIDTH 114 +#define PROP_SPEAK 115 +#define PROP_SPEAK_HEADER 116 +#define PROP_SPEAK_NUMERAL 117 +#define PROP_SPEAK_PUNCTUATION 118 +#define PROP_SPEECH_RATE 119 +#define PROP_STRESS 120 +#define PROP_TABLE_LAYOUT 121 +#define PROP_TEXT_ALIGN 122 +#define PROP_TEXT_DECORATION 123 +#define PROP_TEXT_INDENT 124 +#define PROP_TEXT_SHADOW 125 +#define PROP_TEXT_SHADOW_COLOR 126 +#define PROP_TEXT_SHADOW_RADIUS 127 +#define PROP_TEXT_SHADOW_X 128 +#define PROP_TEXT_SHADOW_Y 129 +#define PROP_TEXT_TRANSFORM 130 +#define PROP_TOP 131 +#define PROP_UNICODE_BIDI 132 +#define PROP_VERTICAL_ALIGN 133 +#define PROP_VISIBILITY 134 +#define PROP_VOICE_FAMILY 135 +#define PROP_VOLUME 136 +#define PROP_WHITE_SPACE 137 +#define PROP_WIDOWS 138 +#define PROP_WIDTH 139 +#define PROP_WORD_SPACING 140 +#define PROP_Z_INDEX 141 +#define PROP_MAX 142 diff --git a/layout/html/style/src/nsCSSProps.cpp b/layout/html/style/src/nsCSSProps.cpp index 097f1c1a7958..bc5230fa7066 100644 --- a/layout/html/style/src/nsCSSProps.cpp +++ b/layout/html/style/src/nsCSSProps.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSProps.h" -#define TOTAL_KEYWORDS 136 +#define TOTAL_KEYWORDS 142 #define MIN_WORD_LENGTH 3 #define MAX_WORD_LENGTH 21 -#define MIN_HASH_VALUE 5 -#define MAX_HASH_VALUE 659 -/* maximum key range = 655, duplicates = 0 */ +#define MIN_HASH_VALUE 193 +#define MAX_HASH_VALUE 1155 +/* maximum key range = 963, duplicates = 0 */ struct StaticNameTable { @@ -50,327 +50,425 @@ PRInt32 nsCSSProps::LookupName(const char* str) { static unsigned short asso_values[] = { - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 95, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 5, 0, 150, - 5, 15, 125, 15, 235, 190, 660, 0, 60, 35, - 110, 0, 0, 10, 0, 0, 40, 80, 0, 35, - 15, 110, 45, 660, 660, 660, 660, 660, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 215, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 161, 214, 250, + 226, 174, 146, 217, 246, 141, 1156, 69, 102, 94, + 144, 30, 7, 185, 4, 194, 153, 32, 89, 212, + 176, 245, 60, 1156, 1156, 1156, 1156, 1156, }; static unsigned char lengthtable[] = { - 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 0, 12, 0, - 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 4, 5, 16, 0, - 0, 0, 0, 16, 0, 0, 19, 15, 6, 17, 0, 0, 0, 0, - 12, 3, 0, 5, 6, 0, 13, 0, 0, 11, 0, 0, 0, 0, - 0, 0, 18, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, - 0, 21, 0, 18, 0, 0, 6, 12, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 11, 12, 0, 0, 0, 6, 0, - 0, 0, 0, 11, 0, 8, 0, 10, 0, 12, 13, 0, 0, 11, - 17, 0, 0, 0, 0, 7, 0, 4, 0, 0, 0, 0, 0, 0, - 11, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 7, 0, 0, - 0, 0, 12, 0, 14, 0, 0, 17, 0, 9, 10, 21, 0, 0, - 0, 5, 11, 7, 0, 0, 10, 0, 0, 0, 0, 0, 16, 17, - 18, 4, 0, 16, 0, 13, 0, 0, 0, 7, 13, 0, 10, 0, - 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 12, 13, 0, 0, 11, 0, 13, 14, 0, 0, 12, 0, 4, - 0, 11, 7, 8, 4, 5, 0, 12, 0, 14, 0, 0, 17, 0, - 0, 15, 16, 17, 0, 0, 5, 6, 12, 13, 9, 5, 6, 0, - 0, 0, 0, 0, 12, 0, 0, 0, 21, 0, 3, 0, 0, 0, - 0, 0, 19, 0, 11, 0, 8, 0, 10, 11, 0, 0, 0, 0, - 6, 0, 0, 0, 10, 0, 12, 13, 0, 10, 0, 0, 13, 0, - 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 18, - 14, 0, 11, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 7, - 8, 0, 0, 11, 0, 0, 0, 0, 0, 7, 0, 9, 15, 6, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, - 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 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, 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, 5, 0, 0, 0, 0, 0, 16, 0, 0, 9, 0, - 0, 0, 13, 14, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 11, 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, 0, 0, 0, 0, 0, 0, 0, 12, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 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, 0, 0, 0, 0, 0, 0, 0, - 0, 9, + 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 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, 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, 0, 6, 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, 5, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, 0, 6, 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, 4, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 7, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 0, 6, 0, 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 6, 8, 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, 4, 11, 19, 0, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 11, 11, + 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 10, 12, 0, 0, 0, + 0, 0, 0, 0, 17, 0, 0, 19, 0, 0, 7, 17, 17, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 11, 18, 0, 13, 0, 0, + 0, 0, 5, 0, 0, 0, 0, 0, 12, 6, 9, 9, 0, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 13, + 0, 0, 7, 0, 0, 0, 11, 0, 0, 0, 0, 17, 0, 0, + 0, 0, 0, 10, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 18, 10, 16, + 11, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 19, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 0, 0, 0, 0, 0, 11, 13, 0, 0, 0, + 0, 8, 0, 0, 0, 0, 0, 12, 0, 0, 13, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, 10, 16, 0, 0, 0, 6, + 16, 0, 0, 0, 21, 6, 0, 0, 13, 0, 21, 0, 0, 0, + 17, 19, 0, 0, 0, 0, 9, 0, 0, 17, 0, 10, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 7, 0, 0, 10, + 9, 16, 0, 0, 14, 10, 0, 0, 0, 0, 11, 0, 0, 0, + 0, 10, 0, 0, 12, 0, 9, 0, 0, 0, 0, 10, 0, 0, + 0, 0, 14, 0, 0, 0, 16, 0, 0, 21, 0, 0, 11, 16, + 0, 0, 17, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 17, 0, 12, 14, 0, 15, 0, 0, 0, 19, 0, + 0, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 11, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 11, 16, 17, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, + 0, 12, 0, 0, 14, 0, 0, 12, 17, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 12, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 12, 13, 0, 0, 0, 16, 0, 0, 12, 0, 0, 0, 0, 12, + 0, 0, 15, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 12, 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, 13, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 18, 0, 0, 0, 0, 0, 15, 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, 13, }; static struct StaticNameTable wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, - {"speak", 109}, - {"border", 10}, - {"",}, {"",}, {"",}, - {"border-top", 27}, - {"",}, - {"border-color", 16}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-bottom-color", 12}, - {"background", 1}, - {"",}, {"",}, {"",}, - {"page", 94}, - {"pause", 98}, - {"page-break-after", 95}, - {"",}, {"",}, {"",}, {"",}, - {"border-top-style", 29}, - {"",}, {"",}, - {"border-bottom-style", 13}, - {"border-collapse", 15}, - {"volume", 130}, - {"page-break-before", 96}, - {"",}, {"",}, {"",}, {"",}, - {"border-style", 26}, - {"top", 125}, - {"",}, - {"marks", 77}, - {"stress", 114}, - {"",}, - {"border-bottom", 11}, - {"",}, {"",}, - {"border-left", 17}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-right-color", 22}, - {"",}, {"",}, {"",}, - {"background-repeat", 9}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"background-attachment", 2}, - {"",}, - {"border-right-style", 23}, - {"",}, {"",}, - {"bottom", 32}, - {"word-spacing", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"play-during", 103}, - {"border-right", 21}, + {"top", 131}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"border", 10}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak", 115}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"color", 42}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"cursor", 49}, + {"",}, {"",}, {"",}, {"",}, + {"filter", 54}, + {"",}, + {"right", 111}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"font", 56}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"quotes", 105}, + {"page", 95}, + {"pause", 99}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"text-shadow", 119}, + {"clear", 36}, {"",}, - {"overflow", 88}, - {"",}, - {"max-height", 78}, - {"",}, - {"speak-header", 110}, - {"marker-offset", 76}, + {"clip", 37}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"orphans", 84}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline", 85}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pause-after", 99}, - {"border-left-color", 18}, + {"pitch", 102}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"float", 55}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"border-top", 27}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right-color", 22}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"left", 65}, {"",}, {"",}, {"",}, {"",}, - {"orphans", 83}, + {"bottom", 34}, + {"",}, {"",}, {"",}, + {"opacity", 83}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"marks", 78}, + {"",}, {"",}, {"",}, {"",}, + {"cue", 46}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline-color", 86}, + {"",}, {"",}, {"",}, {"",}, + {"volume", 136}, + {"position", 106}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"size", 112}, + {"border-left", 17}, + {"border-bottom-color", 12}, + {"",}, {"",}, + {"border-color", 16}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-top", 41}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"padding", 90}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-after", 100}, + {"padding-top", 94}, + {"",}, {"",}, {"",}, + {"margin", 72}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"play-during", 104}, {"",}, - {"left", 64}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"padding-top", 93}, - {"border-left-style", 19}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin-top", 76}, + {"border-right", 21}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-filter", 4}, + {"",}, {"",}, {"background-position", 6}, {"",}, {"",}, - {"padding", 89}, - {"",}, {"",}, {"",}, {"",}, - {"pause-before", 100}, - {"",}, - {"text-transform", 124}, - {"",}, {"",}, - {"background-filter", 4}, - {"",}, - {"font-size", 57}, - {"font-style", 60}, - {"background-x-position", 7}, - {"",}, {"",}, {"",}, - {"color", 40}, - {"empty-cells", 52}, - {"opacity", 82}, - {"",}, {"",}, - {"margin-top", 75}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-top-color", 28}, - {"text-shadow-color", 120}, - {"text-shadow-radius", 121}, - {"font", 55}, - {"",}, - {"background-color", 3}, - {"",}, - {"speak-numeral", 111}, - {"",}, {"",}, {"",}, - {"z-index", 135}, - {"text-shadow-x", 122}, - {"",}, - {"text-align", 116}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"font-size-adjust", 58}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"caption-side", 33}, - {"margin-bottom", 72}, - {"",}, {"",}, - {"margin-left", 73}, - {"",}, - {"outline-color", 85}, - {"padding-bottom", 90}, - {"",}, {"",}, - {"padding-left", 91}, - {"",}, - {"size", 108}, - {"",}, - {"font-weight", 62}, - {"outline", 84}, - {"richness", 106}, - {"clip", 35}, - {"clear", 34}, - {"",}, - {"font-variant", 61}, - {"",}, - {"border-spacing", 25}, - {"",}, {"",}, - {"counter-increment", 42}, - {"",}, {"",}, - {"text-decoration", 117}, - {"background-image", 5}, - {"page-break-inside", 97}, - {"",}, {"",}, - {"float", 54}, - {"widows", 132}, - {"table-layout", 115}, - {"counter-reset", 43}, - {"elevation", 51}, - {"right", 107}, - {"cursor", 47}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"margin-right", 74}, - {"",}, {"",}, {"",}, - {"background-y-position", 8}, - {"",}, - {"cue", 44}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-bottom-width", 14}, - {"",}, - {"clip-bottom", 36}, - {"",}, - {"clip-top", 39}, - {"",}, - {"clip-right", 38}, - {"speech-rate", 113}, - {"",}, {"",}, {"",}, {"",}, - {"margin", 71}, - {"",}, {"",}, {"",}, - {"cue-before", 46}, - {"",}, - {"cursor-image", 48}, - {"text-shadow-y", 123}, - {"",}, - {"list-style", 67}, - {"",}, {"",}, - {"outline-style", 86}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-top-width", 30}, - {"",}, {"",}, {"",}, - {"min-height", 80}, - {"",}, {"",}, - {"border-right-width", 24}, - {"letter-spacing", 65}, - {"",}, - {"text-indent", 118}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"speak-punctuation", 112}, - {"",}, {"",}, {"",}, {"",}, - {"content", 41}, - {"position", 104}, - {"",}, {"",}, - {"pitch-range", 102}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"display", 50}, - {"",}, - {"clip-left", 37}, - {"list-style-type", 70}, - {"filter", 53}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"voice-family", 129}, - {"",}, {"",}, {"",}, {"",}, - {"azimuth", 0}, - {"",}, {"",}, {"",}, - {"height", 63}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"border-left-width", 20}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"direction", 49}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"cue-after", 45}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"font-family", 56}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"list-style-position", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"white-space", 131}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"padding-right", 92}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"content", 43}, + {"background-repeat", 7}, + {"border-left-color", 18}, + {"font-variant", 62}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pitch", 101}, + {"quotes-open", 109}, + {"border-right-style", 23}, + {"",}, + {"border-bottom", 11}, + {"",}, {"",}, {"",}, {"",}, + {"width", 139}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak-header", 116}, + {"quotes", 107}, + {"elevation", 52}, + {"font-size", 58}, + {"",}, + {"cue-after", 47}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"azimuth", 0}, + {"",}, + {"marker-offset", 77}, + {"",}, {"",}, + {"z-index", 141}, + {"",}, {"",}, {"",}, + {"speech-rate", 119}, + {"",}, {"",}, {"",}, {"",}, + {"speak-punctuation", 118}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"background", 1}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"overflow", 89}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"margin-left", 74}, + {"",}, {"",}, {"",}, + {"border-right-width", 24}, + {"cue-before", 48}, + {"border-top-color", 28}, + {"font-family", 57}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-color", 3}, + {"",}, {"",}, {"",}, + {"border-bottom-style", 13}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-weight", 63}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"direction", 50}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch-range", 103}, + {"outline-style", 87}, + {"",}, {"",}, {"",}, {"",}, + {"richness", 110}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin-right", 75}, + {"",}, {"",}, + {"speak-numeral", 117}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"height", 64}, + {"",}, {"",}, {"",}, + {"clip-right", 40}, + {"page-break-after", 96}, + {"",}, {"",}, {"",}, + {"stress", 120}, + {"background-image", 5}, + {"",}, {"",}, {"",}, + {"background-attachment", 2}, + {"widows", 138}, + {"",}, {"",}, + {"margin-bottom", 73}, + {"",}, + {"background-x-position", 8}, + {"",}, {"",}, {"",}, + {"border-left-style", 19}, + {"border-bottom-width", 14}, + {"",}, {"",}, {"",}, {"",}, + {"clip-left", 39}, + {"",}, {"",}, + {"play-during-flags", 105}, + {"",}, + {"visibility", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"text-transform", 130}, + {"display", 51}, + {"",}, {"",}, + {"text-align", 122}, + {"min-width", 82}, + {"border-top-style", 29}, + {"",}, {"",}, + {"padding-bottom", 91}, + {"min-height", 81}, + {"",}, {"",}, {"",}, {"",}, + {"line-height", 67}, + {"",}, {"",}, {"",}, {"",}, + {"font-style", 61}, + {"",}, {"",}, + {"border-style", 26}, + {"",}, + {"max-width", 80}, + {"",}, {"",}, {"",}, {"",}, + {"max-height", 79}, + {"",}, {"",}, {"",}, {"",}, + {"border-spacing", 25}, + {"",}, {"",}, {"",}, + {"border-x-spacing", 32}, + {"",}, {"",}, + {"background-y-position", 9}, + {"",}, {"",}, + {"clip-bottom", 38}, + {"font-size-adjust", 59}, + {"",}, {"",}, + {"border-left-width", 20}, + {"",}, {"",}, {"",}, {"",}, + {"outline-width", 88}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"counter-increment", 44}, + {"",}, + {"padding-left", 92}, + {"letter-spacing", 66}, + {"",}, + {"border-collapse", 15}, + {"",}, {"",}, {"",}, + {"list-style-position", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-indent", 124}, + {"",}, {"",}, {"",}, + {"empty-cells", 53}, + {"",}, {"",}, + {"white-space", 137}, + {"list-style", 68}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-top-width", 30}, + {"",}, {"",}, + {"font-stretch", 60}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"size-height", 113}, + {"border-y-spacing", 33}, + {"page-break-inside", 98}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"width", 133}, + {"text-shadow", 125}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"list-style-image", 68}, + {"unicode-bidi", 132}, {"",}, {"",}, - {"max-width", 79}, + {"vertical-align", 133}, + {"",}, {"",}, + {"pause-before", 101}, + {"text-shadow-color", 126}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"padding-right", 93}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"outline-width", 87}, - {"vertical-align", 127}, + {"page-break-before", 97}, {"",}, {"",}, {"border-width", 31}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"visibility", 128}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"line-height", 66}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"unicode-bidi", 126}, + {"voice-family", 135}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"table-layout", 121}, + {"counter-reset", 45}, + {"",}, {"",}, {"",}, + {"list-style-image", 69}, + {"",}, {"",}, + {"caption-side", 35}, + {"",}, {"",}, {"",}, {"",}, + {"quotes-close", 108}, + {"",}, {"",}, + {"list-style-type", 71}, + {"",}, {"",}, {"",}, {"",}, + {"size-width", 114}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"font-stretch", 59}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"word-spacing", 140}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"min-width", 81}, + {"text-shadow-x", 128}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"text-shadow-radius", 127}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-decoration", 123}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"text-shadow-y", 129}, }; if (str != NULL) { @@ -387,6 +485,7 @@ PRInt32 nsCSSProps::LookupName(const char* str) case 10: case 9: case 8: + hval += asso_values[MYLOWER(str[7])]; case 7: case 6: hval += asso_values[MYLOWER(str[5])]; @@ -438,9 +537,9 @@ const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { { "background-filter", 4 }, { "background-image", 5 }, { "background-position", 6 }, - { "background-x-position", 7 }, - { "background-y-position", 8 }, - { "background-repeat", 9 }, + { "background-repeat", 7 }, + { "background-x-position", 8 }, + { "background-y-position", 9 }, { "border", 10 }, { "border-bottom", 11 }, { "border-bottom-color", 12 }, @@ -463,108 +562,114 @@ const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { { "border-top-style", 29 }, { "border-top-width", 30 }, { "border-width", 31 }, - { "bottom", 32 }, - { "caption-side", 33 }, - { "clear", 34 }, - { "clip", 35 }, - { "clip-bottom", 36 }, - { "clip-left", 37 }, - { "clip-right", 38 }, - { "clip-top", 39 }, - { "color", 40 }, - { "content", 41 }, - { "counter-increment", 42 }, - { "counter-reset", 43 }, - { "cue", 44 }, - { "cue-after", 45 }, - { "cue-before", 46 }, - { "cursor", 47 }, - { "cursor-image", 48 }, - { "direction", 49 }, - { "display", 50 }, - { "elevation", 51 }, - { "empty-cells", 52 }, - { "filter", 53 }, - { "float", 54 }, - { "font", 55 }, - { "font-family", 56 }, - { "font-size", 57 }, - { "font-size-adjust", 58 }, - { "font-stretch", 59 }, - { "font-style", 60 }, - { "font-variant", 61 }, - { "font-weight", 62 }, - { "height", 63 }, - { "left", 64 }, - { "letter-spacing", 65 }, - { "line-height", 66 }, - { "list-style", 67 }, - { "list-style-image", 68 }, - { "list-style-position", 69 }, - { "list-style-type", 70 }, - { "margin", 71 }, - { "margin-bottom", 72 }, - { "margin-left", 73 }, - { "margin-right", 74 }, - { "margin-top", 75 }, - { "marker-offset", 76 }, - { "marks", 77 }, - { "max-height", 78 }, - { "max-width", 79 }, - { "min-height", 80 }, - { "min-width", 81 }, - { "opacity", 82 }, - { "orphans", 83 }, - { "outline", 84 }, - { "outline-color", 85 }, - { "outline-style", 86 }, - { "outline-width", 87 }, - { "overflow", 88 }, - { "padding", 89 }, - { "padding-bottom", 90 }, - { "padding-left", 91 }, - { "padding-right", 92 }, - { "padding-top", 93 }, - { "page", 94 }, - { "page-break-after", 95 }, - { "page-break-before", 96 }, - { "page-break-inside", 97 }, - { "pause", 98 }, - { "pause-after", 99 }, - { "pause-before", 100 }, - { "pitch", 101 }, - { "pitch-range", 102 }, - { "play-during", 103 }, - { "position", 104 }, - { "quotes", 105 }, - { "richness", 106 }, - { "right", 107 }, - { "size", 108 }, - { "speak", 109 }, - { "speak-header", 110 }, - { "speak-numeral", 111 }, - { "speak-punctuation", 112 }, - { "speech-rate", 113 }, - { "stress", 114 }, - { "table-layout", 115 }, - { "text-align", 116 }, - { "text-decoration", 117 }, - { "text-indent", 118 }, - { "text-shadow", 119 }, - { "text-shadow-color", 120 }, - { "text-shadow-radius", 121 }, - { "text-shadow-x", 122 }, - { "text-shadow-y", 123 }, - { "text-transform", 124 }, - { "top", 125 }, - { "unicode-bidi", 126 }, - { "vertical-align", 127 }, - { "visibility", 128 }, - { "voice-family", 129 }, - { "volume", 130 }, - { "white-space", 131 }, - { "widows", 132 }, - { "width", 133 }, - { "word-spacing", 134 }, - { "z-index", 135 }, + { "border-x-spacing", 32 }, + { "border-y-spacing", 33 }, + { "bottom", 34 }, + { "caption-side", 35 }, + { "clear", 36 }, + { "clip", 37 }, + { "clip-bottom", 38 }, + { "clip-left", 39 }, + { "clip-right", 40 }, + { "clip-top", 41 }, + { "color", 42 }, + { "content", 43 }, + { "counter-increment", 44 }, + { "counter-reset", 45 }, + { "cue", 46 }, + { "cue-after", 47 }, + { "cue-before", 48 }, + { "cursor", 49 }, + { "direction", 50 }, + { "display", 51 }, + { "elevation", 52 }, + { "empty-cells", 53 }, + { "filter", 54 }, + { "float", 55 }, + { "font", 56 }, + { "font-family", 57 }, + { "font-size", 58 }, + { "font-size-adjust", 59 }, + { "font-stretch", 60 }, + { "font-style", 61 }, + { "font-variant", 62 }, + { "font-weight", 63 }, + { "height", 64 }, + { "left", 65 }, + { "letter-spacing", 66 }, + { "line-height", 67 }, + { "list-style", 68 }, + { "list-style-image", 69 }, + { "list-style-position", 70 }, + { "list-style-type", 71 }, + { "margin", 72 }, + { "margin-bottom", 73 }, + { "margin-left", 74 }, + { "margin-right", 75 }, + { "margin-top", 76 }, + { "marker-offset", 77 }, + { "marks", 78 }, + { "max-height", 79 }, + { "max-width", 80 }, + { "min-height", 81 }, + { "min-width", 82 }, + { "opacity", 83 }, + { "orphans", 84 }, + { "outline", 85 }, + { "outline-color", 86 }, + { "outline-style", 87 }, + { "outline-width", 88 }, + { "overflow", 89 }, + { "padding", 90 }, + { "padding-bottom", 91 }, + { "padding-left", 92 }, + { "padding-right", 93 }, + { "padding-top", 94 }, + { "page", 95 }, + { "page-break-after", 96 }, + { "page-break-before", 97 }, + { "page-break-inside", 98 }, + { "pause", 99 }, + { "pause-after", 100 }, + { "pause-before", 101 }, + { "pitch", 102 }, + { "pitch-range", 103 }, + { "play-during", 104 }, + { "play-during-flags", 105 }, + { "position", 106 }, + { "quotes", 107 }, + { "quotes-close", 108 }, + { "quotes-open", 109 }, + { "richness", 110 }, + { "right", 111 }, + { "size", 112 }, + { "size-height", 113 }, + { "size-width", 114 }, + { "speak", 115 }, + { "speak-header", 116 }, + { "speak-numeral", 117 }, + { "speak-punctuation", 118 }, + { "speech-rate", 119 }, + { "stress", 120 }, + { "table-layout", 121 }, + { "text-align", 122 }, + { "text-decoration", 123 }, + { "text-indent", 124 }, + { "text-shadow", 125 }, + { "text-shadow-color", 126 }, + { "text-shadow-radius", 127 }, + { "text-shadow-x", 128 }, + { "text-shadow-y", 129 }, + { "text-transform", 130 }, + { "top", 131 }, + { "unicode-bidi", 132 }, + { "vertical-align", 133 }, + { "visibility", 134 }, + { "voice-family", 135 }, + { "volume", 136 }, + { "white-space", 137 }, + { "widows", 138 }, + { "width", 139 }, + { "word-spacing", 140 }, + { "z-index", 141 }, }; diff --git a/layout/html/style/src/nsCSSProps.h b/layout/html/style/src/nsCSSProps.h index 402462b3d736..92f3de0b8e8c 100644 --- a/layout/html/style/src/nsCSSProps.h +++ b/layout/html/style/src/nsCSSProps.h @@ -43,6 +43,56 @@ public: static const NameTableEntry kNameTable[]; static const PRInt32 kHintTable[]; + + // Keyword/Enum value tables + static const PRInt32 kAzimuthKTable[]; + static const PRInt32 kBackgroundAttachmentKTable[]; + static const PRInt32 kBackgroundColorKTable[]; + static const PRInt32 kBackgroundRepeatKTable[]; + static const PRInt32 kBorderCollapseKTable[]; + static const PRInt32 kBorderColorKTable[]; + static const PRInt32 kBorderStyleKTable[]; + static const PRInt32 kBorderWidthKTable[]; + static const PRInt32 kCaptionSideKTable[]; + static const PRInt32 kClearKTable[]; + static const PRInt32 kContentKTable[]; + static const PRInt32 kCursorKTable[]; + static const PRInt32 kDirectionKTable[]; + static const PRInt32 kDisplayKTable[]; + static const PRInt32 kElevationKTable[]; + static const PRInt32 kEmptyCellsKTable[]; + static const PRInt32 kFloatKTable[]; + static const PRInt32 kFontKTable[]; + static const PRInt32 kFontSizeKTable[]; + static const PRInt32 kFontStretchKTable[]; + static const PRInt32 kFontStyleKTable[]; + static const PRInt32 kFontVariantKTable[]; + static const PRInt32 kFontWeightKTable[]; + static const PRInt32 kListStylePositionKTable[]; + static const PRInt32 kListStyleKTable[]; + static const PRInt32 kOutlineColorKTable[]; + static const PRInt32 kOverflowKTable[]; + static const PRInt32 kPageBreakKTable[]; + static const PRInt32 kPageBreakInsideKTable[]; + static const PRInt32 kPageMarksKTable[]; + static const PRInt32 kPageSizeKTable[]; + static const PRInt32 kPitchKTable[]; + static const PRInt32 kPlayDuringKTable[]; + static const PRInt32 kPositionKTable[]; + static const PRInt32 kSpeakKTable[]; + static const PRInt32 kSpeakHeaderKTable[]; + static const PRInt32 kSpeakNumeralKTable[]; + static const PRInt32 kSpeakPunctuationKTable[]; + static const PRInt32 kSpeechRateKTable[]; + static const PRInt32 kTableLayoutKTable[]; + static const PRInt32 kTextAlignKTable[]; + static const PRInt32 kTextDecorationKTable[]; + static const PRInt32 kTextTransformKTable[]; + static const PRInt32 kUnicodeBidiKTable[]; + static const PRInt32 kVerticalAlignKTable[]; + static const PRInt32 kVisibilityKTable[]; + static const PRInt32 kVolumeKTable[]; + static const PRInt32 kWhitespaceKTable[]; }; #endif /* nsCSSProps_h___ */ diff --git a/layout/html/style/src/nsCSSProps2.cpp b/layout/html/style/src/nsCSSProps2.cpp index 64e571a63aeb..48ff75e666d9 100644 --- a/layout/html/style/src/nsCSSProps2.cpp +++ b/layout/html/style/src/nsCSSProps2.cpp @@ -10,27 +10,54 @@ // Keyword id tables for variant/enum parsing -static PRInt32 kBackgroundAttachmentKTable[] = { +const PRInt32 nsCSSProps::kAzimuthKTable[] = { + KEYWORD_LEFT_SIDE, NS_STYLE_AZIMUTH_LEFT_SIDE, + KEYWORD_FAR_LEFT, NS_STYLE_AZIMUTH_FAR_LEFT, + KEYWORD_LEFT, NS_STYLE_AZIMUTH_LEFT, + KEYWORD_CENTER_LEFT, NS_STYLE_AZIMUTH_CENTER_LEFT, + KEYWORD_CENTER, NS_STYLE_AZIMUTH_CENTER, + KEYWORD_CENTER_RIGHT, NS_STYLE_AZIMUTH_CENTER_RIGHT, + KEYWORD_RIGHT, NS_STYLE_AZIMUTH_RIGHT, + KEYWORD_FAR_RIGHT, NS_STYLE_AZIMUTH_FAR_RIGHT, + KEYWORD_RIGHT_SIDE, NS_STYLE_AZIMUTH_RIGHT_SIDE, + KEYWORD_BEHIND, NS_STYLE_AZIMUTH_BEHIND, + KEYWORD_LEFTWARDS, NS_STYLE_AZIMUTH_LEFTWARDS, + KEYWORD_RIGHTWARDS, NS_STYLE_AZIMUTH_RIGHTWARDS, + -1,-1 +}; + +const PRInt32 nsCSSProps::kBackgroundAttachmentKTable[] = { KEYWORD_FIXED, NS_STYLE_BG_ATTACHMENT_FIXED, KEYWORD_SCROLL, NS_STYLE_BG_ATTACHMENT_SCROLL, -1,-1 }; -static PRInt32 kBackgroundColorKTable[] = { +const PRInt32 nsCSSProps::kBackgroundColorKTable[] = { KEYWORD_TRANSPARENT, NS_STYLE_BG_COLOR_TRANSPARENT, -1,-1 }; -static PRInt32 kBackgroundRepeatKTable[] = { - KEYWORD_NO_REPEAT, NS_STYLE_BG_REPEAT_OFF, - KEYWORD_REPEAT, NS_STYLE_BG_REPEAT_XY, - KEYWORD_REPEAT_X, NS_STYLE_BG_REPEAT_X, - KEYWORD_REPEAT_Y, NS_STYLE_BG_REPEAT_Y, +const PRInt32 nsCSSProps::kBackgroundRepeatKTable[] = { + KEYWORD_NO_REPEAT, NS_STYLE_BG_REPEAT_OFF, + KEYWORD_REPEAT, NS_STYLE_BG_REPEAT_XY, + KEYWORD_REPEAT_X, NS_STYLE_BG_REPEAT_X, + KEYWORD_REPEAT_Y, NS_STYLE_BG_REPEAT_Y, -1,-1 }; -static PRInt32 kBorderStyleKTable[] = { - KEYWORD_NONE, NS_STYLE_BORDER_STYLE_NONE, +const PRInt32 nsCSSProps::kBorderCollapseKTable[] = { + KEYWORD_COLLAPSE, NS_STYLE_BORDER_COLLAPSE, + KEYWORD_SEPARATE, NS_STYLE_BORDER_SEPARATE, + -1,-1 +}; + +const PRInt32 nsCSSProps::kBorderColorKTable[] = { + KEYWORD_TRANSPARENT, NS_STYLE_COLOR_TRANSPARENT, + -1,-1 +}; + +const PRInt32 nsCSSProps::kBorderStyleKTable[] = { + KEYWORD_HIDDEN, NS_STYLE_BORDER_STYLE_HIDDEN, KEYWORD_DOTTED, NS_STYLE_BORDER_STYLE_DOTTED, KEYWORD_DASHED, NS_STYLE_BORDER_STYLE_DASHED, KEYWORD_SOLID, NS_STYLE_BORDER_STYLE_SOLID, @@ -42,64 +69,113 @@ static PRInt32 kBorderStyleKTable[] = { -1,-1 }; -static PRInt32 kBorderWidthKTable[] = { +const PRInt32 nsCSSProps::kBorderWidthKTable[] = { KEYWORD_THIN, NS_STYLE_BORDER_WIDTH_THIN, KEYWORD_MEDIUM, NS_STYLE_BORDER_WIDTH_MEDIUM, KEYWORD_THICK, NS_STYLE_BORDER_WIDTH_THICK, -1,-1 }; -static PRInt32 kClearKTable[] = { - KEYWORD_NONE, NS_STYLE_CLEAR_NONE, +const PRInt32 nsCSSProps::kCaptionSideKTable[] = { + KEYWORD_TOP, NS_SIDE_TOP, + KEYWORD_RIGHT, NS_SIDE_RIGHT, + KEYWORD_BOTTOM, NS_SIDE_BOTTOM, + KEYWORD_LEFT, NS_SIDE_LEFT, + -1,-1 +}; + +const PRInt32 nsCSSProps::kClearKTable[] = { KEYWORD_LEFT, NS_STYLE_CLEAR_LEFT, KEYWORD_RIGHT, NS_STYLE_CLEAR_RIGHT, KEYWORD_BOTH, NS_STYLE_CLEAR_LEFT_AND_RIGHT, -1,-1 }; -static PRInt32 kCursorKTable[] = { - KEYWORD_IBEAM, NS_STYLE_CURSOR_IBEAM, - KEYWORD_ARROW, NS_STYLE_CURSOR_DEFAULT, - KEYWORD_HAND, NS_STYLE_CURSOR_HAND, +const PRInt32 nsCSSProps::kContentKTable[] = { + KEYWORD_OPEN_QUOTE, NS_STYLE_CONTENT_OPEN_QUOTE, + KEYWORD_CLOSE_QUOTE, NS_STYLE_CONTENT_CLOSE_QUOTE, + KEYWORD_NO_OPEN_QUOTE, NS_STYLE_CONTENT_NO_OPEN_QUOTE, + KEYWORD_NO_CLOSE_QUOTE, NS_STYLE_CONTENT_NO_CLOSE_QUOTE, -1,-1 }; -static PRInt32 kDirectionKTable[] = { +const PRInt32 nsCSSProps::kCursorKTable[] = { + KEYWORD_CROSSHAIR, NS_STYLE_CURSOR_CROSSHAIR, + KEYWORD_DEFAULT, NS_STYLE_CURSOR_DEFAULT, + KEYWORD_POINTER, NS_STYLE_CURSOR_POINTER, + KEYWORD_MOVE, NS_STYLE_CURSOR_MOVE, + KEYWORD_E_RESIZE, NS_STYLE_CURSOR_E_RESIZE, + KEYWORD_NE_RESIZE, NS_STYLE_CURSOR_NE_RESIZE, + KEYWORD_NW_RESIZE, NS_STYLE_CURSOR_NW_RESIZE, + KEYWORD_N_RESIZE, NS_STYLE_CURSOR_N_RESIZE, + KEYWORD_SE_RESIZE, NS_STYLE_CURSOR_SE_RESIZE, + KEYWORD_SW_RESIZE, NS_STYLE_CURSOR_SW_RESIZE, + KEYWORD_S_RESIZE, NS_STYLE_CURSOR_S_RESIZE, + KEYWORD_W_RESIZE, NS_STYLE_CURSOR_W_RESIZE, + KEYWORD_TEXT, NS_STYLE_CURSOR_TEXT, + KEYWORD_WAIT, NS_STYLE_CURSOR_WAIT, + KEYWORD_HELP, NS_STYLE_CURSOR_HELP, + -1,-1 +}; + +const PRInt32 nsCSSProps::kDirectionKTable[] = { KEYWORD_LTR, NS_STYLE_DIRECTION_LTR, KEYWORD_RTL, NS_STYLE_DIRECTION_RTL, - KEYWORD_INHERIT, NS_STYLE_DIRECTION_INHERIT, -1,-1 }; -static PRInt32 kDisplayKTable[] = { - KEYWORD_NONE, NS_STYLE_DISPLAY_NONE, - KEYWORD_BLOCK, NS_STYLE_DISPLAY_BLOCK, +const PRInt32 nsCSSProps::kDisplayKTable[] = { KEYWORD_INLINE, NS_STYLE_DISPLAY_INLINE, + KEYWORD_BLOCK, NS_STYLE_DISPLAY_BLOCK, KEYWORD_LIST_ITEM, NS_STYLE_DISPLAY_LIST_ITEM, - KEYWORD_MARKER, NS_STYLE_DISPLAY_MARKER, KEYWORD_RUN_IN, NS_STYLE_DISPLAY_RUN_IN, KEYWORD_COMPACT, NS_STYLE_DISPLAY_COMPACT, + KEYWORD_MARKER, NS_STYLE_DISPLAY_MARKER, KEYWORD_TABLE, NS_STYLE_DISPLAY_TABLE, KEYWORD_INLINE_TABLE, NS_STYLE_DISPLAY_INLINE_TABLE, KEYWORD_TABLE_ROW_GROUP, NS_STYLE_DISPLAY_TABLE_ROW_GROUP, - KEYWORD_TABLE_COLUMN, NS_STYLE_DISPLAY_TABLE_COLUMN, - KEYWORD_TABLE_COLUMN_GROUP, NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP, KEYWORD_TABLE_HEADER_GROUP, NS_STYLE_DISPLAY_TABLE_HEADER_GROUP, KEYWORD_TABLE_FOOTER_GROUP, NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP, KEYWORD_TABLE_ROW, NS_STYLE_DISPLAY_TABLE_ROW, + KEYWORD_TABLE_COLUMN_GROUP, NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP, + KEYWORD_TABLE_COLUMN, NS_STYLE_DISPLAY_TABLE_COLUMN, KEYWORD_TABLE_CELL, NS_STYLE_DISPLAY_TABLE_CELL, KEYWORD_TABLE_CAPTION, NS_STYLE_DISPLAY_TABLE_CAPTION, -1,-1 }; -static PRInt32 kFloatKTable[] = { - KEYWORD_NONE, NS_STYLE_FLOAT_NONE, +const PRInt32 nsCSSProps::kElevationKTable[] = { + KEYWORD_BELOW, NS_STYLE_ELEVATION_BELOW, + KEYWORD_LEVEL, NS_STYLE_ELEVATION_LEVEL, + KEYWORD_ABOVE, NS_STYLE_ELEVATION_ABOVE, + KEYWORD_HIGHER, NS_STYLE_ELEVATION_HIGHER, + KEYWORD_LOWER, NS_STYLE_ELEVATION_LOWER, + -1,-1 +}; + +const PRInt32 nsCSSProps::kEmptyCellsKTable[] = { + KEYWORD_SHOW, NS_STYLE_TABLE_EMPTY_CELLS_SHOW, + KEYWORD_HIDE, NS_STYLE_TABLE_EMPTY_CELLS_HIDE, + -1,-1 +}; + +const PRInt32 nsCSSProps::kFloatKTable[] = { KEYWORD_LEFT, NS_STYLE_FLOAT_LEFT, KEYWORD_RIGHT, NS_STYLE_FLOAT_RIGHT, -1,-1 }; -static PRInt32 kFontSizeKTable[] = { +const PRInt32 nsCSSProps::kFontKTable[] = { + KEYWORD_CAPTION, NS_STYLE_FONT_CAPTION, + KEYWORD_ICON, NS_STYLE_FONT_ICON, + KEYWORD_MENU, NS_STYLE_FONT_MENU, + KEYWORD_MESSAGE_BOX, NS_STYLE_FONT_MESSAGE_BOX, + KEYWORD_SMALL_CAPTION, NS_STYLE_FONT_SMALL_CAPTION, + KEYWORD_STATUS_BAR, NS_STYLE_FONT_STATUS_BAR, + -1,-1 +}; + +const PRInt32 nsCSSProps::kFontSizeKTable[] = { KEYWORD_XX_SMALL, NS_STYLE_FONT_SIZE_XXSMALL, KEYWORD_X_SMALL, NS_STYLE_FONT_SIZE_XSMALL, KEYWORD_SMALL, NS_STYLE_FONT_SIZE_SMALL, @@ -112,64 +188,167 @@ static PRInt32 kFontSizeKTable[] = { -1,-1 }; -static PRInt32 kFontStyleKTable[] = { - KEYWORD_NORMAL, NS_STYLE_FONT_STYLE_NORMAL, +const PRInt32 nsCSSProps::kFontStretchKTable[] = { + KEYWORD_WIDER, NS_STYLE_FONT_STRETCH_WIDER, + KEYWORD_NARROWER, NS_STYLE_FONT_STRETCH_NARROWER, + KEYWORD_ULTRA_CONDENSED, NS_STYLE_FONT_STRETCH_ULTRA_CONDENSED, + KEYWORD_EXTRA_CONDENSED, NS_STYLE_FONT_STRETCH_EXTRA_CONDENSED, + KEYWORD_CONDENSED, NS_STYLE_FONT_STRETCH_CONDENSED, + KEYWORD_SEMI_CONDENSED, NS_STYLE_FONT_STRETCH_SEMI_CONDENSED, + KEYWORD_SEMI_EXPANDED, NS_STYLE_FONT_STRETCH_SEMI_EXPANDED, + KEYWORD_EXPANDED, NS_STYLE_FONT_STRETCH_EXPANDED, + KEYWORD_EXTRA_EXPANDED, NS_STYLE_FONT_STRETCH_EXTRA_EXPANDED, + KEYWORD_ULTRA_EXPANDED, NS_STYLE_FONT_STRETCH_ULTRA_EXPANDED, + -1,-1 +}; + +const PRInt32 nsCSSProps::kFontStyleKTable[] = { KEYWORD_ITALIC, NS_STYLE_FONT_STYLE_ITALIC, KEYWORD_OBLIQUE, NS_STYLE_FONT_STYLE_OBLIQUE, -1,-1 }; -static PRInt32 kFontVariantKTable[] = { - KEYWORD_NORMAL, NS_STYLE_FONT_VARIANT_NORMAL, +const PRInt32 nsCSSProps::kFontVariantKTable[] = { KEYWORD_SMALL_CAPS, NS_STYLE_FONT_VARIANT_SMALL_CAPS, -1,-1 }; -static PRInt32 kListStyleImageKTable[] = { - KEYWORD_NONE, NS_STYLE_LIST_STYLE_IMAGE_NONE, - -1,-1 +const PRInt32 nsCSSProps::kFontWeightKTable[] = { + KEYWORD_BOLD, NS_STYLE_FONT_WEIGHT_BOLD, + KEYWORD_BOLDER, NS_STYLE_FONT_WEIGHT_BOLDER, + KEYWORD_LIGHTER, NS_STYLE_FONT_WEIGHT_LIGHTER, + -1,-1 }; -static PRInt32 kListStylePositionKTable[] = { +const PRInt32 nsCSSProps::kListStylePositionKTable[] = { KEYWORD_INSIDE, NS_STYLE_LIST_STYLE_POSITION_INSIDE, KEYWORD_OUTSIDE, NS_STYLE_LIST_STYLE_POSITION_OUTSIDE, -1,-1 }; -static PRInt32 kListStyleKTable[] = { - KEYWORD_NONE, NS_STYLE_LIST_STYLE_NONE, +const PRInt32 nsCSSProps::kListStyleKTable[] = { KEYWORD_DISC, NS_STYLE_LIST_STYLE_DISC, KEYWORD_CIRCLE, NS_STYLE_LIST_STYLE_CIRCLE, KEYWORD_SQUARE, NS_STYLE_LIST_STYLE_SQUARE, KEYWORD_DECIMAL, NS_STYLE_LIST_STYLE_DECIMAL, + KEYWORD_DECIMAL_LEADING_ZERO, NS_STYLE_LIST_STYLE_DECIMAL_LEADING_ZERO, KEYWORD_LOWER_ROMAN, NS_STYLE_LIST_STYLE_LOWER_ROMAN, KEYWORD_UPPER_ROMAN, NS_STYLE_LIST_STYLE_UPPER_ROMAN, + KEYWORD_LOWER_GREEK, NS_STYLE_LIST_STYLE_LOWER_GREEK, KEYWORD_LOWER_ALPHA, NS_STYLE_LIST_STYLE_LOWER_ALPHA, + KEYWORD_LOWER_LATIN, NS_STYLE_LIST_STYLE_LOWER_LATIN, KEYWORD_UPPER_ALPHA, NS_STYLE_LIST_STYLE_UPPER_ALPHA, + KEYWORD_UPPER_LATIN, NS_STYLE_LIST_STYLE_UPPER_LATIN, + KEYWORD_HEBREW, NS_STYLE_LIST_STYLE_HEBREW, + KEYWORD_ARMENIAN, NS_STYLE_LIST_STYLE_ARMENIAN, + KEYWORD_GEORGIAN, NS_STYLE_LIST_STYLE_GEORGIAN, + KEYWORD_CJK_IDEOGRAPHIC, NS_STYLE_LIST_STYLE_CJK_IDEOGRAPHIC, + KEYWORD_HIRAGANA, NS_STYLE_LIST_STYLE_HIRAGANA, + KEYWORD_KATAKANA, NS_STYLE_LIST_STYLE_KATAKANA, + KEYWORD_HIRAGANA_IROHA, NS_STYLE_LIST_STYLE_HIRAGANA_IROHA, + KEYWORD_KATAKANA_IROHA, NS_STYLE_LIST_STYLE_KATAKANA_IROHA, -1,-1 }; -static PRInt32 kMarginSizeKTable[] = { - KEYWORD_AUTO, NS_STYLE_MARGIN_SIZE_AUTO, +const PRInt32 nsCSSProps::kOutlineColorKTable[] = { + KEYWORD_INVERT, NS_STYLE_COLOR_INVERT, -1,-1 }; -static PRInt32 kOverflowKTable[] = { +const PRInt32 nsCSSProps::kOverflowKTable[] = { KEYWORD_VISIBLE, NS_STYLE_OVERFLOW_VISIBLE, KEYWORD_HIDDEN, NS_STYLE_OVERFLOW_HIDDEN, KEYWORD_SCROLL, NS_STYLE_OVERFLOW_SCROLL, - KEYWORD_AUTO, NS_STYLE_OVERFLOW_AUTO, -1,-1 }; -static PRInt32 kPositionKTable[] = { +const PRInt32 nsCSSProps::kPageBreakKTable[] = { + KEYWORD_ALWAYS, NS_STYLE_PAGE_BREAK_ALWAYS, + KEYWORD_AVOID, NS_STYLE_PAGE_BREAK_AVOID, + KEYWORD_LEFT, NS_STYLE_PAGE_BREAK_LEFT, + KEYWORD_RIGHT, NS_STYLE_PAGE_BREAK_RIGHT, + -1,-1 +}; + +const PRInt32 nsCSSProps::kPageBreakInsideKTable[] = { + KEYWORD_AVOID, NS_STYLE_PAGE_BREAK_AVOID, + -1,-1 +}; + +const PRInt32 nsCSSProps::kPageMarksKTable[] = { + KEYWORD_CROP, NS_STYLE_PAGE_MARKS_CROP, + KEYWORD_CROSS, NS_STYLE_PAGE_MARKS_REGISTER, + -1,-1 +}; + +const PRInt32 nsCSSProps::kPageSizeKTable[] = { + KEYWORD_LANDSCAPE, NS_STYLE_PAGE_SIZE_LANDSCAPE, + KEYWORD_PORTRAIT, NS_STYLE_PAGE_SIZE_PORTRAIT, + -1,-1 +}; + +const PRInt32 nsCSSProps::kPitchKTable[] = { + KEYWORD_X_LOW, NS_STYLE_PITCH_X_LOW, + KEYWORD_LOW, NS_STYLE_PITCH_LOW, + KEYWORD_MEDIUM, NS_STYLE_PITCH_MEDIUM, + KEYWORD_HIGH, NS_STYLE_PITCH_HIGH, + KEYWORD_X_HIGH, NS_STYLE_PITCH_X_HIGH, + -1,-1 +}; + +const PRInt32 nsCSSProps::kPlayDuringKTable[] = { + KEYWORD_MIX, NS_STYLE_PLAY_DURING_MIX, + KEYWORD_REPEAT, NS_STYLE_PLAY_DURING_REPEAT, + -1,-1 +}; + +const PRInt32 nsCSSProps::kPositionKTable[] = { + KEYWORD_STATIC, NS_STYLE_POSITION_NORMAL, KEYWORD_RELATIVE, NS_STYLE_POSITION_RELATIVE, KEYWORD_ABSOLUTE, NS_STYLE_POSITION_ABSOLUTE, KEYWORD_FIXED, NS_STYLE_POSITION_FIXED, -1,-1 }; -static PRInt32 kTextAlignKTable[] = { +const PRInt32 nsCSSProps::kSpeakKTable[] = { + KEYWORD_SPELL_OUT, NS_STYLE_SPEAK_SPELL_OUT, + -1,-1 +}; + +const PRInt32 nsCSSProps::kSpeakHeaderKTable[] = { + KEYWORD_ONCE, NS_STYLE_SPEAK_HEADER_ONCE, + KEYWORD_ALWAYS, NS_STYLE_SPEAK_HEADER_ALWAYS, + -1,-1 +}; + +const PRInt32 nsCSSProps::kSpeakNumeralKTable[] = { + KEYWORD_DIGITS, NS_STYLE_SPEAK_NUMERAL_DIGITS, + KEYWORD_CONTINUOUS, NS_STYLE_SPEAK_NUMERAL_CONTINUOUS, + -1,-1 +}; + +const PRInt32 nsCSSProps::kSpeakPunctuationKTable[] = { + KEYWORD_CODE, NS_STYLE_SPEAK_PUNCTUATION_CODE, + -1,-1 +}; + +const PRInt32 nsCSSProps::kSpeechRateKTable[] = { + KEYWORD_X_SLOW, NS_STYLE_SPEECH_RATE_X_SLOW, + KEYWORD_SLOW, NS_STYLE_SPEECH_RATE_SLOW, + KEYWORD_MEDIUM, NS_STYLE_SPEECH_RATE_MEDIUM, + KEYWORD_FAST, NS_STYLE_SPEECH_RATE_FAST, + KEYWORD_X_FAST, NS_STYLE_SPEECH_RATE_X_FAST, + KEYWORD_FASTER, NS_STYLE_SPEECH_RATE_FASTER, + KEYWORD_SLOWER, NS_STYLE_SPEECH_RATE_SLOWER, + -1,-1 +}; + +const PRInt32 nsCSSProps::kTableLayoutKTable[] = { + KEYWORD_FIXED, NS_STYLE_TABLE_LAYOUT_FIXED, + -1,-1 +}; + +const PRInt32 nsCSSProps::kTextAlignKTable[] = { KEYWORD_LEFT, NS_STYLE_TEXT_ALIGN_LEFT, KEYWORD_RIGHT, NS_STYLE_TEXT_ALIGN_RIGHT, KEYWORD_CENTER, NS_STYLE_TEXT_ALIGN_CENTER, @@ -177,15 +356,28 @@ static PRInt32 kTextAlignKTable[] = { -1,-1 }; -static PRInt32 kTextTransformKTable[] = { - KEYWORD_NONE, NS_STYLE_TEXT_TRANSFORM_NONE, +const PRInt32 nsCSSProps::kTextDecorationKTable[] = { + KEYWORD_UNDERLINE, NS_STYLE_TEXT_DECORATION_UNDERLINE, + KEYWORD_OVERLINE, NS_STYLE_TEXT_DECORATION_OVERLINE, + KEYWORD_LINE_THROUGH, NS_STYLE_TEXT_DECORATION_LINE_THROUGH, + KEYWORD_BLINK, NS_STYLE_TEXT_DECORATION_BLINK, + -1,-1 +}; + +const PRInt32 nsCSSProps::kTextTransformKTable[] = { KEYWORD_CAPITALIZE, NS_STYLE_TEXT_TRANSFORM_CAPITALIZE, KEYWORD_LOWERCASE, NS_STYLE_TEXT_TRANSFORM_LOWERCASE, KEYWORD_UPPERCASE, NS_STYLE_TEXT_TRANSFORM_UPPERCASE, -1,-1 }; -static PRInt32 kVerticalAlignKTable[] = { +const PRInt32 nsCSSProps::kUnicodeBidiKTable[] = { + KEYWORD_EMBED, NS_STYLE_UNICODE_BIDI_EMBED, + KEYWORD_BIDI_OVERRIDE, NS_STYLE_UNICODE_BIDI_OVERRIDE, + -1,-1 +}; + +const PRInt32 nsCSSProps::kVerticalAlignKTable[] = { KEYWORD_BASELINE, NS_STYLE_VERTICAL_ALIGN_BASELINE, KEYWORD_SUB, NS_STYLE_VERTICAL_ALIGN_SUB, KEYWORD_SUPER, NS_STYLE_VERTICAL_ALIGN_SUPER, @@ -197,41 +389,30 @@ static PRInt32 kVerticalAlignKTable[] = { -1,-1 }; -static PRInt32 kVisibilityKTable[] = { +const PRInt32 nsCSSProps::kVisibilityKTable[] = { KEYWORD_VISIBLE, NS_STYLE_VISIBILITY_VISIBLE, KEYWORD_HIDDEN, NS_STYLE_VISIBILITY_HIDDEN, + KEYWORD_COLLAPSE, NS_STYLE_VISIBILITY_COLLAPSE, -1,-1 }; -static PRInt32 kWhitespaceKTable[] = { - KEYWORD_NORMAL, NS_STYLE_WHITESPACE_NORMAL, +const PRInt32 nsCSSProps::kVolumeKTable[] = { + KEYWORD_SILENT, NS_STYLE_VOLUME_SILENT, + KEYWORD_X_SOFT, NS_STYLE_VOLUME_X_SOFT, + KEYWORD_SOFT, NS_STYLE_VOLUME_SOFT, + KEYWORD_MEDIUM, NS_STYLE_VOLUME_MEDIUM, + KEYWORD_LOUD, NS_STYLE_VOLUME_LOUD, + KEYWORD_X_LOUD, NS_STYLE_VOLUME_X_LOUD, + -1,-1 +}; + +const PRInt32 nsCSSProps::kWhitespaceKTable[] = { KEYWORD_PRE, NS_STYLE_WHITESPACE_PRE, KEYWORD_NOWRAP, NS_STYLE_WHITESPACE_NOWRAP, -1,-1 }; -static const char* kBorderTopNames[] = { - "border-top-width", - "border-top-style", - "border-top-color", -}; -static const char* kBorderRightNames[] = { - "border-right-width", - "border-right-style", - "border-right-color", -}; -static const char* kBorderBottomNames[] = { - "border-bottom-width", - "border-bottom-style", - "border-bottom-color", -}; -static const char* kBorderLeftNames[] = { - "border-left-width", - "border-left-style", - "border-left-color", -}; - -static const char* SearchKeywordTable(PRInt32 aID, PRInt32 aTable[]) +static const char* SearchKeywordTable(PRInt32 aID, const PRInt32 aTable[]) { PRInt32 i = 1; if (aID >= 0) @@ -253,16 +434,33 @@ static const char* SearchKeywordTable(PRInt32 aID, PRInt32 aTable[]) const char* nsCSSProps::LookupProperty(PRInt32 aProp, PRInt32 aIndex) { +static const PRInt32 kBackgroundXPositionKTable[] = { + KEYWORD_LEFT, 0, + KEYWORD_CENTER, 50, + KEYWORD_RIGHT, 100, + -1,-1 +}; + +static const PRInt32 kBackgroundYPositionKTable[] = { + KEYWORD_TOP, 0, + KEYWORD_CENTER, 50, + KEYWORD_BOTTOM, 100, + -1,-1 +}; + switch (aProp) { + case PROP_AZIMUTH: + return SearchKeywordTable(aIndex, kAzimuthKTable); + case PROP_BACKGROUND: break; case PROP_BACKGROUND_ATTACHMENT: - return SearchKeywordTable(aIndex,kBackgroundAttachmentKTable); + return SearchKeywordTable(aIndex, kBackgroundAttachmentKTable); case PROP_BACKGROUND_COLOR: - return SearchKeywordTable(aIndex,kBackgroundColorKTable); + return SearchKeywordTable(aIndex, kBackgroundColorKTable); case PROP_BACKGROUND_FILTER: break; @@ -274,84 +472,133 @@ const char* nsCSSProps::LookupProperty(PRInt32 aProp, PRInt32 aIndex) break; case PROP_BACKGROUND_REPEAT: - return SearchKeywordTable(aIndex,kBackgroundRepeatKTable); + return SearchKeywordTable(aIndex, kBackgroundRepeatKTable); + + case PROP_BACKGROUND_X_POSITION: + return SearchKeywordTable(aIndex, kBackgroundXPositionKTable); + + case PROP_BACKGROUND_Y_POSITION: + return SearchKeywordTable(aIndex, kBackgroundYPositionKTable); case PROP_BORDER: + break; + + case PROP_BORDER_COLLAPSE: + return SearchKeywordTable(aIndex, kBorderCollapseKTable); + case PROP_BORDER_COLOR: + case PROP_BORDER_SPACING: case PROP_BORDER_STYLE: case PROP_BORDER_BOTTOM: case PROP_BORDER_LEFT: case PROP_BORDER_RIGHT: case PROP_BORDER_TOP: + break; + case PROP_BORDER_BOTTOM_COLOR: case PROP_BORDER_LEFT_COLOR: case PROP_BORDER_RIGHT_COLOR: case PROP_BORDER_TOP_COLOR: - break; + return SearchKeywordTable(aIndex, kBorderColorKTable); case PROP_BORDER_BOTTOM_STYLE: case PROP_BORDER_LEFT_STYLE: case PROP_BORDER_RIGHT_STYLE: case PROP_BORDER_TOP_STYLE: - return SearchKeywordTable(aIndex,kBorderStyleKTable); + return SearchKeywordTable(aIndex, kBorderStyleKTable); case PROP_BORDER_BOTTOM_WIDTH: case PROP_BORDER_LEFT_WIDTH: case PROP_BORDER_RIGHT_WIDTH: case PROP_BORDER_TOP_WIDTH: - return SearchKeywordTable(aIndex,kBorderWidthKTable); + return SearchKeywordTable(aIndex, kBorderWidthKTable); case PROP_BORDER_WIDTH: + case PROP_BORDER_X_SPACING: + case PROP_BORDER_Y_SPACING: + case PROP_BOTTOM: + break; + + case PROP_CAPTION_SIDE: + return SearchKeywordTable(aIndex, kCaptionSideKTable); + case PROP_CLEAR: - return SearchKeywordTable(aIndex,kClearKTable); + return SearchKeywordTable(aIndex, kClearKTable); case PROP_CLIP: + case PROP_CLIP_BOTTOM: + case PROP_CLIP_LEFT: + case PROP_CLIP_RIGHT: + case PROP_CLIP_TOP: case PROP_COLOR: break; + case PROP_CONTENT: + return SearchKeywordTable(aIndex, kContentKTable); + + case PROP_COUNTER_INCREMENT: + case PROP_COUNTER_RESET: + case PROP_CUE: + case PROP_CUE_AFTER: + case PROP_CUE_BEFORE: + break; + case PROP_CURSOR: - return SearchKeywordTable(aIndex,kCursorKTable); + return SearchKeywordTable(aIndex, kCursorKTable); case PROP_DIRECTION: - return SearchKeywordTable(aIndex,kDirectionKTable); + return SearchKeywordTable(aIndex, kDirectionKTable); case PROP_DISPLAY: - return SearchKeywordTable(aIndex,kDisplayKTable); + return SearchKeywordTable(aIndex, kDisplayKTable); + + case PROP_ELEVATION: + return SearchKeywordTable(aIndex, kElevationKTable); + + case PROP_EMPTY_CELLS: + return SearchKeywordTable(aIndex, kEmptyCellsKTable); case PROP_FILTER: break; case PROP_FLOAT: - return SearchKeywordTable(aIndex,kFloatKTable); + return SearchKeywordTable(aIndex, kFloatKTable); case PROP_FONT: - case PROP_FONT_FAMILY: break; + case PROP_FONT_FAMILY: + return SearchKeywordTable(aIndex, kFontKTable); + case PROP_FONT_SIZE: - return SearchKeywordTable(aIndex,kFontSizeKTable); + return SearchKeywordTable(aIndex, kFontSizeKTable); + + case PROP_FONT_SIZE_ADJUST: + break; + + case PROP_FONT_STRETCH: + return SearchKeywordTable(aIndex, kFontStretchKTable); case PROP_FONT_STYLE: - return SearchKeywordTable(aIndex,kFontStyleKTable); + return SearchKeywordTable(aIndex, kFontStyleKTable); case PROP_FONT_VARIANT: - return SearchKeywordTable(aIndex,kFontVariantKTable); - + return SearchKeywordTable(aIndex, kFontVariantKTable); case PROP_FONT_WEIGHT: + return SearchKeywordTable(aIndex, kFontWeightKTable); + case PROP_HEIGHT: case PROP_LEFT: + case PROP_LETTER_SPACING: case PROP_LINE_HEIGHT: case PROP_LIST_STYLE: + case PROP_LIST_STYLE_IMAGE: break; - case PROP_LIST_STYLE_IMAGE: - return SearchKeywordTable(aIndex, kListStyleImageKTable); - case PROP_LIST_STYLE_POSITION: return SearchKeywordTable(aIndex, kListStylePositionKTable); - case PROP_LIST_STYLE_TYPE: return SearchKeywordTable(aIndex, kListStyleKTable); @@ -360,29 +607,111 @@ const char* nsCSSProps::LookupProperty(PRInt32 aProp, PRInt32 aIndex) case PROP_MARGIN_LEFT: case PROP_MARGIN_RIGHT: case PROP_MARGIN_TOP: - return SearchKeywordTable(aIndex, kMarginSizeKTable); + case PROP_MARKER_OFFSET: + break; + case PROP_MARKS: + return SearchKeywordTable(aIndex, kPageMarksKTable); + + case PROP_MAX_HEIGHT: + case PROP_MAX_WIDTH: + case PROP_MIN_HEIGHT: + case PROP_MIN_WIDTH: + case PROP_OPACITY: + case PROP_ORPHANS: + case PROP_OUTLINE: + break; + + case PROP_OUTLINE_COLOR: + return SearchKeywordTable(aIndex, kOutlineColorKTable); + + case PROP_OUTLINE_STYLE: + return SearchKeywordTable(aIndex, kBorderStyleKTable); + + case PROP_OUTLINE_WIDTH: + return SearchKeywordTable(aIndex, kBorderWidthKTable); + + case PROP_OVERFLOW: + return SearchKeywordTable(aIndex, kOverflowKTable); + case PROP_PADDING: case PROP_PADDING_BOTTOM: case PROP_PADDING_LEFT: case PROP_PADDING_RIGHT: case PROP_PADDING_TOP: + case PROP_PAGE: break; + + case PROP_PAGE_BREAK_BEFORE: + case PROP_PAGE_BREAK_AFTER: + return SearchKeywordTable(aIndex, kPageBreakKTable); + + case PROP_PAGE_BREAK_INSIDE: + return SearchKeywordTable(aIndex, kPageBreakInsideKTable); - case PROP_OPACITY: + case PROP_PAUSE: + case PROP_PAUSE_AFTER: + case PROP_PAUSE_BEFORE: break; - - case PROP_OVERFLOW: - return SearchKeywordTable(aIndex, kOverflowKTable); - + + case PROP_PITCH: + return SearchKeywordTable(aIndex, kPitchKTable); + + case PROP_PITCH_RANGE: + case PROP_PLAY_DURING: + break; + + case PROP_PLAY_DURING_FLAGS: + return SearchKeywordTable(aIndex, kPlayDuringKTable); + case PROP_POSITION: return SearchKeywordTable(aIndex, kPositionKTable); + case PROP_QUOTES: + case PROP_QUOTES_CLOSE: + case PROP_QUOTES_OPEN: + case PROP_RICHNESS: + case PROP_RIGHT: + case PROP_SIZE: + break; + + case PROP_SIZE_HEIGHT: + case PROP_SIZE_WIDTH: + return SearchKeywordTable(aIndex, kPageSizeKTable); + + case PROP_SPEAK: + return SearchKeywordTable(aIndex, kSpeakKTable); + + case PROP_SPEAK_HEADER: + return SearchKeywordTable(aIndex, kSpeakHeaderKTable); + + case PROP_SPEAK_NUMERAL: + return SearchKeywordTable(aIndex, kSpeakNumeralKTable); + + case PROP_SPEAK_PUNCTUATION: + return SearchKeywordTable(aIndex, kSpeakPunctuationKTable); + + case PROP_SPEECH_RATE: + return SearchKeywordTable(aIndex, kSpeechRateKTable); + + case PROP_STRESS: + break; + + case PROP_TABLE_LAYOUT: + return SearchKeywordTable(aIndex, kTableLayoutKTable); + case PROP_TEXT_ALIGN: return SearchKeywordTable(aIndex, kTextAlignKTable); case PROP_TEXT_DECORATION: + return SearchKeywordTable(aIndex, kTextDecorationKTable); + case PROP_TEXT_INDENT: + case PROP_TEXT_SHADOW: + case PROP_TEXT_SHADOW_COLOR: + case PROP_TEXT_SHADOW_RADIUS: + case PROP_TEXT_SHADOW_X: + case PROP_TEXT_SHADOW_Y: break; case PROP_TEXT_TRANSFORM: @@ -391,40 +720,55 @@ const char* nsCSSProps::LookupProperty(PRInt32 aProp, PRInt32 aIndex) case PROP_TOP: break; + case PROP_UNICODE_BIDI: + return SearchKeywordTable(aIndex, kUnicodeBidiKTable); + case PROP_VERTICAL_ALIGN: return SearchKeywordTable(aIndex, kVerticalAlignKTable); case PROP_VISIBILITY: return SearchKeywordTable(aIndex, kVisibilityKTable); + + case PROP_VOICE_FAMILY: + break; + + case PROP_VOLUME: + return SearchKeywordTable(aIndex, kVolumeKTable); case PROP_WHITE_SPACE: return SearchKeywordTable(aIndex, kWhitespaceKTable); + case PROP_WIDOWS: case PROP_WIDTH: - case PROP_LETTER_SPACING: case PROP_WORD_SPACING: case PROP_Z_INDEX: break; + + default: + NS_ERROR("unsupported property"); + break; } return nsnull; } -const PRInt32 nsCSSProps::kHintTable[] = { - NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND +const PRInt32 nsCSSProps::kHintTable[PROP_MAX] = { + NS_STYLE_HINT_AURAL, // PROP_AZIMUTH + NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_ATTACHMENT NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_COLOR NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_FILTER NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_IMAGE NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_POSITION + NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_REPEAT NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_X_POSITION NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_Y_POSITION - NS_STYLE_HINT_VISUAL, // PROP_BACKGROUND_REPEAT NS_STYLE_HINT_REFLOW, // PROP_BORDER NS_STYLE_HINT_REFLOW, // PROP_BORDER_BOTTOM NS_STYLE_HINT_VISUAL, // PROP_BORDER_BOTTOM_COLOR NS_STYLE_HINT_VISUAL, // PROP_BORDER_BOTTOM_STYLE NS_STYLE_HINT_REFLOW, // PROP_BORDER_BOTTOM_WIDTH + NS_STYLE_HINT_REFLOW, // PROP_BORDER_COLLAPSE NS_STYLE_HINT_VISUAL, // PROP_BORDER_COLOR NS_STYLE_HINT_REFLOW, // PROP_BORDER_LEFT NS_STYLE_HINT_VISUAL, // PROP_BORDER_LEFT_COLOR @@ -434,12 +778,17 @@ const PRInt32 nsCSSProps::kHintTable[] = { NS_STYLE_HINT_VISUAL, // PROP_BORDER_RIGHT_COLOR NS_STYLE_HINT_VISUAL, // PROP_BORDER_RIGHT_STYLE NS_STYLE_HINT_REFLOW, // PROP_BORDER_RIGHT_WIDTH + NS_STYLE_HINT_REFLOW, // PROP_BORDER_SPACING NS_STYLE_HINT_VISUAL, // PROP_BORDER_STYLE NS_STYLE_HINT_REFLOW, // PROP_BORDER_TOP NS_STYLE_HINT_VISUAL, // PROP_BORDER_TOP_COLOR NS_STYLE_HINT_VISUAL, // PROP_BORDER_TOP_STYLE NS_STYLE_HINT_REFLOW, // PROP_BORDER_TOP_WIDTH NS_STYLE_HINT_REFLOW, // PROP_BORDER_WIDTH + // PROP_BORDER_X_SPACING + // PROP_BORDER_Y_SPACING + NS_STYLE_HINT_REFLOW, // PROP_BOTTOM + NS_STYLE_HINT_REFLOW, // PROP_CAPTION_SIDE NS_STYLE_HINT_REFLOW, // PROP_CLEAR NS_STYLE_HINT_VISUAL, // PROP_CLIP NS_STYLE_HINT_VISUAL, // PROP_CLIP_BOTTOM @@ -447,15 +796,24 @@ const PRInt32 nsCSSProps::kHintTable[] = { NS_STYLE_HINT_VISUAL, // PROP_CLIP_RIGHT NS_STYLE_HINT_VISUAL, // PROP_CLIP_TOP NS_STYLE_HINT_VISUAL, // PROP_COLOR + NS_STYLE_HINT_FRAMECHANGE, // PROP_CONTENT + NS_STYLE_HINT_REFLOW, // PROP_COUNTER_INCREMENT + NS_STYLE_HINT_REFLOW, // PROP_COUNTER_RESET + NS_STYLE_HINT_AURAL, // PROP_CUE + NS_STYLE_HINT_AURAL, // PROP_CUE_AFTER + NS_STYLE_HINT_AURAL, // PROP_CUE_BEFORE NS_STYLE_HINT_VISUAL, // PROP_CURSOR - NS_STYLE_HINT_VISUAL, // PROP_CURSOR_IMAGE NS_STYLE_HINT_REFLOW, // PROP_DIRECTION NS_STYLE_HINT_FRAMECHANGE, // PROP_DISPLAY + NS_STYLE_HINT_AURAL, // PROP_ELEVATION + NS_STYLE_HINT_VISUAL, // PROP_EMPTY_CELLS NS_STYLE_HINT_VISUAL, // PROP_FILTER NS_STYLE_HINT_FRAMECHANGE, // PROP_FLOAT NS_STYLE_HINT_REFLOW, // PROP_FONT NS_STYLE_HINT_REFLOW, // PROP_FONT_FAMILY NS_STYLE_HINT_REFLOW, // PROP_FONT_SIZE + NS_STYLE_HINT_REFLOW, // PROP_FONT_SIZE_ADJUST + NS_STYLE_HINT_REFLOW, // PROP_FONT_STRETCH NS_STYLE_HINT_REFLOW, // PROP_FONT_STYLE NS_STYLE_HINT_REFLOW, // PROP_FONT_VARIANT NS_STYLE_HINT_REFLOW, // PROP_FONT_WEIGHT @@ -472,24 +830,70 @@ const PRInt32 nsCSSProps::kHintTable[] = { NS_STYLE_HINT_REFLOW, // PROP_MARGIN_LEFT NS_STYLE_HINT_REFLOW, // PROP_MARGIN_RIGHT NS_STYLE_HINT_REFLOW, // PROP_MARGIN_TOP + NS_STYLE_HINT_REFLOW, // PROP_MARKER_OFFSET + NS_STYLE_HINT_VISUAL, // PROP_MARKS + NS_STYLE_HINT_REFLOW, // PROP_MAX_HEIGHT + NS_STYLE_HINT_REFLOW, // PROP_MAX_WIDTH + NS_STYLE_HINT_REFLOW, // PROP_MIN_HEIGHT + NS_STYLE_HINT_REFLOW, // PROP_MIN_WIDTH NS_STYLE_HINT_VISUAL, // PROP_OPACITY + NS_STYLE_HINT_REFLOW, // PROP_ORPHANS + NS_STYLE_HINT_VISUAL, // PROP_OUTLINE + NS_STYLE_HINT_VISUAL, // PROP_OUTLINE_COLOR + NS_STYLE_HINT_VISUAL, // PROP_OUTLINE_STYLE + NS_STYLE_HINT_VISUAL, // PROP_OUTLINE_WIDTH NS_STYLE_HINT_REFLOW, // PROP_OVERFLOW NS_STYLE_HINT_REFLOW, // PROP_PADDING NS_STYLE_HINT_REFLOW, // PROP_PADDING_BOTTOM NS_STYLE_HINT_REFLOW, // PROP_PADDING_LEFT NS_STYLE_HINT_REFLOW, // PROP_PADDING_RIGHT NS_STYLE_HINT_REFLOW, // PROP_PADDING_TOP + NS_STYLE_HINT_REFLOW, // PROP_PAGE + NS_STYLE_HINT_REFLOW, // PROP_PAGE_BREAK_AFTER + NS_STYLE_HINT_REFLOW, // PROP_PAGE_BREAK_BEFORE + NS_STYLE_HINT_REFLOW, // PROP_PAGE_BREAK_INSIDE + NS_STYLE_HINT_AURAL, // PROP_PAUSE + NS_STYLE_HINT_AURAL, // PROP_PAUSE_AFTER + NS_STYLE_HINT_AURAL, // PROP_PAUSE_BEFORE + NS_STYLE_HINT_AURAL, // PROP_PITCH + NS_STYLE_HINT_AURAL, // PROP_PITCH_RANGE + NS_STYLE_HINT_AURAL, // PROP_PLAY_DURING + NS_STYLE_HINT_AURAL, // PROP_PLAY_DURING_FLAGS NS_STYLE_HINT_FRAMECHANGE, // PROP_POSITION + NS_STYLE_HINT_REFLOW, // PROP_QUOTES + NS_STYLE_HINT_REFLOW, // PROP_QUOTES_CLOSE + NS_STYLE_HINT_REFLOW, // PROP_QUOTES_OPEN + NS_STYLE_HINT_AURAL, // PROP_RICHNESS + NS_STYLE_HINT_REFLOW, // PROP_RIGHT + NS_STYLE_HINT_REFLOW, // PROP_SIZE + NS_STYLE_HINT_REFLOW, // PROP_SIZE_HEIGHT + NS_STYLE_HINT_REFLOW, // PROP_SIZE_WIDTH + NS_STYLE_HINT_AURAL, // PROP_SPEAK + NS_STYLE_HINT_AURAL, // PROP_SPEAK_HEADER + NS_STYLE_HINT_AURAL, // PROP_SPEAK_NUMERAL + NS_STYLE_HINT_AURAL, // PROP_SPEAK_PUNCTUATION + NS_STYLE_HINT_AURAL, // PROP_SPEECH_RATE + NS_STYLE_HINT_AURAL, // PROP_STRESS + NS_STYLE_HINT_REFLOW, // PROP_TABLE_LAYOUT NS_STYLE_HINT_REFLOW, // PROP_TEXT_ALIGN NS_STYLE_HINT_VISUAL, // PROP_TEXT_DECORATION NS_STYLE_HINT_REFLOW, // PROP_TEXT_INDENT + NS_STYLE_HINT_VISUAL, // PROP_TEXT_SHADOW + NS_STYLE_HINT_VISUAL, // PROP_TEXT_SHADOW_COLOR + NS_STYLE_HINT_VISUAL, // PROP_TEXT_SHADOW_RADIUS + NS_STYLE_HINT_VISUAL, // PROP_TEXT_SHADOW_X + NS_STYLE_HINT_VISUAL, // PROP_TEXT_SHADOW_Y NS_STYLE_HINT_REFLOW, // PROP_TEXT_TRANSFORM NS_STYLE_HINT_REFLOW, // PROP_TOP + NS_STYLE_HINT_REFLOW, // PROP_UNICODE_BIDI NS_STYLE_HINT_REFLOW, // PROP_VERTICAL_ALIGN NS_STYLE_HINT_REFLOW, // PROP_VISIBILITY (for collapse) + NS_STYLE_HINT_AURAL, // PROP_VOICE_FAMILY + NS_STYLE_HINT_AURAL, // PROP_VOLUME NS_STYLE_HINT_REFLOW, // PROP_WHITE_SPACE + NS_STYLE_HINT_REFLOW, // PROP_WIDOWS NS_STYLE_HINT_REFLOW, // PROP_WIDTH NS_STYLE_HINT_REFLOW, // PROP_WORD_SPACING - NS_STYLE_HINT_REFLOW // PROP_Z_INDEX (XXX visual?) + NS_STYLE_HINT_REFLOW // PROP_Z_INDEX (XXX visual?) }; diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index 097f1c1a7958..bc5230fa7066 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSProps.h" -#define TOTAL_KEYWORDS 136 +#define TOTAL_KEYWORDS 142 #define MIN_WORD_LENGTH 3 #define MAX_WORD_LENGTH 21 -#define MIN_HASH_VALUE 5 -#define MAX_HASH_VALUE 659 -/* maximum key range = 655, duplicates = 0 */ +#define MIN_HASH_VALUE 193 +#define MAX_HASH_VALUE 1155 +/* maximum key range = 963, duplicates = 0 */ struct StaticNameTable { @@ -50,327 +50,425 @@ PRInt32 nsCSSProps::LookupName(const char* str) { static unsigned short asso_values[] = { - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 95, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 5, 0, 150, - 5, 15, 125, 15, 235, 190, 660, 0, 60, 35, - 110, 0, 0, 10, 0, 0, 40, 80, 0, 35, - 15, 110, 45, 660, 660, 660, 660, 660, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 215, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 161, 214, 250, + 226, 174, 146, 217, 246, 141, 1156, 69, 102, 94, + 144, 30, 7, 185, 4, 194, 153, 32, 89, 212, + 176, 245, 60, 1156, 1156, 1156, 1156, 1156, }; static unsigned char lengthtable[] = { - 0, 0, 0, 0, 0, 5, 6, 0, 0, 0, 10, 0, 12, 0, - 0, 0, 0, 0, 0, 19, 10, 0, 0, 0, 4, 5, 16, 0, - 0, 0, 0, 16, 0, 0, 19, 15, 6, 17, 0, 0, 0, 0, - 12, 3, 0, 5, 6, 0, 13, 0, 0, 11, 0, 0, 0, 0, - 0, 0, 18, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, - 0, 21, 0, 18, 0, 0, 6, 12, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 11, 12, 0, 0, 0, 6, 0, - 0, 0, 0, 11, 0, 8, 0, 10, 0, 12, 13, 0, 0, 11, - 17, 0, 0, 0, 0, 7, 0, 4, 0, 0, 0, 0, 0, 0, - 11, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 7, 0, 0, - 0, 0, 12, 0, 14, 0, 0, 17, 0, 9, 10, 21, 0, 0, - 0, 5, 11, 7, 0, 0, 10, 0, 0, 0, 0, 0, 16, 17, - 18, 4, 0, 16, 0, 13, 0, 0, 0, 7, 13, 0, 10, 0, - 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 12, 13, 0, 0, 11, 0, 13, 14, 0, 0, 12, 0, 4, - 0, 11, 7, 8, 4, 5, 0, 12, 0, 14, 0, 0, 17, 0, - 0, 15, 16, 17, 0, 0, 5, 6, 12, 13, 9, 5, 6, 0, - 0, 0, 0, 0, 12, 0, 0, 0, 21, 0, 3, 0, 0, 0, - 0, 0, 19, 0, 11, 0, 8, 0, 10, 11, 0, 0, 0, 0, - 6, 0, 0, 0, 10, 0, 12, 13, 0, 10, 0, 0, 13, 0, - 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 10, 0, 0, 18, - 14, 0, 11, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 7, - 8, 0, 0, 11, 0, 0, 0, 0, 0, 7, 0, 9, 15, 6, - 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, - 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 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, 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, 5, 0, 0, 0, 0, 0, 16, 0, 0, 9, 0, - 0, 0, 13, 14, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 11, 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, 0, 0, 0, 0, 0, 0, 0, 12, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 12, 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, 0, 0, 0, 0, 0, 0, 0, - 0, 9, + 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 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, 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, 0, 6, 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, 5, 0, 0, 0, 0, + 0, 0, 6, 0, 0, 0, 0, 6, 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, 4, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 7, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 0, 6, 0, 0, 0, 7, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 6, 8, 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, 4, 11, 19, 0, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 11, 11, + 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 10, 12, 0, 0, 0, + 0, 0, 0, 0, 17, 0, 0, 19, 0, 0, 7, 17, 17, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 11, 18, 0, 13, 0, 0, + 0, 0, 5, 0, 0, 0, 0, 0, 12, 6, 9, 9, 0, 9, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 13, + 0, 0, 7, 0, 0, 0, 11, 0, 0, 0, 0, 17, 0, 0, + 0, 0, 0, 10, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 18, 10, 16, + 11, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 19, + 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 9, 0, 0, 0, 0, 0, 11, 13, 0, 0, 0, + 0, 8, 0, 0, 0, 0, 0, 12, 0, 0, 13, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, 10, 16, 0, 0, 0, 6, + 16, 0, 0, 0, 21, 6, 0, 0, 13, 0, 21, 0, 0, 0, + 17, 19, 0, 0, 0, 0, 9, 0, 0, 17, 0, 10, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 7, 0, 0, 10, + 9, 16, 0, 0, 14, 10, 0, 0, 0, 0, 11, 0, 0, 0, + 0, 10, 0, 0, 12, 0, 9, 0, 0, 0, 0, 10, 0, 0, + 0, 0, 14, 0, 0, 0, 16, 0, 0, 21, 0, 0, 11, 16, + 0, 0, 17, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 17, 0, 12, 14, 0, 15, 0, 0, 0, 19, 0, + 0, 0, 0, 0, 11, 0, 0, 0, 11, 0, 0, 11, 10, 0, + 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 11, 16, 17, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, + 0, 12, 0, 0, 14, 0, 0, 12, 17, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 12, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 12, 13, 0, 0, 0, 16, 0, 0, 12, 0, 0, 0, 0, 12, + 0, 0, 15, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 12, 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, 13, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 18, 0, 0, 0, 0, 0, 15, 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, 13, }; static struct StaticNameTable wordlist[] = { - {"",}, {"",}, {"",}, {"",}, {"",}, - {"speak", 109}, - {"border", 10}, - {"",}, {"",}, {"",}, - {"border-top", 27}, - {"",}, - {"border-color", 16}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-bottom-color", 12}, - {"background", 1}, - {"",}, {"",}, {"",}, - {"page", 94}, - {"pause", 98}, - {"page-break-after", 95}, - {"",}, {"",}, {"",}, {"",}, - {"border-top-style", 29}, - {"",}, {"",}, - {"border-bottom-style", 13}, - {"border-collapse", 15}, - {"volume", 130}, - {"page-break-before", 96}, - {"",}, {"",}, {"",}, {"",}, - {"border-style", 26}, - {"top", 125}, - {"",}, - {"marks", 77}, - {"stress", 114}, - {"",}, - {"border-bottom", 11}, - {"",}, {"",}, - {"border-left", 17}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-right-color", 22}, - {"",}, {"",}, {"",}, - {"background-repeat", 9}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"background-attachment", 2}, - {"",}, - {"border-right-style", 23}, - {"",}, {"",}, - {"bottom", 32}, - {"word-spacing", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"play-during", 103}, - {"border-right", 21}, + {"top", 131}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"border", 10}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak", 115}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"color", 42}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"cursor", 49}, + {"",}, {"",}, {"",}, {"",}, + {"filter", 54}, + {"",}, + {"right", 111}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"font", 56}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"quotes", 105}, + {"page", 95}, + {"pause", 99}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"text-shadow", 119}, + {"clear", 36}, {"",}, - {"overflow", 88}, - {"",}, - {"max-height", 78}, - {"",}, - {"speak-header", 110}, - {"marker-offset", 76}, + {"clip", 37}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"orphans", 84}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline", 85}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pause-after", 99}, - {"border-left-color", 18}, + {"pitch", 102}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"float", 55}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"border-top", 27}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right-color", 22}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"left", 65}, {"",}, {"",}, {"",}, {"",}, - {"orphans", 83}, + {"bottom", 34}, + {"",}, {"",}, {"",}, + {"opacity", 83}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"marks", 78}, + {"",}, {"",}, {"",}, {"",}, + {"cue", 46}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline-color", 86}, + {"",}, {"",}, {"",}, {"",}, + {"volume", 136}, + {"position", 106}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"size", 112}, + {"border-left", 17}, + {"border-bottom-color", 12}, + {"",}, {"",}, + {"border-color", 16}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-top", 41}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"padding", 90}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-after", 100}, + {"padding-top", 94}, + {"",}, {"",}, {"",}, + {"margin", 72}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"play-during", 104}, {"",}, - {"left", 64}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"padding-top", 93}, - {"border-left-style", 19}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin-top", 76}, + {"border-right", 21}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-filter", 4}, + {"",}, {"",}, {"background-position", 6}, {"",}, {"",}, - {"padding", 89}, - {"",}, {"",}, {"",}, {"",}, - {"pause-before", 100}, - {"",}, - {"text-transform", 124}, - {"",}, {"",}, - {"background-filter", 4}, - {"",}, - {"font-size", 57}, - {"font-style", 60}, - {"background-x-position", 7}, - {"",}, {"",}, {"",}, - {"color", 40}, - {"empty-cells", 52}, - {"opacity", 82}, - {"",}, {"",}, - {"margin-top", 75}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-top-color", 28}, - {"text-shadow-color", 120}, - {"text-shadow-radius", 121}, - {"font", 55}, - {"",}, - {"background-color", 3}, - {"",}, - {"speak-numeral", 111}, - {"",}, {"",}, {"",}, - {"z-index", 135}, - {"text-shadow-x", 122}, - {"",}, - {"text-align", 116}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"font-size-adjust", 58}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"caption-side", 33}, - {"margin-bottom", 72}, - {"",}, {"",}, - {"margin-left", 73}, - {"",}, - {"outline-color", 85}, - {"padding-bottom", 90}, - {"",}, {"",}, - {"padding-left", 91}, - {"",}, - {"size", 108}, - {"",}, - {"font-weight", 62}, - {"outline", 84}, - {"richness", 106}, - {"clip", 35}, - {"clear", 34}, - {"",}, - {"font-variant", 61}, - {"",}, - {"border-spacing", 25}, - {"",}, {"",}, - {"counter-increment", 42}, - {"",}, {"",}, - {"text-decoration", 117}, - {"background-image", 5}, - {"page-break-inside", 97}, - {"",}, {"",}, - {"float", 54}, - {"widows", 132}, - {"table-layout", 115}, - {"counter-reset", 43}, - {"elevation", 51}, - {"right", 107}, - {"cursor", 47}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"margin-right", 74}, - {"",}, {"",}, {"",}, - {"background-y-position", 8}, - {"",}, - {"cue", 44}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-bottom-width", 14}, - {"",}, - {"clip-bottom", 36}, - {"",}, - {"clip-top", 39}, - {"",}, - {"clip-right", 38}, - {"speech-rate", 113}, - {"",}, {"",}, {"",}, {"",}, - {"margin", 71}, - {"",}, {"",}, {"",}, - {"cue-before", 46}, - {"",}, - {"cursor-image", 48}, - {"text-shadow-y", 123}, - {"",}, - {"list-style", 67}, - {"",}, {"",}, - {"outline-style", 86}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"border-top-width", 30}, - {"",}, {"",}, {"",}, - {"min-height", 80}, - {"",}, {"",}, - {"border-right-width", 24}, - {"letter-spacing", 65}, - {"",}, - {"text-indent", 118}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"speak-punctuation", 112}, - {"",}, {"",}, {"",}, {"",}, - {"content", 41}, - {"position", 104}, - {"",}, {"",}, - {"pitch-range", 102}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"display", 50}, - {"",}, - {"clip-left", 37}, - {"list-style-type", 70}, - {"filter", 53}, - {"",}, {"",}, {"",}, {"",}, {"",}, - {"voice-family", 129}, - {"",}, {"",}, {"",}, {"",}, - {"azimuth", 0}, - {"",}, {"",}, {"",}, - {"height", 63}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, - {"border-left-width", 20}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"direction", 49}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"cue-after", 45}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"font-family", 56}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"list-style-position", 69}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"white-space", 131}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, - {"padding-right", 92}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"content", 43}, + {"background-repeat", 7}, + {"border-left-color", 18}, + {"font-variant", 62}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"pitch", 101}, + {"quotes-open", 109}, + {"border-right-style", 23}, + {"",}, + {"border-bottom", 11}, + {"",}, {"",}, {"",}, {"",}, + {"width", 139}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak-header", 116}, + {"quotes", 107}, + {"elevation", 52}, + {"font-size", 58}, + {"",}, + {"cue-after", 47}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"azimuth", 0}, + {"",}, + {"marker-offset", 77}, + {"",}, {"",}, + {"z-index", 141}, + {"",}, {"",}, {"",}, + {"speech-rate", 119}, + {"",}, {"",}, {"",}, {"",}, + {"speak-punctuation", 118}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"background", 1}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"overflow", 89}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"margin-left", 74}, + {"",}, {"",}, {"",}, + {"border-right-width", 24}, + {"cue-before", 48}, + {"border-top-color", 28}, + {"font-family", 57}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-color", 3}, + {"",}, {"",}, {"",}, + {"border-bottom-style", 13}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-weight", 63}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"direction", 50}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch-range", 103}, + {"outline-style", 87}, + {"",}, {"",}, {"",}, {"",}, + {"richness", 110}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin-right", 75}, + {"",}, {"",}, + {"speak-numeral", 117}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"height", 64}, + {"",}, {"",}, {"",}, + {"clip-right", 40}, + {"page-break-after", 96}, + {"",}, {"",}, {"",}, + {"stress", 120}, + {"background-image", 5}, + {"",}, {"",}, {"",}, + {"background-attachment", 2}, + {"widows", 138}, + {"",}, {"",}, + {"margin-bottom", 73}, + {"",}, + {"background-x-position", 8}, + {"",}, {"",}, {"",}, + {"border-left-style", 19}, + {"border-bottom-width", 14}, + {"",}, {"",}, {"",}, {"",}, + {"clip-left", 39}, + {"",}, {"",}, + {"play-during-flags", 105}, + {"",}, + {"visibility", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"text-transform", 130}, + {"display", 51}, + {"",}, {"",}, + {"text-align", 122}, + {"min-width", 82}, + {"border-top-style", 29}, + {"",}, {"",}, + {"padding-bottom", 91}, + {"min-height", 81}, + {"",}, {"",}, {"",}, {"",}, + {"line-height", 67}, + {"",}, {"",}, {"",}, {"",}, + {"font-style", 61}, + {"",}, {"",}, + {"border-style", 26}, + {"",}, + {"max-width", 80}, + {"",}, {"",}, {"",}, {"",}, + {"max-height", 79}, + {"",}, {"",}, {"",}, {"",}, + {"border-spacing", 25}, + {"",}, {"",}, {"",}, + {"border-x-spacing", 32}, + {"",}, {"",}, + {"background-y-position", 9}, + {"",}, {"",}, + {"clip-bottom", 38}, + {"font-size-adjust", 59}, + {"",}, {"",}, + {"border-left-width", 20}, + {"",}, {"",}, {"",}, {"",}, + {"outline-width", 88}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"counter-increment", 44}, + {"",}, + {"padding-left", 92}, + {"letter-spacing", 66}, + {"",}, + {"border-collapse", 15}, + {"",}, {"",}, {"",}, + {"list-style-position", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-indent", 124}, + {"",}, {"",}, {"",}, + {"empty-cells", 53}, + {"",}, {"",}, + {"white-space", 137}, + {"list-style", 68}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-top-width", 30}, + {"",}, {"",}, + {"font-stretch", 60}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"size-height", 113}, + {"border-y-spacing", 33}, + {"page-break-inside", 98}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"width", 133}, + {"text-shadow", 125}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"list-style-image", 68}, + {"unicode-bidi", 132}, {"",}, {"",}, - {"max-width", 79}, + {"vertical-align", 133}, + {"",}, {"",}, + {"pause-before", 101}, + {"text-shadow-color", 126}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"padding-right", 93}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"outline-width", 87}, - {"vertical-align", 127}, + {"page-break-before", 97}, {"",}, {"",}, {"border-width", 31}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"visibility", 128}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"line-height", 66}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"unicode-bidi", 126}, + {"voice-family", 135}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"table-layout", 121}, + {"counter-reset", 45}, + {"",}, {"",}, {"",}, + {"list-style-image", 69}, + {"",}, {"",}, + {"caption-side", 35}, + {"",}, {"",}, {"",}, {"",}, + {"quotes-close", 108}, + {"",}, {"",}, + {"list-style-type", 71}, + {"",}, {"",}, {"",}, {"",}, + {"size-width", 114}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"",}, {"font-stretch", 59}, - {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"word-spacing", 140}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, - {"min-width", 81}, + {"text-shadow-x", 128}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"text-shadow-radius", 127}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-decoration", 123}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"text-shadow-y", 129}, }; if (str != NULL) { @@ -387,6 +485,7 @@ PRInt32 nsCSSProps::LookupName(const char* str) case 10: case 9: case 8: + hval += asso_values[MYLOWER(str[7])]; case 7: case 6: hval += asso_values[MYLOWER(str[5])]; @@ -438,9 +537,9 @@ const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { { "background-filter", 4 }, { "background-image", 5 }, { "background-position", 6 }, - { "background-x-position", 7 }, - { "background-y-position", 8 }, - { "background-repeat", 9 }, + { "background-repeat", 7 }, + { "background-x-position", 8 }, + { "background-y-position", 9 }, { "border", 10 }, { "border-bottom", 11 }, { "border-bottom-color", 12 }, @@ -463,108 +562,114 @@ const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { { "border-top-style", 29 }, { "border-top-width", 30 }, { "border-width", 31 }, - { "bottom", 32 }, - { "caption-side", 33 }, - { "clear", 34 }, - { "clip", 35 }, - { "clip-bottom", 36 }, - { "clip-left", 37 }, - { "clip-right", 38 }, - { "clip-top", 39 }, - { "color", 40 }, - { "content", 41 }, - { "counter-increment", 42 }, - { "counter-reset", 43 }, - { "cue", 44 }, - { "cue-after", 45 }, - { "cue-before", 46 }, - { "cursor", 47 }, - { "cursor-image", 48 }, - { "direction", 49 }, - { "display", 50 }, - { "elevation", 51 }, - { "empty-cells", 52 }, - { "filter", 53 }, - { "float", 54 }, - { "font", 55 }, - { "font-family", 56 }, - { "font-size", 57 }, - { "font-size-adjust", 58 }, - { "font-stretch", 59 }, - { "font-style", 60 }, - { "font-variant", 61 }, - { "font-weight", 62 }, - { "height", 63 }, - { "left", 64 }, - { "letter-spacing", 65 }, - { "line-height", 66 }, - { "list-style", 67 }, - { "list-style-image", 68 }, - { "list-style-position", 69 }, - { "list-style-type", 70 }, - { "margin", 71 }, - { "margin-bottom", 72 }, - { "margin-left", 73 }, - { "margin-right", 74 }, - { "margin-top", 75 }, - { "marker-offset", 76 }, - { "marks", 77 }, - { "max-height", 78 }, - { "max-width", 79 }, - { "min-height", 80 }, - { "min-width", 81 }, - { "opacity", 82 }, - { "orphans", 83 }, - { "outline", 84 }, - { "outline-color", 85 }, - { "outline-style", 86 }, - { "outline-width", 87 }, - { "overflow", 88 }, - { "padding", 89 }, - { "padding-bottom", 90 }, - { "padding-left", 91 }, - { "padding-right", 92 }, - { "padding-top", 93 }, - { "page", 94 }, - { "page-break-after", 95 }, - { "page-break-before", 96 }, - { "page-break-inside", 97 }, - { "pause", 98 }, - { "pause-after", 99 }, - { "pause-before", 100 }, - { "pitch", 101 }, - { "pitch-range", 102 }, - { "play-during", 103 }, - { "position", 104 }, - { "quotes", 105 }, - { "richness", 106 }, - { "right", 107 }, - { "size", 108 }, - { "speak", 109 }, - { "speak-header", 110 }, - { "speak-numeral", 111 }, - { "speak-punctuation", 112 }, - { "speech-rate", 113 }, - { "stress", 114 }, - { "table-layout", 115 }, - { "text-align", 116 }, - { "text-decoration", 117 }, - { "text-indent", 118 }, - { "text-shadow", 119 }, - { "text-shadow-color", 120 }, - { "text-shadow-radius", 121 }, - { "text-shadow-x", 122 }, - { "text-shadow-y", 123 }, - { "text-transform", 124 }, - { "top", 125 }, - { "unicode-bidi", 126 }, - { "vertical-align", 127 }, - { "visibility", 128 }, - { "voice-family", 129 }, - { "volume", 130 }, - { "white-space", 131 }, - { "widows", 132 }, - { "width", 133 }, - { "word-spacing", 134 }, - { "z-index", 135 }, + { "border-x-spacing", 32 }, + { "border-y-spacing", 33 }, + { "bottom", 34 }, + { "caption-side", 35 }, + { "clear", 36 }, + { "clip", 37 }, + { "clip-bottom", 38 }, + { "clip-left", 39 }, + { "clip-right", 40 }, + { "clip-top", 41 }, + { "color", 42 }, + { "content", 43 }, + { "counter-increment", 44 }, + { "counter-reset", 45 }, + { "cue", 46 }, + { "cue-after", 47 }, + { "cue-before", 48 }, + { "cursor", 49 }, + { "direction", 50 }, + { "display", 51 }, + { "elevation", 52 }, + { "empty-cells", 53 }, + { "filter", 54 }, + { "float", 55 }, + { "font", 56 }, + { "font-family", 57 }, + { "font-size", 58 }, + { "font-size-adjust", 59 }, + { "font-stretch", 60 }, + { "font-style", 61 }, + { "font-variant", 62 }, + { "font-weight", 63 }, + { "height", 64 }, + { "left", 65 }, + { "letter-spacing", 66 }, + { "line-height", 67 }, + { "list-style", 68 }, + { "list-style-image", 69 }, + { "list-style-position", 70 }, + { "list-style-type", 71 }, + { "margin", 72 }, + { "margin-bottom", 73 }, + { "margin-left", 74 }, + { "margin-right", 75 }, + { "margin-top", 76 }, + { "marker-offset", 77 }, + { "marks", 78 }, + { "max-height", 79 }, + { "max-width", 80 }, + { "min-height", 81 }, + { "min-width", 82 }, + { "opacity", 83 }, + { "orphans", 84 }, + { "outline", 85 }, + { "outline-color", 86 }, + { "outline-style", 87 }, + { "outline-width", 88 }, + { "overflow", 89 }, + { "padding", 90 }, + { "padding-bottom", 91 }, + { "padding-left", 92 }, + { "padding-right", 93 }, + { "padding-top", 94 }, + { "page", 95 }, + { "page-break-after", 96 }, + { "page-break-before", 97 }, + { "page-break-inside", 98 }, + { "pause", 99 }, + { "pause-after", 100 }, + { "pause-before", 101 }, + { "pitch", 102 }, + { "pitch-range", 103 }, + { "play-during", 104 }, + { "play-during-flags", 105 }, + { "position", 106 }, + { "quotes", 107 }, + { "quotes-close", 108 }, + { "quotes-open", 109 }, + { "richness", 110 }, + { "right", 111 }, + { "size", 112 }, + { "size-height", 113 }, + { "size-width", 114 }, + { "speak", 115 }, + { "speak-header", 116 }, + { "speak-numeral", 117 }, + { "speak-punctuation", 118 }, + { "speech-rate", 119 }, + { "stress", 120 }, + { "table-layout", 121 }, + { "text-align", 122 }, + { "text-decoration", 123 }, + { "text-indent", 124 }, + { "text-shadow", 125 }, + { "text-shadow-color", 126 }, + { "text-shadow-radius", 127 }, + { "text-shadow-x", 128 }, + { "text-shadow-y", 129 }, + { "text-transform", 130 }, + { "top", 131 }, + { "unicode-bidi", 132 }, + { "vertical-align", 133 }, + { "visibility", 134 }, + { "voice-family", 135 }, + { "volume", 136 }, + { "white-space", 137 }, + { "widows", 138 }, + { "width", 139 }, + { "word-spacing", 140 }, + { "z-index", 141 }, }; diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h index 402462b3d736..92f3de0b8e8c 100644 --- a/layout/style/nsCSSProps.h +++ b/layout/style/nsCSSProps.h @@ -43,6 +43,56 @@ public: static const NameTableEntry kNameTable[]; static const PRInt32 kHintTable[]; + + // Keyword/Enum value tables + static const PRInt32 kAzimuthKTable[]; + static const PRInt32 kBackgroundAttachmentKTable[]; + static const PRInt32 kBackgroundColorKTable[]; + static const PRInt32 kBackgroundRepeatKTable[]; + static const PRInt32 kBorderCollapseKTable[]; + static const PRInt32 kBorderColorKTable[]; + static const PRInt32 kBorderStyleKTable[]; + static const PRInt32 kBorderWidthKTable[]; + static const PRInt32 kCaptionSideKTable[]; + static const PRInt32 kClearKTable[]; + static const PRInt32 kContentKTable[]; + static const PRInt32 kCursorKTable[]; + static const PRInt32 kDirectionKTable[]; + static const PRInt32 kDisplayKTable[]; + static const PRInt32 kElevationKTable[]; + static const PRInt32 kEmptyCellsKTable[]; + static const PRInt32 kFloatKTable[]; + static const PRInt32 kFontKTable[]; + static const PRInt32 kFontSizeKTable[]; + static const PRInt32 kFontStretchKTable[]; + static const PRInt32 kFontStyleKTable[]; + static const PRInt32 kFontVariantKTable[]; + static const PRInt32 kFontWeightKTable[]; + static const PRInt32 kListStylePositionKTable[]; + static const PRInt32 kListStyleKTable[]; + static const PRInt32 kOutlineColorKTable[]; + static const PRInt32 kOverflowKTable[]; + static const PRInt32 kPageBreakKTable[]; + static const PRInt32 kPageBreakInsideKTable[]; + static const PRInt32 kPageMarksKTable[]; + static const PRInt32 kPageSizeKTable[]; + static const PRInt32 kPitchKTable[]; + static const PRInt32 kPlayDuringKTable[]; + static const PRInt32 kPositionKTable[]; + static const PRInt32 kSpeakKTable[]; + static const PRInt32 kSpeakHeaderKTable[]; + static const PRInt32 kSpeakNumeralKTable[]; + static const PRInt32 kSpeakPunctuationKTable[]; + static const PRInt32 kSpeechRateKTable[]; + static const PRInt32 kTableLayoutKTable[]; + static const PRInt32 kTextAlignKTable[]; + static const PRInt32 kTextDecorationKTable[]; + static const PRInt32 kTextTransformKTable[]; + static const PRInt32 kUnicodeBidiKTable[]; + static const PRInt32 kVerticalAlignKTable[]; + static const PRInt32 kVisibilityKTable[]; + static const PRInt32 kVolumeKTable[]; + static const PRInt32 kWhitespaceKTable[]; }; #endif /* nsCSSProps_h___ */