[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
hyatt
hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:48:43 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 70a63850dae628fd2c0c12c08250bc11ffd62900
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 25 20:47:53 2003 +0000
Rename box and inline-box to -khtml-box and -khtml-inline-box.
Reviewed by john
* khtml/css/cssparser.cpp:
(CSSParser::parseValue):
* khtml/css/cssvalues.c:
(hash_val):
(findValue):
* khtml/css/cssvalues.h:
* khtml/css/cssvalues.in:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ec0a09f..60ed59e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
2003-07-25 Dave Hyatt <hyatt at apple.com>
+ Rename box and inline-box to -khtml-box and -khtml-inline-box.
+
+ Reviewed by john
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ * khtml/css/cssvalues.c:
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h:
+ * khtml/css/cssvalues.in:
+
+2003-07-25 Dave Hyatt <hyatt at apple.com>
+
Fix for 3343529, inline blocks crashing Safari. There were lots of problems with
inlne-blocks. This code gets basic inline-blocks working properly (with no crashes).
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ec0a09f..60ed59e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
2003-07-25 Dave Hyatt <hyatt at apple.com>
+ Rename box and inline-box to -khtml-box and -khtml-inline-box.
+
+ Reviewed by john
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ * khtml/css/cssvalues.c:
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h:
+ * khtml/css/cssvalues.in:
+
+2003-07-25 Dave Hyatt <hyatt at apple.com>
+
Fix for 3343529, inline blocks crashing Safari. There were lots of problems with
inlne-blocks. This code gets basic inline-blocks working properly (with no crashes).
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 0e92919..056de50 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -527,7 +527,7 @@ bool CSSParser::parseValue( int propId, bool important )
// inline | block | list-item | run-in | inline-block | table |
// inline-table | table-row-group | table-header-group | table-footer-group | table-row |
// table-column-group | table-column | table-cell | table-caption | box | inline-box | none | inherit
- if ((id >= CSS_VAL_INLINE && id <= CSS_VAL_INLINE_BOX) || id == CSS_VAL_NONE)
+ if ((id >= CSS_VAL_INLINE && id <= CSS_VAL__KHTML_INLINE_BOX) || id == CSS_VAL_NONE)
valid_primitive = true;
break;
diff --git a/WebCore/khtml/css/cssvalues.c b/WebCore/khtml/css/cssvalues.c
index ff244dc..47328e8 100644
--- a/WebCore/khtml/css/cssvalues.c
+++ b/WebCore/khtml/css/cssvalues.c
@@ -7,7 +7,7 @@ struct css_value {
const char *name;
int id;
};
-/* maximum key range = 1818, duplicates = 1 */
+/* maximum key range = 1719, duplicates = 1 */
#ifdef __GNUC__
__inline
@@ -21,32 +21,32 @@ hash_val (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 20, 1818, 1818, 0, 20,
- 25, 30, 35, 40, 45, 50, 10, 0, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 0, 200, 95,
- 35, 170, 149, 4, 105, 0, 0, 99, 0, 53,
- 50, 205, 204, 30, 5, 10, 0, 255, 18, 97,
- 69, 235, 119, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818, 1818,
- 1818, 1818, 1818, 1818, 1818, 1818
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 20, 1719, 1719, 0, 20,
+ 25, 30, 35, 40, 45, 50, 10, 0, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 0, 200, 95,
+ 35, 170, 230, 4, 105, 0, 5, 198, 0, 4,
+ 50, 205, 24, 30, 5, 10, 0, 255, 8, 142,
+ 24, 29, 184, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 1719
};
register int hval = 0;
@@ -114,7 +114,7 @@ findValue (register const char *str, register unsigned int len)
MIN_WORD_LENGTH = 3,
MAX_WORD_LENGTH = 22,
MIN_HASH_VALUE = 0,
- MAX_HASH_VALUE = 1817
+ MAX_HASH_VALUE = 1718
};
static const struct css_value wordlist_value[] =
@@ -123,436 +123,428 @@ findValue (register const char *str, register unsigned int len)
{"ltr", CSS_VAL_LTR},
{"rtl", CSS_VAL_RTL},
{"800", CSS_VAL_800},
+ {"small", CSS_VAL_SMALL},
{"start", CSS_VAL_START},
{"100", CSS_VAL_100},
{"200", CSS_VAL_200},
+ {"mix", CSS_VAL_MIX},
{"300", CSS_VAL_300},
{"400", CSS_VAL_400},
+ {"gray", CSS_VAL_GRAY},
{"500", CSS_VAL_500},
{"600", CSS_VAL_600},
{"700", CSS_VAL_700},
- {"small", CSS_VAL_SMALL},
+ {"x-small", CSS_VAL_X_SMALL},
+ {"xx-small", CSS_VAL_XX_SMALL},
+ {"navy", CSS_VAL_NAVY},
{"italic", CSS_VAL_ITALIC},
- {"wait", CSS_VAL_WAIT},
{"static", CSS_VAL_STATIC},
{"right", CSS_VAL_RIGHT},
- {"mix", CSS_VAL_MIX},
{"disc", CSS_VAL_DISC},
- {"x-small", CSS_VAL_X_SMALL},
+ {"wait", CSS_VAL_WAIT},
{"thin", CSS_VAL_THIN},
+ {"small-caps", CSS_VAL_SMALL_CAPS},
{"hiragana", CSS_VAL_HIRAGANA},
{"teal", CSS_VAL_TEAL},
+ {"lime", CSS_VAL_LIME},
{"large", CSS_VAL_LARGE},
+ {"always", CSS_VAL_ALWAYS},
{"larger", CSS_VAL_LARGER},
+ {"smaller", CSS_VAL_SMALLER},
{"hand", CSS_VAL_HAND},
{"silver", CSS_VAL_SILVER},
+ {"text", CSS_VAL_TEXT},
+ {"pre", CSS_VAL_PRE},
+ {"list-item", CSS_VAL_LIST_ITEM},
+ {"grey", CSS_VAL_GREY},
{"red", CSS_VAL_RED},
{"ridge", CSS_VAL_RIDGE},
- {"xx-small", CSS_VAL_XX_SMALL},
- {"lime", CSS_VAL_LIME},
+ {"x-large", CSS_VAL_X_LARGE},
+ {"top", CSS_VAL_TOP},
{"inset", CSS_VAL_INSET},
- {"single", CSS_VAL_SINGLE},
- {"smaller", CSS_VAL_SMALLER},
- {"text", CSS_VAL_TEXT},
+ {"graytext", CSS_VAL_GRAYTEXT},
{"invert", CSS_VAL_INVERT},
- {"gray", CSS_VAL_GRAY},
- {"katakana", CSS_VAL_KATAKANA},
+ {"single", CSS_VAL_SINGLE},
+ {"portrait", CSS_VAL_PORTRAIT},
+ {"middle", CSS_VAL_MIDDLE},
+ {"xx-large", CSS_VAL_XX_LARGE},
+ {"avoid", CSS_VAL_AVOID},
{"solid", CSS_VAL_SOLID},
- {"list-item", CSS_VAL_LIST_ITEM},
{"end", CSS_VAL_END},
- {"avoid", CSS_VAL_AVOID},
+ {"normal", CSS_VAL_NORMAL},
{"inside", CSS_VAL_INSIDE},
- {"x-large", CSS_VAL_X_LARGE},
{"inline", CSS_VAL_INLINE},
+ {"vertical", CSS_VAL_VERTICAL},
+ {"armenian", CSS_VAL_ARMENIAN},
{"lighter", CSS_VAL_LIGHTER},
{"aqua", CSS_VAL_AQUA},
- {"vertical", CSS_VAL_VERTICAL},
- {"middle", CSS_VAL_MIDDLE},
- {"thick", CSS_VAL_THICK},
- {"navy", CSS_VAL_NAVY},
- {"wider", CSS_VAL_WIDER},
+ {"help", CSS_VAL_HELP},
+ {"decimal", CSS_VAL_DECIMAL},
{"hide", CSS_VAL_HIDE},
- {"normal", CSS_VAL_NORMAL},
+ {"transparent", CSS_VAL_TRANSPARENT},
{"scroll", CSS_VAL_SCROLL},
- {"left", CSS_VAL_LEFT},
+ {"fantasy", CSS_VAL_FANTASY},
{"highlight", CSS_VAL_HIGHLIGHT},
+ {"inline-axis", CSS_VAL_INLINE_AXIS},
{"cross", CSS_VAL_CROSS},
- {"armenian", CSS_VAL_ARMENIAN},
+ {"crop", CSS_VAL_CROP},
{"inherit", CSS_VAL_INHERIT},
- {"serif", CSS_VAL_SERIF},
- {"xx-large", CSS_VAL_XX_LARGE},
- {"always", CSS_VAL_ALWAYS},
- {"blink", CSS_VAL_BLINK},
- {"icon", CSS_VAL_ICON},
- {"decimal", CSS_VAL_DECIMAL},
- {"dashed", CSS_VAL_DASHED},
{"level", CSS_VAL_LEVEL},
+ {"icon", CSS_VAL_ICON},
+ {"wider", CSS_VAL_WIDER},
{"relative", CSS_VAL_RELATIVE},
+ {"dashed", CSS_VAL_DASHED},
{"circle", CSS_VAL_CIRCLE},
- {"inline-axis", CSS_VAL_INLINE_AXIS},
+ {"repeat", CSS_VAL_REPEAT},
{"table", CSS_VAL_TABLE},
- {"white", CSS_VAL_WHITE},
- {"pre", CSS_VAL_PRE},
+ {"caption", CSS_VAL_CAPTION},
+ {"separate", CSS_VAL_SEPARATE},
{"run-in", CSS_VAL_RUN_IN},
+ {"olive", CSS_VAL_OLIVE},
+ {"landscape", CSS_VAL_LANDSCAPE},
{"stretch", CSS_VAL_STRETCH},
+ {"move", CSS_VAL_MOVE},
+ {"visible", CSS_VAL_VISIBLE},
{"higher", CSS_VAL_HIGHER},
- {"small-caps", CSS_VAL_SMALL_CAPS},
- {"olive", CSS_VAL_OLIVE},
- {"black", CSS_VAL_BLACK},
{"hidden", CSS_VAL_HIDDEN},
- {"visible", CSS_VAL_VISIBLE},
+ {"thick", CSS_VAL_THICK},
{"green", CSS_VAL_GREEN},
- {"top", CSS_VAL_TOP},
- {"-khtml-right", CSS_VAL__KHTML_RIGHT},
- {"grey", CSS_VAL_GREY},
- {"show", CSS_VAL_SHOW},
- {"portrait", CSS_VAL_PORTRAIT},
- {"fixed", CSS_VAL_FIXED},
- {"sans-serif", CSS_VAL_SANS_SERIF},
+ {"left", CSS_VAL_LEFT},
+ {"small-caption", CSS_VAL_SMALL_CAPTION},
+ {"repeat-x", CSS_VAL_REPEAT_X},
+ {"serif", CSS_VAL_SERIF},
+ {"white", CSS_VAL_WHITE},
+ {"repeat-y", CSS_VAL_REPEAT_Y},
+ {"compact", CSS_VAL_COMPACT},
+ {"nowrap", CSS_VAL_NOWRAP},
+ {"progress", CSS_VAL_PROGRESS},
{"orange", CSS_VAL_ORANGE},
{"crosshair", CSS_VAL_CROSSHAIR},
{"georgian", CSS_VAL_GEORGIAN},
{"bold", CSS_VAL_BOLD},
- {"fantasy", CSS_VAL_FANTASY},
+ {"text-top", CSS_VAL_TEXT_TOP},
{"dotted", CSS_VAL_DOTTED},
- {"move", CSS_VAL_MOVE},
+ {"katakana", CSS_VAL_KATAKANA},
+ {"blink", CSS_VAL_BLINK},
+ {"multiple", CSS_VAL_MULTIPLE},
+ {"pointer", CSS_VAL_POINTER},
+ {"fixed", CSS_VAL_FIXED},
{"auto", CSS_VAL_AUTO},
+ {"-khtml-right", CSS_VAL__KHTML_RIGHT},
+ {"show", CSS_VAL_SHOW},
+ {"super", CSS_VAL_SUPER},
{"sub", CSS_VAL_SUB},
+ {"medium", CSS_VAL_MEDIUM},
+ {"maroon", CSS_VAL_MAROON},
{"square", CSS_VAL_SQUARE},
- {"box", CSS_VAL_BOX},
+ {"capitalize", CSS_VAL_CAPITALIZE},
{"none", CSS_VAL_NONE},
- {"lower", CSS_VAL_LOWER},
- {"help", CSS_VAL_HELP},
- {"graytext", CSS_VAL_GRAYTEXT},
- {"window", CSS_VAL_WINDOW},
+ {"purple", CSS_VAL_PURPLE},
+ {"menu", CSS_VAL_MENU},
{"center", CSS_VAL_CENTER},
- {"transparent", CSS_VAL_TRANSPARENT},
+ {"black", CSS_VAL_BLACK},
{"loud", CSS_VAL_LOUD},
{"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
{"status-bar", CSS_VAL_STATUS_BAR},
- {"s-resize", CSS_VAL_S_RESIZE},
- {"crop", CSS_VAL_CROP},
+ {"collapse", CSS_VAL_COLLAPSE},
+ {"sans-serif", CSS_VAL_SANS_SERIF},
+ {"expanded", CSS_VAL_EXPANDED},
{"both", CSS_VAL_BOTH},
- {"maroon", CSS_VAL_MAROON},
+ {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
{"scrollbar", CSS_VAL_SCROLLBAR},
- {"menu", CSS_VAL_MENU},
- {"-khtml-text", CSS_VAL__KHTML_TEXT},
- {"narrower", CSS_VAL_NARROWER},
- {"n-resize", CSS_VAL_N_RESIZE},
- {"lower-latin", CSS_VAL_LOWER_LATIN},
+ {"lower", CSS_VAL_LOWER},
+ {"justify", CSS_VAL_JUSTIFY},
{"reverse", CSS_VAL_REVERSE},
- {"repeat", CSS_VAL_REPEAT},
+ {"-khtml-text", CSS_VAL__KHTML_TEXT},
{"cursive", CSS_VAL_CURSIVE},
- {"caption", CSS_VAL_CAPTION},
- {"separate", CSS_VAL_SEPARATE},
- {"nowrap", CSS_VAL_NOWRAP},
- {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
- {"landscape", CSS_VAL_LANDSCAPE},
- {"medium", CSS_VAL_MEDIUM},
- {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
- {"capitalize", CSS_VAL_CAPITALIZE},
- {"w-resize", CSS_VAL_W_RESIZE},
+ {"yellow", CSS_VAL_YELLOW},
+ {"upper-latin", CSS_VAL_UPPER_LATIN},
+ {"captiontext", CSS_VAL_CAPTIONTEXT},
+ {"s-resize", CSS_VAL_S_RESIZE},
+ {"window", CSS_VAL_WINDOW},
+ {"embed", CSS_VAL_EMBED},
+ {"narrower", CSS_VAL_NARROWER},
{"above", CSS_VAL_ABOVE},
- {"block", CSS_VAL_BLOCK},
- {"baseline", CSS_VAL_BASELINE},
- {"sw-resize", CSS_VAL_SW_RESIZE},
+ {"lower-latin", CSS_VAL_LOWER_LATIN},
{"groove", CSS_VAL_GROOVE},
- {"default", CSS_VAL_DEFAULT},
+ {"baseline", CSS_VAL_BASELINE},
+ {"overline", CSS_VAL_OVERLINE},
+ {"n-resize", CSS_VAL_N_RESIZE},
{"-khtml-normal", CSS_VAL__KHTML_NORMAL},
- {"progress", CSS_VAL_PROGRESS},
- {"fuchsia", CSS_VAL_FUCHSIA},
+ {"bottom", CSS_VAL_BOTTOM},
{"bolder", CSS_VAL_BOLDER},
- {"-khtml-left", CSS_VAL__KHTML_LEFT},
- {"overline", CSS_VAL_OVERLINE},
+ {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
{"blue", CSS_VAL_BLUE},
- {"embed", CSS_VAL_EMBED},
- {"pointer", CSS_VAL_POINTER},
- {"small-caption", CSS_VAL_SMALL_CAPTION},
- {"repeat-x", CSS_VAL_REPEAT_X},
+ {"upper-alpha", CSS_VAL_UPPER_ALPHA},
{"outset", CSS_VAL_OUTSET},
- {"nw-resize", CSS_VAL_NW_RESIZE},
- {"infotext", CSS_VAL_INFOTEXT},
- {"super", CSS_VAL_SUPER},
- {"justify", CSS_VAL_JUSTIFY},
- {"compact", CSS_VAL_COMPACT},
+ {"no-repeat", CSS_VAL_NO_REPEAT},
+ {"activecaption", CSS_VAL_ACTIVECAPTION},
{"table-cell", CSS_VAL_TABLE_CELL},
{"inline-table", CSS_VAL_INLINE_TABLE},
- {"bottom", CSS_VAL_BOTTOM},
- {"e-resize", CSS_VAL_E_RESIZE},
- {"text-top", CSS_VAL_TEXT_TOP},
+ {"lower-alpha", CSS_VAL_LOWER_ALPHA},
+ {"menutext", CSS_VAL_MENUTEXT},
+ {"outside", CSS_VAL_OUTSIDE},
+ {"infotext", CSS_VAL_INFOTEXT},
+ {"default", CSS_VAL_DEFAULT},
+ {"fuchsia", CSS_VAL_FUCHSIA},
+ {"inactivecaption", CSS_VAL_INACTIVECAPTION},
+ {"block", CSS_VAL_BLOCK},
+ {"w-resize", CSS_VAL_W_RESIZE},
+ {"sw-resize", CSS_VAL_SW_RESIZE},
+ {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
{"below", CSS_VAL_BELOW},
+ {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
+ {"e-resize", CSS_VAL_E_RESIZE},
+ {"underline", CSS_VAL_UNDERLINE},
{"se-resize", CSS_VAL_SE_RESIZE},
- {"outside", CSS_VAL_OUTSIDE},
- {"multiple", CSS_VAL_MULTIPLE},
- {"collapse", CSS_VAL_COLLAPSE},
- {"horizontal", CSS_VAL_HORIZONTAL},
{"table-row", CSS_VAL_TABLE_ROW},
+ {"-khtml-left", CSS_VAL__KHTML_LEFT},
+ {"nw-resize", CSS_VAL_NW_RESIZE},
{"block-axis", CSS_VAL_BLOCK_AXIS},
- {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
- {"yellow", CSS_VAL_YELLOW},
- {"ne-resize", CSS_VAL_NE_RESIZE},
+ {"uppercase", CSS_VAL_UPPERCASE},
+ {"horizontal", CSS_VAL_HORIZONTAL},
+ {"upper-roman", CSS_VAL_UPPER_ROMAN},
+ {"monospace", CSS_VAL_MONOSPACE},
+ {"table-caption", CSS_VAL_TABLE_CAPTION},
{"windowtext", CSS_VAL_WINDOWTEXT},
- {"expanded", CSS_VAL_EXPANDED},
- {"underline", CSS_VAL_UNDERLINE},
+ {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
+ {"-khtml-box", CSS_VAL__KHTML_BOX},
+ {"ne-resize", CSS_VAL_NE_RESIZE},
+ {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
+ {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
{"hebrew", CSS_VAL_HEBREW},
{"lowercase", CSS_VAL_LOWERCASE},
+ {"lower-roman", CSS_VAL_LOWER_ROMAN},
{"-khtml-auto", CSS_VAL__KHTML_AUTO},
- {"inline-box", CSS_VAL_INLINE_BOX},
- {"menutext", CSS_VAL_MENUTEXT},
- {"-khtml-center", CSS_VAL__KHTML_CENTER},
- {"captiontext", CSS_VAL_CAPTIONTEXT},
- {"repeat-y", CSS_VAL_REPEAT_Y},
- {"lower-alpha", CSS_VAL_LOWER_ALPHA},
{"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
- {"lower-roman", CSS_VAL_LOWER_ROMAN},
+ {"-khtml-body", CSS_VAL__KHTML_BODY},
+ {"message-box", CSS_VAL_MESSAGE_BOX},
{"condensed", CSS_VAL_CONDENSED},
- {"no-repeat", CSS_VAL_NO_REPEAT},
- {"activecaption", CSS_VAL_ACTIVECAPTION},
- {"purple", CSS_VAL_PURPLE},
+ {"text-bottom", CSS_VAL_TEXT_BOTTOM},
+ {"-khtml-center", CSS_VAL__KHTML_CENTER},
{"absolute", CSS_VAL_ABSOLUTE},
- {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
- {"oblique", CSS_VAL_OBLIQUE},
- {"windowframe", CSS_VAL_WINDOWFRAME},
{"bidi-override", CSS_VAL_BIDI_OVERRIDE},
+ {"oblique", CSS_VAL_OBLIQUE},
{"double", CSS_VAL_DOUBLE},
- {"inactivecaption", CSS_VAL_INACTIVECAPTION},
- {"inline-block", CSS_VAL_INLINE_BLOCK},
- {"threedface", CSS_VAL_THREEDFACE},
+ {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
{"activeborder", CSS_VAL_ACTIVEBORDER},
- {"upper-latin", CSS_VAL_UPPER_LATIN},
- {"message-box", CSS_VAL_MESSAGE_BOX},
- {"line-through", CSS_VAL_LINE_THROUGH},
- {"text-bottom", CSS_VAL_TEXT_BOTTOM},
- {"threedshadow", CSS_VAL_THREEDSHADOW},
- {"table-caption", CSS_VAL_TABLE_CAPTION},
- {"lower-greek", CSS_VAL_LOWER_GREEK},
- {"background", CSS_VAL_BACKGROUND},
+ {"appworkspace", CSS_VAL_APPWORKSPACE},
{"buttontext", CSS_VAL_BUTTONTEXT},
+ {"line-through", CSS_VAL_LINE_THROUGH},
{"inactiveborder", CSS_VAL_INACTIVEBORDER},
- {"-khtml-body", CSS_VAL__KHTML_BODY},
- {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
- {"monospace", CSS_VAL_MONOSPACE},
- {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
- {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
- {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
{"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
- {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
+ {"threedface", CSS_VAL_THREEDFACE},
+ {"threedshadow", CSS_VAL_THREEDSHADOW},
+ {"windowframe", CSS_VAL_WINDOWFRAME},
+ {"inline-block", CSS_VAL_INLINE_BLOCK},
{"table-column", CSS_VAL_TABLE_COLUMN},
{"semi-condensed", CSS_VAL_SEMI_CONDENSED},
- {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
+ {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
{"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
+ {"background", CSS_VAL_BACKGROUND},
+ {"-khtml-inline-box", CSS_VAL__KHTML_INLINE_BOX},
+ {"lower-greek", CSS_VAL_LOWER_GREEK},
+ {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
- {"uppercase", CSS_VAL_UPPERCASE},
- {"buttonface", CSS_VAL_BUTTONFACE},
- {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
- {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+ {"open-quote", CSS_VAL_OPEN_QUOTE},
{"close-quote", CSS_VAL_CLOSE_QUOTE},
+ {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+ {"buttonface", CSS_VAL_BUTTONFACE},
{"buttonshadow", CSS_VAL_BUTTONSHADOW},
- {"upper-alpha", CSS_VAL_UPPER_ALPHA},
- {"upper-roman", CSS_VAL_UPPER_ROMAN},
{"-khtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
- {"-khtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
- {"appworkspace", CSS_VAL_APPWORKSPACE},
- {"open-quote", CSS_VAL_OPEN_QUOTE},
- {"infobackground", CSS_VAL_INFOBACKGROUND},
+ {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
{"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
- {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
+ {"-khtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
{"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
+ {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
{"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
+ {"infobackground", CSS_VAL_INFOBACKGROUND},
{"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP}
};
static const short lookup[] =
{
0, -1, -1, -1, -1, -249, -241, -2,
- -1, -1, 3, -1, -1, -1, -1, 4,
- -1, -1, -1, -1, 5, -1, -1, -1,
- -1, 6, -1, -1, -1, -1, 7, -1,
- -1, -1, -1, 8, -1, -1, -1, -1,
- 9, -1, -1, -1, -1, 10, -1, -1,
- -1, -1, 11, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 12,
+ -1, -1, 3, -1, -1, -1, 4, 5,
+ -1, -1, -1, -1, 6, -1, -1, -1,
+ -1, 7, -1, -1, 8, -1, 9, -1,
+ -1, -1, -1, 10, -1, -1, 11, -1,
+ 12, -1, -1, -1, -1, 13, -1, -1,
+ -1, -1, 14, -1, -1, -1, -1, -1,
+ -1, -1, 15, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 16, -1, -1, -1, -1, 17,
+ -1, -1, -1, -1, -1, -1, -1, 18,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 19, -1, -1, -1, -1, -1, -1,
+ -1, -1, 20, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 13,
- -1, 14, -1, -1, -1, -1, -1, -1,
- -1, 15, -1, -1, -1, -1, -1, -1,
- -1, -1, 16, -1, -1, -1, -1, -1,
- -1, -1, 17, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 18, -1, -1, -1,
+ -1, -1, -1, -1, 21, -1, 22, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 19, -1, -1, 20, -1, -1, -1, -1,
- -1, -1, -1, -1, 21, -1, -1, -1,
- -1, -1, 22, -1, -1, -1, -1, -1,
-1, -1, -1, 23, -1, -1, -1, -1,
- 24, -1, -1, -1, -1, -1, 25, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 26, -1, -1, -1, -1,
- -1, -1, 27, -1, -1, -1, 28, -1,
- -1, -1, -1, -1, -1, 29, -1, 30,
- -1, -1, -1, -1, -1, -1, 31, -1,
- -1, -1, 32, -1, -1, -1, 33, 34,
- -1, -1, -1, 35, 36, -1, -1, -1,
- 37, -1, 38, -1, -1, 39, -1, 40,
- -1, -1, 41, -1, -1, -1, -1, -1,
- -1, 42, -1, -1, 43, -1, 44, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 45, 46, -1, -1,
- 47, -1, -1, -1, -1, 48, -1, -1,
- -1, -1, -1, 49, -1, -1, -1, 50,
- -1, -1, -1, 51, -1, -1, 52, -1,
- -1, 53, -1, 54, -1, -1, -1, 55,
- -1, -1, -1, 56, -1, 57, -1, -1,
- 58, -1, 59, -1, -1, -1, 60, -1,
- -1, 61, -1, -1, -1, -1, 62, -1,
- -1, -1, -1, -1, -1, 63, 64, -1,
- -1, 65, -1, 66, -1, -1, 67, -1,
- -1, -1, -1, 68, -1, 69, -1, -1,
- -1, 70, 71, -1, 72, -1, -1, -1,
- -1, -1, -1, 73, 74, -1, -1, -1,
- -1, 75, -1, -1, -1, 76, -1, -1,
- 77, 78, 79, 80, -1, -1, 81, 82,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 83, -1, 84, -1, -1, 85, -1,
- -1, 86, -1, 87, -1, -1, -1, 88,
- 89, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 90, 91, -1, -1, 92, -1,
- 93, -1, -1, -1, 94, 95, 96, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 97, -1, -1, -1,
- -1, 98, -1, -1, -1, -1, 99, -1,
- -1, -1, 100, 101, -1, 102, -1, 103,
- -1, -1, -1, 104, 105, -1, -1, -1,
- -1, -1, 106, -1, -1, -1, 107, 108,
- -1, -1, -1, 109, 110, -1, -1, -1,
- 111, -1, -1, -1, -1, 112, 113, -1,
- -1, -1, -1, -1, -1, -1, 114, -1,
- 115, -1, -1, -1, -1, -1, -1, -1,
- 116, -1, -1, -1, -1, -1, -1, -1,
- 117, 118, -1, -1, -1, -1, -1, -1,
- 119, -1, -1, 120, 121, 122, -1, -1,
- -1, 123, 124, -1, -1, -1, -1, 125,
- -1, 126, 127, -1, 128, -1, 129, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 130,
- -1, -1, -1, -1, 131, -1, -1, 132,
- -1, 133, -1, -1, -1, -1, -1, 134,
- 135, 136, -1, -1, -1, -1, -1, 137,
- -1, 138, 139, -1, -1, 140, 141, 142,
- 143, -1, 144, -1, -1, -1, -1, -1,
- -1, 145, -1, -1, 146, -1, -1, -1,
- -1, -1, 147, -1, -1, 148, 149, -1,
- 150, 151, -1, 152, 153, -1, -1, -1,
- -1, 154, -1, -1, 155, -1, -1, 156,
- -1, -1, -1, -1, 157, -1, -1, 158,
- 159, -1, -1, -1, 160, -1, -1, -1,
- 161, -1, 162, 163, -1, -1, -1, -1,
- -1, -1, 164, -1, 165, -1, -1, -1,
- -1, 166, -1, -1, -1, -1, -1, -1,
- -1, 167, 168, -1, -1, -1, -1, 169,
- -1, -1, -1, 170, -1, -1, -1, -1,
- -1, -1, 171, -1, -1, -1, -1, -1,
- -1, -1, -1, 172, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 173, -1, 174,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 175, -1, -1, -1, -1,
- 176, -1, -1, -1, -1, 177, -1, -1,
- -1, -1, -1, -1, 178, -1, -1, 179,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 180, -1, -1, -1, -1,
- -1, 181, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 182, -1, 183, -1,
- 184, -1, 185, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 186, -1, -1, -1,
- 187, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 188, 189, -1,
- 190, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 191, -1, 192, 193, -1, 194,
- -1, 195, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 196,
- -1, 197, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 198, -1, -1, -1, 199,
- -1, -1, -1, -1, 200, -1, -1, 201,
- -1, -1, -1, -1, -1, -1, -1, 202,
- -1, -1, 203, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 204, -1, -1, -1, -1, -1, -1,
- 205, 206, -1, -1, 207, 208, -1, -1,
+ -1, -1, -1, 24, 25, -1, -1, -1,
+ -1, -1, 26, -1, -1, -1, 27, -1,
+ -1, -1, -1, 28, -1, 29, -1, -1,
+ 30, -1, -1, -1, -1, 31, 32, -1,
+ -1, 33, 34, -1, -1, -1, -1, 35,
+ -1, -1, -1, -1, 36, -1, -1, -1,
+ 37, -1, 38, -1, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, 40,
+ -1, -1, -1, -1, -1, 41, 42, -1,
+ 43, 44, 45, -1, -1, -1, -1, 46,
+ -1, -1, -1, -1, 47, -1, -1, 48,
+ 49, -1, 50, -1, -1, -1, -1, 51,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 52, 53, -1, -1, -1, -1, 54, -1,
+ -1, -1, -1, -1, -1, -1, 55, 56,
+ -1, -1, -1, -1, 57, 58, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 59, -1, -1, -1, -1,
+ 60, -1, -1, -1, -1, -1, 61, -1,
+ -1, -1, 62, 63, -1, -1, -1, 64,
+ -1, -1, -1, 65, 66, 67, -1, -1,
+ -1, 68, 69, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 70, -1, 71, -1,
+ 72, 73, -1, 74, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 75, -1, -1,
+ -1, 76, 77, -1, -1, -1, 78, -1,
+ -1, -1, -1, 79, 80, -1, -1, 81,
+ 82, 83, -1, 84, 85, 86, -1, -1,
+ -1, -1, -1, 87, -1, -1, 88, 89,
+ 90, -1, -1, -1, -1, -1, -1, -1,
+ 91, -1, -1, -1, -1, 92, -1, 93,
+ -1, 94, 95, -1, -1, -1, -1, 96,
+ -1, -1, 97, -1, -1, -1, -1, -1,
+ -1, 98, 99, 100, -1, -1, 101, -1,
+ 102, -1, -1, 103, -1, 104, 105, -1,
+ 106, -1, -1, -1, -1, 107, 108, -1,
+ -1, -1, -1, 109, 110, 111, 112, -1,
+ 113, 114, -1, -1, 115, 116, 117, -1,
+ -1, 118, -1, 119, -1, -1, 120, 121,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 122, -1, -1, 123, -1, 124,
+ -1, -1, -1, 125, 126, -1, -1, -1,
+ 127, 128, -1, -1, 129, -1, 130, -1,
+ -1, -1, -1, -1, -1, 131, -1, -1,
+ 132, -1, 133, -1, -1, -1, -1, -1,
+ -1, 134, -1, -1, -1, -1, -1, -1,
+ -1, -1, 135, -1, -1, 136, -1, 137,
+ -1, -1, 138, -1, 139, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 140, 141, -1, -1, -1, -1, 142, -1,
+ -1, -1, -1, 143, -1, -1, 144, 145,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 146, -1, -1, -1, -1, 147, -1, -1,
+ 148, -1, -1, -1, -1, -1, -1, -1,
+ 149, 150, -1, 151, -1, -1, 152, 153,
+ -1, -1, 154, -1, -1, -1, -1, -1,
+ -1, 155, -1, 156, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 157, -1, -1, -1, 158, -1, -1, 159,
+ -1, -1, -1, -1, -1, -1, -1, 160,
+ -1, -1, -1, -1, 161, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 162,
+ -1, 163, -1, 164, -1, -1, -1, 165,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 166, -1, -1, -1, -1, 167,
+ -1, 168, 169, -1, -1, 170, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 171,
+ 172, -1, -1, -1, -1, 173, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 174,
+ -1, 175, -1, -1, -1, -1, -1, 176,
+ -1, -1, -1, 177, -1, -1, 178, -1,
+ -1, -1, -1, 179, -1, -1, -1, 180,
+ 181, 182, 183, -1, -1, -1, -1, -1,
+ -1, -1, 184, 185, 186, -1, -1, -1,
+ 187, -1, -1, -1, -1, 188, -1, -1,
+ 189, -1, -1, 190, -1, 191, -1, -1,
+ -1, -1, -1, -1, 192, -1, -1, -1,
+ 193, -1, -1, -1, -1, 194, -1, -1,
+ -1, -1, -1, -1, -1, -1, 195, 196,
+ 197, -1, -1, -1, -1, -1, -1, -1,
+ 198, 199, -1, -1, 200, -1, -1, -1,
+ -1, -1, -1, -1, 201, -1, -1, -1,
+ -1, -1, -1, -1, -1, 202, -1, -1,
+ 203, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 204, -1, -1,
+ -1, -1, -1, -1, 205, -1, -1, -1,
+ -1, 206, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 207, -1, 208, -1, -1,
-1, 209, -1, -1, -1, -1, -1, -1,
+ 210, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 211,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 210, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 211, -1, -1, -1, -1, -1,
- 212, -1, -1, -1, -1, 213, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 214, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 212,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 215, -1, -1, -1, 216, -1, -1,
- -1, -1, -1, -1, -1, -1, 217, -1,
- 218, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 213, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 219, -1, -1, 220, -1, -1, -1,
- -1, -1, -1, -1, 221, -1, -1, -1,
+ -1, -1, -1, -1, 214, -1, 215, 216,
+ -1, -1, -1, -1, 217, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 218,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 222, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 223, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 224, -1, 225, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 219, -1, -1, -1, -1, -1, -1, -1,
+ -1, 220, -1, -1, -1, -1, -1, 221,
+ -1, -1, -1, -1, -1, -1, -1, 222,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 226,
-1, -1, -1, -1, -1, -1, -1, -1,
- 227, -1, 228, -1, -1, -1, -1, 229,
- -1, -1, -1, 230, -1, -1, -1, -1,
+ -1, -1, 223, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 224, -1, 225, -1, -1, -1, -1,
+ -1, -1, -1, -1, 226, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 231, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 232,
+ -1, 227, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 228, -1, -1, -1, -1, -1, -1, 229,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 233, -1, -1,
+ -1, -1, -1, -1, -1, 230, -1, 231,
+ -1, -1, -1, 232, -1, -1, -1, -1,
+ -1, -1, -1, -1, 233, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 234, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 234,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 235, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 236, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 237, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 235, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 236, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 237, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 238, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -561,10 +553,10 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 238, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
239, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 240, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -582,17 +574,12 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 240, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 241
+ -1, -1, -1, -1, -1, -1, 241
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -796,8 +783,8 @@ static const char * const valueList[] = {
"table-column",
"table-cell",
"table-caption",
-"box",
-"inline-box",
+"-khtml-box",
+"-khtml-inline-box",
"auto",
"crosshair",
"default",
diff --git a/WebCore/khtml/css/cssvalues.h b/WebCore/khtml/css/cssvalues.h
index bc3b7e4..f176aec 100644
--- a/WebCore/khtml/css/cssvalues.h
+++ b/WebCore/khtml/css/cssvalues.h
@@ -174,8 +174,8 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_TABLE_COLUMN 163
#define CSS_VAL_TABLE_CELL 164
#define CSS_VAL_TABLE_CAPTION 165
-#define CSS_VAL_BOX 166
-#define CSS_VAL_INLINE_BOX 167
+#define CSS_VAL__KHTML_BOX 166
+#define CSS_VAL__KHTML_INLINE_BOX 167
#define CSS_VAL_AUTO 168
#define CSS_VAL_CROSSHAIR 169
#define CSS_VAL_DEFAULT 170
diff --git a/WebCore/khtml/css/cssvalues.in b/WebCore/khtml/css/cssvalues.in
index 50565e7..0ca1c6d 100644
--- a/WebCore/khtml/css/cssvalues.in
+++ b/WebCore/khtml/css/cssvalues.in
@@ -233,8 +233,8 @@ table-column-group
table-column
table-cell
table-caption
-box
-inline-box
+-khtml-box
+-khtml-inline-box
#none
#
# CSS_PROP_CURSOR:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list