[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:03 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d0334790498a536262bf22fb9b99aa44043306c1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 22 16:40:20 2003 +0000
Fix for mozilla.org front page. This patch re-architects
align="left" and align="right" (for rtl and ltr directionality
respectively). The attributes are mapped to custom text-align
values, konq-left and konq-right, just as was done with the
center/middle attributes for alignment.
A number of "hack" style rules have been dropped from html4.css
and replaced with this C++ code that now works in the general
case for any children of align="left/right" divs and tds.
In addition, absmiddle support has been added for <td>s.
For RTL blocks, there is also a regression fix (this was probably
the #1 culprit for mangled placement of blocks in Hebrew Web
pages). The old code was doing byzantine math that happened to
work out. When I tried to simplify it before 1.0, I missed a spot
and basically broke margin handling on RTL blocks completely.
Reviewed by mjs
* khtml/css/cssparser.cpp:
(CSSParser::parseValue):
* khtml/css/cssvalues.c:
(hash_val):
(findValue):
* khtml/css/cssvalues.h:
* khtml/css/cssvalues.in:
* khtml/css/html4.css:
* khtml/html/html_blockimpl.cpp:
(HTMLDivElementImpl::parseAttribute):
(HTMLParagraphElementImpl::parseAttribute):
* khtml/html/html_tableimpl.cpp:
(HTMLTablePartElementImpl::parseAttribute):
* khtml/rendering/bidi.cpp:
* khtml/rendering/render_block.cpp:
* khtml/rendering/render_box.cpp:
(RenderBox::calcHorizontalMargins):
* khtml/rendering/render_style.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4684 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 19210ac..7f4747f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,44 @@
+2003-07-22 Dave Hyatt <hyatt at apple.com>
+
+ Fix for mozilla.org front page. This patch re-architects
+ align="left" and align="right" (for rtl and ltr directionality
+ respectively). The attributes are mapped to custom text-align
+ values, konq-left and konq-right, just as was done with the
+ center/middle attributes for alignment.
+
+ A number of "hack" style rules have been dropped from html4.css
+ and replaced with this C++ code that now works in the general
+ case for any children of align="left/right" divs and tds.
+
+ In addition, absmiddle support has been added for <td>s.
+
+ For RTL blocks, there is also a regression fix (this was probably
+ the #1 culprit for mangled placement of blocks in Hebrew Web
+ pages). The old code was doing byzantine math that happened to
+ work out. When I tried to simplify it before 1.0, I missed a spot
+ and basically broke margin handling on RTL blocks completely.
+
+ Reviewed by mjs
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ * khtml/css/cssvalues.c:
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h:
+ * khtml/css/cssvalues.in:
+ * khtml/css/html4.css:
+ * khtml/html/html_blockimpl.cpp:
+ (HTMLDivElementImpl::parseAttribute):
+ (HTMLParagraphElementImpl::parseAttribute):
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTablePartElementImpl::parseAttribute):
+ * khtml/rendering/bidi.cpp:
+ * khtml/rendering/render_block.cpp:
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::calcHorizontalMargins):
+ * khtml/rendering/render_style.h:
+
2003-07-21 Dave Hyatt <hyatt at apple.com>
Fix for 3333557, crash on www.dremedia.com. markDescendants in RenderBlock
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 19210ac..7f4747f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,44 @@
+2003-07-22 Dave Hyatt <hyatt at apple.com>
+
+ Fix for mozilla.org front page. This patch re-architects
+ align="left" and align="right" (for rtl and ltr directionality
+ respectively). The attributes are mapped to custom text-align
+ values, konq-left and konq-right, just as was done with the
+ center/middle attributes for alignment.
+
+ A number of "hack" style rules have been dropped from html4.css
+ and replaced with this C++ code that now works in the general
+ case for any children of align="left/right" divs and tds.
+
+ In addition, absmiddle support has been added for <td>s.
+
+ For RTL blocks, there is also a regression fix (this was probably
+ the #1 culprit for mangled placement of blocks in Hebrew Web
+ pages). The old code was doing byzantine math that happened to
+ work out. When I tried to simplify it before 1.0, I missed a spot
+ and basically broke margin handling on RTL blocks completely.
+
+ Reviewed by mjs
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseValue):
+ * khtml/css/cssvalues.c:
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h:
+ * khtml/css/cssvalues.in:
+ * khtml/css/html4.css:
+ * khtml/html/html_blockimpl.cpp:
+ (HTMLDivElementImpl::parseAttribute):
+ (HTMLParagraphElementImpl::parseAttribute):
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTablePartElementImpl::parseAttribute):
+ * khtml/rendering/bidi.cpp:
+ * khtml/rendering/render_block.cpp:
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::calcHorizontalMargins):
+ * khtml/rendering/render_style.h:
+
2003-07-21 Dave Hyatt <hyatt at apple.com>
Fix for 3333557, crash on www.dremedia.com. markDescendants in RenderBlock
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 224eb38..6ed8784 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -554,7 +554,7 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_TEXT_ALIGN:
- // left | right | center | justify | konq_center | <string> | inherit
+ // left | right | center | justify | konq_left | konq_right | konq_center | <string> | inherit
if ( ( id >= CSS_VAL__KONQ_AUTO && id <= CSS_VAL__KONQ_CENTER ) ||
value->unit == CSSPrimitiveValue::CSS_STRING )
valid_primitive = true;
diff --git a/WebCore/khtml/css/cssvalues.c b/WebCore/khtml/css/cssvalues.c
index c853b70..d8c54ee 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 = 1909, duplicates = 1 */
+/* maximum key range = 1456, 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[] =
{
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 249, 1909, 1909, 0, 5,
- 10, 15, 20, 35, 50, 55, 60, 0, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 0, 207, 20,
- 27, 110, 25, 229, 29, 0, 0, 29, 20, 16,
- 95, 35, 245, 255, 25, 5, 0, 135, 3, 160,
- 98, 105, 34, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909, 1909,
- 1909, 1909, 1909, 1909, 1909, 1909
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 0, 1456, 1456, 0, 10,
+ 15, 20, 35, 50, 55, 60, 5, 0, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 0, 23, 20,
+ 84, 110, 225, 167, 193, 0, 10, 0, 20, 56,
+ 95, 35, 190, 245, 25, 5, 0, 65, 7, 223,
+ 208, 25, 214, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456,
+ 1456, 1456, 1456, 1456, 1456, 1456
};
register int hval = 0;
@@ -108,255 +108,257 @@ findValue (register const char *str, register unsigned int len)
{
enum
{
- TOTAL_KEYWORDS = 240,
+ TOTAL_KEYWORDS = 242,
MIN_WORD_LENGTH = 3,
MAX_WORD_LENGTH = 21,
MIN_HASH_VALUE = 0,
- MAX_HASH_VALUE = 1908
+ MAX_HASH_VALUE = 1455
};
static const struct css_value wordlist_value[] =
{
{"900", CSS_VAL_900},
+ {"800", CSS_VAL_800},
{"100", CSS_VAL_100},
{"200", CSS_VAL_200},
{"300", CSS_VAL_300},
- {"400", CSS_VAL_400},
{"static", CSS_VAL_STATIC},
{"start", CSS_VAL_START},
- {"500", CSS_VAL_500},
+ {"400", CSS_VAL_400},
{"italic", CSS_VAL_ITALIC},
{"ltr", CSS_VAL_LTR},
{"rtl", CSS_VAL_RTL},
+ {"500", CSS_VAL_500},
{"600", CSS_VAL_600},
- {"disc", CSS_VAL_DISC},
{"700", CSS_VAL_700},
- {"800", CSS_VAL_800},
- {"small", CSS_VAL_SMALL},
- {"avoid", CSS_VAL_AVOID},
- {"thick", CSS_VAL_THICK},
- {"solid", CSS_VAL_SOLID},
+ {"black", CSS_VAL_BLACK},
{"cross", CSS_VAL_CROSS},
- {"mix", CSS_VAL_MIX},
- {"thin", CSS_VAL_THIN},
+ {"sub", CSS_VAL_SUB},
+ {"katakana", CSS_VAL_KATAKANA},
+ {"block", CSS_VAL_BLOCK},
+ {"auto", CSS_VAL_AUTO},
+ {"small", CSS_VAL_SMALL},
+ {"disc", CSS_VAL_DISC},
+ {"status-bar", CSS_VAL_STATUS_BAR},
{"scroll", CSS_VAL_SCROLL},
+ {"avoid", CSS_VAL_AVOID},
+ {"navy", CSS_VAL_NAVY},
{"teal", CSS_VAL_TEAL},
- {"crosshair", CSS_VAL_CROSSHAIR},
- {"lime", CSS_VAL_LIME},
+ {"blink", CSS_VAL_BLINK},
+ {"solid", CSS_VAL_SOLID},
+ {"bottom", CSS_VAL_BOTTOM},
{"icon", CSS_VAL_ICON},
- {"hand", CSS_VAL_HAND},
- {"katakana", CSS_VAL_KATAKANA},
- {"left", CSS_VAL_LEFT},
- {"wait", CSS_VAL_WAIT},
- {"red", CSS_VAL_RED},
+ {"table", CSS_VAL_TABLE},
+ {"bold", CSS_VAL_BOLD},
+ {"visible", CSS_VAL_VISIBLE},
{"silver", CSS_VAL_SILVER},
- {"move", CSS_VAL_MOVE},
- {"serif", CSS_VAL_SERIF},
- {"hide", CSS_VAL_HIDE},
{"olive", CSS_VAL_OLIVE},
- {"auto", CSS_VAL_AUTO},
+ {"scrollbar", CSS_VAL_SCROLLBAR},
+ {"above", CSS_VAL_ABOVE},
{"vertical", CSS_VAL_VERTICAL},
- {"stretch", CSS_VAL_STRETCH},
- {"normal", CSS_VAL_NORMAL},
- {"decimal", CSS_VAL_DECIMAL},
+ {"lime", CSS_VAL_LIME},
+ {"list-item", CSS_VAL_LIST_ITEM},
{"circle", CSS_VAL_CIRCLE},
- {"smaller", CSS_VAL_SMALLER},
- {"dashed", CSS_VAL_DASHED},
- {"dotted", CSS_VAL_DOTTED},
- {"middle", CSS_VAL_MIDDLE},
- {"navy", CSS_VAL_NAVY},
- {"maroon", CSS_VAL_MAROON},
- {"text", CSS_VAL_TEXT},
- {"inset", CSS_VAL_INSET},
- {"fuchsia", CSS_VAL_FUCHSIA},
{"loud", CSS_VAL_LOUD},
- {"show", CSS_VAL_SHOW},
- {"fantasy", CSS_VAL_FANTASY},
- {"end", CSS_VAL_END},
+ {"move", CSS_VAL_MOVE},
+ {"inset", CSS_VAL_INSET},
+ {"thick", CSS_VAL_THICK},
+ {"outset", CSS_VAL_OUTSET},
+ {"gray", CSS_VAL_GRAY},
+ {"blue", CSS_VAL_BLUE},
+ {"red", CSS_VAL_RED},
+ {"wait", CSS_VAL_WAIT},
+ {"top", CSS_VAL_TOP},
+ {"normal", CSS_VAL_NORMAL},
+ {"cursive", CSS_VAL_CURSIVE},
+ {"smaller", CSS_VAL_SMALLER},
{"invert", CSS_VAL_INVERT},
- {"inside", CSS_VAL_INSIDE},
- {"inherit", CSS_VAL_INHERIT},
- {"fixed", CSS_VAL_FIXED},
+ {"maroon", CSS_VAL_MAROON},
+ {"both", CSS_VAL_BOTH},
+ {"absolute", CSS_VAL_ABSOLUTE},
+ {"mix", CSS_VAL_MIX},
+ {"box", CSS_VAL_BOX},
{"level", CSS_VAL_LEVEL},
+ {"crop", CSS_VAL_CROP},
{"relative", CSS_VAL_RELATIVE},
- {"justify", CSS_VAL_JUSTIFY},
- {"both", CSS_VAL_BOTH},
- {"horizontal", CSS_VAL_HORIZONTAL},
- {"black", CSS_VAL_BLACK},
- {"top", CSS_VAL_TOP},
- {"right", CSS_VAL_RIGHT},
- {"outset", CSS_VAL_OUTSET},
- {"hidden", CSS_VAL_HIDDEN},
- {"bold", CSS_VAL_BOLD},
{"always", CSS_VAL_ALWAYS},
- {"bottom", CSS_VAL_BOTTOM},
- {"cursive", CSS_VAL_CURSIVE},
- {"white", CSS_VAL_WHITE},
- {"medium", CSS_VAL_MEDIUM},
- {"block", CSS_VAL_BLOCK},
+ {"portrait", CSS_VAL_PORTRAIT},
+ {"run-in", CSS_VAL_RUN_IN},
+ {"thin", CSS_VAL_THIN},
+ {"end", CSS_VAL_END},
+ {"decimal", CSS_VAL_DECIMAL},
+ {"inside", CSS_VAL_INSIDE},
+ {"bolder", CSS_VAL_BOLDER},
{"outside", CSS_VAL_OUTSIDE},
- {"default", CSS_VAL_DEFAULT},
+ {"crosshair", CSS_VAL_CROSSHAIR},
+ {"x-small", CSS_VAL_X_SMALL},
+ {"aqua", CSS_VAL_AQUA},
+ {"block-axis", CSS_VAL_BLOCK_AXIS},
+ {"dotted", CSS_VAL_DOTTED},
+ {"small-caps", CSS_VAL_SMALL_CAPS},
+ {"text", CSS_VAL_TEXT},
{"inline", CSS_VAL_INLINE},
- {"wider", CSS_VAL_WIDER},
- {"crop", CSS_VAL_CROP},
- {"portrait", CSS_VAL_PORTRAIT},
- {"none", CSS_VAL_NONE},
{"compact", CSS_VAL_COMPACT},
- {"table", CSS_VAL_TABLE},
- {"box", CSS_VAL_BOX},
- {"armenian", CSS_VAL_ARMENIAN},
- {"visible", CSS_VAL_VISIBLE},
- {"sub", CSS_VAL_SUB},
- {"lower", CSS_VAL_LOWER},
- {"blink", CSS_VAL_BLINK},
- {"above", CSS_VAL_ABOVE},
- {"menu", CSS_VAL_MENU},
- {"scrollbar", CSS_VAL_SCROLLBAR},
- {"gray", CSS_VAL_GRAY},
- {"center", CSS_VAL_CENTER},
- {"infotext", CSS_VAL_INFOTEXT},
- {"hiragana", CSS_VAL_HIRAGANA},
- {"pre", CSS_VAL_PRE},
{"large", CSS_VAL_LARGE},
- {"reverse", CSS_VAL_REVERSE},
- {"aqua", CSS_VAL_AQUA},
- {"ridge", CSS_VAL_RIDGE},
+ {"table-cell", CSS_VAL_TABLE_CELL},
+ {"pre", CSS_VAL_PRE},
+ {"menu", CSS_VAL_MENU},
+ {"grey", CSS_VAL_GREY},
+ {"justify", CSS_VAL_JUSTIFY},
+ {"none", CSS_VAL_NONE},
+ {"double", CSS_VAL_DOUBLE},
{"caption", CSS_VAL_CAPTION},
- {"overline", CSS_VAL_OVERLINE},
- {"list-item", CSS_VAL_LIST_ITEM},
- {"help", CSS_VAL_HELP},
- {"x-small", CSS_VAL_X_SMALL},
{"larger", CSS_VAL_LARGER},
- {"lighter", CSS_VAL_LIGHTER},
- {"higher", CSS_VAL_HIGHER},
- {"bolder", CSS_VAL_BOLDER},
- {"capitalize", CSS_VAL_CAPITALIZE},
+ {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
+ {"fantasy", CSS_VAL_FANTASY},
+ {"stretch", CSS_VAL_STRETCH},
+ {"middle", CSS_VAL_MIDDLE},
+ {"left", CSS_VAL_LEFT},
+ {"center", CSS_VAL_CENTER},
+ {"baseline", CSS_VAL_BASELINE},
+ {"serif", CSS_VAL_SERIF},
+ {"medium", CSS_VAL_MEDIUM},
+ {"hand", CSS_VAL_HAND},
{"groove", CSS_VAL_GROOVE},
- {"yellow", CSS_VAL_YELLOW},
- {"collapse", CSS_VAL_COLLAPSE},
- {"threedface", CSS_VAL_THREEDFACE},
- {"single", CSS_VAL_SINGLE},
- {"grey", CSS_VAL_GREY},
+ {"armenian", CSS_VAL_ARMENIAN},
{"embed", CSS_VAL_EMBED},
- {"blue", CSS_VAL_BLUE},
- {"narrower", CSS_VAL_NARROWER},
- {"window", CSS_VAL_WINDOW},
- {"lowercase", CSS_VAL_LOWERCASE},
- {"repeat", CSS_VAL_REPEAT},
- {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
+ {"right", CSS_VAL_RIGHT},
+ {"ridge", CSS_VAL_RIDGE},
+ {"hide", CSS_VAL_HIDE},
+ {"reverse", CSS_VAL_REVERSE},
+ {"super", CSS_VAL_SUPER},
+ {"single", CSS_VAL_SINGLE},
+ {"collapse", CSS_VAL_COLLAPSE},
+ {"overline", CSS_VAL_OVERLINE},
+ {"below", CSS_VAL_BELOW},
+ {"lower", CSS_VAL_LOWER},
+ {"inline-block", CSS_VAL_INLINE_BLOCK},
+ {"inherit", CSS_VAL_INHERIT},
{"orange", CSS_VAL_ORANGE},
+ {"yellow", CSS_VAL_YELLOW},
+ {"repeat", CSS_VAL_REPEAT},
+ {"table-row", CSS_VAL_TABLE_ROW},
+ {"activeborder", CSS_VAL_ACTIVEBORDER},
{"separate", CSS_VAL_SEPARATE},
- {"xx-small", CSS_VAL_XX_SMALL},
+ {"small-caption", CSS_VAL_SMALL_CAPTION},
+ {"wider", CSS_VAL_WIDER},
+ {"table-column", CSS_VAL_TABLE_COLUMN},
+ {"square", CSS_VAL_SQUARE},
{"pointer", CSS_VAL_POINTER},
- {"absolute", CSS_VAL_ABSOLUTE},
+ {"show", CSS_VAL_SHOW},
+ {"repeat-y", CSS_VAL_REPEAT_Y},
+ {"multiple", CSS_VAL_MULTIPLE},
+ {"text-bottom", CSS_VAL_TEXT_BOTTOM},
+ {"s-resize", CSS_VAL_S_RESIZE},
{"sans-serif", CSS_VAL_SANS_SERIF},
- {"super", CSS_VAL_SUPER},
- {"landscape", CSS_VAL_LANDSCAPE},
- {"condensed", CSS_VAL_CONDENSED},
+ {"inline-table", CSS_VAL_INLINE_TABLE},
+ {"-konq-auto", CSS_VAL__KONQ_AUTO},
+ {"dashed", CSS_VAL_DASHED},
{"activecaption", CSS_VAL_ACTIVECAPTION},
- {"square", CSS_VAL_SQUARE},
- {"below", CSS_VAL_BELOW},
- {"double", CSS_VAL_DOUBLE},
- {"s-resize", CSS_VAL_S_RESIZE},
- {"multiple", CSS_VAL_MULTIPLE},
- {"baseline", CSS_VAL_BASELINE},
- {"threedshadow", CSS_VAL_THREEDSHADOW},
- {"nowrap", CSS_VAL_NOWRAP},
- {"monospace", CSS_VAL_MONOSPACE},
- {"activeborder", CSS_VAL_ACTIVEBORDER},
- {"menutext", CSS_VAL_MENUTEXT},
- {"highlight", CSS_VAL_HIGHLIGHT},
- {"graytext", CSS_VAL_GRAYTEXT},
+ {"hiragana", CSS_VAL_HIRAGANA},
+ {"table-caption", CSS_VAL_TABLE_CAPTION},
+ {"oblique", CSS_VAL_OBLIQUE},
+ {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
+ {"default", CSS_VAL_DEFAULT},
{"green", CSS_VAL_GREEN},
- {"small-caps", CSS_VAL_SMALL_CAPS},
- {"run-in", CSS_VAL_RUN_IN},
+ {"fuchsia", CSS_VAL_FUCHSIA},
+ {"help", CSS_VAL_HELP},
+ {"background", CSS_VAL_BACKGROUND},
+ {"lighter", CSS_VAL_LIGHTER},
+ {"xx-small", CSS_VAL_XX_SMALL},
+ {"landscape", CSS_VAL_LANDSCAPE},
+ {"white", CSS_VAL_WHITE},
+ {"lower-latin", CSS_VAL_LOWER_LATIN},
+ {"x-large", CSS_VAL_X_LARGE},
+ {"inline-axis", CSS_VAL_INLINE_AXIS},
+ {"inactiveborder", CSS_VAL_INACTIVEBORDER},
+ {"graytext", CSS_VAL_GRAYTEXT},
+ {"buttontext", CSS_VAL_BUTTONTEXT},
+ {"narrower", CSS_VAL_NARROWER},
+ {"-konq-body", CSS_VAL__KONQ_BODY},
+ {"text-top", CSS_VAL_TEXT_TOP},
{"transparent", CSS_VAL_TRANSPARENT},
- {"captiontext", CSS_VAL_CAPTIONTEXT},
- {"underline", CSS_VAL_UNDERLINE},
+ {"monospace", CSS_VAL_MONOSPACE},
+ {"lowercase", CSS_VAL_LOWERCASE},
+ {"capitalize", CSS_VAL_CAPITALIZE},
+ {"n-resize", CSS_VAL_N_RESIZE},
+ {"progress", CSS_VAL_PROGRESS},
+ {"no-repeat", CSS_VAL_NO_REPEAT},
+ {"hidden", CSS_VAL_HIDDEN},
+ {"nowrap", CSS_VAL_NOWRAP},
{"inactivecaption", CSS_VAL_INACTIVECAPTION},
- {"status-bar", CSS_VAL_STATUS_BAR},
{"buttonface", CSS_VAL_BUTTONFACE},
- {"n-resize", CSS_VAL_N_RESIZE},
- {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
- {"hebrew", CSS_VAL_HEBREW},
{"e-resize", CSS_VAL_E_RESIZE},
{"se-resize", CSS_VAL_SE_RESIZE},
- {"windowframe", CSS_VAL_WINDOWFRAME},
- {"inactiveborder", CSS_VAL_INACTIVEBORDER},
- {"block-axis", CSS_VAL_BLOCK_AXIS},
- {"inline-axis", CSS_VAL_INLINE_AXIS},
- {"progress", CSS_VAL_PROGRESS},
- {"buttontext", CSS_VAL_BUTTONTEXT},
- {"windowtext", CSS_VAL_WINDOWTEXT},
- {"w-resize", CSS_VAL_W_RESIZE},
- {"sw-resize", CSS_VAL_SW_RESIZE},
- {"small-caption", CSS_VAL_SMALL_CAPTION},
- {"expanded", CSS_VAL_EXPANDED},
- {"lower-latin", CSS_VAL_LOWER_LATIN},
- {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
+ {"inline-box", CSS_VAL_INLINE_BOX},
{"georgian", CSS_VAL_GEORGIAN},
- {"buttonshadow", CSS_VAL_BUTTONSHADOW},
- {"x-large", CSS_VAL_X_LARGE},
- {"text-top", CSS_VAL_TEXT_TOP},
- {"ne-resize", CSS_VAL_NE_RESIZE},
- {"text-bottom", CSS_VAL_TEXT_BOTTOM},
- {"table-cell", CSS_VAL_TABLE_CELL},
- {"oblique", CSS_VAL_OBLIQUE},
- {"lower-roman", CSS_VAL_LOWER_ROMAN},
- {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
{"purple", CSS_VAL_PURPLE},
- {"nw-resize", CSS_VAL_NW_RESIZE},
- {"background", CSS_VAL_BACKGROUND},
- {"table-row", CSS_VAL_TABLE_ROW},
- {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
- {"xx-large", CSS_VAL_XX_LARGE},
- {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
- {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
+ {"underline", CSS_VAL_UNDERLINE},
+ {"-konq-normal", CSS_VAL__KONQ_NORMAL},
+ {"horizontal", CSS_VAL_HORIZONTAL},
+ {"lower-roman", CSS_VAL_LOWER_ROMAN},
+ {"fixed", CSS_VAL_FIXED},
+ {"condensed", CSS_VAL_CONDENSED},
{"repeat-x", CSS_VAL_REPEAT_X},
- {"repeat-y", CSS_VAL_REPEAT_Y},
- {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
- {"no-repeat", CSS_VAL_NO_REPEAT},
- {"inline-block", CSS_VAL_INLINE_BLOCK},
- {"lower-alpha", CSS_VAL_LOWER_ALPHA},
- {"uppercase", CSS_VAL_UPPERCASE},
- {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
- {"inline-table", CSS_VAL_INLINE_TABLE},
- {"table-column", CSS_VAL_TABLE_COLUMN},
- {"inline-box", CSS_VAL_INLINE_BOX},
- {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
- {"line-through", CSS_VAL_LINE_THROUGH},
- {"infobackground", CSS_VAL_INFOBACKGROUND},
+ {"menutext", CSS_VAL_MENUTEXT},
{"close-quote", CSS_VAL_CLOSE_QUOTE},
- {"table-caption", CSS_VAL_TABLE_CAPTION},
- {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
- {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
- {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
- {"message-box", CSS_VAL_MESSAGE_BOX},
- {"-konq-auto", CSS_VAL__KONQ_AUTO},
- {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
- {"lower-greek", CSS_VAL_LOWER_GREEK},
- {"-konq-normal", CSS_VAL__KONQ_NORMAL},
- {"appworkspace", CSS_VAL_APPWORKSPACE},
+ {"captiontext", CSS_VAL_CAPTIONTEXT},
+ {"window", CSS_VAL_WINDOW},
+ {"ne-resize", CSS_VAL_NE_RESIZE},
+ {"infotext", CSS_VAL_INFOTEXT},
+ {"hebrew", CSS_VAL_HEBREW},
+ {"w-resize", CSS_VAL_W_RESIZE},
+ {"higher", CSS_VAL_HIGHER},
+ {"sw-resize", CSS_VAL_SW_RESIZE},
{"-konq-text", CSS_VAL__KONQ_TEXT},
{"upper-latin", CSS_VAL_UPPER_LATIN},
- {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
- {"upper-roman", CSS_VAL_UPPER_ROMAN},
- {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
- {"open-quote", CSS_VAL_OPEN_QUOTE},
+ {"uppercase", CSS_VAL_UPPERCASE},
+ {"message-box", CSS_VAL_MESSAGE_BOX},
+ {"-konq-left", CSS_VAL__KONQ_LEFT},
+ {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
{"-konq-center", CSS_VAL__KONQ_CENTER},
- {"-konq-body", CSS_VAL__KONQ_BODY},
- {"upper-alpha", CSS_VAL_UPPER_ALPHA},
+ {"xx-large", CSS_VAL_XX_LARGE},
+ {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
+ {"buttonshadow", CSS_VAL_BUTTONSHADOW},
+ {"-konq-right", CSS_VAL__KONQ_RIGHT},
{"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
- {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+ {"nw-resize", CSS_VAL_NW_RESIZE},
+ {"upper-roman", CSS_VAL_UPPER_ROMAN},
+ {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
+ {"lower-alpha", CSS_VAL_LOWER_ALPHA},
+ {"lower-greek", CSS_VAL_LOWER_GREEK},
+ {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
+ {"infobackground", CSS_VAL_INFOBACKGROUND},
+ {"threedface", CSS_VAL_THREEDFACE},
+ {"expanded", CSS_VAL_EXPANDED},
+ {"open-quote", CSS_VAL_OPEN_QUOTE},
+ {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
+ {"line-through", CSS_VAL_LINE_THROUGH},
+ {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
+ {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
+ {"highlight", CSS_VAL_HIGHLIGHT},
{"-konq-nowrap", CSS_VAL__KONQ_NOWRAP},
{"-konq-around-floats", CSS_VAL__KONQ_AROUND_FLOATS},
+ {"windowtext", CSS_VAL_WINDOWTEXT},
+ {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
+ {"upper-alpha", CSS_VAL_UPPER_ALPHA},
+ {"appworkspace", CSS_VAL_APPWORKSPACE},
+ {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
{"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
- {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
+ {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
+ {"threedshadow", CSS_VAL_THREEDSHADOW},
{"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP},
+ {"windowframe", CSS_VAL_WINDOWFRAME},
+ {"-konq-baseline-middle", CSS_VAL__KONQ_BASELINE_MIDDLE},
+ {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+ {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
- {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
+ {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
+ {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
+ {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
{"-konq-xxx-large", CSS_VAL__KONQ_XXX_LARGE},
- {"-konq-baseline-middle", CSS_VAL__KONQ_BASELINE_MIDDLE}
+ {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
+ {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT}
};
static const short lookup[] =
@@ -366,231 +368,173 @@ findValue (register const char *str, register unsigned int len)
-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, -287, -231, -2,
- -1, -1, 11, -1, 12, -1, -1, 13,
- -1, -1, -1, -1, 14, 15, -1, -1,
- -1, 16, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 17, -1,
- -1, -1, -1, -1, -1, -1, -1, 18,
- -1, -1, 19, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 20, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 21, 22, -1, -1,
- -1, -1, 23, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 24, -1, 25, -1, -1, -1, 26, 27,
- -1, 28, -1, 29, -1, -1, -1, -1,
- 30, -1, 31, 32, 33, 34, 35, -1,
- 36, -1, 37, -1, -1, -1, -1, -1,
- -1, -1, 38, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 39, -1, 40,
- -1, 41, -1, 42, 43, -1, 44, 45,
- 46, -1, -1, 47, -1, -1, 48, -1,
- 49, -1, 50, -1, -1, -1, 51, -1,
- -1, 52, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 53, 54, -1,
- 55, 56, -1, -1, -1, 57, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 58, 59, -1, -1, 60,
- -1, -1, -1, -1, 61, -1, 62, 63,
- -1, 64, -1, -1, 65, -1, -1, -1,
- 66, -1, -1, 67, -1, 68, -1, -1,
- 69, 70, 71, -1, -1, 72, -1, -1,
- -1, -1, 73, 74, -1, -1, -1, -1,
- 75, -1, -1, -1, -1, -1, -1, 76,
- 77, -1, -1, -1, -1, 78, -1, -1,
- 79, -1, 80, -1, -1, 81, -1, -1,
- -1, -1, 82, -1, -1, -1, -1, 83,
- 84, 85, -1, -1, 86, 87, -1, -1,
- -1, 88, -1, 89, -1, -1, 90, 91,
- -1, -1, -1, 92, 93, 94, -1, 95,
- 96, -1, -1, 97, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 98, -1, 99, -1, -1, -1,
- 100, -1, -1, -1, 101, -1, 102, 103,
- -1, -1, -1, 104, -1, -1, 105, -1,
- 106, -1, -1, -1, 107, -1, -1, -1,
- 108, 109, -1, -1, -1, 110, -1, -1,
- -1, -1, -1, -1, -1, -1, 111, -1,
- 112, -1, -1, -1, -1, 113, -1, -1,
- -1, -1, -1, -1, -1, 114, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
+ 8, -1, -1, -1, -1, -289, -233, -2,
+ -1, -1, 11, -1, -1, -1, -1, 12,
+ -1, -1, -1, -1, 13, -1, -1, 14,
+ -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, 15, -1, -1, 16, -1, 17,
+ -1, -1, 18, -1, 19, 20, -1, -1,
+ -1, -1, -1, -1, -1, 21, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 22, -1, 23, 24, 25,
+ -1, -1, 26, -1, -1, -1, -1, -1,
+ -1, -1, 27, -1, -1, -1, -1, -1,
+ 28, -1, -1, -1, -1, 29, 30, -1,
+ -1, 31, -1, -1, -1, -1, -1, -1,
+ -1, -1, 32, -1, -1, 33, -1, 34,
+ -1, -1, -1, -1, 35, 36, -1, 37,
+ -1, -1, -1, -1, -1, -1, 38, -1,
+ -1, -1, 39, -1, -1, -1, -1, 40,
+ -1, -1, -1, 41, -1, -1, -1, -1,
+ -1, -1, -1, -1, 42, -1, -1, -1,
+ 43, -1, 44, -1, -1, 45, -1, 46,
+ -1, 47, 48, 49, -1, -1, -1, 50,
+ -1, 51, -1, -1, -1, -1, -1, 52,
+ 53, -1, -1, -1, 54, 55, -1, -1,
+ -1, -1, -1, -1, -1, -1, 56, -1,
+ -1, -1, -1, 57, -1, -1, -1, -1,
+ -1, -1, 58, -1, -1, -1, -1, -1,
+ 59, -1, 60, 61, -1, -1, 62, -1,
+ 63, 64, -1, 65, -1, -1, -1, -1,
+ 66, -1, -1, -1, -1, -1, -1, -1,
+ 67, 68, 69, -1, -1, -1, 70, -1,
+ -1, 71, -1, 72, -1, -1, -1, -1,
+ -1, -1, -1, -1, 73, 74, 75, 76,
+ -1, 77, -1, -1, 78, -1, 79, -1,
+ 80, 81, 82, 83, -1, 84, 85, 86,
+ -1, -1, 87, -1, -1, -1, -1, 88,
+ -1, 89, -1, -1, 90, -1, -1, -1,
+ -1, -1, -1, 91, 92, -1, 93, -1,
+ -1, 94, 95, 96, -1, -1, -1, -1,
+ 97, -1, -1, 98, -1, 99, -1, -1,
+ -1, -1, -1, 100, 101, -1, -1, -1,
+ -1, -1, -1, 102, -1, 103, -1, 104,
+ -1, 105, 106, 107, -1, -1, -1, -1,
+ 108, -1, -1, 109, -1, 110, -1, -1,
+ 111, -1, 112, -1, -1, -1, -1, -1,
+ -1, -1, -1, 113, -1, 114, -1, -1,
-1, -1, 115, -1, -1, -1, -1, 116,
- 117, -1, -1, 118, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 119, 120, -1,
- 121, -1, -1, 122, -1, 123, -1, -1,
- -1, -1, -1, -1, -1, 124, -1, -1,
- -1, -1, 125, 126, -1, -1, 127, 128,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 129, -1, -1, -1, 130, -1,
- 131, -1, -1, -1, -1, -1, -1, 132,
- 133, -1, 134, -1, 135, -1, -1, -1,
- 136, -1, 137, -1, 138, -1, 139, -1,
- -1, -1, 140, -1, -1, -1, -1, -1,
- -1, -1, 141, 142, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 143, -1, -1,
- 144, 145, 146, -1, 147, 148, -1, 149,
- -1, 150, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 151, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 152,
- 153, -1, -1, 154, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 155, -1, -1, -1, -1, -1, 156,
- -1, -1, 157, 158, 159, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 160, -1,
- -1, 161, -1, 162, -1, -1, -1, -1,
- 163, -1, -1, -1, -1, 164, -1, -1,
- -1, 165, -1, -1, -1, -1, -1, 166,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 167, -1, -1, -1, -1, -1, -1, 168,
- 169, -1, -1, -1, -1, 170, -1, -1,
- -1, -1, -1, -1, -1, 171, -1, -1,
- -1, -1, 172, -1, -1, -1, -1, -1,
- -1, 173, -1, -1, -1, -1, -1, -1,
- 174, -1, 175, -1, 176, -1, -1, -1,
- -1, -1, -1, 177, -1, -1, -1, -1,
- 178, -1, -1, 179, -1, -1, -1, -1,
- -1, 180, 181, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 182, -1,
- -1, -1, -1, -1, 183, -1, -1, -1,
- -1, -1, 184, -1, -1, -1, -1, -1,
- -1, -1, 185, -1, -1, 186, -1, -1,
- -1, -1, -1, -1, 187, -1, -1, -1,
- -1, -1, -1, -1, 188, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 189, -1, -1, -1, 190, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 191, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 192, -1, 193,
- -1, -1, -1, 194, -1, 195, -1, -1,
- -1, -1, -1, -1, 196, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 197, -1, -1, 198, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 199, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 200, -1, 201,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 202, -1, 203, 204, -1, 205, -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, 206, -1, -1, 207, 208, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -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, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 211, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 212, -1, -1, -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, -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,
+ 117, 118, -1, 119, 120, -1, -1, 121,
+ 122, 123, 124, -1, 125, -1, -1, -1,
+ -1, -1, 126, -1, -1, -1, -1, 127,
+ 128, -1, -1, -1, 129, 130, -1, -1,
+ -1, -1, -1, 131, -1, 132, 133, -1,
+ -1, 134, -1, 135, 136, 137, -1, -1,
+ 138, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 139, -1, -1,
+ -1, -1, 140, -1, -1, -1, -1, 141,
+ 142, -1, -1, 143, 144, -1, -1, -1,
+ -1, 145, 146, 147, -1, 148, -1, -1,
+ -1, -1, -1, -1, 149, -1, 150, -1,
+ 151, -1, 152, -1, -1, 153, 154, 155,
+ 156, -1, 157, -1, -1, -1, 158, 159,
+ -1, 160, 161, -1, 162, -1, -1, -1,
+ -1, -1, 163, -1, -1, -1, -1, 164,
+ -1, -1, 165, -1, -1, 166, 167, -1,
+ 168, -1, -1, -1, 169, 170, 171, -1,
+ -1, -1, -1, 172, -1, -1, -1, -1,
+ -1, -1, 173, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 174,
+ 175, -1, -1, -1, 176, -1, 177, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 178, -1, -1, -1, -1, -1, -1,
+ 179, -1, -1, 180, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 181, -1,
+ -1, -1, -1, 182, 183, 184, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 185, -1, 186, -1, -1, -1,
+ -1, -1, -1, -1, -1, 187, -1, -1,
+ -1, 188, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 189, -1, -1, 190,
+ 191, -1, -1, -1, 192, 193, -1, 194,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 195, -1, -1, -1, 196,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 197, -1, -1, 198, -1, 199,
+ -1, -1, 200, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 201, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 202, -1,
+ 203, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 204,
+ -1, -1, -1, -1, -1, -1, 205, -1,
+ -1, -1, -1, -1, -1, -1, -1, 206,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 207, -1, -1, -1, -1, -1, -1,
+ 208, -1, -1, -1, -1, -1, -1, -1,
+ -1, 209, -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, 210, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 211, -1, -1,
+ -1, -1, -1, -1, -1, 212, -1, -1,
+ -1, 213, -1, -1, -1, 214, -1, -1,
-1, -1, 215, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 216, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 217, 218,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 219,
- 220, -1, -1, -1, 221, -1, -1, -1,
- -1, -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, -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, 223, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 224, -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, 225, -1, -1,
- 226, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 227, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 228,
- -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, 229, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 230, -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, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 216,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 217, -1,
+ -1, -1, -1, -1, -1, -1, 218, -1,
+ -1, -1, -1, -1, -1, 219, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 220,
-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, 221, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 222, -1, -1, 223, -1, 224,
+ -1, -1, -1, -1, 225, -1, -1, 226,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -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, -1, -1,
+ -1, -1, -1, -1, 228, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 229, -1,
+ -1, 230, -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, 232, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 232, -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, 233, 234,
+ -1, -1, -1, -1, -1, 235, -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,
- 233, -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, -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,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 234, -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, 239, -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, 236, -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, 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,
@@ -599,7 +543,8 @@ 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, 239
+ -1, -1, 240, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 241
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -762,6 +707,8 @@ static const char * const valueList[] = {
"right",
"center",
"justify",
+"-konq-left",
+"-konq-right",
"-konq-center",
"outside",
"inside",
diff --git a/WebCore/khtml/css/cssvalues.h b/WebCore/khtml/css/cssvalues.h
index c53c52d..8691634 100644
--- a/WebCore/khtml/css/cssvalues.h
+++ b/WebCore/khtml/css/cssvalues.h
@@ -133,123 +133,125 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_RIGHT 122
#define CSS_VAL_CENTER 123
#define CSS_VAL_JUSTIFY 124
-#define CSS_VAL__KONQ_CENTER 125
-#define CSS_VAL_OUTSIDE 126
-#define CSS_VAL_INSIDE 127
-#define CSS_VAL_DISC 128
-#define CSS_VAL_CIRCLE 129
-#define CSS_VAL_SQUARE 130
-#define CSS_VAL_DECIMAL 131
-#define CSS_VAL_DECIMAL_LEADING_ZERO 132
-#define CSS_VAL_LOWER_ROMAN 133
-#define CSS_VAL_UPPER_ROMAN 134
-#define CSS_VAL_LOWER_GREEK 135
-#define CSS_VAL_LOWER_ALPHA 136
-#define CSS_VAL_LOWER_LATIN 137
-#define CSS_VAL_UPPER_ALPHA 138
-#define CSS_VAL_UPPER_LATIN 139
-#define CSS_VAL_HEBREW 140
-#define CSS_VAL_ARMENIAN 141
-#define CSS_VAL_GEORGIAN 142
-#define CSS_VAL_CJK_IDEOGRAPHIC 143
-#define CSS_VAL_HIRAGANA 144
-#define CSS_VAL_KATAKANA 145
-#define CSS_VAL_HIRAGANA_IROHA 146
-#define CSS_VAL_KATAKANA_IROHA 147
-#define CSS_VAL_INLINE 148
-#define CSS_VAL_BLOCK 149
-#define CSS_VAL_LIST_ITEM 150
-#define CSS_VAL_RUN_IN 151
-#define CSS_VAL_COMPACT 152
-#define CSS_VAL_INLINE_BLOCK 153
-#define CSS_VAL_TABLE 154
-#define CSS_VAL_INLINE_TABLE 155
-#define CSS_VAL_TABLE_ROW_GROUP 156
-#define CSS_VAL_TABLE_HEADER_GROUP 157
-#define CSS_VAL_TABLE_FOOTER_GROUP 158
-#define CSS_VAL_TABLE_ROW 159
-#define CSS_VAL_TABLE_COLUMN_GROUP 160
-#define CSS_VAL_TABLE_COLUMN 161
-#define CSS_VAL_TABLE_CELL 162
-#define CSS_VAL_TABLE_CAPTION 163
-#define CSS_VAL_BOX 164
-#define CSS_VAL_INLINE_BOX 165
-#define CSS_VAL_AUTO 166
-#define CSS_VAL_CROSSHAIR 167
-#define CSS_VAL_DEFAULT 168
-#define CSS_VAL_POINTER 169
-#define CSS_VAL_PROGRESS 170
-#define CSS_VAL_MOVE 171
-#define CSS_VAL_E_RESIZE 172
-#define CSS_VAL_NE_RESIZE 173
-#define CSS_VAL_NW_RESIZE 174
-#define CSS_VAL_N_RESIZE 175
-#define CSS_VAL_SE_RESIZE 176
-#define CSS_VAL_SW_RESIZE 177
-#define CSS_VAL_S_RESIZE 178
-#define CSS_VAL_W_RESIZE 179
-#define CSS_VAL_TEXT 180
-#define CSS_VAL_WAIT 181
-#define CSS_VAL_HELP 182
-#define CSS_VAL_LTR 183
-#define CSS_VAL_RTL 184
-#define CSS_VAL_CAPITALIZE 185
-#define CSS_VAL_UPPERCASE 186
-#define CSS_VAL_LOWERCASE 187
-#define CSS_VAL_VISIBLE 188
-#define CSS_VAL_COLLAPSE 189
-#define CSS_VAL_ABOVE 190
-#define CSS_VAL_ABSOLUTE 191
-#define CSS_VAL_ALWAYS 192
-#define CSS_VAL_AVOID 193
-#define CSS_VAL_BELOW 194
-#define CSS_VAL_BIDI_OVERRIDE 195
-#define CSS_VAL_BLINK 196
-#define CSS_VAL_BOTH 197
-#define CSS_VAL_CLOSE_QUOTE 198
-#define CSS_VAL_CROP 199
-#define CSS_VAL_CROSS 200
-#define CSS_VAL_EMBED 201
-#define CSS_VAL_FIXED 202
-#define CSS_VAL_HAND 203
-#define CSS_VAL_HIDE 204
-#define CSS_VAL_HIGHER 205
-#define CSS_VAL_INVERT 206
-#define CSS_VAL_LANDSCAPE 207
-#define CSS_VAL_LEVEL 208
-#define CSS_VAL_LINE_THROUGH 209
-#define CSS_VAL_LOUD 210
-#define CSS_VAL_LOWER 211
-#define CSS_VAL_MIX 212
-#define CSS_VAL_NO_CLOSE_QUOTE 213
-#define CSS_VAL_NO_OPEN_QUOTE 214
-#define CSS_VAL_NOWRAP 215
-#define CSS_VAL_OPEN_QUOTE 216
-#define CSS_VAL_OVERLINE 217
-#define CSS_VAL_PORTRAIT 218
-#define CSS_VAL_PRE 219
-#define CSS_VAL_RELATIVE 220
-#define CSS_VAL_SCROLL 221
-#define CSS_VAL_SEPARATE 222
-#define CSS_VAL_SHOW 223
-#define CSS_VAL_STATIC 224
-#define CSS_VAL_THICK 225
-#define CSS_VAL_THIN 226
-#define CSS_VAL_UNDERLINE 227
-#define CSS_VAL__KONQ_NOWRAP 228
-#define CSS_VAL__KONQ_NORMAL 229
-#define CSS_VAL__KONQ_AROUND_FLOATS 230
-#define CSS_VAL_STRETCH 231
-#define CSS_VAL_START 232
-#define CSS_VAL_END 233
-#define CSS_VAL_REVERSE 234
-#define CSS_VAL_HORIZONTAL 235
-#define CSS_VAL_VERTICAL 236
-#define CSS_VAL_INLINE_AXIS 237
-#define CSS_VAL_BLOCK_AXIS 238
-#define CSS_VAL_SINGLE 239
-#define CSS_VAL_MULTIPLE 240
+#define CSS_VAL__KONQ_LEFT 125
+#define CSS_VAL__KONQ_RIGHT 126
+#define CSS_VAL__KONQ_CENTER 127
+#define CSS_VAL_OUTSIDE 128
+#define CSS_VAL_INSIDE 129
+#define CSS_VAL_DISC 130
+#define CSS_VAL_CIRCLE 131
+#define CSS_VAL_SQUARE 132
+#define CSS_VAL_DECIMAL 133
+#define CSS_VAL_DECIMAL_LEADING_ZERO 134
+#define CSS_VAL_LOWER_ROMAN 135
+#define CSS_VAL_UPPER_ROMAN 136
+#define CSS_VAL_LOWER_GREEK 137
+#define CSS_VAL_LOWER_ALPHA 138
+#define CSS_VAL_LOWER_LATIN 139
+#define CSS_VAL_UPPER_ALPHA 140
+#define CSS_VAL_UPPER_LATIN 141
+#define CSS_VAL_HEBREW 142
+#define CSS_VAL_ARMENIAN 143
+#define CSS_VAL_GEORGIAN 144
+#define CSS_VAL_CJK_IDEOGRAPHIC 145
+#define CSS_VAL_HIRAGANA 146
+#define CSS_VAL_KATAKANA 147
+#define CSS_VAL_HIRAGANA_IROHA 148
+#define CSS_VAL_KATAKANA_IROHA 149
+#define CSS_VAL_INLINE 150
+#define CSS_VAL_BLOCK 151
+#define CSS_VAL_LIST_ITEM 152
+#define CSS_VAL_RUN_IN 153
+#define CSS_VAL_COMPACT 154
+#define CSS_VAL_INLINE_BLOCK 155
+#define CSS_VAL_TABLE 156
+#define CSS_VAL_INLINE_TABLE 157
+#define CSS_VAL_TABLE_ROW_GROUP 158
+#define CSS_VAL_TABLE_HEADER_GROUP 159
+#define CSS_VAL_TABLE_FOOTER_GROUP 160
+#define CSS_VAL_TABLE_ROW 161
+#define CSS_VAL_TABLE_COLUMN_GROUP 162
+#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_AUTO 168
+#define CSS_VAL_CROSSHAIR 169
+#define CSS_VAL_DEFAULT 170
+#define CSS_VAL_POINTER 171
+#define CSS_VAL_PROGRESS 172
+#define CSS_VAL_MOVE 173
+#define CSS_VAL_E_RESIZE 174
+#define CSS_VAL_NE_RESIZE 175
+#define CSS_VAL_NW_RESIZE 176
+#define CSS_VAL_N_RESIZE 177
+#define CSS_VAL_SE_RESIZE 178
+#define CSS_VAL_SW_RESIZE 179
+#define CSS_VAL_S_RESIZE 180
+#define CSS_VAL_W_RESIZE 181
+#define CSS_VAL_TEXT 182
+#define CSS_VAL_WAIT 183
+#define CSS_VAL_HELP 184
+#define CSS_VAL_LTR 185
+#define CSS_VAL_RTL 186
+#define CSS_VAL_CAPITALIZE 187
+#define CSS_VAL_UPPERCASE 188
+#define CSS_VAL_LOWERCASE 189
+#define CSS_VAL_VISIBLE 190
+#define CSS_VAL_COLLAPSE 191
+#define CSS_VAL_ABOVE 192
+#define CSS_VAL_ABSOLUTE 193
+#define CSS_VAL_ALWAYS 194
+#define CSS_VAL_AVOID 195
+#define CSS_VAL_BELOW 196
+#define CSS_VAL_BIDI_OVERRIDE 197
+#define CSS_VAL_BLINK 198
+#define CSS_VAL_BOTH 199
+#define CSS_VAL_CLOSE_QUOTE 200
+#define CSS_VAL_CROP 201
+#define CSS_VAL_CROSS 202
+#define CSS_VAL_EMBED 203
+#define CSS_VAL_FIXED 204
+#define CSS_VAL_HAND 205
+#define CSS_VAL_HIDE 206
+#define CSS_VAL_HIGHER 207
+#define CSS_VAL_INVERT 208
+#define CSS_VAL_LANDSCAPE 209
+#define CSS_VAL_LEVEL 210
+#define CSS_VAL_LINE_THROUGH 211
+#define CSS_VAL_LOUD 212
+#define CSS_VAL_LOWER 213
+#define CSS_VAL_MIX 214
+#define CSS_VAL_NO_CLOSE_QUOTE 215
+#define CSS_VAL_NO_OPEN_QUOTE 216
+#define CSS_VAL_NOWRAP 217
+#define CSS_VAL_OPEN_QUOTE 218
+#define CSS_VAL_OVERLINE 219
+#define CSS_VAL_PORTRAIT 220
+#define CSS_VAL_PRE 221
+#define CSS_VAL_RELATIVE 222
+#define CSS_VAL_SCROLL 223
+#define CSS_VAL_SEPARATE 224
+#define CSS_VAL_SHOW 225
+#define CSS_VAL_STATIC 226
+#define CSS_VAL_THICK 227
+#define CSS_VAL_THIN 228
+#define CSS_VAL_UNDERLINE 229
+#define CSS_VAL__KONQ_NOWRAP 230
+#define CSS_VAL__KONQ_NORMAL 231
+#define CSS_VAL__KONQ_AROUND_FLOATS 232
+#define CSS_VAL_STRETCH 233
+#define CSS_VAL_START 234
+#define CSS_VAL_END 235
+#define CSS_VAL_REVERSE 236
+#define CSS_VAL_HORIZONTAL 237
+#define CSS_VAL_VERTICAL 238
+#define CSS_VAL_INLINE_AXIS 239
+#define CSS_VAL_BLOCK_AXIS 240
+#define CSS_VAL_SINGLE 241
+#define CSS_VAL_MULTIPLE 242
-#define CSS_VAL_TOTAL 241
+#define CSS_VAL_TOTAL 243
#endif
diff --git a/WebCore/khtml/css/cssvalues.in b/WebCore/khtml/css/cssvalues.in
index da0bcdd..a099d07 100644
--- a/WebCore/khtml/css/cssvalues.in
+++ b/WebCore/khtml/css/cssvalues.in
@@ -182,6 +182,8 @@ left
right
center
justify
+-konq-left
+-konq-right
-konq-center
#
# CSS_PROP_LIST_STYLE_POSITION:
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index 4942bf7..aa50d66 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -168,17 +168,9 @@ TABLE {
\2d konq-flow-mode: \2d konq-around-floats;
}
-TD[align=left] > TABLE {
- margin-right: auto;
-}
-
-TD[align=right] > TABLE {
- margin-left: auto;
-}
-
TABLE[align="center"] {
- margin-left: auto !important;
- margin-right: auto !important;
+ margin-left: auto;
+ margin-right: auto;
}
THEAD {
@@ -229,12 +221,6 @@ CAPTION {
text-align: \2d konq-center;
}
-/* rules to deal with right-aligned divs. -dwh */
-DIV[align="right"] > TABLE,
-DIV[align="right"] > P,
-DIV[align="right"] > DIV
- { margin-left: auto; margin-right: 0px; }
-
/*
* Lists
*/
diff --git a/WebCore/khtml/html/html_blockimpl.cpp b/WebCore/khtml/html/html_blockimpl.cpp
index 7e5d862..db49a94 100644
--- a/WebCore/khtml/html/html_blockimpl.cpp
+++ b/WebCore/khtml/html/html_blockimpl.cpp
@@ -75,6 +75,10 @@ void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr)
DOMString v = attr->value();
if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_CENTER);
+ else if (strcasecmp(attr->value(), "left") == 0)
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_LEFT);
+ else if (strcasecmp(attr->value(), "right") == 0)
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
@@ -198,6 +202,10 @@ void HTMLParagraphElementImpl::parseAttribute(AttributeImpl *attr)
DOMString v = attr->value();
if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_CENTER);
+ else if (strcasecmp(attr->value(), "left") == 0)
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_LEFT);
+ else if (strcasecmp(attr->value(), "right") == 0)
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index 4adfcf3..0ce5a0d 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -600,6 +600,12 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
DOMString v = attr->value();
if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 )
addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_CENTER);
+ else if (strcasecmp(attr->value(), "absmiddle") == 0)
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER);
+ else if (strcasecmp(attr->value(), "left") == 0)
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_LEFT);
+ else if (strcasecmp(attr->value(), "right") == 0)
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 55f634f..170dd44 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -644,6 +644,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
int availableWidth = lineWidth(m_height);
switch(style()->textAlign()) {
case LEFT:
+ case KONQ_LEFT:
numSpaces = 0;
break;
case JUSTIFY:
@@ -656,6 +657,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
if (endEmbed->basicDir == QChar::DirL)
break;
case RIGHT:
+ case KONQ_RIGHT:
x += availableWidth - totWidth;
numSpaces = 0;
break;
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 293fc9d..6ec6c8e 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -915,9 +915,12 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
if (topMarginContributor && !child->isSelfCollapsingBlock())
topMarginContributor = false;
- int chPos = xPos + child->marginLeft();
+ int chPos = xPos;
if (style()->direction() == LTR) {
+ // Add in our left margin.
+ chPos += child->marginLeft();
+
// html blocks flow around floats
if (child->style()->hidesOverflow() || child->isFlexibleBox() ||
(( style()->htmlHacks() || child->isTable() ) && child->style()->flowAroundFloats()))
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index ec0de31..38bdb3e 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -795,19 +795,23 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw
else
{
if ( (ml.type == Variable && mr.type == Variable) ||
- (!(ml.type == Variable) &&
+ (ml.type != Variable && mr.type != Variable &&
containingBlock()->style()->textAlign() == KONQ_CENTER) )
{
m_marginLeft = (cw - m_width)/2;
if (m_marginLeft<0) m_marginLeft=0;
m_marginRight = cw - m_width - m_marginLeft;
}
- else if (mr.type == Variable)
+ else if (mr.type == Variable ||
+ (ml.type != Variable && containingBlock()->style()->direction() == RTL &&
+ containingBlock()->style()->textAlign() == KONQ_LEFT))
{
m_marginLeft = ml.width(cw);
m_marginRight = cw - m_width - m_marginLeft;
}
- else if (ml.type == Variable)
+ else if (ml.type == Variable ||
+ (mr.type != Variable && containingBlock()->style()->direction() == LTR &&
+ containingBlock()->style()->textAlign() == KONQ_RIGHT))
{
m_marginRight = mr.width(cw);
m_marginLeft = cw - m_width - m_marginRight;
diff --git a/WebCore/khtml/rendering/render_style.h b/WebCore/khtml/rendering/render_style.h
index ef967b2..b421325 100644
--- a/WebCore/khtml/rendering/render_style.h
+++ b/WebCore/khtml/rendering/render_style.h
@@ -477,7 +477,7 @@ enum EWhiteSpace {
};
enum ETextAlign {
- TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, KONQ_CENTER
+ TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, KONQ_LEFT, KONQ_RIGHT, KONQ_CENTER
};
enum ETextTransform {
@@ -601,12 +601,27 @@ protected:
// inherit
struct InheritedFlags {
- // 32 bit inherited, don't add to the struct, or the operator will break.
- bool operator==( const InheritedFlags &other ) const {
- return *((Q_UINT32 *)this) == *((Q_UINT32 *)&other);
+ bool operator==( const InheritedFlags &other ) const {
+ return (_empty_cells == other._empty_cells) &&
+ (_caption_side == other._caption_side) &&
+ (_list_style_type == other._list_style_type) &&
+ (_list_style_position == other._list_style_position) &&
+ (_visibility == other._visibility) &&
+ (_text_align == other._text_align) &&
+ (_text_transform == other._text_transform) &&
+ (_text_decorations == other._text_decorations) &&
+ (_text_transform == other._text_transform) &&
+ (_cursor_style == other._cursor_style) &&
+ (_direction == other._direction) &&
+ (_border_collapse == other._border_collapse) &&
+ (_white_space == other._white_space) &&
+ (_font_variant == other._font_variant) &&
+ (_box_direction == other._box_direction) &&
+ (_visuallyOrdered == other._visuallyOrdered) &&
+ (_htmlHacks == other._htmlHacks);
}
bool operator!=( const InheritedFlags &other ) const {
- return *((Q_UINT32 *)this) != *((Q_UINT32 *)&other);
+ return !(*this == other);
}
EEmptyCell _empty_cells : 1 ;
@@ -614,7 +629,7 @@ protected:
EListStyleType _list_style_type : 5 ;
EListStylePosition _list_style_position :1;
EVisibility _visibility : 2;
- ETextAlign _text_align : 3;
+ ETextAlign _text_align : 4;
ETextTransform _text_transform : 2;
int _text_decorations : 4;
ECursor _cursor_style : 4;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list