From f82375c8508ce1e6b3bc5fa6e965b572c70b18e0 Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Sat, 3 Apr 1999 03:15:01 +0000 Subject: [PATCH] added -moz-border-radius git-svn-id: svn://10.0.0.236/trunk@26137 18797224-902f-48f8-a5cc-f745e15eee43 --- .../html/style/src/nsCSSDeclaration.cpp | 25 +- .../content/html/style/src/nsCSSParser.cpp | 2 + .../content/html/style/src/nsCSSStruct.cpp | 25 +- .../content/html/style/src/nsCSSStyleRule.cpp | 5 + .../html/style/src/nsICSSDeclaration.h | 1 + mozilla/content/shared/src/nsCSSProps.cpp | 1117 +++++++++-------- .../html/style/src/nsCSSDeclaration.cpp | 25 +- mozilla/layout/html/style/src/nsCSSParser.cpp | 2 + mozilla/layout/html/style/src/nsCSSPropIDs.h | 289 ++--- mozilla/layout/html/style/src/nsCSSProps.cpp | 1117 +++++++++-------- .../layout/html/style/src/nsCSSStyleRule.cpp | 5 + .../layout/html/style/src/nsICSSDeclaration.h | 1 + mozilla/layout/style/nsCSSDeclaration.cpp | 25 +- mozilla/layout/style/nsCSSParser.cpp | 2 + mozilla/layout/style/nsCSSProps.cpp | 1117 +++++++++-------- mozilla/layout/style/nsCSSStruct.cpp | 25 +- mozilla/layout/style/nsCSSStyleRule.cpp | 5 + mozilla/layout/tools/CSSProps.txt | 1 + 18 files changed, 1941 insertions(+), 1848 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index cc698689f5a..312c3a0d20b 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp @@ -341,6 +341,7 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const for (PRInt32 index = aIndent; --index >= 0; ) fputs(" ", out); nsAutoString buffer; + mBorderRadius.AppendToString(buffer, PROP__MOZ_BORDER_RADIUS); mOutlineWidth.AppendToString(buffer, PROP_OUTLINE_WIDTH); mOutlineColor.AppendToString(buffer, PROP_OUTLINE_COLOR); mOutlineStyle.AppendToString(buffer, PROP_OUTLINE_STYLE); @@ -1036,14 +1037,16 @@ CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: CSS_ENSURE(Margin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; - case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; - case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; + case PROP__MOZ_BORDER_RADIUS: mMargin->mBorderRadius = aValue; break; + case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; + case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; + case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; } } break; @@ -1634,15 +1637,17 @@ CSSDeclarationImpl::SetValueImportant(PRInt32 aProperty) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { CSS_ENSURE_IMPORTANT(Margin) { switch (aProperty) { - CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); - CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); - CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); + CSS_CASE_IMPORTANT(PROP__MOZ_BORDER_RADIUS, mMargin->mBorderRadius); + CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); + CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); + CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); } } } @@ -2257,14 +2262,16 @@ CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; - case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; - case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; + case PROP__MOZ_BORDER_RADIUS: aValue = mMargin->mBorderRadius; break; + case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; + case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; + case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; } } else { diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 0da6f5063e6..11bf4c3d90d 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -2297,6 +2297,8 @@ PRBool CSSParserImpl::ParseSingleValueProperty(PRInt32& aErrorCode, case PROP_BORDER_TOP_WIDTH: return ParseVariant(aErrorCode, aValue, VARIANT_HKL, nsCSSProps::kBorderWidthKTable); + case PROP__MOZ_BORDER_RADIUS: + return ParseVariant(aErrorCode, aValue, VARIANT_HLP, nsnull); case PROP_BOTTOM: case PROP_TOP: case PROP_LEFT: diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp index cc698689f5a..312c3a0d20b 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.cpp +++ b/mozilla/content/html/style/src/nsCSSStruct.cpp @@ -341,6 +341,7 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const for (PRInt32 index = aIndent; --index >= 0; ) fputs(" ", out); nsAutoString buffer; + mBorderRadius.AppendToString(buffer, PROP__MOZ_BORDER_RADIUS); mOutlineWidth.AppendToString(buffer, PROP_OUTLINE_WIDTH); mOutlineColor.AppendToString(buffer, PROP_OUTLINE_COLOR); mOutlineStyle.AppendToString(buffer, PROP_OUTLINE_STYLE); @@ -1036,14 +1037,16 @@ CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: CSS_ENSURE(Margin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; - case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; - case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; + case PROP__MOZ_BORDER_RADIUS: mMargin->mBorderRadius = aValue; break; + case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; + case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; + case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; } } break; @@ -1634,15 +1637,17 @@ CSSDeclarationImpl::SetValueImportant(PRInt32 aProperty) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { CSS_ENSURE_IMPORTANT(Margin) { switch (aProperty) { - CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); - CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); - CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); + CSS_CASE_IMPORTANT(PROP__MOZ_BORDER_RADIUS, mMargin->mBorderRadius); + CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); + CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); + CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); } } } @@ -2257,14 +2262,16 @@ CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; - case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; - case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; + case PROP__MOZ_BORDER_RADIUS: aValue = mMargin->mBorderRadius; break; + case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; + case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; + case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; } } else { diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index 40086e3717a..c7704990f44 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -1866,6 +1866,11 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, } } + // -moz-border-radius: length, inherit + if (! SetCoord(ourMargin->mBorderRadius, spacing->mBorderRadius, + SETCOORD_LPH, font, aPresContext)) { + } + // outline-width: length, enum, inherit if (! SetCoord(ourMargin->mOutlineWidth, spacing->mOutlineWidth, SETCOORD_LE, font, aPresContext)) { diff --git a/mozilla/content/html/style/src/nsICSSDeclaration.h b/mozilla/content/html/style/src/nsICSSDeclaration.h index fbfe214b970..36a39e8cc81 100644 --- a/mozilla/content/html/style/src/nsICSSDeclaration.h +++ b/mozilla/content/html/style/src/nsICSSDeclaration.h @@ -198,6 +198,7 @@ struct nsCSSMargin : public nsCSSStruct { nsCSSRect* mBorderWidth; // CHANGED nsCSSRect* mBorderColor; // CHANGED nsCSSRect* mBorderStyle; // CHANGED + nsCSSValue mBorderRadius; // NEW (extension) nsCSSValue mOutlineWidth; // NEW nsCSSValue mOutlineColor; // NEW nsCSSValue mOutlineStyle; // NEW diff --git a/mozilla/content/shared/src/nsCSSProps.cpp b/mozilla/content/shared/src/nsCSSProps.cpp index d6fd982c038..8d9f87576dc 100644 --- a/mozilla/content/shared/src/nsCSSProps.cpp +++ b/mozilla/content/shared/src/nsCSSProps.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSProps.h" -#define TOTAL_KEYWORDS 142 +#define TOTAL_KEYWORDS 143 #define MIN_WORD_LENGTH 3 #define MAX_WORD_LENGTH 21 -#define MIN_HASH_VALUE 13 -#define MAX_HASH_VALUE 1085 -/* maximum key range = 1073, duplicates = 0 */ +#define MIN_HASH_VALUE 260 +#define MAX_HASH_VALUE 1186 +/* maximum key range = 927, duplicates = 0 */ struct StaticNameTable { @@ -50,419 +50,429 @@ PRInt32 nsCSSProps::LookupName(const char* str) { static unsigned short asso_values[] = { - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 24, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 204, 24, 221, - 248, 28, 55, 153, 92, 157, 1086, 176, 42, 223, - 245, 130, 243, 32, 9, 2, 1, 242, 46, 17, - 232, 56, 252, 1086, 1086, 1086, 1086, 1086 + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 115, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 84, 184, 76, + 120, 248, 1, 192, 45, 108, 1187, 52, 98, 78, + 46, 127, 221, 59, 85, 219, 204, 211, 54, 111, + 216, 201, 122, 1187, 1187, 1187, 1187, 1187, }; static unsigned char lengthtable[] = { - 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 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, 6, 0, 0, 0, - 0, 0, 6, 0, 12, 0, 0, 0, 4, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 8, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 11, 0, 18, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 6, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 12, 17, 0, 0, 0, 0, 8, 0, 0, 11, 0, 0, - 0, 0, 0, 0, 0, 5, 0, 0, 17, 0, 0, 5, 0, 18, - 0, 10, 0, 18, 6, 17, 0, 0, 0, 16, 0, 0, 0, 0, - 0, 10, 0, 0, 0, 0, 0, 15, 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, 12, 13, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 19, 5, 0, 0, 0, 0, 9, 11, 0, 0, 0, 0, 12, 3, - 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, - 12, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 0, 0, 0, 0, 16, 0, 0, 0, 12, 11, 0, 10, 0, 0, - 11, 0, 0, 0, 0, 0, 5, 0, 19, 0, 17, 0, 0, 0, - 5, 0, 10, 7, 0, 0, 0, 0, 0, 0, 0, 13, 11, 12, - 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 0, 11, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, 6, 0, 14, - 0, 0, 0, 0, 3, 0, 0, 5, 0, 0, 0, 0, 0, 0, - 13, 0, 17, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, 10, 0, 12, 0, 11, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, - 11, 0, 0, 0, 0, 0, 0, 13, 0, 0, 7, 0, 0, 0, - 17, 0, 0, 0, 9, 12, 0, 12, 17, 0, 0, 0, 10, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 17, 0, 0, - 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 0, 0, 7, 0, 6, 0, 13, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 15, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, - 0, 10, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, - 0, 10, 0, 0, 11, 0, 0, 0, 0, 11, 0, 0, 0, 12, - 7, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 0, 17, 0, 0, 16, 21, 11, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 16, 11, 0, - 16, 0, 12, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 14, 0, 0, - 0, 0, 8, 15, 0, 0, 0, 0, 19, 0, 0, 0, 16, 0, - 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 0, 0, 13, 0, 0, 0, 0, - 0, 0, 0, 21, 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, 0, 0, 0, 0, 0, 0, 0, 7, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 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, 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, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 21, 0, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 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, 13, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 5, 0, + 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 5, + 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, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 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, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 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, 7, 0, + 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 9, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 11, + 0, 0, 7, 11, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 9, 0, 4, 3, 8, 4, 5, 0, + 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 0, 4, 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, 12, 13, 0, 0, 10, 9, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 10, + 14, 0, 0, 0, 0, 0, 0, 11, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 10, 0, 17, 0, 0, 0, 17, + 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, + 0, 12, 0, 0, 0, 0, 0, 0, 10, 11, 0, 0, 11, 0, + 10, 0, 0, 0, 0, 0, 0, 6, 7, 11, 0, 17, 0, 12, + 6, 0, 0, 0, 0, 0, 12, 0, 0, 0, 13, 0, 9, 11, + 13, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 16, + 0, 0, 0, 0, 0, 0, 18, 0, 0, 11, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 13, 14, 0, 0, 0, 0, 0, 0, 0, + 0, 19, 16, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 18, 0, 0, 0, 0, 0, 12, 0, 0, 0, + 13, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 0, 19, + 0, 0, 18, 0, 10, 0, 0, 15, 0, 0, 0, 0, 0, 0, + 0, 0, 8, 11, 0, 10, 21, 0, 0, 0, 0, 0, 0, 13, + 10, 0, 0, 0, 0, 0, 0, 21, 0, 0, 19, 0, 0, 0, + 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 17, 0, 17, 21, 17, 17, 0, 11, 0, 0, 0, 0, + 0, 0, 10, 0, 12, 8, 0, 16, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 0, 0, 12, 0, 0, 16, 0, 0, 12, 0, 0, + 12, 0, 19, 15, 0, 0, 0, 0, 0, 11, 10, 0, 16, 0, + 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 16, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 14, 0, 13, 0, 0, 14, 0, + 0, 0, 0, 0, 0, 0, 17, 0, 19, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 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, 17, 0, 0, 0, 0, 0, 0, 0, 0, 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, 16, 13, 0, 0, 0, 0, 0, 0, 0, + 0, 15, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 0, 18, 0, 0, 17, 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, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, }; static struct StaticNameTable wordlist[] = { - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"stress", 120}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"left", 65}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"float", 55}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"height", 64}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"right", 111}, - {""}, {""}, {""}, {""}, {""}, - {"border", 10}, - {""}, {""}, {""}, {""}, {""}, - {"widows", 138}, - {""}, - {"border-right", 21}, - {""}, {""}, {""}, - {"font", 56}, - {"size", 112}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-right-color", 22}, - {""}, {""}, {""}, {""}, {""}, - {"richness", 110}, - {""}, {""}, {""}, - {"border-top-style", 29}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-left", 17}, - {""}, - {"border-right-style", 23}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"border-style", 26}, - {""}, {""}, - {"filter", 54}, - {""}, - {"volume", 136}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-variant", 62}, - {"border-left-color", 18}, - {""}, {""}, {""}, {""}, - {"overflow", 89}, - {""}, {""}, - {"text-shadow", 125}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"width", 139}, - {""}, {""}, - {"border-left-style", 19}, - {""}, {""}, - {"clear", 36}, - {""}, - {"text-shadow-radius", 127}, - {""}, - {"font-style", 61}, - {""}, - {"border-right-width", 24}, - {"quotes", 107}, - {"text-shadow-color", 126}, - {""}, {""}, {""}, - {"border-top-width", 30}, - {""}, {""}, {""}, {""}, {""}, - {"list-style", 68}, - {""}, {""}, {""}, {""}, {""}, - {"list-style-type", 71}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, - {"empty-cells", 53}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"speak-header", 116}, - {"text-shadow-y", 129}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-left-width", 20}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom-color", 12}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom-style", 13}, - {"color", 42}, - {""}, {""}, {""}, {""}, - {"clip-left", 39}, - {"font-weight", 63}, - {""}, {""}, {""}, {""}, - {"border-width", 31}, - {"top", 131}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"speech-rate", 119}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-stretch", 60}, - {"orphans", 84}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"letter-spacing", 66}, - {""}, {""}, {""}, {""}, - {"border-top-color", 28}, - {""}, {""}, {""}, - {"border-color", 16}, - {"white-space", 137}, - {""}, - {"border-top", 27}, - {""}, {""}, - {"size-height", 113}, - {""}, {""}, {""}, {""}, {""}, - {"speak", 115}, - {""}, - {"border-bottom-width", 14}, - {""}, - {"counter-increment", 44}, - {""}, {""}, {""}, - {"marks", 78}, - {""}, - {"clip-right", 40}, - {"opacity", 83}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"counter-reset", 45}, - {"text-indent", 124}, - {"table-layout", 121}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"elevation", 52}, - {""}, {""}, - {"list-style-image", 69}, - {""}, - {"line-height", 67}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-size", 58}, - {""}, {""}, - {"page", 95}, - {"pause", 99}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"cursor", 49}, - {""}, - {"border-spacing", 25}, - {""}, {""}, {""}, {""}, - {"cue", 46}, - {""}, {""}, - {"pitch", 102}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"text-shadow-x", 128}, - {""}, - {"background-repeat", 7}, - {""}, {""}, {""}, - {"clip", 37}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"clip-bottom", 38}, - {""}, {""}, {""}, - {"size-width", 114}, - {""}, - {"voice-family", 135}, - {""}, - {"font-family", 57}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, - {"z-index", 141}, - {""}, {""}, - {"pause-after", 100}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom", 11}, - {""}, {""}, - {"azimuth", 0}, - {""}, {""}, {""}, - {"background-filter", 4}, - {""}, {""}, {""}, - {"cue-after", 47}, - {"quotes-close", 108}, - {""}, - {"pause-before", 101}, - {"page-break-before", 97}, - {""}, {""}, {""}, - {"min-height", 81}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"visibility", 134}, - {""}, - {"play-during-flags", 105}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-y-spacing", 33}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"text-transform", 130}, - {""}, {""}, - {"content", 43}, - {""}, - {"bottom", 34}, - {""}, - {"marker-offset", 77}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"max-height", 79}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"border-collapse", 15}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"min-width", 82}, - {""}, {""}, {""}, {""}, {""}, - {"text-align", 122}, - {""}, - {"caption-side", 35}, - {""}, {""}, {""}, {""}, - {"outline", 85}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"cue-before", 48}, - {""}, {""}, - {"quotes-open", 109}, - {""}, {""}, {""}, {""}, - {"pitch-range", 103}, - {""}, {""}, {""}, - {"word-spacing", 140}, - {"display", 51}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-image", 5}, - {""}, {""}, {""}, {""}, {""}, - {"max-width", 80}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"margin-right", 75}, - {""}, {""}, {""}, {""}, {""}, - {"page-break-inside", 98}, - {""}, {""}, - {"font-size-adjust", 59}, - {"background-attachment", 2}, - {"play-during", 104}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"outline-style", 87}, - {"background-color", 3}, - {"margin-left", 74}, - {""}, - {"page-break-after", 96}, - {""}, - {"padding-left", 92}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"background", 1}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"outline-width", 88}, - {""}, {""}, {""}, {""}, {""}, - {"vertical-align", 133}, - {""}, {""}, {""}, {""}, - {"clip-top", 41}, - {"text-decoration", 123}, - {""}, {""}, {""}, {""}, - {"list-style-position", 70}, - {""}, {""}, {""}, - {"border-x-spacing", 32}, - {""}, - {"speak-numeral", 117}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"direction", 50}, - {""}, {""}, - {"outline-color", 86}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-y-position", 9}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"padding-right", 93}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"padding", 90}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"margin", 72}, - {""}, {""}, - {"margin-top", 76}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"padding-bottom", 91}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"padding-top", 94}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"background-x-position", 8}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-position", 6}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"speak-punctuation", 118}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, - {"position", 106}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"margin-bottom", 73}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"unicode-bidi", 132} + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin", 73}, + {"",}, {"",}, {"",}, + {"clear", 37}, + {"",}, {"",}, {"",}, {"",}, + {"width", 140}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"filter", 55}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"color", 43}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"float", 56}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + + {"font", 57}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch", 103}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"marks", 79}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"clip", 38}, + {"",}, {"",}, + {"right", 112}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-family", 58}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"content", 44}, + {"",}, + {"azimuth", 1}, + {"cursor", 50}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"bottom", 35}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"orphans", 85}, + {"",}, + {"clip-left", 40}, + {"border", 11}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak", 116}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"overflow", 90}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-after", 101}, + {"",}, {"",}, + {"display", 52}, + {"margin-left", 75}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"max-width", 81}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-stretch", 61}, + {"",}, {"",}, {"",}, + {"cue", 47}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"padding", 91}, + {"",}, + {"min-width", 83}, + {"",}, + {"left", 66}, + {"top", 132}, + {"position", 107}, + {"page", 96}, + {"pause", 100}, + {"",}, {"",}, {"",}, + {"font-weight", 64}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"line-height", 68}, + {"",}, {"",}, {"",}, {"",}, + {"size", 113}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"visibility", 135}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"border-width", 32}, + {"margin-bottom", 74}, + {"",}, {"",}, + {"size-width", 115}, + {"direction", 51}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"cue-after", 48}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline", 86}, + {"",}, {"",}, {"",}, + {"margin-top", 77}, + {"vertical-align", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-bottom", 39}, + {"",}, {"",}, + {"border-color", 17}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"widows", 139}, + {"",}, + {"clip-right", 41}, + {"",}, + {"background-filter", 5}, + {"",}, {"",}, {"",}, + {"border-left-width", 21}, + {"",}, + {"quotes-open", 110}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"volume", 137}, + {"",}, {"",}, {"",}, + {"font-variant", 63}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background", 2}, + {"size-height", 114}, + {"",}, {"",}, + {"padding-top", 95}, + {"",}, + {"text-align", 123}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"height", 65}, + {"z-index", 142}, + {"border-left", 18}, + {"",}, + {"border-left-color", 19}, + {"",}, + {"margin-right", 76}, + {"quotes", 108}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"unicode-bidi", 133}, + {"",}, {"",}, {"",}, + {"outline-color", 87}, + {"",}, + {"font-size", 59}, + {"play-during", 105}, + {"padding-right", 94}, + {"",}, {"",}, {"",}, + {"elevation", 53}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-color", 4}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right-width", 25}, + {"",}, {"",}, + {"white-space", 138}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"opacity", 84}, + {"outline-width", 89}, + {"padding-bottom", 92}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-bottom-width", 15}, + {"border-top-width", 31}, + {"",}, {"",}, {"",}, {"",}, + {"border-top-color", 29}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch-range", 104}, + {"border-right-color", 23}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"voice-family", 136}, + {"",}, {"",}, {"",}, + {"border-bottom", 12}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-style", 62}, + {"",}, {"",}, + {"font-size-adjust", 60}, + {"",}, + {"border-bottom-color", 13}, + {"",}, {"",}, + {"-moz-border-radius", 0}, + {"",}, + {"max-height", 80}, + {"",}, {"",}, + {"border-collapse", 16}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-top", 42}, + {"speech-rate", 120}, + {"",}, + {"border-top", 28}, + {"background-y-position", 10}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"marker-offset", 78}, + {"min-height", 82}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-x-position", 9}, + {"",}, {"",}, + {"background-position", 7}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline-style", 88}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"stress", 121}, + {"",}, {"",}, + {"background-repeat", 8}, + {"",}, + {"counter-increment", 45}, + {"background-attachment", 3}, + {"border-left-style", 20}, + {"play-during-flags", 106}, + {"",}, + {"text-shadow", 126}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"list-style", 69}, + {"",}, + {"padding-left", 93}, + {"richness", 111}, + {"",}, + {"border-y-spacing", 34}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-indent", 125}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right", 22}, + {"",}, {"",}, + {"border-x-spacing", 33}, + {"",}, {"",}, + {"table-layout", 122}, + {"",}, {"",}, + {"caption-side", 36}, + {"",}, + {"list-style-position", 71}, + {"text-decoration", 124}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"empty-cells", 54}, + {"cue-before", 49}, + {"",}, + {"page-break-after", 97}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-spacing", 26}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-image", 6}, + {"word-spacing", 141}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"border-right-style", 24}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-transform", 131}, + {"",}, + {"speak-numeral", 118}, + {"",}, {"",}, + {"letter-spacing", 67}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-color", 127}, + {"",}, + {"border-bottom-style", 14}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"speak-header", 117}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"list-style-image", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"counter-reset", 46}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak-punctuation", 119}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"quotes-close", 109}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-top-style", 30}, + {"text-shadow-y", 130}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"list-style-type", 72}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-x", 129}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-radius", 128}, + {"",}, {"",}, + {"page-break-inside", 99}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"border-style", 27}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-before", 102}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"page-break-before", 98}, }; if (str != NULL) { @@ -524,146 +534,147 @@ PRInt32 nsCSSProps::LookupName(const char* str) } const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { - { "azimuth", 0 }, - { "background", 1 }, - { "background-attachment", 2 }, - { "background-color", 3 }, - { "background-filter", 4 }, - { "background-image", 5 }, - { "background-position", 6 }, - { "background-repeat", 7 }, - { "background-x-position", 8 }, - { "background-y-position", 9 }, - { "border", 10 }, - { "border-bottom", 11 }, - { "border-bottom-color", 12 }, - { "border-bottom-style", 13 }, - { "border-bottom-width", 14 }, - { "border-collapse", 15 }, - { "border-color", 16 }, - { "border-left", 17 }, - { "border-left-color", 18 }, - { "border-left-style", 19 }, - { "border-left-width", 20 }, - { "border-right", 21 }, - { "border-right-color", 22 }, - { "border-right-style", 23 }, - { "border-right-width", 24 }, - { "border-spacing", 25 }, - { "border-style", 26 }, - { "border-top", 27 }, - { "border-top-color", 28 }, - { "border-top-style", 29 }, - { "border-top-width", 30 }, - { "border-width", 31 }, - { "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 }, + { "-moz-border-radius", 0 }, + { "azimuth", 1 }, + { "background", 2 }, + { "background-attachment", 3 }, + { "background-color", 4 }, + { "background-filter", 5 }, + { "background-image", 6 }, + { "background-position", 7 }, + { "background-repeat", 8 }, + { "background-x-position", 9 }, + { "background-y-position", 10 }, + { "border", 11 }, + { "border-bottom", 12 }, + { "border-bottom-color", 13 }, + { "border-bottom-style", 14 }, + { "border-bottom-width", 15 }, + { "border-collapse", 16 }, + { "border-color", 17 }, + { "border-left", 18 }, + { "border-left-color", 19 }, + { "border-left-style", 20 }, + { "border-left-width", 21 }, + { "border-right", 22 }, + { "border-right-color", 23 }, + { "border-right-style", 24 }, + { "border-right-width", 25 }, + { "border-spacing", 26 }, + { "border-style", 27 }, + { "border-top", 28 }, + { "border-top-color", 29 }, + { "border-top-style", 30 }, + { "border-top-width", 31 }, + { "border-width", 32 }, + { "border-x-spacing", 33 }, + { "border-y-spacing", 34 }, + { "bottom", 35 }, + { "caption-side", 36 }, + { "clear", 37 }, + { "clip", 38 }, + { "clip-bottom", 39 }, + { "clip-left", 40 }, + { "clip-right", 41 }, + { "clip-top", 42 }, + { "color", 43 }, + { "content", 44 }, + { "counter-increment", 45 }, + { "counter-reset", 46 }, + { "cue", 47 }, + { "cue-after", 48 }, + { "cue-before", 49 }, + { "cursor", 50 }, + { "direction", 51 }, + { "display", 52 }, + { "elevation", 53 }, + { "empty-cells", 54 }, + { "filter", 55 }, + { "float", 56 }, + { "font", 57 }, + { "font-family", 58 }, + { "font-size", 59 }, + { "font-size-adjust", 60 }, + { "font-stretch", 61 }, + { "font-style", 62 }, + { "font-variant", 63 }, + { "font-weight", 64 }, + { "height", 65 }, + { "left", 66 }, + { "letter-spacing", 67 }, + { "line-height", 68 }, + { "list-style", 69 }, + { "list-style-image", 70 }, + { "list-style-position", 71 }, + { "list-style-type", 72 }, + { "margin", 73 }, + { "margin-bottom", 74 }, + { "margin-left", 75 }, + { "margin-right", 76 }, + { "margin-top", 77 }, + { "marker-offset", 78 }, + { "marks", 79 }, + { "max-height", 80 }, + { "max-width", 81 }, + { "min-height", 82 }, + { "min-width", 83 }, + { "opacity", 84 }, + { "orphans", 85 }, + { "outline", 86 }, + { "outline-color", 87 }, + { "outline-style", 88 }, + { "outline-width", 89 }, + { "overflow", 90 }, + { "padding", 91 }, + { "padding-bottom", 92 }, + { "padding-left", 93 }, + { "padding-right", 94 }, + { "padding-top", 95 }, + { "page", 96 }, + { "page-break-after", 97 }, + { "page-break-before", 98 }, + { "page-break-inside", 99 }, + { "pause", 100 }, + { "pause-after", 101 }, + { "pause-before", 102 }, + { "pitch", 103 }, + { "pitch-range", 104 }, + { "play-during", 105 }, + { "play-during-flags", 106 }, + { "position", 107 }, + { "quotes", 108 }, + { "quotes-close", 109 }, + { "quotes-open", 110 }, + { "richness", 111 }, + { "right", 112 }, + { "size", 113 }, + { "size-height", 114 }, + { "size-width", 115 }, + { "speak", 116 }, + { "speak-header", 117 }, + { "speak-numeral", 118 }, + { "speak-punctuation", 119 }, + { "speech-rate", 120 }, + { "stress", 121 }, + { "table-layout", 122 }, + { "text-align", 123 }, + { "text-decoration", 124 }, + { "text-indent", 125 }, + { "text-shadow", 126 }, + { "text-shadow-color", 127 }, + { "text-shadow-radius", 128 }, + { "text-shadow-x", 129 }, + { "text-shadow-y", 130 }, + { "text-transform", 131 }, + { "top", 132 }, + { "unicode-bidi", 133 }, + { "vertical-align", 134 }, + { "visibility", 135 }, + { "voice-family", 136 }, + { "volume", 137 }, + { "white-space", 138 }, + { "widows", 139 }, + { "width", 140 }, + { "word-spacing", 141 }, + { "z-index", 142 }, }; diff --git a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp index cc698689f5a..312c3a0d20b 100644 --- a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp @@ -341,6 +341,7 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const for (PRInt32 index = aIndent; --index >= 0; ) fputs(" ", out); nsAutoString buffer; + mBorderRadius.AppendToString(buffer, PROP__MOZ_BORDER_RADIUS); mOutlineWidth.AppendToString(buffer, PROP_OUTLINE_WIDTH); mOutlineColor.AppendToString(buffer, PROP_OUTLINE_COLOR); mOutlineStyle.AppendToString(buffer, PROP_OUTLINE_STYLE); @@ -1036,14 +1037,16 @@ CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: CSS_ENSURE(Margin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; - case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; - case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; + case PROP__MOZ_BORDER_RADIUS: mMargin->mBorderRadius = aValue; break; + case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; + case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; + case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; } } break; @@ -1634,15 +1637,17 @@ CSSDeclarationImpl::SetValueImportant(PRInt32 aProperty) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { CSS_ENSURE_IMPORTANT(Margin) { switch (aProperty) { - CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); - CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); - CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); + CSS_CASE_IMPORTANT(PROP__MOZ_BORDER_RADIUS, mMargin->mBorderRadius); + CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); + CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); + CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); } } } @@ -2257,14 +2262,16 @@ CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; - case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; - case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; + case PROP__MOZ_BORDER_RADIUS: aValue = mMargin->mBorderRadius; break; + case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; + case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; + case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; } } else { diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp index 0da6f5063e6..11bf4c3d90d 100644 --- a/mozilla/layout/html/style/src/nsCSSParser.cpp +++ b/mozilla/layout/html/style/src/nsCSSParser.cpp @@ -2297,6 +2297,8 @@ PRBool CSSParserImpl::ParseSingleValueProperty(PRInt32& aErrorCode, case PROP_BORDER_TOP_WIDTH: return ParseVariant(aErrorCode, aValue, VARIANT_HKL, nsCSSProps::kBorderWidthKTable); + case PROP__MOZ_BORDER_RADIUS: + return ParseVariant(aErrorCode, aValue, VARIANT_HLP, nsnull); case PROP_BOTTOM: case PROP_TOP: case PROP_LEFT: diff --git a/mozilla/layout/html/style/src/nsCSSPropIDs.h b/mozilla/layout/html/style/src/nsCSSPropIDs.h index 05be8afc3a3..cf392b3e64b 100644 --- a/mozilla/layout/html/style/src/nsCSSPropIDs.h +++ b/mozilla/layout/html/style/src/nsCSSPropIDs.h @@ -1,144 +1,145 @@ -/* Do not edit - generated by ./genhash.pl */ -#define PROP_AZIMUTH 0 -#define PROP_BACKGROUND 1 -#define PROP_BACKGROUND_ATTACHMENT 2 -#define PROP_BACKGROUND_COLOR 3 -#define PROP_BACKGROUND_FILTER 4 -#define PROP_BACKGROUND_IMAGE 5 -#define PROP_BACKGROUND_POSITION 6 -#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 -#define PROP_BORDER_BOTTOM_STYLE 13 -#define PROP_BORDER_BOTTOM_WIDTH 14 -#define PROP_BORDER_COLLAPSE 15 -#define PROP_BORDER_COLOR 16 -#define PROP_BORDER_LEFT 17 -#define PROP_BORDER_LEFT_COLOR 18 -#define PROP_BORDER_LEFT_STYLE 19 -#define PROP_BORDER_LEFT_WIDTH 20 -#define PROP_BORDER_RIGHT 21 -#define PROP_BORDER_RIGHT_COLOR 22 -#define PROP_BORDER_RIGHT_STYLE 23 -#define PROP_BORDER_RIGHT_WIDTH 24 -#define PROP_BORDER_SPACING 25 -#define PROP_BORDER_STYLE 26 -#define PROP_BORDER_TOP 27 -#define PROP_BORDER_TOP_COLOR 28 -#define PROP_BORDER_TOP_STYLE 29 -#define PROP_BORDER_TOP_WIDTH 30 -#define PROP_BORDER_WIDTH 31 -#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 +/* Do not edit - generated by genhash.pl */ +#define PROP__MOZ_BORDER_RADIUS 0 +#define PROP_AZIMUTH 1 +#define PROP_BACKGROUND 2 +#define PROP_BACKGROUND_ATTACHMENT 3 +#define PROP_BACKGROUND_COLOR 4 +#define PROP_BACKGROUND_FILTER 5 +#define PROP_BACKGROUND_IMAGE 6 +#define PROP_BACKGROUND_POSITION 7 +#define PROP_BACKGROUND_REPEAT 8 +#define PROP_BACKGROUND_X_POSITION 9 +#define PROP_BACKGROUND_Y_POSITION 10 +#define PROP_BORDER 11 +#define PROP_BORDER_BOTTOM 12 +#define PROP_BORDER_BOTTOM_COLOR 13 +#define PROP_BORDER_BOTTOM_STYLE 14 +#define PROP_BORDER_BOTTOM_WIDTH 15 +#define PROP_BORDER_COLLAPSE 16 +#define PROP_BORDER_COLOR 17 +#define PROP_BORDER_LEFT 18 +#define PROP_BORDER_LEFT_COLOR 19 +#define PROP_BORDER_LEFT_STYLE 20 +#define PROP_BORDER_LEFT_WIDTH 21 +#define PROP_BORDER_RIGHT 22 +#define PROP_BORDER_RIGHT_COLOR 23 +#define PROP_BORDER_RIGHT_STYLE 24 +#define PROP_BORDER_RIGHT_WIDTH 25 +#define PROP_BORDER_SPACING 26 +#define PROP_BORDER_STYLE 27 +#define PROP_BORDER_TOP 28 +#define PROP_BORDER_TOP_COLOR 29 +#define PROP_BORDER_TOP_STYLE 30 +#define PROP_BORDER_TOP_WIDTH 31 +#define PROP_BORDER_WIDTH 32 +#define PROP_BORDER_X_SPACING 33 +#define PROP_BORDER_Y_SPACING 34 +#define PROP_BOTTOM 35 +#define PROP_CAPTION_SIDE 36 +#define PROP_CLEAR 37 +#define PROP_CLIP 38 +#define PROP_CLIP_BOTTOM 39 +#define PROP_CLIP_LEFT 40 +#define PROP_CLIP_RIGHT 41 +#define PROP_CLIP_TOP 42 +#define PROP_COLOR 43 +#define PROP_CONTENT 44 +#define PROP_COUNTER_INCREMENT 45 +#define PROP_COUNTER_RESET 46 +#define PROP_CUE 47 +#define PROP_CUE_AFTER 48 +#define PROP_CUE_BEFORE 49 +#define PROP_CURSOR 50 +#define PROP_DIRECTION 51 +#define PROP_DISPLAY 52 +#define PROP_ELEVATION 53 +#define PROP_EMPTY_CELLS 54 +#define PROP_FILTER 55 +#define PROP_FLOAT 56 +#define PROP_FONT 57 +#define PROP_FONT_FAMILY 58 +#define PROP_FONT_SIZE 59 +#define PROP_FONT_SIZE_ADJUST 60 +#define PROP_FONT_STRETCH 61 +#define PROP_FONT_STYLE 62 +#define PROP_FONT_VARIANT 63 +#define PROP_FONT_WEIGHT 64 +#define PROP_HEIGHT 65 +#define PROP_LEFT 66 +#define PROP_LETTER_SPACING 67 +#define PROP_LINE_HEIGHT 68 +#define PROP_LIST_STYLE 69 +#define PROP_LIST_STYLE_IMAGE 70 +#define PROP_LIST_STYLE_POSITION 71 +#define PROP_LIST_STYLE_TYPE 72 +#define PROP_MARGIN 73 +#define PROP_MARGIN_BOTTOM 74 +#define PROP_MARGIN_LEFT 75 +#define PROP_MARGIN_RIGHT 76 +#define PROP_MARGIN_TOP 77 +#define PROP_MARKER_OFFSET 78 +#define PROP_MARKS 79 +#define PROP_MAX_HEIGHT 80 +#define PROP_MAX_WIDTH 81 +#define PROP_MIN_HEIGHT 82 +#define PROP_MIN_WIDTH 83 +#define PROP_OPACITY 84 +#define PROP_ORPHANS 85 +#define PROP_OUTLINE 86 +#define PROP_OUTLINE_COLOR 87 +#define PROP_OUTLINE_STYLE 88 +#define PROP_OUTLINE_WIDTH 89 +#define PROP_OVERFLOW 90 +#define PROP_PADDING 91 +#define PROP_PADDING_BOTTOM 92 +#define PROP_PADDING_LEFT 93 +#define PROP_PADDING_RIGHT 94 +#define PROP_PADDING_TOP 95 +#define PROP_PAGE 96 +#define PROP_PAGE_BREAK_AFTER 97 +#define PROP_PAGE_BREAK_BEFORE 98 +#define PROP_PAGE_BREAK_INSIDE 99 +#define PROP_PAUSE 100 +#define PROP_PAUSE_AFTER 101 +#define PROP_PAUSE_BEFORE 102 +#define PROP_PITCH 103 +#define PROP_PITCH_RANGE 104 +#define PROP_PLAY_DURING 105 +#define PROP_PLAY_DURING_FLAGS 106 +#define PROP_POSITION 107 +#define PROP_QUOTES 108 +#define PROP_QUOTES_CLOSE 109 +#define PROP_QUOTES_OPEN 110 +#define PROP_RICHNESS 111 +#define PROP_RIGHT 112 +#define PROP_SIZE 113 +#define PROP_SIZE_HEIGHT 114 +#define PROP_SIZE_WIDTH 115 +#define PROP_SPEAK 116 +#define PROP_SPEAK_HEADER 117 +#define PROP_SPEAK_NUMERAL 118 +#define PROP_SPEAK_PUNCTUATION 119 +#define PROP_SPEECH_RATE 120 +#define PROP_STRESS 121 +#define PROP_TABLE_LAYOUT 122 +#define PROP_TEXT_ALIGN 123 +#define PROP_TEXT_DECORATION 124 +#define PROP_TEXT_INDENT 125 +#define PROP_TEXT_SHADOW 126 +#define PROP_TEXT_SHADOW_COLOR 127 +#define PROP_TEXT_SHADOW_RADIUS 128 +#define PROP_TEXT_SHADOW_X 129 +#define PROP_TEXT_SHADOW_Y 130 +#define PROP_TEXT_TRANSFORM 131 +#define PROP_TOP 132 +#define PROP_UNICODE_BIDI 133 +#define PROP_VERTICAL_ALIGN 134 +#define PROP_VISIBILITY 135 +#define PROP_VOICE_FAMILY 136 +#define PROP_VOLUME 137 +#define PROP_WHITE_SPACE 138 +#define PROP_WIDOWS 139 +#define PROP_WIDTH 140 +#define PROP_WORD_SPACING 141 +#define PROP_Z_INDEX 142 +#define PROP_MAX 143 diff --git a/mozilla/layout/html/style/src/nsCSSProps.cpp b/mozilla/layout/html/style/src/nsCSSProps.cpp index d6fd982c038..8d9f87576dc 100644 --- a/mozilla/layout/html/style/src/nsCSSProps.cpp +++ b/mozilla/layout/html/style/src/nsCSSProps.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSProps.h" -#define TOTAL_KEYWORDS 142 +#define TOTAL_KEYWORDS 143 #define MIN_WORD_LENGTH 3 #define MAX_WORD_LENGTH 21 -#define MIN_HASH_VALUE 13 -#define MAX_HASH_VALUE 1085 -/* maximum key range = 1073, duplicates = 0 */ +#define MIN_HASH_VALUE 260 +#define MAX_HASH_VALUE 1186 +/* maximum key range = 927, duplicates = 0 */ struct StaticNameTable { @@ -50,419 +50,429 @@ PRInt32 nsCSSProps::LookupName(const char* str) { static unsigned short asso_values[] = { - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 24, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 204, 24, 221, - 248, 28, 55, 153, 92, 157, 1086, 176, 42, 223, - 245, 130, 243, 32, 9, 2, 1, 242, 46, 17, - 232, 56, 252, 1086, 1086, 1086, 1086, 1086 + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 115, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 84, 184, 76, + 120, 248, 1, 192, 45, 108, 1187, 52, 98, 78, + 46, 127, 221, 59, 85, 219, 204, 211, 54, 111, + 216, 201, 122, 1187, 1187, 1187, 1187, 1187, }; static unsigned char lengthtable[] = { - 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 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, 6, 0, 0, 0, - 0, 0, 6, 0, 12, 0, 0, 0, 4, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 8, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 11, 0, 18, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 6, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 12, 17, 0, 0, 0, 0, 8, 0, 0, 11, 0, 0, - 0, 0, 0, 0, 0, 5, 0, 0, 17, 0, 0, 5, 0, 18, - 0, 10, 0, 18, 6, 17, 0, 0, 0, 16, 0, 0, 0, 0, - 0, 10, 0, 0, 0, 0, 0, 15, 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, 12, 13, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 19, 5, 0, 0, 0, 0, 9, 11, 0, 0, 0, 0, 12, 3, - 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, - 12, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 0, 0, 0, 0, 16, 0, 0, 0, 12, 11, 0, 10, 0, 0, - 11, 0, 0, 0, 0, 0, 5, 0, 19, 0, 17, 0, 0, 0, - 5, 0, 10, 7, 0, 0, 0, 0, 0, 0, 0, 13, 11, 12, - 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 0, 11, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, 6, 0, 14, - 0, 0, 0, 0, 3, 0, 0, 5, 0, 0, 0, 0, 0, 0, - 13, 0, 17, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, 10, 0, 12, 0, 11, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, - 11, 0, 0, 0, 0, 0, 0, 13, 0, 0, 7, 0, 0, 0, - 17, 0, 0, 0, 9, 12, 0, 12, 17, 0, 0, 0, 10, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 17, 0, 0, - 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 0, 0, 7, 0, 6, 0, 13, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 15, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, - 0, 10, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, - 0, 10, 0, 0, 11, 0, 0, 0, 0, 11, 0, 0, 0, 12, - 7, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 0, 17, 0, 0, 16, 21, 11, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 16, 11, 0, - 16, 0, 12, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 14, 0, 0, - 0, 0, 8, 15, 0, 0, 0, 0, 19, 0, 0, 0, 16, 0, - 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 0, 0, 13, 0, 0, 0, 0, - 0, 0, 0, 21, 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, 0, 0, 0, 0, 0, 0, 0, 7, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 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, 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, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 21, 0, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 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, 13, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 5, 0, + 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 5, + 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, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 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, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 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, 7, 0, + 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 9, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 11, + 0, 0, 7, 11, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 9, 0, 4, 3, 8, 4, 5, 0, + 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 0, 4, 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, 12, 13, 0, 0, 10, 9, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 10, + 14, 0, 0, 0, 0, 0, 0, 11, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 10, 0, 17, 0, 0, 0, 17, + 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, + 0, 12, 0, 0, 0, 0, 0, 0, 10, 11, 0, 0, 11, 0, + 10, 0, 0, 0, 0, 0, 0, 6, 7, 11, 0, 17, 0, 12, + 6, 0, 0, 0, 0, 0, 12, 0, 0, 0, 13, 0, 9, 11, + 13, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 16, + 0, 0, 0, 0, 0, 0, 18, 0, 0, 11, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 13, 14, 0, 0, 0, 0, 0, 0, 0, + 0, 19, 16, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 18, 0, 0, 0, 0, 0, 12, 0, 0, 0, + 13, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 0, 19, + 0, 0, 18, 0, 10, 0, 0, 15, 0, 0, 0, 0, 0, 0, + 0, 0, 8, 11, 0, 10, 21, 0, 0, 0, 0, 0, 0, 13, + 10, 0, 0, 0, 0, 0, 0, 21, 0, 0, 19, 0, 0, 0, + 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 17, 0, 17, 21, 17, 17, 0, 11, 0, 0, 0, 0, + 0, 0, 10, 0, 12, 8, 0, 16, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 0, 0, 12, 0, 0, 16, 0, 0, 12, 0, 0, + 12, 0, 19, 15, 0, 0, 0, 0, 0, 11, 10, 0, 16, 0, + 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 16, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 14, 0, 13, 0, 0, 14, 0, + 0, 0, 0, 0, 0, 0, 17, 0, 19, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 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, 17, 0, 0, 0, 0, 0, 0, 0, 0, 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, 16, 13, 0, 0, 0, 0, 0, 0, 0, + 0, 15, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 0, 18, 0, 0, 17, 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, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, }; static struct StaticNameTable wordlist[] = { - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"stress", 120}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"left", 65}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"float", 55}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"height", 64}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"right", 111}, - {""}, {""}, {""}, {""}, {""}, - {"border", 10}, - {""}, {""}, {""}, {""}, {""}, - {"widows", 138}, - {""}, - {"border-right", 21}, - {""}, {""}, {""}, - {"font", 56}, - {"size", 112}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-right-color", 22}, - {""}, {""}, {""}, {""}, {""}, - {"richness", 110}, - {""}, {""}, {""}, - {"border-top-style", 29}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-left", 17}, - {""}, - {"border-right-style", 23}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"border-style", 26}, - {""}, {""}, - {"filter", 54}, - {""}, - {"volume", 136}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-variant", 62}, - {"border-left-color", 18}, - {""}, {""}, {""}, {""}, - {"overflow", 89}, - {""}, {""}, - {"text-shadow", 125}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"width", 139}, - {""}, {""}, - {"border-left-style", 19}, - {""}, {""}, - {"clear", 36}, - {""}, - {"text-shadow-radius", 127}, - {""}, - {"font-style", 61}, - {""}, - {"border-right-width", 24}, - {"quotes", 107}, - {"text-shadow-color", 126}, - {""}, {""}, {""}, - {"border-top-width", 30}, - {""}, {""}, {""}, {""}, {""}, - {"list-style", 68}, - {""}, {""}, {""}, {""}, {""}, - {"list-style-type", 71}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, - {"empty-cells", 53}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"speak-header", 116}, - {"text-shadow-y", 129}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-left-width", 20}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom-color", 12}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom-style", 13}, - {"color", 42}, - {""}, {""}, {""}, {""}, - {"clip-left", 39}, - {"font-weight", 63}, - {""}, {""}, {""}, {""}, - {"border-width", 31}, - {"top", 131}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"speech-rate", 119}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-stretch", 60}, - {"orphans", 84}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"letter-spacing", 66}, - {""}, {""}, {""}, {""}, - {"border-top-color", 28}, - {""}, {""}, {""}, - {"border-color", 16}, - {"white-space", 137}, - {""}, - {"border-top", 27}, - {""}, {""}, - {"size-height", 113}, - {""}, {""}, {""}, {""}, {""}, - {"speak", 115}, - {""}, - {"border-bottom-width", 14}, - {""}, - {"counter-increment", 44}, - {""}, {""}, {""}, - {"marks", 78}, - {""}, - {"clip-right", 40}, - {"opacity", 83}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"counter-reset", 45}, - {"text-indent", 124}, - {"table-layout", 121}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"elevation", 52}, - {""}, {""}, - {"list-style-image", 69}, - {""}, - {"line-height", 67}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-size", 58}, - {""}, {""}, - {"page", 95}, - {"pause", 99}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"cursor", 49}, - {""}, - {"border-spacing", 25}, - {""}, {""}, {""}, {""}, - {"cue", 46}, - {""}, {""}, - {"pitch", 102}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"text-shadow-x", 128}, - {""}, - {"background-repeat", 7}, - {""}, {""}, {""}, - {"clip", 37}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"clip-bottom", 38}, - {""}, {""}, {""}, - {"size-width", 114}, - {""}, - {"voice-family", 135}, - {""}, - {"font-family", 57}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, - {"z-index", 141}, - {""}, {""}, - {"pause-after", 100}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom", 11}, - {""}, {""}, - {"azimuth", 0}, - {""}, {""}, {""}, - {"background-filter", 4}, - {""}, {""}, {""}, - {"cue-after", 47}, - {"quotes-close", 108}, - {""}, - {"pause-before", 101}, - {"page-break-before", 97}, - {""}, {""}, {""}, - {"min-height", 81}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"visibility", 134}, - {""}, - {"play-during-flags", 105}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-y-spacing", 33}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"text-transform", 130}, - {""}, {""}, - {"content", 43}, - {""}, - {"bottom", 34}, - {""}, - {"marker-offset", 77}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"max-height", 79}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"border-collapse", 15}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"min-width", 82}, - {""}, {""}, {""}, {""}, {""}, - {"text-align", 122}, - {""}, - {"caption-side", 35}, - {""}, {""}, {""}, {""}, - {"outline", 85}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"cue-before", 48}, - {""}, {""}, - {"quotes-open", 109}, - {""}, {""}, {""}, {""}, - {"pitch-range", 103}, - {""}, {""}, {""}, - {"word-spacing", 140}, - {"display", 51}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-image", 5}, - {""}, {""}, {""}, {""}, {""}, - {"max-width", 80}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"margin-right", 75}, - {""}, {""}, {""}, {""}, {""}, - {"page-break-inside", 98}, - {""}, {""}, - {"font-size-adjust", 59}, - {"background-attachment", 2}, - {"play-during", 104}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"outline-style", 87}, - {"background-color", 3}, - {"margin-left", 74}, - {""}, - {"page-break-after", 96}, - {""}, - {"padding-left", 92}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"background", 1}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"outline-width", 88}, - {""}, {""}, {""}, {""}, {""}, - {"vertical-align", 133}, - {""}, {""}, {""}, {""}, - {"clip-top", 41}, - {"text-decoration", 123}, - {""}, {""}, {""}, {""}, - {"list-style-position", 70}, - {""}, {""}, {""}, - {"border-x-spacing", 32}, - {""}, - {"speak-numeral", 117}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"direction", 50}, - {""}, {""}, - {"outline-color", 86}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-y-position", 9}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"padding-right", 93}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"padding", 90}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"margin", 72}, - {""}, {""}, - {"margin-top", 76}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"padding-bottom", 91}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"padding-top", 94}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"background-x-position", 8}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-position", 6}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"speak-punctuation", 118}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, - {"position", 106}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"margin-bottom", 73}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"unicode-bidi", 132} + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin", 73}, + {"",}, {"",}, {"",}, + {"clear", 37}, + {"",}, {"",}, {"",}, {"",}, + {"width", 140}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"filter", 55}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"color", 43}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"float", 56}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + + {"font", 57}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch", 103}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"marks", 79}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"clip", 38}, + {"",}, {"",}, + {"right", 112}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-family", 58}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"content", 44}, + {"",}, + {"azimuth", 1}, + {"cursor", 50}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"bottom", 35}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"orphans", 85}, + {"",}, + {"clip-left", 40}, + {"border", 11}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak", 116}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"overflow", 90}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-after", 101}, + {"",}, {"",}, + {"display", 52}, + {"margin-left", 75}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"max-width", 81}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-stretch", 61}, + {"",}, {"",}, {"",}, + {"cue", 47}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"padding", 91}, + {"",}, + {"min-width", 83}, + {"",}, + {"left", 66}, + {"top", 132}, + {"position", 107}, + {"page", 96}, + {"pause", 100}, + {"",}, {"",}, {"",}, + {"font-weight", 64}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"line-height", 68}, + {"",}, {"",}, {"",}, {"",}, + {"size", 113}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"visibility", 135}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"border-width", 32}, + {"margin-bottom", 74}, + {"",}, {"",}, + {"size-width", 115}, + {"direction", 51}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"cue-after", 48}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline", 86}, + {"",}, {"",}, {"",}, + {"margin-top", 77}, + {"vertical-align", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-bottom", 39}, + {"",}, {"",}, + {"border-color", 17}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"widows", 139}, + {"",}, + {"clip-right", 41}, + {"",}, + {"background-filter", 5}, + {"",}, {"",}, {"",}, + {"border-left-width", 21}, + {"",}, + {"quotes-open", 110}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"volume", 137}, + {"",}, {"",}, {"",}, + {"font-variant", 63}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background", 2}, + {"size-height", 114}, + {"",}, {"",}, + {"padding-top", 95}, + {"",}, + {"text-align", 123}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"height", 65}, + {"z-index", 142}, + {"border-left", 18}, + {"",}, + {"border-left-color", 19}, + {"",}, + {"margin-right", 76}, + {"quotes", 108}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"unicode-bidi", 133}, + {"",}, {"",}, {"",}, + {"outline-color", 87}, + {"",}, + {"font-size", 59}, + {"play-during", 105}, + {"padding-right", 94}, + {"",}, {"",}, {"",}, + {"elevation", 53}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-color", 4}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right-width", 25}, + {"",}, {"",}, + {"white-space", 138}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"opacity", 84}, + {"outline-width", 89}, + {"padding-bottom", 92}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-bottom-width", 15}, + {"border-top-width", 31}, + {"",}, {"",}, {"",}, {"",}, + {"border-top-color", 29}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch-range", 104}, + {"border-right-color", 23}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"voice-family", 136}, + {"",}, {"",}, {"",}, + {"border-bottom", 12}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-style", 62}, + {"",}, {"",}, + {"font-size-adjust", 60}, + {"",}, + {"border-bottom-color", 13}, + {"",}, {"",}, + {"-moz-border-radius", 0}, + {"",}, + {"max-height", 80}, + {"",}, {"",}, + {"border-collapse", 16}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-top", 42}, + {"speech-rate", 120}, + {"",}, + {"border-top", 28}, + {"background-y-position", 10}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"marker-offset", 78}, + {"min-height", 82}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-x-position", 9}, + {"",}, {"",}, + {"background-position", 7}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline-style", 88}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"stress", 121}, + {"",}, {"",}, + {"background-repeat", 8}, + {"",}, + {"counter-increment", 45}, + {"background-attachment", 3}, + {"border-left-style", 20}, + {"play-during-flags", 106}, + {"",}, + {"text-shadow", 126}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"list-style", 69}, + {"",}, + {"padding-left", 93}, + {"richness", 111}, + {"",}, + {"border-y-spacing", 34}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-indent", 125}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right", 22}, + {"",}, {"",}, + {"border-x-spacing", 33}, + {"",}, {"",}, + {"table-layout", 122}, + {"",}, {"",}, + {"caption-side", 36}, + {"",}, + {"list-style-position", 71}, + {"text-decoration", 124}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"empty-cells", 54}, + {"cue-before", 49}, + {"",}, + {"page-break-after", 97}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-spacing", 26}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-image", 6}, + {"word-spacing", 141}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"border-right-style", 24}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-transform", 131}, + {"",}, + {"speak-numeral", 118}, + {"",}, {"",}, + {"letter-spacing", 67}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-color", 127}, + {"",}, + {"border-bottom-style", 14}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"speak-header", 117}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"list-style-image", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"counter-reset", 46}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak-punctuation", 119}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"quotes-close", 109}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-top-style", 30}, + {"text-shadow-y", 130}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"list-style-type", 72}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-x", 129}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-radius", 128}, + {"",}, {"",}, + {"page-break-inside", 99}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"border-style", 27}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-before", 102}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"page-break-before", 98}, }; if (str != NULL) { @@ -524,146 +534,147 @@ PRInt32 nsCSSProps::LookupName(const char* str) } const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { - { "azimuth", 0 }, - { "background", 1 }, - { "background-attachment", 2 }, - { "background-color", 3 }, - { "background-filter", 4 }, - { "background-image", 5 }, - { "background-position", 6 }, - { "background-repeat", 7 }, - { "background-x-position", 8 }, - { "background-y-position", 9 }, - { "border", 10 }, - { "border-bottom", 11 }, - { "border-bottom-color", 12 }, - { "border-bottom-style", 13 }, - { "border-bottom-width", 14 }, - { "border-collapse", 15 }, - { "border-color", 16 }, - { "border-left", 17 }, - { "border-left-color", 18 }, - { "border-left-style", 19 }, - { "border-left-width", 20 }, - { "border-right", 21 }, - { "border-right-color", 22 }, - { "border-right-style", 23 }, - { "border-right-width", 24 }, - { "border-spacing", 25 }, - { "border-style", 26 }, - { "border-top", 27 }, - { "border-top-color", 28 }, - { "border-top-style", 29 }, - { "border-top-width", 30 }, - { "border-width", 31 }, - { "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 }, + { "-moz-border-radius", 0 }, + { "azimuth", 1 }, + { "background", 2 }, + { "background-attachment", 3 }, + { "background-color", 4 }, + { "background-filter", 5 }, + { "background-image", 6 }, + { "background-position", 7 }, + { "background-repeat", 8 }, + { "background-x-position", 9 }, + { "background-y-position", 10 }, + { "border", 11 }, + { "border-bottom", 12 }, + { "border-bottom-color", 13 }, + { "border-bottom-style", 14 }, + { "border-bottom-width", 15 }, + { "border-collapse", 16 }, + { "border-color", 17 }, + { "border-left", 18 }, + { "border-left-color", 19 }, + { "border-left-style", 20 }, + { "border-left-width", 21 }, + { "border-right", 22 }, + { "border-right-color", 23 }, + { "border-right-style", 24 }, + { "border-right-width", 25 }, + { "border-spacing", 26 }, + { "border-style", 27 }, + { "border-top", 28 }, + { "border-top-color", 29 }, + { "border-top-style", 30 }, + { "border-top-width", 31 }, + { "border-width", 32 }, + { "border-x-spacing", 33 }, + { "border-y-spacing", 34 }, + { "bottom", 35 }, + { "caption-side", 36 }, + { "clear", 37 }, + { "clip", 38 }, + { "clip-bottom", 39 }, + { "clip-left", 40 }, + { "clip-right", 41 }, + { "clip-top", 42 }, + { "color", 43 }, + { "content", 44 }, + { "counter-increment", 45 }, + { "counter-reset", 46 }, + { "cue", 47 }, + { "cue-after", 48 }, + { "cue-before", 49 }, + { "cursor", 50 }, + { "direction", 51 }, + { "display", 52 }, + { "elevation", 53 }, + { "empty-cells", 54 }, + { "filter", 55 }, + { "float", 56 }, + { "font", 57 }, + { "font-family", 58 }, + { "font-size", 59 }, + { "font-size-adjust", 60 }, + { "font-stretch", 61 }, + { "font-style", 62 }, + { "font-variant", 63 }, + { "font-weight", 64 }, + { "height", 65 }, + { "left", 66 }, + { "letter-spacing", 67 }, + { "line-height", 68 }, + { "list-style", 69 }, + { "list-style-image", 70 }, + { "list-style-position", 71 }, + { "list-style-type", 72 }, + { "margin", 73 }, + { "margin-bottom", 74 }, + { "margin-left", 75 }, + { "margin-right", 76 }, + { "margin-top", 77 }, + { "marker-offset", 78 }, + { "marks", 79 }, + { "max-height", 80 }, + { "max-width", 81 }, + { "min-height", 82 }, + { "min-width", 83 }, + { "opacity", 84 }, + { "orphans", 85 }, + { "outline", 86 }, + { "outline-color", 87 }, + { "outline-style", 88 }, + { "outline-width", 89 }, + { "overflow", 90 }, + { "padding", 91 }, + { "padding-bottom", 92 }, + { "padding-left", 93 }, + { "padding-right", 94 }, + { "padding-top", 95 }, + { "page", 96 }, + { "page-break-after", 97 }, + { "page-break-before", 98 }, + { "page-break-inside", 99 }, + { "pause", 100 }, + { "pause-after", 101 }, + { "pause-before", 102 }, + { "pitch", 103 }, + { "pitch-range", 104 }, + { "play-during", 105 }, + { "play-during-flags", 106 }, + { "position", 107 }, + { "quotes", 108 }, + { "quotes-close", 109 }, + { "quotes-open", 110 }, + { "richness", 111 }, + { "right", 112 }, + { "size", 113 }, + { "size-height", 114 }, + { "size-width", 115 }, + { "speak", 116 }, + { "speak-header", 117 }, + { "speak-numeral", 118 }, + { "speak-punctuation", 119 }, + { "speech-rate", 120 }, + { "stress", 121 }, + { "table-layout", 122 }, + { "text-align", 123 }, + { "text-decoration", 124 }, + { "text-indent", 125 }, + { "text-shadow", 126 }, + { "text-shadow-color", 127 }, + { "text-shadow-radius", 128 }, + { "text-shadow-x", 129 }, + { "text-shadow-y", 130 }, + { "text-transform", 131 }, + { "top", 132 }, + { "unicode-bidi", 133 }, + { "vertical-align", 134 }, + { "visibility", 135 }, + { "voice-family", 136 }, + { "volume", 137 }, + { "white-space", 138 }, + { "widows", 139 }, + { "width", 140 }, + { "word-spacing", 141 }, + { "z-index", 142 }, }; diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index 40086e3717a..c7704990f44 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -1866,6 +1866,11 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, } } + // -moz-border-radius: length, inherit + if (! SetCoord(ourMargin->mBorderRadius, spacing->mBorderRadius, + SETCOORD_LPH, font, aPresContext)) { + } + // outline-width: length, enum, inherit if (! SetCoord(ourMargin->mOutlineWidth, spacing->mOutlineWidth, SETCOORD_LE, font, aPresContext)) { diff --git a/mozilla/layout/html/style/src/nsICSSDeclaration.h b/mozilla/layout/html/style/src/nsICSSDeclaration.h index fbfe214b970..36a39e8cc81 100644 --- a/mozilla/layout/html/style/src/nsICSSDeclaration.h +++ b/mozilla/layout/html/style/src/nsICSSDeclaration.h @@ -198,6 +198,7 @@ struct nsCSSMargin : public nsCSSStruct { nsCSSRect* mBorderWidth; // CHANGED nsCSSRect* mBorderColor; // CHANGED nsCSSRect* mBorderStyle; // CHANGED + nsCSSValue mBorderRadius; // NEW (extension) nsCSSValue mOutlineWidth; // NEW nsCSSValue mOutlineColor; // NEW nsCSSValue mOutlineStyle; // NEW diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index cc698689f5a..312c3a0d20b 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/layout/style/nsCSSDeclaration.cpp @@ -341,6 +341,7 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const for (PRInt32 index = aIndent; --index >= 0; ) fputs(" ", out); nsAutoString buffer; + mBorderRadius.AppendToString(buffer, PROP__MOZ_BORDER_RADIUS); mOutlineWidth.AppendToString(buffer, PROP_OUTLINE_WIDTH); mOutlineColor.AppendToString(buffer, PROP_OUTLINE_COLOR); mOutlineStyle.AppendToString(buffer, PROP_OUTLINE_STYLE); @@ -1036,14 +1037,16 @@ CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: CSS_ENSURE(Margin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; - case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; - case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; + case PROP__MOZ_BORDER_RADIUS: mMargin->mBorderRadius = aValue; break; + case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; + case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; + case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; } } break; @@ -1634,15 +1637,17 @@ CSSDeclarationImpl::SetValueImportant(PRInt32 aProperty) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { CSS_ENSURE_IMPORTANT(Margin) { switch (aProperty) { - CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); - CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); - CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); + CSS_CASE_IMPORTANT(PROP__MOZ_BORDER_RADIUS, mMargin->mBorderRadius); + CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); + CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); + CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); } } } @@ -2257,14 +2262,16 @@ CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; - case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; - case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; + case PROP__MOZ_BORDER_RADIUS: aValue = mMargin->mBorderRadius; break; + case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; + case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; + case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; } } else { diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp index 0da6f5063e6..11bf4c3d90d 100644 --- a/mozilla/layout/style/nsCSSParser.cpp +++ b/mozilla/layout/style/nsCSSParser.cpp @@ -2297,6 +2297,8 @@ PRBool CSSParserImpl::ParseSingleValueProperty(PRInt32& aErrorCode, case PROP_BORDER_TOP_WIDTH: return ParseVariant(aErrorCode, aValue, VARIANT_HKL, nsCSSProps::kBorderWidthKTable); + case PROP__MOZ_BORDER_RADIUS: + return ParseVariant(aErrorCode, aValue, VARIANT_HLP, nsnull); case PROP_BOTTOM: case PROP_TOP: case PROP_LEFT: diff --git a/mozilla/layout/style/nsCSSProps.cpp b/mozilla/layout/style/nsCSSProps.cpp index d6fd982c038..8d9f87576dc 100644 --- a/mozilla/layout/style/nsCSSProps.cpp +++ b/mozilla/layout/style/nsCSSProps.cpp @@ -6,12 +6,12 @@ #include "plstr.h" #include "nsCSSProps.h" -#define TOTAL_KEYWORDS 142 +#define TOTAL_KEYWORDS 143 #define MIN_WORD_LENGTH 3 #define MAX_WORD_LENGTH 21 -#define MIN_HASH_VALUE 13 -#define MAX_HASH_VALUE 1085 -/* maximum key range = 1073, duplicates = 0 */ +#define MIN_HASH_VALUE 260 +#define MAX_HASH_VALUE 1186 +/* maximum key range = 927, duplicates = 0 */ struct StaticNameTable { @@ -50,419 +50,429 @@ PRInt32 nsCSSProps::LookupName(const char* str) { static unsigned short asso_values[] = { - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 24, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1086, 1086, 1086, 1086, 1086, 1086, 204, 24, 221, - 248, 28, 55, 153, 92, 157, 1086, 176, 42, 223, - 245, 130, 243, 32, 9, 2, 1, 242, 46, 17, - 232, 56, 252, 1086, 1086, 1086, 1086, 1086 + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 115, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, + 1187, 1187, 1187, 1187, 1187, 1187, 1187, 84, 184, 76, + 120, 248, 1, 192, 45, 108, 1187, 52, 98, 78, + 46, 127, 221, 59, 85, 219, 204, 211, 54, 111, + 216, 201, 122, 1187, 1187, 1187, 1187, 1187, }; static unsigned char lengthtable[] = { - 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 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, 6, 0, 0, 0, - 0, 0, 6, 0, 12, 0, 0, 0, 4, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, 8, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 11, 0, 18, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 6, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 12, 17, 0, 0, 0, 0, 8, 0, 0, 11, 0, 0, - 0, 0, 0, 0, 0, 5, 0, 0, 17, 0, 0, 5, 0, 18, - 0, 10, 0, 18, 6, 17, 0, 0, 0, 16, 0, 0, 0, 0, - 0, 10, 0, 0, 0, 0, 0, 15, 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, 12, 13, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 17, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 19, 5, 0, 0, 0, 0, 9, 11, 0, 0, 0, 0, 12, 3, - 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, - 12, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 0, 0, 0, 0, 16, 0, 0, 0, 12, 11, 0, 10, 0, 0, - 11, 0, 0, 0, 0, 0, 5, 0, 19, 0, 17, 0, 0, 0, - 5, 0, 10, 7, 0, 0, 0, 0, 0, 0, 0, 13, 11, 12, - 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 16, 0, 11, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, 6, 0, 14, - 0, 0, 0, 0, 3, 0, 0, 5, 0, 0, 0, 0, 0, 0, - 13, 0, 17, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, 10, 0, 12, 0, 11, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, - 11, 0, 0, 0, 0, 0, 0, 13, 0, 0, 7, 0, 0, 0, - 17, 0, 0, 0, 9, 12, 0, 12, 17, 0, 0, 0, 10, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 17, 0, 0, - 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 0, 0, 7, 0, 6, 0, 13, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 15, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, - 0, 10, 0, 12, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, - 0, 10, 0, 0, 11, 0, 0, 0, 0, 11, 0, 0, 0, 12, - 7, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, - 0, 17, 0, 0, 16, 21, 11, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 16, 11, 0, - 16, 0, 12, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 14, 0, 0, - 0, 0, 8, 15, 0, 0, 0, 0, 19, 0, 0, 0, 16, 0, - 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 9, 0, 0, 13, 0, 0, 0, 0, - 0, 0, 0, 21, 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, 0, 0, 0, 0, 0, 0, 0, 7, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 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, 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, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 21, 0, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 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, 13, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 5, 0, + 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 5, + 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, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 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, 5, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 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, 7, 0, + 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 9, 6, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 11, + 0, 0, 7, 11, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, + 0, 0, 12, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 0, 9, 0, 4, 3, 8, 4, 5, 0, + 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 0, 4, 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, 12, 13, 0, 0, 10, 9, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 10, + 14, 0, 0, 0, 0, 0, 0, 11, 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 0, 6, 0, 10, 0, 17, 0, 0, 0, 17, + 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, + 0, 12, 0, 0, 0, 0, 0, 0, 10, 11, 0, 0, 11, 0, + 10, 0, 0, 0, 0, 0, 0, 6, 7, 11, 0, 17, 0, 12, + 6, 0, 0, 0, 0, 0, 12, 0, 0, 0, 13, 0, 9, 11, + 13, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 16, + 0, 0, 0, 0, 0, 0, 18, 0, 0, 11, 0, 0, 0, 0, + 0, 0, 0, 0, 7, 13, 14, 0, 0, 0, 0, 0, 0, 0, + 0, 19, 16, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 11, 18, 0, 0, 0, 0, 0, 12, 0, 0, 0, + 13, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 16, 0, 19, + 0, 0, 18, 0, 10, 0, 0, 15, 0, 0, 0, 0, 0, 0, + 0, 0, 8, 11, 0, 10, 21, 0, 0, 0, 0, 0, 0, 13, + 10, 0, 0, 0, 0, 0, 0, 21, 0, 0, 19, 0, 0, 0, + 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 17, 0, 17, 21, 17, 17, 0, 11, 0, 0, 0, 0, + 0, 0, 10, 0, 12, 8, 0, 16, 0, 0, 0, 0, 0, 11, + 0, 0, 0, 0, 0, 12, 0, 0, 16, 0, 0, 12, 0, 0, + 12, 0, 19, 15, 0, 0, 0, 0, 0, 11, 10, 0, 16, 0, + 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 16, 12, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 14, 0, 13, 0, 0, 14, 0, + 0, 0, 0, 0, 0, 0, 17, 0, 19, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 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, 17, 0, 0, 0, 0, 0, 0, 0, 0, 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, 16, 13, 0, 0, 0, 0, 0, 0, 0, + 0, 15, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 0, 18, 0, 0, 17, 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, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, }; static struct StaticNameTable wordlist[] = { - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"stress", 120}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"left", 65}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"float", 55}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"height", 64}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"right", 111}, - {""}, {""}, {""}, {""}, {""}, - {"border", 10}, - {""}, {""}, {""}, {""}, {""}, - {"widows", 138}, - {""}, - {"border-right", 21}, - {""}, {""}, {""}, - {"font", 56}, - {"size", 112}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-right-color", 22}, - {""}, {""}, {""}, {""}, {""}, - {"richness", 110}, - {""}, {""}, {""}, - {"border-top-style", 29}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-left", 17}, - {""}, - {"border-right-style", 23}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"border-style", 26}, - {""}, {""}, - {"filter", 54}, - {""}, - {"volume", 136}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-variant", 62}, - {"border-left-color", 18}, - {""}, {""}, {""}, {""}, - {"overflow", 89}, - {""}, {""}, - {"text-shadow", 125}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"width", 139}, - {""}, {""}, - {"border-left-style", 19}, - {""}, {""}, - {"clear", 36}, - {""}, - {"text-shadow-radius", 127}, - {""}, - {"font-style", 61}, - {""}, - {"border-right-width", 24}, - {"quotes", 107}, - {"text-shadow-color", 126}, - {""}, {""}, {""}, - {"border-top-width", 30}, - {""}, {""}, {""}, {""}, {""}, - {"list-style", 68}, - {""}, {""}, {""}, {""}, {""}, - {"list-style-type", 71}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, - {"empty-cells", 53}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"speak-header", 116}, - {"text-shadow-y", 129}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-left-width", 20}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom-color", 12}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom-style", 13}, - {"color", 42}, - {""}, {""}, {""}, {""}, - {"clip-left", 39}, - {"font-weight", 63}, - {""}, {""}, {""}, {""}, - {"border-width", 31}, - {"top", 131}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"speech-rate", 119}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-stretch", 60}, - {"orphans", 84}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"letter-spacing", 66}, - {""}, {""}, {""}, {""}, - {"border-top-color", 28}, - {""}, {""}, {""}, - {"border-color", 16}, - {"white-space", 137}, - {""}, - {"border-top", 27}, - {""}, {""}, - {"size-height", 113}, - {""}, {""}, {""}, {""}, {""}, - {"speak", 115}, - {""}, - {"border-bottom-width", 14}, - {""}, - {"counter-increment", 44}, - {""}, {""}, {""}, - {"marks", 78}, - {""}, - {"clip-right", 40}, - {"opacity", 83}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"counter-reset", 45}, - {"text-indent", 124}, - {"table-layout", 121}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"elevation", 52}, - {""}, {""}, - {"list-style-image", 69}, - {""}, - {"line-height", 67}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"font-size", 58}, - {""}, {""}, - {"page", 95}, - {"pause", 99}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"cursor", 49}, - {""}, - {"border-spacing", 25}, - {""}, {""}, {""}, {""}, - {"cue", 46}, - {""}, {""}, - {"pitch", 102}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"text-shadow-x", 128}, - {""}, - {"background-repeat", 7}, - {""}, {""}, {""}, - {"clip", 37}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"clip-bottom", 38}, - {""}, {""}, {""}, - {"size-width", 114}, - {""}, - {"voice-family", 135}, - {""}, - {"font-family", 57}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, - {"z-index", 141}, - {""}, {""}, - {"pause-after", 100}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-bottom", 11}, - {""}, {""}, - {"azimuth", 0}, - {""}, {""}, {""}, - {"background-filter", 4}, - {""}, {""}, {""}, - {"cue-after", 47}, - {"quotes-close", 108}, - {""}, - {"pause-before", 101}, - {"page-break-before", 97}, - {""}, {""}, {""}, - {"min-height", 81}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"visibility", 134}, - {""}, - {"play-during-flags", 105}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"border-y-spacing", 33}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"text-transform", 130}, - {""}, {""}, - {"content", 43}, - {""}, - {"bottom", 34}, - {""}, - {"marker-offset", 77}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"max-height", 79}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"border-collapse", 15}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"min-width", 82}, - {""}, {""}, {""}, {""}, {""}, - {"text-align", 122}, - {""}, - {"caption-side", 35}, - {""}, {""}, {""}, {""}, - {"outline", 85}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"cue-before", 48}, - {""}, {""}, - {"quotes-open", 109}, - {""}, {""}, {""}, {""}, - {"pitch-range", 103}, - {""}, {""}, {""}, - {"word-spacing", 140}, - {"display", 51}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-image", 5}, - {""}, {""}, {""}, {""}, {""}, - {"max-width", 80}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"margin-right", 75}, - {""}, {""}, {""}, {""}, {""}, - {"page-break-inside", 98}, - {""}, {""}, - {"font-size-adjust", 59}, - {"background-attachment", 2}, - {"play-during", 104}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"outline-style", 87}, - {"background-color", 3}, - {"margin-left", 74}, - {""}, - {"page-break-after", 96}, - {""}, - {"padding-left", 92}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"background", 1}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"outline-width", 88}, - {""}, {""}, {""}, {""}, {""}, - {"vertical-align", 133}, - {""}, {""}, {""}, {""}, - {"clip-top", 41}, - {"text-decoration", 123}, - {""}, {""}, {""}, {""}, - {"list-style-position", 70}, - {""}, {""}, {""}, - {"border-x-spacing", 32}, - {""}, - {"speak-numeral", 117}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"direction", 50}, - {""}, {""}, - {"outline-color", 86}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-y-position", 9}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"padding-right", 93}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, - {"padding", 90}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"margin", 72}, - {""}, {""}, - {"margin-top", 76}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"padding-bottom", 91}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"padding-top", 94}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"background-x-position", 8}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {"background-position", 6}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, - {"speak-punctuation", 118}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, - {"position", 106}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, - {"margin-bottom", 73}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, - {""}, {""}, {""}, {""}, - {"unicode-bidi", 132} + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"margin", 73}, + {"",}, {"",}, {"",}, + {"clear", 37}, + {"",}, {"",}, {"",}, {"",}, + {"width", 140}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"filter", 55}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"color", 43}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"float", 56}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + + {"font", 57}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch", 103}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"marks", 79}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"clip", 38}, + {"",}, {"",}, + {"right", 112}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-family", 58}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"content", 44}, + {"",}, + {"azimuth", 1}, + {"cursor", 50}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"bottom", 35}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"orphans", 85}, + {"",}, + {"clip-left", 40}, + {"border", 11}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak", 116}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"overflow", 90}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-after", 101}, + {"",}, {"",}, + {"display", 52}, + {"margin-left", 75}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"max-width", 81}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-stretch", 61}, + {"",}, {"",}, {"",}, + {"cue", 47}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"padding", 91}, + {"",}, + {"min-width", 83}, + {"",}, + {"left", 66}, + {"top", 132}, + {"position", 107}, + {"page", 96}, + {"pause", 100}, + {"",}, {"",}, {"",}, + {"font-weight", 64}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, + {"line-height", 68}, + {"",}, {"",}, {"",}, {"",}, + {"size", 113}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"visibility", 135}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"border-width", 32}, + {"margin-bottom", 74}, + {"",}, {"",}, + {"size-width", 115}, + {"direction", 51}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"cue-after", 48}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline", 86}, + {"",}, {"",}, {"",}, + {"margin-top", 77}, + {"vertical-align", 134}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-bottom", 39}, + {"",}, {"",}, + {"border-color", 17}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"widows", 139}, + {"",}, + {"clip-right", 41}, + {"",}, + {"background-filter", 5}, + {"",}, {"",}, {"",}, + {"border-left-width", 21}, + {"",}, + {"quotes-open", 110}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"volume", 137}, + {"",}, {"",}, {"",}, + {"font-variant", 63}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background", 2}, + {"size-height", 114}, + {"",}, {"",}, + {"padding-top", 95}, + {"",}, + {"text-align", 123}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"height", 65}, + {"z-index", 142}, + {"border-left", 18}, + {"",}, + {"border-left-color", 19}, + {"",}, + {"margin-right", 76}, + {"quotes", 108}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"unicode-bidi", 133}, + {"",}, {"",}, {"",}, + {"outline-color", 87}, + {"",}, + {"font-size", 59}, + {"play-during", 105}, + {"padding-right", 94}, + {"",}, {"",}, {"",}, + {"elevation", 53}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-color", 4}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right-width", 25}, + {"",}, {"",}, + {"white-space", 138}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"opacity", 84}, + {"outline-width", 89}, + {"padding-bottom", 92}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-bottom-width", 15}, + {"border-top-width", 31}, + {"",}, {"",}, {"",}, {"",}, + {"border-top-color", 29}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pitch-range", 104}, + {"border-right-color", 23}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"voice-family", 136}, + {"",}, {"",}, {"",}, + {"border-bottom", 12}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"font-style", 62}, + {"",}, {"",}, + {"font-size-adjust", 60}, + {"",}, + {"border-bottom-color", 13}, + {"",}, {"",}, + {"-moz-border-radius", 0}, + {"",}, + {"max-height", 80}, + {"",}, {"",}, + {"border-collapse", 16}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"clip-top", 42}, + {"speech-rate", 120}, + {"",}, + {"border-top", 28}, + {"background-y-position", 10}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"marker-offset", 78}, + {"min-height", 82}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-x-position", 9}, + {"",}, {"",}, + {"background-position", 7}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"outline-style", 88}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"stress", 121}, + {"",}, {"",}, + {"background-repeat", 8}, + {"",}, + {"counter-increment", 45}, + {"background-attachment", 3}, + {"border-left-style", 20}, + {"play-during-flags", 106}, + {"",}, + {"text-shadow", 126}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"list-style", 69}, + {"",}, + {"padding-left", 93}, + {"richness", 111}, + {"",}, + {"border-y-spacing", 34}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-indent", 125}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-right", 22}, + {"",}, {"",}, + {"border-x-spacing", 33}, + {"",}, {"",}, + {"table-layout", 122}, + {"",}, {"",}, + {"caption-side", 36}, + {"",}, + {"list-style-position", 71}, + {"text-decoration", 124}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"empty-cells", 54}, + {"cue-before", 49}, + {"",}, + {"page-break-after", 97}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-spacing", 26}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"background-image", 6}, + {"word-spacing", 141}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, + {"border-right-style", 24}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-transform", 131}, + {"",}, + {"speak-numeral", 118}, + {"",}, {"",}, + {"letter-spacing", 67}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-color", 127}, + {"",}, + {"border-bottom-style", 14}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, + {"speak-header", 117}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"list-style-image", 70}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"counter-reset", 46}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"speak-punctuation", 119}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"quotes-close", 109}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"border-top-style", 30}, + {"text-shadow-y", 130}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"list-style-type", 72}, + {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-x", 129}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"text-shadow-radius", 128}, + {"",}, {"",}, + {"page-break-inside", 99}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, + {"border-style", 27}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"pause-before", 102}, + {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, + {"page-break-before", 98}, }; if (str != NULL) { @@ -524,146 +534,147 @@ PRInt32 nsCSSProps::LookupName(const char* str) } const nsCSSProps::NameTableEntry nsCSSProps::kNameTable[] = { - { "azimuth", 0 }, - { "background", 1 }, - { "background-attachment", 2 }, - { "background-color", 3 }, - { "background-filter", 4 }, - { "background-image", 5 }, - { "background-position", 6 }, - { "background-repeat", 7 }, - { "background-x-position", 8 }, - { "background-y-position", 9 }, - { "border", 10 }, - { "border-bottom", 11 }, - { "border-bottom-color", 12 }, - { "border-bottom-style", 13 }, - { "border-bottom-width", 14 }, - { "border-collapse", 15 }, - { "border-color", 16 }, - { "border-left", 17 }, - { "border-left-color", 18 }, - { "border-left-style", 19 }, - { "border-left-width", 20 }, - { "border-right", 21 }, - { "border-right-color", 22 }, - { "border-right-style", 23 }, - { "border-right-width", 24 }, - { "border-spacing", 25 }, - { "border-style", 26 }, - { "border-top", 27 }, - { "border-top-color", 28 }, - { "border-top-style", 29 }, - { "border-top-width", 30 }, - { "border-width", 31 }, - { "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 }, + { "-moz-border-radius", 0 }, + { "azimuth", 1 }, + { "background", 2 }, + { "background-attachment", 3 }, + { "background-color", 4 }, + { "background-filter", 5 }, + { "background-image", 6 }, + { "background-position", 7 }, + { "background-repeat", 8 }, + { "background-x-position", 9 }, + { "background-y-position", 10 }, + { "border", 11 }, + { "border-bottom", 12 }, + { "border-bottom-color", 13 }, + { "border-bottom-style", 14 }, + { "border-bottom-width", 15 }, + { "border-collapse", 16 }, + { "border-color", 17 }, + { "border-left", 18 }, + { "border-left-color", 19 }, + { "border-left-style", 20 }, + { "border-left-width", 21 }, + { "border-right", 22 }, + { "border-right-color", 23 }, + { "border-right-style", 24 }, + { "border-right-width", 25 }, + { "border-spacing", 26 }, + { "border-style", 27 }, + { "border-top", 28 }, + { "border-top-color", 29 }, + { "border-top-style", 30 }, + { "border-top-width", 31 }, + { "border-width", 32 }, + { "border-x-spacing", 33 }, + { "border-y-spacing", 34 }, + { "bottom", 35 }, + { "caption-side", 36 }, + { "clear", 37 }, + { "clip", 38 }, + { "clip-bottom", 39 }, + { "clip-left", 40 }, + { "clip-right", 41 }, + { "clip-top", 42 }, + { "color", 43 }, + { "content", 44 }, + { "counter-increment", 45 }, + { "counter-reset", 46 }, + { "cue", 47 }, + { "cue-after", 48 }, + { "cue-before", 49 }, + { "cursor", 50 }, + { "direction", 51 }, + { "display", 52 }, + { "elevation", 53 }, + { "empty-cells", 54 }, + { "filter", 55 }, + { "float", 56 }, + { "font", 57 }, + { "font-family", 58 }, + { "font-size", 59 }, + { "font-size-adjust", 60 }, + { "font-stretch", 61 }, + { "font-style", 62 }, + { "font-variant", 63 }, + { "font-weight", 64 }, + { "height", 65 }, + { "left", 66 }, + { "letter-spacing", 67 }, + { "line-height", 68 }, + { "list-style", 69 }, + { "list-style-image", 70 }, + { "list-style-position", 71 }, + { "list-style-type", 72 }, + { "margin", 73 }, + { "margin-bottom", 74 }, + { "margin-left", 75 }, + { "margin-right", 76 }, + { "margin-top", 77 }, + { "marker-offset", 78 }, + { "marks", 79 }, + { "max-height", 80 }, + { "max-width", 81 }, + { "min-height", 82 }, + { "min-width", 83 }, + { "opacity", 84 }, + { "orphans", 85 }, + { "outline", 86 }, + { "outline-color", 87 }, + { "outline-style", 88 }, + { "outline-width", 89 }, + { "overflow", 90 }, + { "padding", 91 }, + { "padding-bottom", 92 }, + { "padding-left", 93 }, + { "padding-right", 94 }, + { "padding-top", 95 }, + { "page", 96 }, + { "page-break-after", 97 }, + { "page-break-before", 98 }, + { "page-break-inside", 99 }, + { "pause", 100 }, + { "pause-after", 101 }, + { "pause-before", 102 }, + { "pitch", 103 }, + { "pitch-range", 104 }, + { "play-during", 105 }, + { "play-during-flags", 106 }, + { "position", 107 }, + { "quotes", 108 }, + { "quotes-close", 109 }, + { "quotes-open", 110 }, + { "richness", 111 }, + { "right", 112 }, + { "size", 113 }, + { "size-height", 114 }, + { "size-width", 115 }, + { "speak", 116 }, + { "speak-header", 117 }, + { "speak-numeral", 118 }, + { "speak-punctuation", 119 }, + { "speech-rate", 120 }, + { "stress", 121 }, + { "table-layout", 122 }, + { "text-align", 123 }, + { "text-decoration", 124 }, + { "text-indent", 125 }, + { "text-shadow", 126 }, + { "text-shadow-color", 127 }, + { "text-shadow-radius", 128 }, + { "text-shadow-x", 129 }, + { "text-shadow-y", 130 }, + { "text-transform", 131 }, + { "top", 132 }, + { "unicode-bidi", 133 }, + { "vertical-align", 134 }, + { "visibility", 135 }, + { "voice-family", 136 }, + { "volume", 137 }, + { "white-space", 138 }, + { "widows", 139 }, + { "width", 140 }, + { "word-spacing", 141 }, + { "z-index", 142 }, }; diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp index cc698689f5a..312c3a0d20b 100644 --- a/mozilla/layout/style/nsCSSStruct.cpp +++ b/mozilla/layout/style/nsCSSStruct.cpp @@ -341,6 +341,7 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const for (PRInt32 index = aIndent; --index >= 0; ) fputs(" ", out); nsAutoString buffer; + mBorderRadius.AppendToString(buffer, PROP__MOZ_BORDER_RADIUS); mOutlineWidth.AppendToString(buffer, PROP_OUTLINE_WIDTH); mOutlineColor.AppendToString(buffer, PROP_OUTLINE_COLOR); mOutlineStyle.AppendToString(buffer, PROP_OUTLINE_STYLE); @@ -1036,14 +1037,16 @@ CSSDeclarationImpl::AppendValue(PRInt32 aProperty, const nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: CSS_ENSURE(Margin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; - case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; - case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; + case PROP__MOZ_BORDER_RADIUS: mMargin->mBorderRadius = aValue; break; + case PROP_OUTLINE_WIDTH: mMargin->mOutlineWidth = aValue; break; + case PROP_OUTLINE_COLOR: mMargin->mOutlineColor = aValue; break; + case PROP_OUTLINE_STYLE: mMargin->mOutlineStyle = aValue; break; } } break; @@ -1634,15 +1637,17 @@ CSSDeclarationImpl::SetValueImportant(PRInt32 aProperty) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { CSS_ENSURE_IMPORTANT(Margin) { switch (aProperty) { - CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); - CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); - CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); + CSS_CASE_IMPORTANT(PROP__MOZ_BORDER_RADIUS, mMargin->mBorderRadius); + CSS_CASE_IMPORTANT(PROP_OUTLINE_WIDTH, mMargin->mOutlineWidth); + CSS_CASE_IMPORTANT(PROP_OUTLINE_COLOR, mMargin->mOutlineColor); + CSS_CASE_IMPORTANT(PROP_OUTLINE_STYLE, mMargin->mOutlineStyle); } } } @@ -2257,14 +2262,16 @@ CSSDeclarationImpl::GetValue(PRInt32 aProperty, nsCSSValue& aValue) } break; + case PROP__MOZ_BORDER_RADIUS: case PROP_OUTLINE_WIDTH: case PROP_OUTLINE_COLOR: case PROP_OUTLINE_STYLE: if (nsnull != mMargin) { switch (aProperty) { - case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; - case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; - case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; + case PROP__MOZ_BORDER_RADIUS: aValue = mMargin->mBorderRadius; break; + case PROP_OUTLINE_WIDTH: aValue = mMargin->mOutlineWidth; break; + case PROP_OUTLINE_COLOR: aValue = mMargin->mOutlineColor; break; + case PROP_OUTLINE_STYLE: aValue = mMargin->mOutlineStyle; break; } } else { diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index 40086e3717a..c7704990f44 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -1866,6 +1866,11 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, } } + // -moz-border-radius: length, inherit + if (! SetCoord(ourMargin->mBorderRadius, spacing->mBorderRadius, + SETCOORD_LPH, font, aPresContext)) { + } + // outline-width: length, enum, inherit if (! SetCoord(ourMargin->mOutlineWidth, spacing->mOutlineWidth, SETCOORD_LE, font, aPresContext)) { diff --git a/mozilla/layout/tools/CSSProps.txt b/mozilla/layout/tools/CSSProps.txt index db0096d77a1..d87b5c093ca 100644 --- a/mozilla/layout/tools/CSSProps.txt +++ b/mozilla/layout/tools/CSSProps.txt @@ -1,3 +1,4 @@ +-moz-border-radius azimuth background background-attachment