[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:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 47c1d4d7e4d988be81bf32993b2c9aed3ea1369a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 24 22:07:45 2003 +0000
Change all uses of "konq-" in CSS to "khtml-".
Also rename the CSS3 properties that have either buggy or
incomplete implementations to "-khtml-property" for forward
compatibility (so that people don't have to worry about a buggy
Safari if/when they use the official property names).
Reviewed by john
* khtml/css/cssparser.cpp:
(CSSParser::parseRule):
(CSSParser::parseValue):
(CSSParser::parseDeclaration):
(CSSParser::parseFontFamily):
(CSSParser::parseShadow):
* khtml/css/cssproperties.c:
(hash_prop):
(findProp):
* khtml/css/cssproperties.h:
* khtml/css/cssproperties.in:
* khtml/css/cssstyleselector.cpp:
* khtml/css/cssvalues.c:
(hash_val):
(findValue):
* khtml/css/cssvalues.h:
* khtml/css/cssvalues.in:
* khtml/css/html4.css:
* khtml/css/parser.cpp:
* khtml/css/parser.h:
* khtml/css/parser.y:
* khtml/css/quirks.css:
* khtml/css/tokenizer.cpp:
* khtml/css/tokenizer.flex:
* khtml/html/html_blockimpl.cpp:
(HTMLDivElementImpl::parseAttribute):
(HTMLParagraphElementImpl::parseAttribute):
* khtml/html/html_elementimpl.cpp:
(HTMLElementImpl::addHTMLAlignment):
* khtml/html/html_inlineimpl.cpp:
(HTMLFontElementImpl::parseAttribute):
* khtml/html/html_tableimpl.cpp:
(HTMLTablePartElementImpl::parseAttribute):
(HTMLTableCellElementImpl::parseAttribute):
* khtml/rendering/bidi.cpp:
* khtml/rendering/render_block.cpp:
* khtml/rendering/render_box.cpp:
(RenderBox::calcHorizontalMargins):
* khtml/rendering/render_flexbox.cpp:
* khtml/rendering/render_style.h:
* khtml/rendering/render_table.cpp:
(RenderTableCell::setStyle):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4704 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 90d7b62..bbd719e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,57 @@
+2003-07-24 Dave Hyatt <hyatt at apple.com>
+
+ Change all uses of "konq-" in CSS to "khtml-".
+
+ Also rename the CSS3 properties that have either buggy or
+ incomplete implementations to "-khtml-property" for forward
+ compatibility (so that people don't have to worry about a buggy
+ Safari if/when they use the official property names).
+
+ Reviewed by john
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseRule):
+ (CSSParser::parseValue):
+ (CSSParser::parseDeclaration):
+ (CSSParser::parseFontFamily):
+ (CSSParser::parseShadow):
+ * khtml/css/cssproperties.c:
+ (hash_prop):
+ (findProp):
+ * khtml/css/cssproperties.h:
+ * khtml/css/cssproperties.in:
+ * khtml/css/cssstyleselector.cpp:
+ * khtml/css/cssvalues.c:
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h:
+ * khtml/css/cssvalues.in:
+ * khtml/css/html4.css:
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.h:
+ * khtml/css/parser.y:
+ * khtml/css/quirks.css:
+ * khtml/css/tokenizer.cpp:
+ * khtml/css/tokenizer.flex:
+ * khtml/html/html_blockimpl.cpp:
+ (HTMLDivElementImpl::parseAttribute):
+ (HTMLParagraphElementImpl::parseAttribute):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::addHTMLAlignment):
+ * khtml/html/html_inlineimpl.cpp:
+ (HTMLFontElementImpl::parseAttribute):
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTablePartElementImpl::parseAttribute):
+ (HTMLTableCellElementImpl::parseAttribute):
+ * khtml/rendering/bidi.cpp:
+ * khtml/rendering/render_block.cpp:
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::calcHorizontalMargins):
+ * khtml/rendering/render_flexbox.cpp:
+ * khtml/rendering/render_style.h:
+ * khtml/rendering/render_table.cpp:
+ (RenderTableCell::setStyle):
+
=== Safari-90 ===
2003-07-23 Dave Hyatt <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 90d7b62..bbd719e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,57 @@
+2003-07-24 Dave Hyatt <hyatt at apple.com>
+
+ Change all uses of "konq-" in CSS to "khtml-".
+
+ Also rename the CSS3 properties that have either buggy or
+ incomplete implementations to "-khtml-property" for forward
+ compatibility (so that people don't have to worry about a buggy
+ Safari if/when they use the official property names).
+
+ Reviewed by john
+
+ * khtml/css/cssparser.cpp:
+ (CSSParser::parseRule):
+ (CSSParser::parseValue):
+ (CSSParser::parseDeclaration):
+ (CSSParser::parseFontFamily):
+ (CSSParser::parseShadow):
+ * khtml/css/cssproperties.c:
+ (hash_prop):
+ (findProp):
+ * khtml/css/cssproperties.h:
+ * khtml/css/cssproperties.in:
+ * khtml/css/cssstyleselector.cpp:
+ * khtml/css/cssvalues.c:
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h:
+ * khtml/css/cssvalues.in:
+ * khtml/css/html4.css:
+ * khtml/css/parser.cpp:
+ * khtml/css/parser.h:
+ * khtml/css/parser.y:
+ * khtml/css/quirks.css:
+ * khtml/css/tokenizer.cpp:
+ * khtml/css/tokenizer.flex:
+ * khtml/html/html_blockimpl.cpp:
+ (HTMLDivElementImpl::parseAttribute):
+ (HTMLParagraphElementImpl::parseAttribute):
+ * khtml/html/html_elementimpl.cpp:
+ (HTMLElementImpl::addHTMLAlignment):
+ * khtml/html/html_inlineimpl.cpp:
+ (HTMLFontElementImpl::parseAttribute):
+ * khtml/html/html_tableimpl.cpp:
+ (HTMLTablePartElementImpl::parseAttribute):
+ (HTMLTableCellElementImpl::parseAttribute):
+ * khtml/rendering/bidi.cpp:
+ * khtml/rendering/render_block.cpp:
+ * khtml/rendering/render_box.cpp:
+ (RenderBox::calcHorizontalMargins):
+ * khtml/rendering/render_flexbox.cpp:
+ * khtml/rendering/render_style.h:
+ * khtml/rendering/render_table.cpp:
+ (RenderTableCell::setStyle):
+
=== Safari-90 ===
2003-07-23 Dave Hyatt <hyatt at apple.com>
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 6e7f3ae..0e92919 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -159,12 +159,12 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
{
styleElement = sheet;
- const char konq_rule[] = "@-konq-rule{";
- int length = string.length() + 4 + strlen(konq_rule);
+ const char khtml_rule[] = "@-khtml-rule{";
+ int length = string.length() + 4 + strlen(khtml_rule);
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
- for ( unsigned int i = 0; i < strlen(konq_rule); i++ )
- data[i] = konq_rule[i];
- memcpy( data + strlen( konq_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
+ for ( unsigned int i = 0; i < strlen(khtml_rule); i++ )
+ data[i] = khtml_rule[i];
+ memcpy( data + strlen( khtml_rule ), string.unicode(), string.length()*sizeof( unsigned short) );
// qDebug("parse string = '%s'", QConstString( (const QChar *)data, length ).string().latin1() );
data[length-1] = 0;
data[length-2] = 0;
@@ -196,12 +196,12 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
styleElement = declaration->stylesheet();
- const char konq_value[] = "@-konq-value{";
- int length = string.length() + 4 + strlen(konq_value);
+ const char khtml_value[] = "@-khtml-value{";
+ int length = string.length() + 4 + strlen(khtml_value);
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
- for ( unsigned int i = 0; i < strlen(konq_value); i++ )
- data[i] = konq_value[i];
- memcpy( data + strlen( konq_value ), string.unicode(), string.length()*sizeof( unsigned short) );
+ for ( unsigned int i = 0; i < strlen(khtml_value); i++ )
+ data[i] = khtml_value[i];
+ memcpy( data + strlen( khtml_value ), string.unicode(), string.length()*sizeof( unsigned short) );
data[length-1] = 0;
data[length-2] = 0;
data[length-3] = ' ';
@@ -247,12 +247,12 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
styleElement = declaration->stylesheet();
- const char konq_decls[] = "@-konq-decls{";
- int length = string.length() + 4 + strlen(konq_decls);
+ const char khtml_decls[] = "@-khtml-decls{";
+ int length = string.length() + 4 + strlen(khtml_decls);
data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
- for ( unsigned int i = 0; i < strlen(konq_decls); i++ )
- data[i] = konq_decls[i];
- memcpy( data + strlen( konq_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
+ for ( unsigned int i = 0; i < strlen(khtml_decls); i++ )
+ data[i] = khtml_decls[i];
+ memcpy( data + strlen( khtml_decls ), string.unicode(), string.length()*sizeof( unsigned short) );
data[length-1] = 0;
data[length-2] = 0;
data[length-3] = ' ';
@@ -524,7 +524,7 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_DISPLAY:
- // inline | block | list-item | run-in | inline-block | -konq-ruler | table |
+ // 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)
@@ -554,8 +554,8 @@ bool CSSParser::parseValue( int propId, bool important )
break;
case CSS_PROP_TEXT_ALIGN:
- // left | right | center | justify | konq_left | konq_right | konq_center | <string> | inherit
- if ( ( id >= CSS_VAL__KONQ_AUTO && id <= CSS_VAL__KONQ_CENTER ) ||
+ // left | right | center | justify | khtml_left | khtml_right | khtml_center | <string> | inherit
+ if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) ||
value->unit == CSSPrimitiveValue::CSS_STRING )
valid_primitive = true;
break;
@@ -727,11 +727,11 @@ bool CSSParser::parseValue( int propId, bool important )
/* fall through */
case CSS_PROP_COLOR: // <color> | inherit
case CSS_PROP_TEXT_DECORATION_COLOR:
- if (id == CSS_VAL__KONQ_TEXT)
+ if (id == CSS_VAL__KHTML_TEXT)
valid_primitive = true; // Always allow this, even when strict parsing is on,
// since we use this in our UA sheets.
else if ( id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT || id == CSS_VAL_MENU ||
- (id >= CSS_VAL_GREY && id < CSS_VAL__KONQ_TEXT && (nonCSSHint|!strict)) ) {
+ (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict)) ) {
valid_primitive = true;
} else {
parsedValue = parseColor();
@@ -843,7 +843,7 @@ bool CSSParser::parseValue( int propId, bool important )
// baseline | sub | super | top | text-top | middle | bottom | text-bottom |
// <percentage> | <length> | inherit
- if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KONQ_BASELINE_MIDDLE )
+ if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE )
valid_primitive = true;
else
valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) );
@@ -966,49 +966,49 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true;
break;
- case CSS_PROP__KONQ_FLOW_MODE:
- if ( id == CSS_VAL__KONQ_NORMAL || id == CSS_VAL__KONQ_AROUND_FLOATS )
+ case CSS_PROP__KHTML_FLOW_MODE:
+ if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS )
valid_primitive = true;
break;
/* CSS3 properties */
- case CSS_PROP_OPACITY:
- valid_primitive = validUnit(value, FNumber, strict);
- break;
case CSS_PROP_TEXT_SHADOW: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3
if (id == CSS_VAL_NONE)
valid_primitive = true;
else
return parseShadow(propId, important);
break;
- case CSS_PROP_BOX_ALIGN:
+ case CSS_PROP__KHTML_OPACITY:
+ valid_primitive = validUnit(value, FNumber, strict);
+ break;
+ case CSS_PROP__KHTML_BOX_ALIGN:
if (id == CSS_VAL_STRETCH || id == CSS_VAL_START || id == CSS_VAL_END ||
id == CSS_VAL_CENTER || id == CSS_VAL_BASELINE)
valid_primitive = true;
break;
- case CSS_PROP_BOX_DIRECTION:
+ case CSS_PROP__KHTML_BOX_DIRECTION:
if (id == CSS_VAL_NORMAL || id == CSS_VAL_REVERSE)
valid_primitive = true;
break;
- case CSS_PROP_BOX_LINES:
+ case CSS_PROP__KHTML_BOX_LINES:
if (id == CSS_VAL_SINGLE || id == CSS_VAL_MULTIPLE)
valid_primitive = true;
break;
- case CSS_PROP_BOX_ORIENT:
+ case CSS_PROP__KHTML_BOX_ORIENT:
if (id == CSS_VAL_HORIZONTAL || id == CSS_VAL_VERTICAL ||
id == CSS_VAL_INLINE_AXIS || id == CSS_VAL_BLOCK_AXIS)
valid_primitive = true;
break;
- case CSS_PROP_BOX_PACK:
+ case CSS_PROP__KHTML_BOX_PACK:
if (id == CSS_VAL_START || id == CSS_VAL_END ||
id == CSS_VAL_CENTER || id == CSS_VAL_JUSTIFY)
valid_primitive = true;
break;
- case CSS_PROP_BOX_FLEX:
+ case CSS_PROP__KHTML_BOX_FLEX:
valid_primitive = validUnit(value, FNumber, strict);
break;
- case CSS_PROP_BOX_FLEX_GROUP:
- case CSS_PROP_BOX_ORDINAL_GROUP:
+ case CSS_PROP__KHTML_BOX_FLEX_GROUP:
+ case CSS_PROP__KHTML_BOX_ORDINAL_GROUP:
valid_primitive = validUnit(value, FInteger|FNonNeg, true);
break;
@@ -1500,10 +1500,10 @@ CSSValueListImpl *CSSParser::parseFontFamily()
bool nextValBreaksFont = !nextValue ||
(nextValue->unit == Value::Operator && nextValue->iValue == ',');
bool nextValIsFontName = nextValue &&
- ((nextValue->id >= CSS_VAL_SERIF && nextValue->id <= CSS_VAL__KONQ_BODY) ||
+ ((nextValue->id >= CSS_VAL_SERIF && nextValue->id <= CSS_VAL__KHTML_BODY) ||
(nextValue->unit == CSSPrimitiveValue::CSS_STRING || nextValue->unit == CSSPrimitiveValue::CSS_IDENT));
- if (value->id >= CSS_VAL_SERIF && value->id <= CSS_VAL__KONQ_BODY) {
+ if (value->id >= CSS_VAL_SERIF && value->id <= CSS_VAL__KHTML_BODY) {
if (currFamily) {
currFamily->parsedFontName += ' ';
currFamily->parsedFontName += qString(value->string);
@@ -1789,7 +1789,7 @@ bool CSSParser::parseShadow( int propId, bool important )
// The only other type of value that's ok is a color value.
CSSPrimitiveValueImpl* parsedColor = 0;
bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
- (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KONQ_TEXT && (nonCSSHint|!strict)));
+ (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict)));
if (isColor) {
if (!context.allowColor)
return context.failed();
diff --git a/WebCore/khtml/css/cssproperties.c b/WebCore/khtml/css/cssproperties.c
index 87a7f32..f7a80d9 100644
--- a/WebCore/khtml/css/cssproperties.c
+++ b/WebCore/khtml/css/cssproperties.c
@@ -7,7 +7,7 @@ struct props {
const char *name;
int id;
};
-/* maximum key range = 832, duplicates = 0 */
+/* maximum key range = 855, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -21,32 +21,32 @@ hash_prop (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 0, 835, 835, 835, 835,
- 835, 5, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 15, 230, 0,
- 0, 0, 75, 0, 45, 0, 0, 30, 0, 70,
- 120, 0, 0, 5, 0, 125, 0, 0, 0, 150,
- 35, 160, 5, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835, 835, 835, 835, 835,
- 835, 835, 835, 835, 835, 835
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 0, 860, 860, 860, 860,
+ 860, 0, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 25, 35, 0,
+ 0, 0, 160, 0, 30, 0, 0, 100, 0, 135,
+ 158, 0, 10, 5, 0, 20, 0, 110, 15, 220,
+ 95, 210, 10, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860, 860, 860, 860, 860,
+ 860, 860, 860, 860, 860, 860
};
register int hval = len;
@@ -121,221 +121,223 @@ findProp (register const char *str, register unsigned int len)
TOTAL_KEYWORDS = 121,
MIN_WORD_LENGTH = 3,
MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 3,
- MAX_HASH_VALUE = 834
+ MIN_HASH_VALUE = 5,
+ MAX_HASH_VALUE = 859
};
static const struct props wordlist_prop[] =
{
+ {"color", CSS_PROP_COLOR},
{"top", CSS_PROP_TOP},
{"clip", CSS_PROP_CLIP},
- {"color", CSS_PROP_COLOR},
- {"page", CSS_PROP_PAGE},
{"clear", CSS_PROP_CLEAR},
+ {"size", CSS_PROP_SIZE},
{"right", CSS_PROP_RIGHT},
- {"left", CSS_PROP_LEFT},
- {"float", CSS_PROP_FLOAT},
+ {"page", CSS_PROP_PAGE},
+ {"border", CSS_PROP_BORDER},
+ {"border-color", CSS_PROP_BORDER_COLOR},
+ {"border-top", CSS_PROP_BORDER_TOP},
+ {"border-top-color", CSS_PROP_BORDER_TOP_COLOR},
{"height", CSS_PROP_HEIGHT},
- {"outline", CSS_PROP_OUTLINE},
- {"direction", CSS_PROP_DIRECTION},
+ {"border-right", CSS_PROP_BORDER_RIGHT},
+ {"border-right-color", CSS_PROP_BORDER_RIGHT_COLOR},
+ {"border-collapse", CSS_PROP_BORDER_COLLAPSE},
+ {"scrollbar-3dlight-color", CSS_PROP_SCROLLBAR_3DLIGHT_COLOR},
{"cursor", CSS_PROP_CURSOR},
- {"outline-color", CSS_PROP_OUTLINE_COLOR},
- {"size", CSS_PROP_SIZE},
{"quotes", CSS_PROP_QUOTES},
+ {"left", CSS_PROP_LEFT},
+ {"direction", CSS_PROP_DIRECTION},
+ {"bottom", CSS_PROP_BOTTOM},
+ {"float", CSS_PROP_FLOAT},
+ {"scrollbar-highlight-color", CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR},
+ {"position", CSS_PROP_POSITION},
{"padding", CSS_PROP_PADDING},
+ {"border-left", CSS_PROP_BORDER_LEFT},
+ {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
{"padding-top", CSS_PROP_PADDING_TOP},
+ {"border-bottom", CSS_PROP_BORDER_BOTTOM},
+ {"border-bottom-color", CSS_PROP_BORDER_BOTTOM_COLOR},
+ {"caption-side", CSS_PROP_CAPTION_SIDE},
+ {"scrollbar-track-color", CSS_PROP_SCROLLBAR_TRACK_COLOR},
+ {"letter-spacing", CSS_PROP_LETTER_SPACING},
+ {"line-height", CSS_PROP_LINE_HEIGHT},
+ {"padding-right", CSS_PROP_PADDING_RIGHT},
{"vertical-align", CSS_PROP_VERTICAL_ALIGN},
+ {"orphans", CSS_PROP_ORPHANS},
+ {"width", CSS_PROP_WIDTH},
+ {"list-style", CSS_PROP_LIST_STYLE},
+ {"border-spacing", CSS_PROP_BORDER_SPACING},
{"z-index", CSS_PROP_Z_INDEX},
+ {"display", CSS_PROP_DISPLAY},
+ {"outline", CSS_PROP_OUTLINE},
+ {"border-style", CSS_PROP_BORDER_STYLE},
+ {"outline-color", CSS_PROP_OUTLINE_COLOR},
+ {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
{"text-align", CSS_PROP_TEXT_ALIGN},
- {"opacity", CSS_PROP_OPACITY},
+ {"visibility", CSS_PROP_VISIBILITY},
+ {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
{"text-decoration", CSS_PROP_TEXT_DECORATION},
+ {"border-width", CSS_PROP_BORDER_WIDTH},
{"text-decoration-color", CSS_PROP_TEXT_DECORATION_COLOR},
- {"padding-right", CSS_PROP_PADDING_RIGHT},
+ {"counter-reset", CSS_PROP_COUNTER_RESET},
+ {"border-top-width", CSS_PROP_BORDER_TOP_WIDTH},
+ {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
+ {"unicode-bidi", CSS_PROP_UNICODE_BIDI},
+ {"white-space", CSS_PROP_WHITE_SPACE},
{"font", CSS_PROP_FONT},
- {"width", CSS_PROP_WIDTH},
+ {"content", CSS_PROP_CONTENT},
{"margin", CSS_PROP_MARGIN},
- {"margin-top", CSS_PROP_MARGIN_TOP},
{"max-height", CSS_PROP_MAX_HEIGHT},
- {"line-height", CSS_PROP_LINE_HEIGHT},
- {"padding-left", CSS_PROP_PADDING_LEFT},
- {"overflow", CSS_PROP_OVERFLOW},
- {"border", CSS_PROP_BORDER},
- {"border-top", CSS_PROP_BORDER_TOP},
- {"border-color", CSS_PROP_BORDER_COLOR},
- {"border-top-color", CSS_PROP_BORDER_TOP_COLOR},
- {"content", CSS_PROP_CONTENT},
- {"position", CSS_PROP_POSITION},
- {"counter-reset", CSS_PROP_COUNTER_RESET},
+ {"border-right-width", CSS_PROP_BORDER_RIGHT_WIDTH},
+ {"margin-top", CSS_PROP_MARGIN_TOP},
+ {"scrollbar-arrow-color", CSS_PROP_SCROLLBAR_ARROW_COLOR},
+ {"font-size", CSS_PROP_FONT_SIZE},
{"margin-right", CSS_PROP_MARGIN_RIGHT},
- {"caption-side", CSS_PROP_CAPTION_SIDE},
- {"letter-spacing", CSS_PROP_LETTER_SPACING},
- {"text-indent", CSS_PROP_TEXT_INDENT},
- {"border-right", CSS_PROP_BORDER_RIGHT},
{"min-height", CSS_PROP_MIN_HEIGHT},
- {"margin-left", CSS_PROP_MARGIN_LEFT},
- {"border-right-color", CSS_PROP_BORDER_RIGHT_COLOR},
- {"bottom", CSS_PROP_BOTTOM},
- {"display", CSS_PROP_DISPLAY},
- {"orphans", CSS_PROP_ORPHANS},
- {"border-left", CSS_PROP_BORDER_LEFT},
- {"box-pack", CSS_PROP_BOX_PACK},
- {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
- {"max-width", CSS_PROP_MAX_WIDTH},
- {"outline-width", CSS_PROP_OUTLINE_WIDTH},
- {"font-size", CSS_PROP_FONT_SIZE},
- {"white-space", CSS_PROP_WHITE_SPACE},
- {"font-variant", CSS_PROP_FONT_VARIANT},
- {"unicode-bidi", CSS_PROP_UNICODE_BIDI},
- {"empty-cells", CSS_PROP_EMPTY_CELLS},
+ {"padding-left", CSS_PROP_PADDING_LEFT},
+ {"padding-bottom", CSS_PROP_PADDING_BOTTOM},
{"font-stretch", CSS_PROP_FONT_STRETCH},
- {"text-shadow", CSS_PROP_TEXT_SHADOW},
- {"box-flex", CSS_PROP_BOX_FLEX},
- {"border-collapse", CSS_PROP_BORDER_COLLAPSE},
- {"box-flex-group", CSS_PROP_BOX_FLEX_GROUP},
- {"min-width", CSS_PROP_MIN_WIDTH},
- {"box-orient", CSS_PROP_BOX_ORIENT},
+ {"empty-cells", CSS_PROP_EMPTY_CELLS},
+ {"page-break-inside", CSS_PROP_PAGE_BREAK_INSIDE},
{"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
- {"box-direction", CSS_PROP_BOX_DIRECTION},
- {"font-weight", CSS_PROP_FONT_WEIGHT},
- {"marker-offset", CSS_PROP_MARKER_OFFSET},
+ {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
+ {"text-shadow", CSS_PROP_TEXT_SHADOW},
+ {"overflow", CSS_PROP_OVERFLOW},
+ {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
+ {"table-layout", CSS_PROP_TABLE_LAYOUT},
+ {"text-indent", CSS_PROP_TEXT_INDENT},
+ {"list-style-image", CSS_PROP_LIST_STYLE_IMAGE},
{"background", CSS_PROP_BACKGROUND},
- {"box-align", CSS_PROP_BOX_ALIGN},
+ {"border-left-style", CSS_PROP_BORDER_LEFT_STYLE},
{"background-color", CSS_PROP_BACKGROUND_COLOR},
- {"box-ordinal-group", CSS_PROP_BOX_ORDINAL_GROUP},
- {"outline-style", CSS_PROP_OUTLINE_STYLE},
- {"list-style", CSS_PROP_LIST_STYLE},
{"word-spacing", CSS_PROP_WORD_SPACING},
- {"background-repeat", CSS_PROP_BACKGROUND_REPEAT},
+ {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
+ {"list-style-position", CSS_PROP_LIST_STYLE_POSITION},
+ {"border-left-width", CSS_PROP_BORDER_LEFT_WIDTH},
{"widows", CSS_PROP_WIDOWS},
- {"table-layout", CSS_PROP_TABLE_LAYOUT},
- {"scrollbar-track-color", CSS_PROP_SCROLLBAR_TRACK_COLOR},
- {"border-width", CSS_PROP_BORDER_WIDTH},
- {"border-top-width", CSS_PROP_BORDER_TOP_WIDTH},
- {"scrollbar-3dlight-color", CSS_PROP_SCROLLBAR_3DLIGHT_COLOR},
- {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
- {"padding-bottom", CSS_PROP_PADDING_BOTTOM},
- {"text-transform", CSS_PROP_TEXT_TRANSFORM},
- {"-konq-flow-mode", CSS_PROP__KONQ_FLOW_MODE},
- {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
+ {"border-bottom-width", CSS_PROP_BORDER_BOTTOM_WIDTH},
+ {"background-repeat", CSS_PROP_BACKGROUND_REPEAT},
+ {"list-style-type", CSS_PROP_LIST_STYLE_TYPE},
+ {"margin-left", CSS_PROP_MARGIN_LEFT},
+ {"margin-bottom", CSS_PROP_MARGIN_BOTTOM},
+ {"outline-style", CSS_PROP_OUTLINE_STYLE},
+ {"max-width", CSS_PROP_MAX_WIDTH},
{"font-size-adjust", CSS_PROP_FONT_SIZE_ADJUST},
- {"border-right-width", CSS_PROP_BORDER_RIGHT_WIDTH},
+ {"-khtml-opacity", CSS_PROP__KHTML_OPACITY},
+ {"scrollbar-darkshadow-color", CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR},
+ {"outline-width", CSS_PROP_OUTLINE_WIDTH},
+ {"-khtml-box-pack", CSS_PROP__KHTML_BOX_PACK},
+ {"min-width", CSS_PROP_MIN_WIDTH},
+ {"font-variant", CSS_PROP_FONT_VARIANT},
{"font-style", CSS_PROP_FONT_STYLE},
+ {"-khtml-box-orient", CSS_PROP__KHTML_BOX_ORIENT},
+ {"-khtml-box-direction", CSS_PROP__KHTML_BOX_DIRECTION},
+ {"font-weight", CSS_PROP_FONT_WEIGHT},
+ {"-khtml-box-lines", CSS_PROP__KHTML_BOX_LINES},
+ {"-khtml-box-align", CSS_PROP__KHTML_BOX_ALIGN},
{"background-image", CSS_PROP_BACKGROUND_IMAGE},
- {"border-spacing", CSS_PROP_BORDER_SPACING},
- {"list-style-image", CSS_PROP_LIST_STYLE_IMAGE},
- {"border-left-width", CSS_PROP_BORDER_LEFT_WIDTH},
- {"margin-bottom", CSS_PROP_MARGIN_BOTTOM},
- {"box-lines", CSS_PROP_BOX_LINES},
- {"visibility", CSS_PROP_VISIBILITY},
- {"font-family", CSS_PROP_FONT_FAMILY},
- {"border-style", CSS_PROP_BORDER_STYLE},
- {"scrollbar-highlight-color", CSS_PROP_SCROLLBAR_HIGHLIGHT_COLOR},
- {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
- {"border-bottom", CSS_PROP_BORDER_BOTTOM},
- {"border-bottom-color", CSS_PROP_BORDER_BOTTOM_COLOR},
- {"page-break-inside", CSS_PROP_PAGE_BREAK_INSIDE},
- {"scrollbar-arrow-color", CSS_PROP_SCROLLBAR_ARROW_COLOR},
- {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
- {"list-style-type", CSS_PROP_LIST_STYLE_TYPE},
- {"border-left-style", CSS_PROP_BORDER_LEFT_STYLE},
- {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
+ {"text-transform", CSS_PROP_TEXT_TRANSFORM},
+ {"marker-offset", CSS_PROP_MARKER_OFFSET},
{"background-position", CSS_PROP_BACKGROUND_POSITION},
- {"list-style-position", CSS_PROP_LIST_STYLE_POSITION},
- {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
+ {"-khtml-box-flex", CSS_PROP__KHTML_BOX_FLEX},
+ {"-khtml-box-ordinal-group", CSS_PROP__KHTML_BOX_ORDINAL_GROUP},
{"background-position-x", CSS_PROP_BACKGROUND_POSITION_X},
- {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
- {"border-bottom-width", CSS_PROP_BORDER_BOTTOM_WIDTH},
- {"scrollbar-darkshadow-color", CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR},
+ {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
+ {"-khtml-box-flex-group", CSS_PROP__KHTML_BOX_FLEX_GROUP},
+ {"-khtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE},
+ {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
{"background-position-y", CSS_PROP_BACKGROUND_POSITION_Y},
- {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE}
+ {"font-family", CSS_PROP_FONT_FAMILY}
};
static const signed char lookup[] =
{
- -1, -1, -1, 0, 1, 2, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
- 4, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 0, -1, -1, -1, -1,
+ -1, -1, -1, 1, 2, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 3, -1, -1, -1, 4, 5, -1, -1, -1, 6,
+ -1, 7, -1, -1, -1, -1, -1, 8, -1, -1,
+ -1, -1, -1, -1, -1, 9, -1, -1, -1, -1,
+ -1, 10, -1, -1, -1, -1, 11, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 12, -1, -1,
+ -1, -1, -1, 13, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 14, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 5, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 6,
+ -1, -1, -1, 15, -1, -1, 16, -1, -1, -1,
+ -1, 17, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 7, 8, -1, -1, -1,
+ -1, -1, -1, -1, 18, -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,
+ 21, -1, -1, -1, -1, 22, 23, -1, -1, -1,
+ 24, -1, -1, -1, -1, -1, 25, -1, -1, -1,
+ -1, -1, 26, -1, 27, -1, -1, -1, 28, -1,
+ -1, -1, -1, -1, 29, 30, 31, 32, -1, 33,
+ -1, -1, -1, -1, -1, -1, 34, 35, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 9, -1, 10,
- -1, 11, -1, 12, 13, -1, 14, -1, -1, -1,
- -1, -1, 15, -1, -1, -1, 16, -1, -1, -1,
+ 36, -1, -1, -1, -1, 37, -1, -1, -1, -1,
+ 38, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ 40, -1, 41, -1, -1, 42, -1, 43, -1, -1,
+ -1, 44, -1, -1, -1, 45, -1, -1, 46, -1,
+ 47, 48, -1, 49, -1, -1, -1, 50, -1, 51,
+ -1, 52, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 53, -1, 54, -1, 55, 56, -1, -1, -1,
+ -1, -1, 57, 58, 59, 60, -1, -1, -1, -1,
+ -1, -1, -1, 61, -1, -1, -1, -1, 62, -1,
+ -1, -1, -1, -1, -1, -1, 63, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 64, -1, -1,
+ 65, -1, -1, 66, -1, 67, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 68, -1, -1,
+ 69, -1, -1, -1, -1, -1, 70, -1, -1, -1,
+ 71, -1, -1, -1, -1, -1, 72, 73, -1, -1,
+ -1, 74, -1, 75, -1, -1, -1, 76, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 77, -1, -1,
+ -1, -1, 78, -1, -1, -1, 79, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 80, -1,
+ -1, -1, 81, -1, 82, 83, -1, -1, -1, -1,
+ -1, -1, -1, -1, 84, -1, -1, 85, -1, -1,
+ -1, -1, 86, -1, -1, -1, 87, -1, -1, -1,
+ -1, -1, -1, -1, 88, -1, -1, -1, -1, -1,
+ 89, -1, -1, -1, -1, 90, -1, -1, -1, 91,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 17, -1, -1, 18, -1, -1,
+ -1, 92, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 93, -1, -1, 94, -1, -1, -1, -1, 95,
+ -1, -1, -1, -1, 96, -1, 97, -1, -1, -1,
+ -1, 98, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 99, -1, -1, -1, -1,
+ -1, -1, 100, 101, -1, -1, -1, -1, 102, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 19, -1, 20, -1, -1, 21, -1, -1, -1, -1,
- -1, 22, -1, 23, -1, -1, -1, -1, -1, 24,
- 25, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 26, -1, -1, -1, 27, -1, -1, -1, -1,
- 28, 29, 30, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 31, -1, -1, 32, -1, -1, -1,
- 33, -1, 34, -1, -1, -1, 35, 36, -1, -1,
- -1, -1, -1, 37, -1, -1, -1, -1, 38, -1,
- -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 40, -1, 41, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 42, 43, -1, -1,
- 44, 45, -1, 46, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 47, 48, -1, -1,
- -1, -1, 49, -1, -1, -1, 50, -1, 51, -1,
- -1, -1, 52, -1, 53, -1, -1, -1, 54, -1,
- -1, -1, -1, -1, 55, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 56, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 57, -1, -1,
- -1, -1, 58, -1, -1, -1, 59, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 60, -1, -1,
- -1, 61, -1, 62, -1, 63, -1, -1, -1, 64,
- -1, -1, -1, -1, 65, 66, 67, -1, 68, -1,
- -1, 69, -1, 70, -1, 71, -1, -1, -1, 72,
- -1, 73, -1, -1, -1, -1, -1, 74, 75, -1,
- 76, -1, 77, -1, -1, -1, -1, 78, -1, -1,
- -1, 79, 80, -1, -1, -1, 81, 82, -1, -1,
- -1, 83, -1, 84, -1, -1, -1, 85, -1, 86,
- -1, -1, -1, -1, 87, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 88, -1, -1, -1, -1,
+ 103, -1, -1, 104, -1, -1, -1, -1, -1, 105,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 106,
+ -1, -1, -1, -1, 107, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 108, -1, -1, 109, -1, -1,
+ -1, -1, -1, 110, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 89, 90, -1, -1, -1, -1, -1, -1, 91, -1,
- 92, -1, -1, -1, -1, -1, 93, -1, -1, -1,
- -1, -1, -1, -1, 94, -1, -1, -1, -1, -1,
- -1, 95, -1, -1, -1, -1, -1, 96, 97, 98,
- -1, -1, -1, -1, -1, 99, 100, 101, -1, -1,
- 102, 103, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 104, -1, -1, -1, -1, -1, 105,
- -1, -1, 106, -1, -1, -1, 107, -1, -1, -1,
+ -1, -1, -1, -1, -1, 111, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 108, -1,
- -1, -1, -1, -1, -1, 109, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 110, -1, -1,
- -1, -1, 111, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 112, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 112,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 113, -1, -1, -1, -1, -1,
- -1, 114, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 115, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 113, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 114, -1, -1, -1, 115, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 116, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 117, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 118, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 116, -1, -1, -1, -1, 117, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 118, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 119, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 120
+ -1, -1, -1, -1, -1, -1, -1, 119, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 120
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -381,14 +383,14 @@ static const char * const propertyList[] = {
"border-bottom-width",
"border-left-width",
"bottom",
-"box-align",
-"box-direction",
-"box-flex",
-"box-flex-group",
-"box-lines",
-"box-ordinal-group",
-"box-orient",
-"box-pack",
+"-khtml-box-align",
+"-khtml-box-direction",
+"-khtml-box-flex",
+"-khtml-box-flex-group",
+"-khtml-box-lines",
+"-khtml-box-ordinal-group",
+"-khtml-box-orient",
+"-khtml-box-pack",
"caption-side",
"clear",
"clip",
@@ -424,7 +426,7 @@ static const char * const propertyList[] = {
"max-width",
"min-height",
"min-width",
-"opacity",
+"-khtml-opacity",
"orphans",
"outline-color",
"outline-style",
@@ -479,7 +481,7 @@ static const char * const propertyList[] = {
"scrollbar-darkshadow-color",
"scrollbar-track-color",
"scrollbar-arrow-color",
-"-konq-flow-mode",
+"-khtml-flow-mode",
0
};
DOMString getPropertyName(unsigned short id)
diff --git a/WebCore/khtml/css/cssproperties.h b/WebCore/khtml/css/cssproperties.h
index 09c0dab..d21b5b8 100644
--- a/WebCore/khtml/css/cssproperties.h
+++ b/WebCore/khtml/css/cssproperties.h
@@ -29,14 +29,14 @@
#define CSS_PROP_BORDER_BOTTOM_WIDTH 20
#define CSS_PROP_BORDER_LEFT_WIDTH 21
#define CSS_PROP_BOTTOM 22
-#define CSS_PROP_BOX_ALIGN 23
-#define CSS_PROP_BOX_DIRECTION 24
-#define CSS_PROP_BOX_FLEX 25
-#define CSS_PROP_BOX_FLEX_GROUP 26
-#define CSS_PROP_BOX_LINES 27
-#define CSS_PROP_BOX_ORDINAL_GROUP 28
-#define CSS_PROP_BOX_ORIENT 29
-#define CSS_PROP_BOX_PACK 30
+#define CSS_PROP__KHTML_BOX_ALIGN 23
+#define CSS_PROP__KHTML_BOX_DIRECTION 24
+#define CSS_PROP__KHTML_BOX_FLEX 25
+#define CSS_PROP__KHTML_BOX_FLEX_GROUP 26
+#define CSS_PROP__KHTML_BOX_LINES 27
+#define CSS_PROP__KHTML_BOX_ORDINAL_GROUP 28
+#define CSS_PROP__KHTML_BOX_ORIENT 29
+#define CSS_PROP__KHTML_BOX_PACK 30
#define CSS_PROP_CAPTION_SIDE 31
#define CSS_PROP_CLEAR 32
#define CSS_PROP_CLIP 33
@@ -72,7 +72,7 @@
#define CSS_PROP_MAX_WIDTH 63
#define CSS_PROP_MIN_HEIGHT 64
#define CSS_PROP_MIN_WIDTH 65
-#define CSS_PROP_OPACITY 66
+#define CSS_PROP__KHTML_OPACITY 66
#define CSS_PROP_ORPHANS 67
#define CSS_PROP_OUTLINE_COLOR 68
#define CSS_PROP_OUTLINE_STYLE 69
@@ -127,7 +127,7 @@
#define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 118
#define CSS_PROP_SCROLLBAR_TRACK_COLOR 119
#define CSS_PROP_SCROLLBAR_ARROW_COLOR 120
-#define CSS_PROP__KONQ_FLOW_MODE 121
+#define CSS_PROP__KHTML_FLOW_MODE 121
#define CSS_PROP_MAX CSS_PROP_Z_INDEX
#define CSS_PROP_TOTAL 122
diff --git a/WebCore/khtml/css/cssproperties.in b/WebCore/khtml/css/cssproperties.in
index 8951bd7..0de3ee9 100644
--- a/WebCore/khtml/css/cssproperties.in
+++ b/WebCore/khtml/css/cssproperties.in
@@ -37,14 +37,14 @@ border-right-width
border-bottom-width
border-left-width
bottom
-box-align
-box-direction
-box-flex
-box-flex-group
-box-lines
-box-ordinal-group
-box-orient
-box-pack
+-khtml-box-align
+-khtml-box-direction
+-khtml-box-flex
+-khtml-box-flex-group
+-khtml-box-lines
+-khtml-box-ordinal-group
+-khtml-box-orient
+-khtml-box-pack
caption-side
clear
clip
@@ -83,7 +83,7 @@ max-height
max-width
min-height
min-width
-opacity
+-khtml-opacity
orphans
outline-color
outline-style
@@ -154,4 +154,4 @@ scrollbar-3dlight-color
scrollbar-darkshadow-color
scrollbar-track-color
scrollbar-arrow-color
--konq-flow-mode
+-khtml-flow-mode
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 7a4933b..eb409fc 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2042,8 +2042,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EWhiteSpace s;
switch(primitiveValue->getIdent()) {
- case CSS_VAL__KONQ_NOWRAP:
- s = KONQ_NOWRAP;
+ case CSS_VAL__KHTML_NOWRAP:
+ s = KHTML_NOWRAP;
break;
case CSS_VAL_NOWRAP:
s = NOWRAP;
@@ -2171,7 +2171,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return;
int ident = primitiveValue->getIdent();
if ( ident ) {
- if ( ident == CSS_VAL__KONQ_TEXT )
+ if ( ident == CSS_VAL__KHTML_TEXT )
col = element->getDocument()->textColor();
else if ( ident == CSS_VAL_TRANSPARENT ) {
col = QColor();
@@ -2600,7 +2600,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
align = SUB; break;
case CSS_VAL_SUPER:
align = SUPER; break;
- case CSS_VAL__KONQ_BASELINE_MIDDLE:
+ case CSS_VAL__KHTML_BASELINE_MIDDLE:
align = BASELINE_MIDDLE; break;
default:
return;
@@ -2647,7 +2647,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_VAL_LARGE: size = m_fontSizes[4]; break;
case CSS_VAL_X_LARGE: size = m_fontSizes[5]; break;
case CSS_VAL_XX_LARGE: size = m_fontSizes[6]; break;
- case CSS_VAL__KONQ_XXX_LARGE: size = ( m_fontSizes[6]*5 )/3; break;
+ case CSS_VAL__KHTML_XXX_LARGE: size = ( m_fontSizes[6]*5 )/3; break;
case CSS_VAL_LARGER:
size = oldSize * 1.2;
break;
@@ -2773,7 +2773,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
if(!primitiveValue) return;
if(primitiveValue->getIdent())
- style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KONQ_AUTO) );
+ style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) );
return;
}
@@ -2878,7 +2878,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
face = static_cast<FontFamilyValueImpl *>(val)->fontName();
else if (val->primitiveType() == CSSPrimitiveValue::CSS_IDENT) {
switch (val->getIdent()) {
- case CSS_VAL__KONQ_BODY:
+ case CSS_VAL__KHTML_BODY:
face = settings->stdFontName();
break;
case CSS_VAL_SERIF:
@@ -2972,7 +2972,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setTextDecoration(t);
break;
}
- case CSS_PROP__KONQ_FLOW_MODE:
+ case CSS_PROP__KHTML_FLOW_MODE:
if(value->cssValueType() == CSSValue::CSS_INHERIT)
{
if(!parentNode) return;
@@ -2982,7 +2982,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
if(!primitiveValue) return;
if(primitiveValue->getIdent())
{
- style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KONQ_AROUND_FLOATS );
+ style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS );
return;
}
break;
@@ -3138,7 +3138,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return;
}
- case CSS_PROP_OPACITY:
+ case CSS_PROP__KHTML_OPACITY:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if (!parentNode) return;
style->setOpacity(parentStyle->opacity());
@@ -3149,7 +3149,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
// Clamp opacity to the range 0-1
style->setOpacity(QMIN(1.0f, QMAX(0, primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER))));
return;
- case CSS_PROP_BOX_ALIGN:
+ case CSS_PROP__KHTML_BOX_ALIGN:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxAlign(parentStyle->boxAlign());
@@ -3176,7 +3176,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return;
}
return;
- case CSS_PROP_BOX_DIRECTION:
+ case CSS_PROP__KHTML_BOX_DIRECTION:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxDirection(parentStyle->boxDirection());
@@ -3188,7 +3188,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
else
style->setBoxDirection(BREVERSE);
return;
- case CSS_PROP_BOX_LINES:
+ case CSS_PROP__KHTML_BOX_LINES:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxLines(parentStyle->boxLines());
@@ -3200,7 +3200,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
else
style->setBoxLines(MULTIPLE);
return;
- case CSS_PROP_BOX_ORIENT:
+ case CSS_PROP__KHTML_BOX_ORIENT:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxOrient(parentStyle->boxOrient());
@@ -3213,7 +3213,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
else
style->setBoxOrient(VERTICAL);
return;
- case CSS_PROP_BOX_PACK:
+ case CSS_PROP__KHTML_BOX_PACK:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxPack(parentStyle->boxPack());
@@ -3237,7 +3237,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return;
}
return;
- case CSS_PROP_BOX_FLEX:
+ case CSS_PROP__KHTML_BOX_FLEX:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxFlex(parentStyle->boxFlex());
@@ -3247,7 +3247,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return; // Error case.
style->setBoxFlex(primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER));
return;
- case CSS_PROP_BOX_FLEX_GROUP:
+ case CSS_PROP__KHTML_BOX_FLEX_GROUP:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxFlexGroup(parentStyle->boxFlexGroup());
@@ -3257,7 +3257,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return; // Error case.
style->setBoxFlexGroup((unsigned int)(primitiveValue->getFloatValue(CSSPrimitiveValue::CSS_NUMBER)));
return;
- case CSS_PROP_BOX_ORDINAL_GROUP:
+ case CSS_PROP__KHTML_BOX_ORDINAL_GROUP:
if (value->cssValueType() == CSSValue::CSS_INHERIT) {
if(!parentNode) return;
style->setBoxOrdinalGroup(parentStyle->boxOrdinalGroup());
diff --git a/WebCore/khtml/css/cssvalues.c b/WebCore/khtml/css/cssvalues.c
index d8c54ee..ff244dc 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 = 1456, duplicates = 1 */
+/* maximum key range = 1818, duplicates = 1 */
#ifdef __GNUC__
__inline
@@ -21,38 +21,40 @@ hash_val (register const char *str, register unsigned int len)
{
static const unsigned short asso_values[] =
{
- 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
+ 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
};
register int hval = 0;
switch (len)
{
default:
+ case 22:
+ hval += asso_values[(unsigned char)str[21]];
case 21:
hval += asso_values[(unsigned char)str[20]];
case 20:
@@ -110,416 +112,463 @@ findValue (register const char *str, register unsigned int len)
{
TOTAL_KEYWORDS = 242,
MIN_WORD_LENGTH = 3,
- MAX_WORD_LENGTH = 21,
+ MAX_WORD_LENGTH = 22,
MIN_HASH_VALUE = 0,
- MAX_HASH_VALUE = 1455
+ MAX_HASH_VALUE = 1817
};
static const struct css_value wordlist_value[] =
{
{"900", CSS_VAL_900},
+ {"ltr", CSS_VAL_LTR},
+ {"rtl", CSS_VAL_RTL},
{"800", CSS_VAL_800},
+ {"start", CSS_VAL_START},
{"100", CSS_VAL_100},
{"200", CSS_VAL_200},
{"300", CSS_VAL_300},
- {"static", CSS_VAL_STATIC},
- {"start", CSS_VAL_START},
{"400", CSS_VAL_400},
- {"italic", CSS_VAL_ITALIC},
- {"ltr", CSS_VAL_LTR},
- {"rtl", CSS_VAL_RTL},
{"500", CSS_VAL_500},
{"600", CSS_VAL_600},
{"700", CSS_VAL_700},
- {"black", CSS_VAL_BLACK},
- {"cross", CSS_VAL_CROSS},
- {"sub", CSS_VAL_SUB},
- {"katakana", CSS_VAL_KATAKANA},
- {"block", CSS_VAL_BLOCK},
- {"auto", CSS_VAL_AUTO},
{"small", CSS_VAL_SMALL},
+ {"italic", CSS_VAL_ITALIC},
+ {"wait", CSS_VAL_WAIT},
+ {"static", CSS_VAL_STATIC},
+ {"right", CSS_VAL_RIGHT},
+ {"mix", CSS_VAL_MIX},
{"disc", CSS_VAL_DISC},
- {"status-bar", CSS_VAL_STATUS_BAR},
- {"scroll", CSS_VAL_SCROLL},
- {"avoid", CSS_VAL_AVOID},
- {"navy", CSS_VAL_NAVY},
+ {"x-small", CSS_VAL_X_SMALL},
+ {"thin", CSS_VAL_THIN},
+ {"hiragana", CSS_VAL_HIRAGANA},
{"teal", CSS_VAL_TEAL},
- {"blink", CSS_VAL_BLINK},
- {"solid", CSS_VAL_SOLID},
- {"bottom", CSS_VAL_BOTTOM},
- {"icon", CSS_VAL_ICON},
- {"table", CSS_VAL_TABLE},
- {"bold", CSS_VAL_BOLD},
- {"visible", CSS_VAL_VISIBLE},
+ {"large", CSS_VAL_LARGE},
+ {"larger", CSS_VAL_LARGER},
+ {"hand", CSS_VAL_HAND},
{"silver", CSS_VAL_SILVER},
- {"olive", CSS_VAL_OLIVE},
- {"scrollbar", CSS_VAL_SCROLLBAR},
- {"above", CSS_VAL_ABOVE},
- {"vertical", CSS_VAL_VERTICAL},
+ {"red", CSS_VAL_RED},
+ {"ridge", CSS_VAL_RIDGE},
+ {"xx-small", CSS_VAL_XX_SMALL},
{"lime", CSS_VAL_LIME},
- {"list-item", CSS_VAL_LIST_ITEM},
- {"circle", CSS_VAL_CIRCLE},
- {"loud", CSS_VAL_LOUD},
- {"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},
+ {"single", CSS_VAL_SINGLE},
{"smaller", CSS_VAL_SMALLER},
+ {"text", CSS_VAL_TEXT},
{"invert", CSS_VAL_INVERT},
- {"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},
- {"always", CSS_VAL_ALWAYS},
- {"portrait", CSS_VAL_PORTRAIT},
- {"run-in", CSS_VAL_RUN_IN},
- {"thin", CSS_VAL_THIN},
+ {"gray", CSS_VAL_GRAY},
+ {"katakana", CSS_VAL_KATAKANA},
+ {"solid", CSS_VAL_SOLID},
+ {"list-item", CSS_VAL_LIST_ITEM},
{"end", CSS_VAL_END},
- {"decimal", CSS_VAL_DECIMAL},
+ {"avoid", CSS_VAL_AVOID},
{"inside", CSS_VAL_INSIDE},
- {"bolder", CSS_VAL_BOLDER},
- {"outside", CSS_VAL_OUTSIDE},
- {"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},
+ {"x-large", CSS_VAL_X_LARGE},
{"inline", CSS_VAL_INLINE},
- {"compact", CSS_VAL_COMPACT},
- {"large", CSS_VAL_LARGE},
- {"table-cell", CSS_VAL_TABLE_CELL},
+ {"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},
+ {"hide", CSS_VAL_HIDE},
+ {"normal", CSS_VAL_NORMAL},
+ {"scroll", CSS_VAL_SCROLL},
+ {"left", CSS_VAL_LEFT},
+ {"highlight", CSS_VAL_HIGHLIGHT},
+ {"cross", CSS_VAL_CROSS},
+ {"armenian", CSS_VAL_ARMENIAN},
+ {"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},
+ {"relative", CSS_VAL_RELATIVE},
+ {"circle", CSS_VAL_CIRCLE},
+ {"inline-axis", CSS_VAL_INLINE_AXIS},
+ {"table", CSS_VAL_TABLE},
+ {"white", CSS_VAL_WHITE},
{"pre", CSS_VAL_PRE},
- {"menu", CSS_VAL_MENU},
+ {"run-in", CSS_VAL_RUN_IN},
+ {"stretch", CSS_VAL_STRETCH},
+ {"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},
+ {"green", CSS_VAL_GREEN},
+ {"top", CSS_VAL_TOP},
+ {"-khtml-right", CSS_VAL__KHTML_RIGHT},
{"grey", CSS_VAL_GREY},
- {"justify", CSS_VAL_JUSTIFY},
+ {"show", CSS_VAL_SHOW},
+ {"portrait", CSS_VAL_PORTRAIT},
+ {"fixed", CSS_VAL_FIXED},
+ {"sans-serif", CSS_VAL_SANS_SERIF},
+ {"orange", CSS_VAL_ORANGE},
+ {"crosshair", CSS_VAL_CROSSHAIR},
+ {"georgian", CSS_VAL_GEORGIAN},
+ {"bold", CSS_VAL_BOLD},
+ {"fantasy", CSS_VAL_FANTASY},
+ {"dotted", CSS_VAL_DOTTED},
+ {"move", CSS_VAL_MOVE},
+ {"auto", CSS_VAL_AUTO},
+ {"sub", CSS_VAL_SUB},
+ {"square", CSS_VAL_SQUARE},
+ {"box", CSS_VAL_BOX},
{"none", CSS_VAL_NONE},
- {"double", CSS_VAL_DOUBLE},
+ {"lower", CSS_VAL_LOWER},
+ {"help", CSS_VAL_HELP},
+ {"graytext", CSS_VAL_GRAYTEXT},
+ {"window", CSS_VAL_WINDOW},
+ {"center", CSS_VAL_CENTER},
+ {"transparent", CSS_VAL_TRANSPARENT},
+ {"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},
+ {"both", CSS_VAL_BOTH},
+ {"maroon", CSS_VAL_MAROON},
+ {"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},
+ {"reverse", CSS_VAL_REVERSE},
+ {"repeat", CSS_VAL_REPEAT},
+ {"cursive", CSS_VAL_CURSIVE},
{"caption", CSS_VAL_CAPTION},
- {"larger", CSS_VAL_LARGER},
+ {"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},
- {"fantasy", CSS_VAL_FANTASY},
- {"stretch", CSS_VAL_STRETCH},
- {"middle", CSS_VAL_MIDDLE},
- {"left", CSS_VAL_LEFT},
- {"center", CSS_VAL_CENTER},
+ {"capitalize", CSS_VAL_CAPITALIZE},
+ {"w-resize", CSS_VAL_W_RESIZE},
+ {"above", CSS_VAL_ABOVE},
+ {"block", CSS_VAL_BLOCK},
{"baseline", CSS_VAL_BASELINE},
- {"serif", CSS_VAL_SERIF},
- {"medium", CSS_VAL_MEDIUM},
- {"hand", CSS_VAL_HAND},
+ {"sw-resize", CSS_VAL_SW_RESIZE},
{"groove", CSS_VAL_GROOVE},
- {"armenian", CSS_VAL_ARMENIAN},
+ {"default", CSS_VAL_DEFAULT},
+ {"-khtml-normal", CSS_VAL__KHTML_NORMAL},
+ {"progress", CSS_VAL_PROGRESS},
+ {"fuchsia", CSS_VAL_FUCHSIA},
+ {"bolder", CSS_VAL_BOLDER},
+ {"-khtml-left", CSS_VAL__KHTML_LEFT},
+ {"overline", CSS_VAL_OVERLINE},
+ {"blue", CSS_VAL_BLUE},
{"embed", CSS_VAL_EMBED},
- {"right", CSS_VAL_RIGHT},
- {"ridge", CSS_VAL_RIDGE},
- {"hide", CSS_VAL_HIDE},
- {"reverse", CSS_VAL_REVERSE},
+ {"pointer", CSS_VAL_POINTER},
+ {"small-caption", CSS_VAL_SMALL_CAPTION},
+ {"repeat-x", CSS_VAL_REPEAT_X},
+ {"outset", CSS_VAL_OUTSET},
+ {"nw-resize", CSS_VAL_NW_RESIZE},
+ {"infotext", CSS_VAL_INFOTEXT},
{"super", CSS_VAL_SUPER},
- {"single", CSS_VAL_SINGLE},
- {"collapse", CSS_VAL_COLLAPSE},
- {"overline", CSS_VAL_OVERLINE},
+ {"justify", CSS_VAL_JUSTIFY},
+ {"compact", CSS_VAL_COMPACT},
+ {"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},
{"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},
+ {"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},
- {"activeborder", CSS_VAL_ACTIVEBORDER},
- {"separate", CSS_VAL_SEPARATE},
- {"small-caption", CSS_VAL_SMALL_CAPTION},
- {"wider", CSS_VAL_WIDER},
- {"table-column", CSS_VAL_TABLE_COLUMN},
- {"square", CSS_VAL_SQUARE},
- {"pointer", CSS_VAL_POINTER},
- {"show", CSS_VAL_SHOW},
+ {"block-axis", CSS_VAL_BLOCK_AXIS},
+ {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
+ {"yellow", CSS_VAL_YELLOW},
+ {"ne-resize", CSS_VAL_NE_RESIZE},
+ {"windowtext", CSS_VAL_WINDOWTEXT},
+ {"expanded", CSS_VAL_EXPANDED},
+ {"underline", CSS_VAL_UNDERLINE},
+ {"hebrew", CSS_VAL_HEBREW},
+ {"lowercase", CSS_VAL_LOWERCASE},
+ {"-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},
- {"multiple", CSS_VAL_MULTIPLE},
- {"text-bottom", CSS_VAL_TEXT_BOTTOM},
- {"s-resize", CSS_VAL_S_RESIZE},
- {"sans-serif", CSS_VAL_SANS_SERIF},
- {"inline-table", CSS_VAL_INLINE_TABLE},
- {"-konq-auto", CSS_VAL__KONQ_AUTO},
- {"dashed", CSS_VAL_DASHED},
+ {"lower-alpha", CSS_VAL_LOWER_ALPHA},
+ {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
+ {"lower-roman", CSS_VAL_LOWER_ROMAN},
+ {"condensed", CSS_VAL_CONDENSED},
+ {"no-repeat", CSS_VAL_NO_REPEAT},
{"activecaption", CSS_VAL_ACTIVECAPTION},
- {"hiragana", CSS_VAL_HIRAGANA},
- {"table-caption", CSS_VAL_TABLE_CAPTION},
+ {"purple", CSS_VAL_PURPLE},
+ {"absolute", CSS_VAL_ABSOLUTE},
+ {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
{"oblique", CSS_VAL_OBLIQUE},
+ {"windowframe", CSS_VAL_WINDOWFRAME},
{"bidi-override", CSS_VAL_BIDI_OVERRIDE},
- {"default", CSS_VAL_DEFAULT},
- {"green", CSS_VAL_GREEN},
- {"fuchsia", CSS_VAL_FUCHSIA},
- {"help", CSS_VAL_HELP},
+ {"double", CSS_VAL_DOUBLE},
+ {"inactivecaption", CSS_VAL_INACTIVECAPTION},
+ {"inline-block", CSS_VAL_INLINE_BLOCK},
+ {"threedface", CSS_VAL_THREEDFACE},
+ {"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},
- {"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},
+ {"inactiveborder", CSS_VAL_INACTIVEBORDER},
+ {"-khtml-body", CSS_VAL__KHTML_BODY},
+ {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
{"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},
+ {"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},
+ {"table-column", CSS_VAL_TABLE_COLUMN},
+ {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
+ {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
+ {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
+ {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
+ {"uppercase", CSS_VAL_UPPERCASE},
{"buttonface", CSS_VAL_BUTTONFACE},
- {"e-resize", CSS_VAL_E_RESIZE},
- {"se-resize", CSS_VAL_SE_RESIZE},
- {"inline-box", CSS_VAL_INLINE_BOX},
- {"georgian", CSS_VAL_GEORGIAN},
- {"purple", CSS_VAL_PURPLE},
- {"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},
- {"menutext", CSS_VAL_MENUTEXT},
+ {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
+ {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
{"close-quote", CSS_VAL_CLOSE_QUOTE},
- {"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},
- {"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},
- {"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},
- {"nw-resize", CSS_VAL_NW_RESIZE},
+ {"upper-alpha", CSS_VAL_UPPER_ALPHA},
{"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},
+ {"-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},
- {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
- {"line-through", CSS_VAL_LINE_THROUGH},
+ {"infobackground", CSS_VAL_INFOBACKGROUND},
{"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},
- {"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},
+ {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
- {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
- {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
- {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
- {"-konq-xxx-large", CSS_VAL__KONQ_XXX_LARGE},
- {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
- {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT}
+ {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
+ {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
+ {"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP}
};
static const short lookup[] =
{
- 0, -1, -1, -1, -1, 1, -1, -1,
- -1, -1, 2, -1, -1, -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, -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,
- -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,
+ 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, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -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, -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, 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, 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, 209, -1, -1, -1, -1, -1, -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, 210, -1, -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, 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, 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, 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, -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, 219, -1, -1, 220, -1, -1, -1,
+ -1, -1, -1, -1, 221, -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, 210, -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,
+ -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, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -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, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -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, 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, -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, 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, -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,
-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, 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, 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, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -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,
+ 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, -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,
@@ -528,12 +577,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, 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, -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,
@@ -543,8 +592,7 @@ 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, 240, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 241
+ -1, 241
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -623,7 +671,7 @@ static const char * const valueList[] = {
"large",
"x-large",
"xx-large",
-"-konq-xxx-large",
+"-khtml-xxx-large",
"smaller",
"larger",
"wider",
@@ -641,7 +689,7 @@ static const char * const valueList[] = {
"cursive",
"fantasy",
"monospace",
-"-konq-body",
+"-khtml-body",
"transparent",
"aqua",
"black",
@@ -688,7 +736,7 @@ static const char * const valueList[] = {
"windowframe",
"windowtext",
"grey",
-"-konq-text",
+"-khtml-text",
"repeat",
"repeat-x",
"repeat-y",
@@ -701,15 +749,15 @@ static const char * const valueList[] = {
"text-bottom",
"top",
"bottom",
-"-konq-baseline-middle",
-"-konq-auto",
+"-khtml-baseline-middle",
+"-khtml-auto",
"left",
"right",
"center",
"justify",
-"-konq-left",
-"-konq-right",
-"-konq-center",
+"-khtml-left",
+"-khtml-right",
+"-khtml-center",
"outside",
"inside",
"disc",
@@ -812,9 +860,9 @@ static const char * const valueList[] = {
"thick",
"thin",
"underline",
-"-konq-nowrap",
-"-konq-normal",
-"-konq-around-floats",
+"-khtml-nowrap",
+"-khtml-normal",
+"-khtml-around-floats",
"stretch",
"start",
"end",
diff --git a/WebCore/khtml/css/cssvalues.h b/WebCore/khtml/css/cssvalues.h
index 8691634..bc3b7e4 100644
--- a/WebCore/khtml/css/cssvalues.h
+++ b/WebCore/khtml/css/cssvalues.h
@@ -49,7 +49,7 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_LARGE 38
#define CSS_VAL_X_LARGE 39
#define CSS_VAL_XX_LARGE 40
-#define CSS_VAL__KONQ_XXX_LARGE 41
+#define CSS_VAL__KHTML_XXX_LARGE 41
#define CSS_VAL_SMALLER 42
#define CSS_VAL_LARGER 43
#define CSS_VAL_WIDER 44
@@ -67,7 +67,7 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_CURSIVE 56
#define CSS_VAL_FANTASY 57
#define CSS_VAL_MONOSPACE 58
-#define CSS_VAL__KONQ_BODY 59
+#define CSS_VAL__KHTML_BODY 59
#define CSS_VAL_TRANSPARENT 60
#define CSS_VAL_AQUA 61
#define CSS_VAL_BLACK 62
@@ -114,7 +114,7 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_WINDOWFRAME 103
#define CSS_VAL_WINDOWTEXT 104
#define CSS_VAL_GREY 105
-#define CSS_VAL__KONQ_TEXT 106
+#define CSS_VAL__KHTML_TEXT 106
#define CSS_VAL_REPEAT 107
#define CSS_VAL_REPEAT_X 108
#define CSS_VAL_REPEAT_Y 109
@@ -127,15 +127,15 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_TEXT_BOTTOM 116
#define CSS_VAL_TOP 117
#define CSS_VAL_BOTTOM 118
-#define CSS_VAL__KONQ_BASELINE_MIDDLE 119
-#define CSS_VAL__KONQ_AUTO 120
+#define CSS_VAL__KHTML_BASELINE_MIDDLE 119
+#define CSS_VAL__KHTML_AUTO 120
#define CSS_VAL_LEFT 121
#define CSS_VAL_RIGHT 122
#define CSS_VAL_CENTER 123
#define CSS_VAL_JUSTIFY 124
-#define CSS_VAL__KONQ_LEFT 125
-#define CSS_VAL__KONQ_RIGHT 126
-#define CSS_VAL__KONQ_CENTER 127
+#define CSS_VAL__KHTML_LEFT 125
+#define CSS_VAL__KHTML_RIGHT 126
+#define CSS_VAL__KHTML_CENTER 127
#define CSS_VAL_OUTSIDE 128
#define CSS_VAL_INSIDE 129
#define CSS_VAL_DISC 130
@@ -238,9 +238,9 @@ DOM::DOMString getValueName(unsigned short id);
#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__KHTML_NOWRAP 230
+#define CSS_VAL__KHTML_NORMAL 231
+#define CSS_VAL__KHTML_AROUND_FLOATS 232
#define CSS_VAL_STRETCH 233
#define CSS_VAL_START 234
#define CSS_VAL_END 235
diff --git a/WebCore/khtml/css/cssvalues.in b/WebCore/khtml/css/cssvalues.in
index a099d07..50565e7 100644
--- a/WebCore/khtml/css/cssvalues.in
+++ b/WebCore/khtml/css/cssvalues.in
@@ -71,7 +71,7 @@ medium
large
x-large
xx-large
--konq-xxx-large
+-khtml-xxx-large
smaller
larger
#
@@ -96,7 +96,7 @@ sans-serif
cursive
fantasy
monospace
--konq-body
+-khtml-body
#
#
# CSS_PROP_BACKGROUND_COLOR:
@@ -153,7 +153,7 @@ windowtext
#
# colors in non strict mode
grey
--konq-text
+-khtml-text
#
# CSS_PROP_BACKGROUND_REPEAT:
#
@@ -173,18 +173,18 @@ text-bottom
top
bottom
# HTML alignment MIDDLE has no corresponding CSS alignment
--konq-baseline-middle
+-khtml-baseline-middle
#
# CSS_PROP_TEXT_ALIGN:
#
--konq-auto
+-khtml-auto
left
right
center
justify
--konq-left
--konq-right
--konq-center
+-khtml-left
+-khtml-right
+-khtml-center
#
# CSS_PROP_LIST_STYLE_POSITION:
#
@@ -315,10 +315,10 @@ static
thick
thin
underline
--konq-nowrap
-# CSS_PROP__KONQ_FLOW_MODE
--konq-normal
--konq-around-floats
+-khtml-nowrap
+# CSS_PROP__khtml_FLOW_MODE
+-khtml-normal
+-khtml-around-floats
#
# Not supported CSS 2 Aural values
#
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index aa50d66..3d399b7 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -91,7 +91,7 @@ IFRAME {
CENTER {
display: block;
/* special centering to be able to emulate the html4/netscape behaviour */
- text-align: \2d konq-center;
+ text-align: -khtml-center;
}
HR {
@@ -102,7 +102,7 @@ HR {
border-width: 1px;
margin-left: 1px; /* will be overwritten by ALIGN */
margin-right: 1px; /* will be overwritten by ALIGN */
- \2d konq-flow-mode: \2d konq-around-floats;
+ -khtml-flow-mode: -khtml-around-floats;
}
MAP {
@@ -162,10 +162,10 @@ H6 {
TABLE {
display: table;
border-collapse: separate;
- text-align: \2d konq-auto;
+ text-align: -khtml-auto;
border-spacing: 2px;
border-color: gray;
- \2d konq-flow-mode: \2d konq-around-floats;
+ -khtml-flow-mode: -khtml-around-floats;
}
TABLE[align="center"] {
@@ -218,7 +218,7 @@ TH {
CAPTION {
display: table-caption;
- text-align: \2d konq-center;
+ text-align: -khtml-center;
}
/*
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index 6caa1ed..f229849 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -26,9 +26,9 @@
#define MEDIA_SYM 269
#define FONT_FACE_SYM 270
#define CHARSET_SYM 271
-#define KONQ_RULE_SYM 272
-#define KONQ_DECLS_SYM 273
-#define KONQ_VALUE_SYM 274
+#define KHTML_RULE_SYM 272
+#define KHTML_DECLS_SYM 273
+#define KHTML_VALUE_SYM 274
#define IMPORTANT_SYM 275
#define QEMS 276
#define EMS 277
@@ -318,11 +318,11 @@ static const short yyrline[] = { 0,
static const char * const yytname[] = { "$","error","$undefined.","S","SGML_CD",
"INCLUDES","DASHMATCH","BEGINSWITH","ENDSWITH","CONTAINS","STRING","IDENT","HASH",
"':'","'.'","'['","IMPORT_SYM","PAGE_SYM","MEDIA_SYM","FONT_FACE_SYM","CHARSET_SYM",
-"KONQ_RULE_SYM","KONQ_DECLS_SYM","KONQ_VALUE_SYM","IMPORTANT_SYM","QEMS","EMS",
-"EXS","PXS","CMS","MMS","INS","PTS","PCS","DEGS","RADS","GRADS","MSECS","SECS",
-"HERZ","KHERZ","DIMEN","PERCENTAGE","NUMBER","URI","FUNCTION","UNICODERANGE",
+"KHTML_RULE_SYM","KHTML_DECLS_SYM","KHTML_VALUE_SYM","IMPORTANT_SYM","QEMS",
+"EMS","EXS","PXS","CMS","MMS","INS","PTS","PCS","DEGS","RADS","GRADS","MSECS",
+"SECS","HERZ","KHERZ","DIMEN","PERCENTAGE","NUMBER","URI","FUNCTION","UNICODERANGE",
"'{'","'}'","';'","','","'+'","'>'","'-'","'*'","']'","'='","')'","'/'","'#'",
-"'@'","stylesheet","konq_rule","konq_decls","konq_value","maybe_space","maybe_sgml",
+"'@'","stylesheet","khtml_rule","khtml_decls","khtml_value","maybe_space","maybe_sgml",
"maybe_charset","import_list","rule_list","rule","import","string_or_uri","maybe_media_list",
"media_list","media","ruleset_list","medium","page","font_face","combinator",
"unary_operator","ruleset","selector_list","selector","simple_selector","element_name",
diff --git a/WebCore/khtml/css/parser.h b/WebCore/khtml/css/parser.h
index 5b0fd0c..8ceb950 100644
--- a/WebCore/khtml/css/parser.h
+++ b/WebCore/khtml/css/parser.h
@@ -32,9 +32,9 @@ typedef union {
#define MEDIA_SYM 269
#define FONT_FACE_SYM 270
#define CHARSET_SYM 271
-#define KONQ_RULE_SYM 272
-#define KONQ_DECLS_SYM 273
-#define KONQ_VALUE_SYM 274
+#define KHTML_RULE_SYM 272
+#define KHTML_DECLS_SYM 273
+#define KHTML_VALUE_SYM 274
#define IMPORTANT_SYM 275
#define QEMS 276
#define EMS 277
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index c70518a..a07775e 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -143,9 +143,9 @@ static int cssyylex( YYSTYPE *yylval ) {
%token MEDIA_SYM
%token FONT_FACE_SYM
%token CHARSET_SYM
-%token KONQ_RULE_SYM
-%token KONQ_DECLS_SYM
-%token KONQ_VALUE_SYM
+%token KHTML_RULE_SYM
+%token KHTML_DECLS_SYM
+%token KHTML_VALUE_SYM
%token IMPORTANT_SYM
@@ -229,26 +229,26 @@ static int cssyylex( YYSTYPE *yylval ) {
stylesheet:
maybe_charset maybe_sgml import_list rule_list
- | konq_rule maybe_space
- | konq_decls maybe_space
- | konq_value maybe_space
+ | khtml_rule maybe_space
+ | khtml_decls maybe_space
+ | khtml_value maybe_space
;
-konq_rule:
- KONQ_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
+khtml_rule:
+ KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
CSSParser *p = static_cast<CSSParser *>(parser);
p->rule = $4;
}
;
-konq_decls:
- KONQ_DECLS_SYM '{' maybe_space declaration_list '}' {
+khtml_decls:
+ KHTML_DECLS_SYM '{' maybe_space declaration_list '}' {
/* can be empty */
}
;
-konq_value:
- KONQ_VALUE_SYM '{' maybe_space expr '}' {
+khtml_value:
+ KHTML_VALUE_SYM '{' maybe_space expr '}' {
CSSParser *p = static_cast<CSSParser *>(parser);
if ( $4 ) {
p->valueList = $4;
diff --git a/WebCore/khtml/css/quirks.css b/WebCore/khtml/css/quirks.css
index 1bb57de..90a2dfb 100644
--- a/WebCore/khtml/css/quirks.css
+++ b/WebCore/khtml/css/quirks.css
@@ -18,7 +18,7 @@ img[align="right"] {
/* Make lists flow around floats. */
UL, OL, MENU, DIR {
- \2d konq-flow-mode: \2d konq-around-floats;
+ -khtml-flow-mode: -khtml-around-floats;
}
/* Tables reset both line-height and white-space in quirks mode.
@@ -30,7 +30,7 @@ TABLE {
font-size: medium;
font-variant: normal;
font-style: normal;
- color: \2d konq-text;
+ color: -khtml-text;
}
diff --git a/WebCore/khtml/css/tokenizer.cpp b/WebCore/khtml/css/tokenizer.cpp
index e018abd..a24d1f6 100644
--- a/WebCore/khtml/css/tokenizer.cpp
+++ b/WebCore/khtml/css/tokenizer.cpp
@@ -42,42 +42,42 @@
#define YY_NUM_RULES 47
#define YY_END_OF_BUFFER 48
-static yyconst short int yy_accept[304] =
+static yyconst short int yy_accept[308] =
{ 0,
0, 0, 48, 46, 2, 2, 46, 46, 46, 46,
46, 46, 46, 46, 46, 40, 46, 46, 46, 46,
11, 11, 46, 46, 2, 0, 0, 0, 10, 0,
- 12, 0, 8, 0, 0, 9, 0, 40, 0, 39,
- 0, 40, 0, 38, 38, 38, 38, 38, 38, 38,
- 38, 38, 38, 38, 38, 35, 0, 0, 0, 0,
- 0, 0, 0, 11, 11, 7, 43, 11, 0, 0,
- 11, 6, 5, 0, 0, 0, 10, 0, 0, 12,
- 12, 0, 0, 10, 0, 0, 4, 0, 0, 38,
- 38, 38, 0, 38, 26, 38, 22, 24, 38, 36,
-
- 28, 38, 27, 34, 30, 29, 25, 38, 0, 0,
- 0, 0, 0, 0, 0, 11, 11, 11, 44, 44,
- 11, 0, 0, 0, 12, 0, 0, 0, 1, 38,
- 38, 38, 38, 31, 38, 37, 32, 3, 0, 0,
- 0, 0, 0, 0, 11, 11, 0, 44, 44, 44,
- 43, 0, 0, 12, 0, 0, 0, 38, 38, 38,
- 33, 0, 0, 0, 0, 0, 14, 11, 11, 45,
- 44, 44, 44, 44, 0, 0, 0, 0, 42, 0,
- 0, 0, 12, 0, 38, 38, 23, 0, 0, 0,
- 0, 15, 11, 11, 45, 44, 44, 44, 44, 44,
-
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 42,
- 0, 0, 0, 0, 12, 0, 38, 38, 0, 0,
- 0, 13, 11, 11, 45, 44, 44, 44, 44, 44,
- 44, 0, 41, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 12, 0, 38, 38,
- 0, 0, 0, 17, 0, 11, 45, 44, 44, 44,
- 44, 44, 44, 44, 0, 41, 0, 0, 0, 41,
- 0, 0, 0, 0, 38, 0, 0, 0, 0, 45,
- 0, 0, 0, 21, 0, 0, 0, 16, 45, 0,
- 0, 0, 0, 18, 0, 0, 0, 0, 19, 20,
-
- 0, 0, 0
+ 12, 0, 8, 0, 0, 9, 0, 0, 11, 40,
+ 0, 39, 0, 0, 40, 0, 38, 38, 38, 38,
+ 38, 38, 38, 38, 38, 38, 38, 38, 35, 0,
+ 0, 0, 0, 0, 0, 0, 11, 11, 7, 43,
+ 11, 0, 0, 11, 6, 5, 0, 0, 0, 10,
+ 0, 0, 12, 12, 0, 0, 10, 0, 0, 4,
+ 0, 0, 38, 38, 38, 0, 38, 26, 38, 22,
+
+ 24, 38, 36, 28, 38, 27, 34, 30, 29, 25,
+ 38, 0, 0, 0, 0, 0, 0, 0, 11, 11,
+ 11, 44, 44, 11, 0, 0, 0, 12, 0, 0,
+ 0, 1, 38, 38, 38, 38, 31, 38, 37, 32,
+ 3, 0, 0, 0, 0, 0, 0, 11, 11, 0,
+ 44, 44, 44, 43, 0, 0, 12, 0, 0, 0,
+ 38, 38, 38, 33, 0, 0, 0, 0, 0, 14,
+ 11, 11, 45, 44, 44, 44, 44, 0, 0, 0,
+ 0, 42, 0, 0, 0, 12, 0, 38, 38, 23,
+ 0, 0, 0, 0, 15, 11, 11, 45, 44, 44,
+
+ 44, 44, 44, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 42, 0, 0, 0, 0, 12, 0, 38,
+ 38, 0, 0, 0, 13, 11, 11, 45, 44, 44,
+ 44, 44, 44, 44, 0, 41, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
+ 0, 38, 38, 0, 17, 0, 11, 45, 44, 44,
+ 44, 44, 44, 44, 44, 0, 41, 0, 0, 0,
+ 41, 0, 0, 0, 0, 38, 0, 0, 0, 0,
+ 45, 0, 0, 0, 21, 0, 0, 0, 16, 45,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+ 18, 0, 0, 0, 19, 20, 0
} ;
static yyconst int yy_ec[256] =
@@ -116,93 +116,95 @@ static yyconst int yy_meta[57] =
{ 0,
1, 2, 3, 3, 3, 4, 4, 4, 4, 4,
4, 4, 4, 5, 4, 4, 4, 6, 4, 4,
- 6, 4, 4, 4, 7, 4, 8, 4, 8, 6,
- 6, 6, 6, 6, 6, 8, 8, 8, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
- 8, 8, 8, 4, 4, 8
+ 7, 4, 4, 4, 8, 4, 9, 4, 9, 10,
+ 10, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+ 9, 9, 9, 4, 4, 9
} ;
-static yyconst short int yy_base[330] =
+static yyconst short int yy_base[336] =
{ 0,
- 0, 0, 731, 1578, 55, 60, 65, 64, 696, 698,
- 60, 697, 701, 697, 688, 93, 696, 57, 75, 679,
- 63, 66, 678, 677, 113, 148, 657, 70, 1578, 185,
- 671, 126, 1578, 61, 219, 1578, 673, 60, 667, 671,
- 658, 0, 134, 55, 651, 58, 67, 121, 135, 143,
- 148, 49, 150, 151, 144, 650, 658, 622, 624, 597,
- 598, 603, 606, 84, 253, 1578, 1578, 158, 204, 268,
- 167, 1578, 1578, 590, 199, 168, 172, 302, 336, 607,
- 370, 201, 184, 200, 404, 438, 1578, 609, 185, 596,
- 472, 595, 321, 183, 594, 206, 593, 579, 214, 578,
-
- 564, 216, 555, 554, 553, 552, 551, 233, 559, 532,
- 544, 530, 527, 538, 534, 423, 234, 506, 245, 544,
- 248, 513, 237, 498, 513, 252, 521, 534, 1578, 528,
- 508, 562, 244, 499, 249, 498, 497, 1578, 480, 475,
- 472, 476, 480, 483, 554, 569, 577, 272, 491, 490,
- 611, 467, 597, 612, 618, 484, 252, 633, 639, 250,
- 471, 451, 448, 477, 440, 456, 1578, 654, 660, 675,
- 291, 459, 458, 457, 709, 735, 286, 268, 1578, 761,
- 432, 695, 721, 768, 776, 783, 453, 461, 433, 395,
- 380, 1578, 791, 798, 806, 293, 402, 394, 369, 368,
-
- 343, 288, 375, 840, 299, 874, 908, 934, 960, 986,
- 1012, 1046, 358, 825, 859, 894, 920, 946, 365, 338,
- 335, 1578, 972, 1053, 1061, 296, 339, 337, 336, 335,
- 334, 380, 1578, 316, 323, 418, 1095, 1129, 386, 401,
- 1108, 1163, 1197, 1182, 287, 1204, 1212, 1219, 458, 1227,
- 294, 277, 295, 1578, 290, 444, 1234, 302, 1578, 1578,
- 1578, 1578, 1578, 1578, 486, 384, 388, 1242, 1276, 405,
- 439, 1262, 1277, 268, 653, 259, 232, 206, 197, 1283,
- 1298, 1304, 1319, 1578, 189, 175, 134, 1578, 1578, 1325,
- 1340, 1346, 131, 1578, 87, 1361, 1367, 1382, 1578, 1578,
-
- 1388, 1403, 1578, 1437, 1440, 1447, 1452, 1456, 1463, 1468,
- 1475, 1483, 1488, 1491, 1496, 1504, 1509, 1512, 1519, 1522,
- 1528, 1531, 1537, 1544, 1551, 1554, 1560, 1567, 1570
+ 0, 0, 744, 1642, 55, 60, 65, 64, 708, 711,
+ 60, 710, 56, 711, 715, 93, 716, 57, 75, 698,
+ 63, 71, 697, 696, 76, 148, 676, 86, 1642, 185,
+ 677, 126, 1642, 73, 219, 1642, 679, 134, 70, 96,
+ 686, 690, 673, 678, 0, 141, 92, 671, 74, 136,
+ 150, 151, 152, 153, 154, 155, 177, 180, 670, 665,
+ 642, 642, 634, 635, 642, 632, 181, 253, 1642, 1642,
+ 186, 204, 268, 187, 1642, 1642, 616, 239, 203, 233,
+ 302, 336, 614, 370, 265, 172, 218, 404, 438, 1642,
+ 624, 228, 610, 472, 609, 321, 216, 608, 234, 607,
+
+ 598, 242, 596, 595, 237, 594, 593, 579, 578, 564,
+ 200, 564, 544, 550, 536, 533, 544, 540, 423, 249,
+ 506, 257, 549, 267, 529, 269, 498, 513, 252, 521,
+ 556, 1642, 528, 544, 562, 282, 543, 264, 542, 530,
+ 1642, 501, 488, 477, 481, 486, 489, 554, 569, 577,
+ 293, 497, 496, 611, 473, 597, 612, 618, 502, 297,
+ 633, 639, 285, 490, 474, 467, 495, 454, 468, 1642,
+ 654, 660, 675, 296, 472, 471, 470, 709, 735, 316,
+ 318, 1642, 761, 445, 695, 721, 768, 776, 783, 465,
+ 450, 455, 453, 438, 1642, 791, 798, 806, 297, 461,
+
+ 459, 458, 457, 344, 350, 377, 840, 351, 874, 908,
+ 934, 960, 986, 1012, 1046, 450, 825, 859, 894, 920,
+ 946, 461, 380, 397, 1642, 972, 1053, 1061, 301, 394,
+ 393, 391, 370, 369, 383, 1642, 357, 385, 418, 1095,
+ 1129, 487, 386, 1108, 1163, 1197, 1182, 347, 1204, 1212,
+ 1219, 458, 1227, 381, 1642, 330, 444, 1234, 343, 1642,
+ 1642, 1642, 1642, 1642, 1642, 1026, 388, 403, 1242, 1276,
+ 439, 454, 1262, 1277, 281, 653, 294, 275, 290, 261,
+ 1283, 1298, 1304, 1319, 1642, 241, 230, 153, 1642, 1642,
+ 1325, 1340, 1346, 143, 149, 98, 1361, 1367, 1382, 45,
+
+ 1642, 42, 1388, 1403, 1642, 1642, 1642, 1437, 1442, 1451,
+ 1456, 1463, 1469, 1478, 1485, 1494, 1504, 1506, 1513, 1518,
+ 1525, 1535, 1542, 1547, 1557, 1562, 1571, 1576, 1585, 1594,
+ 1603, 1608, 1617, 1626, 1631
} ;
-static yyconst short int yy_def[330] =
+static yyconst short int yy_def[336] =
{ 0,
- 303, 1, 303, 303, 303, 303, 303, 304, 305, 303,
- 306, 303, 303, 303, 303, 303, 303, 303, 307, 303,
- 308, 308, 303, 303, 303, 303, 303, 304, 303, 309,
- 305, 310, 303, 306, 311, 303, 303, 16, 312, 303,
- 303, 16, 313, 314, 314, 314, 314, 314, 314, 314,
- 314, 314, 314, 314, 314, 314, 303, 303, 303, 303,
- 303, 303, 303, 308, 308, 303, 303, 308, 315, 303,
- 308, 303, 303, 303, 304, 304, 304, 304, 309, 305,
- 305, 306, 306, 306, 306, 311, 303, 312, 316, 314,
- 314, 314, 317, 314, 314, 314, 314, 314, 314, 314,
-
- 314, 314, 314, 314, 314, 314, 314, 314, 303, 303,
- 303, 303, 303, 303, 303, 65, 308, 65, 318, 303,
- 308, 303, 304, 78, 81, 306, 85, 319, 303, 91,
- 314, 91, 314, 314, 314, 314, 314, 303, 303, 303,
- 303, 303, 303, 303, 65, 118, 303, 320, 303, 303,
- 321, 303, 78, 81, 85, 319, 316, 91, 132, 314,
- 314, 303, 303, 303, 303, 303, 303, 65, 118, 303,
- 322, 303, 303, 303, 321, 321, 323, 324, 303, 325,
- 303, 78, 81, 85, 91, 132, 314, 303, 303, 303,
- 303, 303, 65, 118, 303, 326, 303, 303, 303, 303,
-
- 303, 323, 303, 327, 324, 328, 321, 321, 321, 321,
- 321, 325, 303, 78, 81, 85, 91, 132, 303, 303,
- 303, 303, 65, 118, 303, 329, 303, 303, 303, 303,
- 303, 303, 303, 323, 323, 323, 323, 327, 324, 324,
- 324, 324, 328, 211, 303, 78, 81, 85, 314, 132,
- 303, 303, 303, 303, 303, 223, 303, 303, 303, 303,
- 303, 303, 303, 303, 323, 323, 323, 237, 324, 324,
- 324, 242, 211, 303, 314, 303, 303, 303, 303, 303,
- 237, 242, 211, 303, 303, 303, 303, 303, 303, 237,
- 242, 211, 303, 303, 303, 237, 242, 211, 303, 303,
-
- 237, 242, 0, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303
+ 307, 1, 307, 307, 307, 307, 307, 308, 309, 307,
+ 310, 307, 311, 307, 307, 307, 307, 307, 312, 307,
+ 313, 313, 307, 307, 307, 307, 307, 308, 307, 314,
+ 309, 315, 307, 310, 316, 307, 307, 312, 313, 16,
+ 317, 307, 318, 307, 16, 319, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 307,
+ 307, 307, 307, 307, 307, 307, 313, 313, 307, 307,
+ 313, 321, 307, 313, 307, 307, 307, 308, 308, 308,
+ 308, 314, 309, 309, 310, 310, 310, 310, 316, 307,
+ 317, 322, 320, 320, 320, 323, 320, 320, 320, 320,
+
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 307, 307, 307, 307, 307, 307, 307, 68, 313,
+ 68, 324, 307, 313, 307, 308, 81, 84, 310, 88,
+ 325, 307, 94, 320, 94, 320, 320, 320, 320, 320,
+ 307, 307, 307, 307, 307, 307, 307, 68, 121, 307,
+ 326, 307, 307, 327, 307, 81, 84, 88, 325, 322,
+ 94, 135, 320, 320, 307, 307, 307, 307, 307, 307,
+ 68, 121, 307, 328, 307, 307, 307, 327, 327, 329,
+ 330, 307, 331, 307, 81, 84, 88, 94, 135, 320,
+ 307, 307, 307, 307, 307, 68, 121, 307, 332, 307,
+
+ 307, 307, 307, 307, 329, 307, 333, 330, 334, 327,
+ 327, 327, 327, 327, 331, 307, 81, 84, 88, 94,
+ 135, 307, 307, 307, 307, 68, 121, 307, 335, 307,
+ 307, 307, 307, 307, 307, 307, 329, 329, 329, 329,
+ 333, 330, 330, 330, 330, 334, 214, 307, 81, 84,
+ 88, 320, 135, 307, 307, 307, 226, 307, 307, 307,
+ 307, 307, 307, 307, 307, 329, 329, 329, 240, 330,
+ 330, 330, 245, 214, 307, 320, 307, 307, 307, 307,
+ 307, 240, 245, 214, 307, 307, 307, 307, 307, 307,
+ 240, 245, 214, 307, 307, 307, 240, 245, 214, 307,
+
+ 307, 307, 240, 245, 307, 307, 0, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307
} ;
-static yyconst short int yy_nxt[1635] =
+static yyconst short int yy_nxt[1699] =
{ 0,
4, 5, 6, 5, 5, 5, 7, 8, 9, 10,
4, 4, 11, 4, 4, 12, 4, 13, 14, 15,
@@ -211,182 +213,189 @@ static yyconst short int yy_nxt[1635] =
21, 21, 21, 21, 21, 21, 21, 21, 21, 22,
21, 21, 21, 23, 24, 21, 25, 25, 25, 25,
25, 25, 25, 25, 25, 25, 26, 26, 26, 26,
- 26, 29, 29, 29, 58, 93, 67, 29, 303, 67,
- 38, 93, 70, 94, 93, 102, 35, 35, 59, 69,
- 30, 60, 69, 93, 61, 65, 30, 67, 62, 95,
-
- 96, 63, 27, 40, 65, 65, 65, 65, 65, 65,
- 69, 41, 71, 42, 25, 25, 25, 25, 25, 43,
- 300, 44, 45, 45, 46, 47, 48, 45, 49, 50,
- 51, 45, 52, 45, 53, 45, 45, 54, 45, 55,
- 56, 45, 45, 45, 45, 45, 81, 93, 45, 26,
- 26, 26, 26, 26, 91, 81, 81, 81, 81, 81,
- 81, 93, 97, 91, 91, 91, 91, 91, 91, 93,
- 93, 67, 98, 108, 93, 29, 93, 93, 299, 29,
- 67, 99, 105, 295, 69, 27, 28, 28, 28, 75,
- 101, 103, 77, 69, 30, 100, 29, 104, 30, 106,
-
- 89, 28, 107, 34, 129, 78, 29, 121, 294, 93,
- 35, 79, 29, 29, 78, 78, 78, 78, 78, 78,
- 34, 34, 34, 82, 118, 30, 35, 35, 133, 293,
- 288, 84, 93, 118, 118, 118, 118, 118, 118, 85,
- 93, 134, 93, 135, 29, 86, 287, 67, 85, 85,
- 85, 85, 85, 85, 64, 64, 64, 64, 64, 93,
- 69, 151, 147, 30, 29, 137, 67, 157, 136, 149,
- 93, 129, 286, 116, 69, 93, 93, 160, 35, 69,
- 203, 161, 116, 116, 116, 116, 116, 116, 119, 147,
- 285, 187, 120, 203, 206, 203, 172, 119, 119, 119,
-
- 119, 119, 119, 76, 123, 123, 123, 76, 147, 29,
- 147, 203, 204, 147, 204, 197, 284, 227, 202, 147,
- 259, 279, 124, 203, 278, 206, 277, 276, 30, 274,
- 203, 124, 124, 124, 124, 124, 124, 28, 28, 28,
- 75, 132, 204, 77, 201, 201, 201, 201, 201, 204,
- 132, 132, 132, 132, 132, 132, 78, 179, 264, 263,
- 262, 261, 79, 260, 255, 78, 78, 78, 78, 78,
- 78, 80, 80, 80, 80, 80, 232, 232, 232, 232,
- 232, 232, 232, 232, 232, 232, 254, 245, 205, 233,
- 125, 203, 231, 230, 233, 203, 32, 251, 203, 125,
-
- 125, 125, 125, 125, 125, 83, 126, 126, 126, 83,
- 204, 252, 206, 203, 204, 253, 29, 203, 229, 265,
- 232, 232, 232, 265, 127, 203, 228, 206, 222, 221,
- 35, 206, 266, 127, 127, 127, 127, 127, 127, 34,
- 34, 34, 82, 145, 204, 117, 117, 117, 117, 117,
- 84, 203, 145, 145, 145, 145, 145, 145, 85, 90,
- 90, 90, 90, 90, 86, 206, 220, 85, 85, 85,
- 85, 85, 85, 90, 90, 90, 90, 90, 219, 93,
- 213, 200, 199, 198, 93, 192, 191, 265, 232, 232,
- 232, 265, 130, 203, 190, 189, 188, 93, 93, 157,
-
- 266, 130, 130, 130, 130, 130, 130, 117, 117, 117,
- 117, 117, 204, 181, 174, 173, 167, 166, 153, 165,
- 164, 163, 162, 93, 93, 93, 146, 153, 153, 153,
- 153, 153, 153, 154, 93, 146, 146, 146, 146, 146,
- 146, 155, 154, 154, 154, 154, 154, 154, 158, 157,
- 155, 155, 155, 155, 155, 155, 152, 158, 158, 158,
- 158, 158, 158, 131, 131, 131, 131, 131, 150, 144,
- 143, 142, 141, 140, 168, 139, 138, 93, 93, 93,
- 93, 93, 159, 168, 168, 168, 168, 168, 168, 169,
- 93, 159, 159, 159, 159, 159, 159, 170, 169, 169,
-
- 169, 169, 169, 169, 93, 93, 170, 170, 170, 170,
- 170, 170, 175, 175, 175, 175, 175, 182, 177, 93,
- 93, 93, 93, 178, 89, 179, 182, 182, 182, 182,
- 182, 182, 183, 32, 122, 115, 114, 180, 184, 113,
- 112, 183, 183, 183, 183, 183, 183, 184, 184, 184,
- 184, 184, 184, 185, 131, 131, 131, 131, 131, 186,
- 111, 110, 185, 185, 185, 185, 185, 185, 186, 186,
- 186, 186, 186, 186, 193, 109, 93, 93, 38, 93,
- 194, 40, 89, 193, 193, 193, 193, 193, 193, 194,
- 194, 194, 194, 194, 194, 195, 87, 32, 74, 73,
-
- 72, 66, 57, 39, 195, 195, 195, 195, 195, 195,
- 175, 175, 175, 175, 175, 214, 177, 38, 37, 36,
- 33, 178, 32, 179, 214, 214, 214, 214, 214, 214,
- 303, 303, 303, 303, 303, 180, 201, 201, 201, 201,
- 201, 215, 303, 303, 303, 303, 303, 303, 303, 179,
- 215, 215, 215, 215, 215, 215, 303, 303, 303, 303,
- 303, 180, 201, 201, 201, 201, 207, 303, 209, 303,
- 303, 303, 303, 209, 209, 210, 303, 303, 303, 303,
- 303, 211, 303, 303, 303, 303, 303, 212, 216, 303,
- 211, 211, 211, 211, 211, 211, 217, 216, 216, 216,
-
- 216, 216, 216, 218, 303, 217, 217, 217, 217, 217,
- 217, 223, 218, 218, 218, 218, 218, 218, 224, 303,
- 223, 223, 223, 223, 223, 223, 225, 224, 224, 224,
- 224, 224, 224, 303, 303, 225, 225, 225, 225, 225,
- 225, 202, 202, 202, 234, 246, 303, 236, 303, 303,
- 303, 303, 303, 303, 246, 246, 246, 246, 246, 246,
- 237, 303, 303, 303, 303, 303, 238, 303, 303, 237,
- 237, 237, 237, 237, 237, 205, 205, 205, 239, 247,
- 303, 303, 303, 303, 303, 303, 241, 303, 247, 247,
- 247, 247, 247, 247, 242, 303, 303, 303, 303, 303,
-
- 243, 303, 303, 242, 242, 242, 242, 242, 242, 201,
- 201, 201, 201, 201, 248, 303, 303, 303, 303, 303,
- 303, 303, 179, 248, 248, 248, 248, 248, 248, 303,
- 303, 303, 303, 303, 180, 201, 201, 201, 201, 201,
- 249, 303, 303, 303, 303, 303, 303, 303, 179, 249,
- 249, 249, 249, 249, 249, 303, 303, 303, 303, 303,
- 180, 201, 201, 201, 201, 201, 250, 303, 303, 303,
- 303, 303, 303, 303, 179, 250, 250, 250, 250, 250,
- 250, 303, 303, 303, 303, 303, 180, 201, 201, 201,
- 201, 201, 68, 303, 303, 303, 303, 303, 303, 303,
-
- 179, 68, 68, 68, 68, 68, 68, 303, 303, 303,
- 303, 303, 180, 207, 207, 207, 207, 207, 303, 303,
- 303, 303, 303, 303, 303, 303, 179, 303, 303, 303,
- 303, 303, 244, 303, 303, 303, 303, 303, 180, 303,
- 303, 244, 244, 244, 244, 244, 244, 201, 201, 201,
- 201, 207, 303, 209, 303, 303, 303, 303, 209, 209,
- 210, 303, 303, 303, 303, 303, 211, 303, 303, 303,
- 303, 303, 212, 256, 303, 211, 211, 211, 211, 211,
- 211, 257, 256, 256, 256, 256, 256, 256, 303, 303,
- 257, 257, 257, 257, 257, 257, 235, 267, 267, 267,
-
- 235, 303, 203, 303, 303, 303, 303, 303, 303, 269,
- 232, 232, 232, 269, 303, 268, 303, 303, 303, 303,
- 203, 204, 270, 303, 268, 268, 268, 268, 268, 268,
- 202, 202, 202, 234, 206, 303, 236, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 237,
- 303, 303, 303, 303, 303, 238, 303, 303, 237, 237,
- 237, 237, 237, 237, 240, 271, 271, 271, 240, 303,
- 303, 303, 303, 303, 303, 203, 303, 303, 303, 303,
- 303, 303, 303, 272, 303, 303, 303, 303, 303, 206,
- 303, 303, 272, 272, 272, 272, 272, 272, 205, 205,
-
- 205, 239, 273, 303, 303, 303, 303, 303, 303, 241,
- 303, 273, 273, 273, 273, 273, 273, 242, 303, 303,
- 303, 303, 303, 243, 28, 303, 242, 242, 242, 242,
- 242, 242, 31, 28, 28, 28, 28, 28, 28, 34,
- 303, 31, 31, 31, 31, 31, 31, 275, 34, 34,
- 34, 34, 34, 34, 280, 303, 275, 275, 275, 275,
- 275, 275, 281, 280, 280, 280, 280, 280, 280, 303,
- 303, 281, 281, 281, 281, 281, 281, 269, 232, 232,
- 232, 269, 282, 303, 303, 303, 303, 303, 203, 303,
- 270, 282, 282, 282, 282, 282, 282, 283, 303, 303,
-
- 303, 303, 206, 289, 303, 303, 283, 283, 283, 283,
- 283, 283, 289, 289, 289, 289, 289, 289, 290, 303,
- 303, 303, 303, 303, 291, 303, 303, 290, 290, 290,
- 290, 290, 290, 291, 291, 291, 291, 291, 291, 292,
- 303, 303, 303, 303, 303, 296, 303, 303, 292, 292,
- 292, 292, 292, 292, 296, 296, 296, 296, 296, 296,
- 297, 303, 303, 303, 303, 303, 298, 303, 303, 297,
- 297, 297, 297, 297, 297, 298, 298, 298, 298, 298,
- 298, 301, 303, 303, 303, 303, 303, 302, 303, 303,
- 301, 301, 301, 301, 301, 301, 302, 302, 302, 302,
-
- 302, 302, 176, 303, 303, 303, 303, 303, 202, 303,
- 303, 176, 176, 176, 176, 176, 176, 202, 202, 202,
- 202, 202, 202, 205, 303, 303, 303, 303, 303, 303,
- 303, 303, 205, 205, 205, 205, 205, 205, 28, 303,
- 28, 28, 28, 28, 28, 31, 303, 31, 34, 303,
- 34, 34, 34, 34, 34, 64, 64, 64, 64, 64,
- 68, 68, 303, 68, 76, 76, 76, 76, 76, 76,
- 76, 80, 80, 80, 80, 80, 83, 83, 83, 83,
- 83, 83, 83, 88, 88, 88, 88, 88, 88, 88,
- 88, 90, 90, 90, 90, 90, 92, 303, 92, 117,
-
- 117, 117, 117, 117, 128, 128, 128, 128, 128, 128,
- 128, 128, 131, 131, 131, 131, 131, 148, 148, 156,
- 156, 156, 156, 156, 156, 156, 156, 171, 171, 176,
- 176, 176, 303, 176, 176, 176, 196, 196, 202, 303,
- 202, 202, 202, 202, 202, 205, 303, 205, 205, 205,
- 205, 205, 208, 208, 208, 208, 208, 208, 208, 226,
- 226, 235, 235, 235, 235, 235, 235, 235, 240, 240,
- 240, 240, 240, 240, 240, 258, 258, 3, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
-
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303
+ 26, 29, 29, 37, 61, 306, 70, 25, 25, 25,
+ 25, 25, 38, 70, 70, 29, 35, 73, 62, 72,
+ 30, 63, 305, 29, 64, 68, 72, 72, 65, 35,
+
+ 96, 66, 27, 42, 68, 68, 68, 68, 68, 68,
+ 43, 44, 30, 45, 307, 98, 40, 74, 96, 46,
+ 97, 47, 48, 48, 49, 50, 51, 48, 52, 53,
+ 54, 48, 55, 48, 56, 48, 48, 57, 48, 58,
+ 59, 48, 48, 48, 48, 48, 84, 302, 48, 26,
+ 26, 26, 26, 26, 68, 84, 84, 84, 84, 84,
+ 84, 94, 96, 68, 68, 68, 68, 68, 68, 99,
+ 94, 94, 94, 94, 94, 94, 96, 96, 96, 96,
+ 96, 96, 301, 300, 29, 27, 28, 28, 28, 78,
+ 105, 100, 80, 296, 70, 104, 106, 102, 35, 70,
+
+ 70, 101, 107, 96, 103, 81, 96, 72, 108, 111,
+ 29, 82, 72, 72, 81, 81, 81, 81, 81, 81,
+ 34, 34, 34, 85, 121, 109, 96, 124, 110, 30,
+ 29, 87, 140, 121, 121, 121, 121, 121, 121, 88,
+ 29, 28, 96, 92, 35, 89, 29, 132, 88, 88,
+ 88, 88, 88, 88, 67, 67, 67, 67, 67, 30,
+ 96, 136, 70, 96, 29, 30, 70, 34, 96, 137,
+ 295, 138, 294, 119, 150, 72, 29, 29, 35, 72,
+ 154, 152, 119, 119, 119, 119, 119, 119, 122, 139,
+ 96, 35, 123, 72, 289, 30, 164, 122, 122, 122,
+
+ 122, 122, 122, 79, 126, 126, 126, 79, 96, 29,
+ 150, 96, 160, 150, 150, 163, 132, 175, 150, 288,
+ 200, 230, 127, 206, 287, 260, 190, 286, 30, 285,
+ 206, 127, 127, 127, 127, 127, 127, 28, 28, 28,
+ 78, 135, 207, 80, 209, 204, 204, 204, 204, 204,
+ 135, 135, 135, 135, 135, 135, 81, 206, 182, 205,
+ 150, 280, 82, 206, 206, 81, 81, 81, 81, 81,
+ 81, 83, 83, 83, 83, 83, 207, 209, 235, 235,
+ 235, 235, 235, 207, 235, 235, 235, 235, 235, 275,
+ 128, 236, 206, 265, 264, 206, 32, 236, 206, 128,
+
+ 128, 128, 128, 128, 128, 86, 129, 129, 129, 86,
+ 206, 207, 209, 277, 207, 263, 29, 262, 261, 266,
+ 235, 235, 235, 266, 130, 206, 256, 278, 255, 207,
+ 35, 279, 267, 130, 130, 130, 130, 130, 130, 34,
+ 34, 34, 85, 148, 207, 120, 120, 120, 120, 120,
+ 87, 206, 148, 148, 148, 148, 148, 148, 88, 93,
+ 93, 93, 93, 93, 89, 209, 206, 88, 88, 88,
+ 88, 88, 88, 93, 93, 93, 93, 93, 254, 248,
+ 209, 234, 233, 232, 96, 231, 225, 224, 223, 208,
+ 222, 96, 133, 216, 203, 202, 201, 195, 96, 206,
+
+ 194, 133, 133, 133, 133, 133, 133, 120, 120, 120,
+ 120, 120, 193, 209, 192, 191, 96, 160, 156, 184,
+ 177, 176, 170, 169, 168, 167, 149, 156, 156, 156,
+ 156, 156, 156, 157, 166, 149, 149, 149, 149, 149,
+ 149, 158, 157, 157, 157, 157, 157, 157, 161, 165,
+ 158, 158, 158, 158, 158, 158, 96, 161, 161, 161,
+ 161, 161, 161, 134, 134, 134, 134, 134, 96, 96,
+ 96, 160, 155, 153, 171, 147, 146, 145, 144, 143,
+ 142, 141, 162, 171, 171, 171, 171, 171, 171, 172,
+ 96, 162, 162, 162, 162, 162, 162, 173, 172, 172,
+
+ 172, 172, 172, 172, 96, 96, 173, 173, 173, 173,
+ 173, 173, 178, 178, 178, 178, 178, 185, 180, 96,
+ 96, 96, 96, 181, 96, 182, 185, 185, 185, 185,
+ 185, 185, 186, 96, 96, 96, 96, 183, 187, 92,
+ 32, 186, 186, 186, 186, 186, 186, 187, 187, 187,
+ 187, 187, 187, 188, 134, 134, 134, 134, 134, 189,
+ 125, 118, 188, 188, 188, 188, 188, 188, 189, 189,
+ 189, 189, 189, 189, 196, 117, 116, 115, 114, 96,
+ 197, 113, 112, 196, 196, 196, 196, 196, 196, 197,
+ 197, 197, 197, 197, 197, 198, 96, 96, 40, 46,
+
+ 42, 92, 90, 32, 198, 198, 198, 198, 198, 198,
+ 178, 178, 178, 178, 178, 217, 180, 77, 76, 75,
+ 69, 181, 60, 182, 217, 217, 217, 217, 217, 217,
+ 41, 40, 36, 33, 32, 183, 204, 204, 204, 204,
+ 204, 218, 307, 307, 307, 307, 307, 307, 307, 182,
+ 218, 218, 218, 218, 218, 218, 307, 307, 307, 307,
+ 307, 183, 204, 204, 204, 204, 210, 307, 212, 307,
+ 307, 307, 307, 212, 212, 213, 307, 307, 307, 307,
+ 307, 214, 307, 307, 307, 307, 307, 215, 219, 307,
+ 214, 214, 214, 214, 214, 214, 220, 219, 219, 219,
+
+ 219, 219, 219, 221, 307, 220, 220, 220, 220, 220,
+ 220, 226, 221, 221, 221, 221, 221, 221, 227, 307,
+ 226, 226, 226, 226, 226, 226, 228, 227, 227, 227,
+ 227, 227, 227, 307, 307, 228, 228, 228, 228, 228,
+ 228, 205, 205, 205, 237, 249, 307, 239, 307, 307,
+ 307, 307, 307, 307, 249, 249, 249, 249, 249, 249,
+ 240, 307, 307, 307, 307, 307, 241, 307, 307, 240,
+ 240, 240, 240, 240, 240, 208, 208, 208, 242, 250,
+ 307, 307, 307, 307, 307, 307, 244, 307, 250, 250,
+ 250, 250, 250, 250, 245, 307, 307, 307, 307, 307,
+
+ 246, 307, 307, 245, 245, 245, 245, 245, 245, 204,
+ 204, 204, 204, 204, 251, 307, 307, 307, 307, 307,
+ 307, 307, 182, 251, 251, 251, 251, 251, 251, 307,
+ 307, 307, 307, 307, 183, 204, 204, 204, 204, 204,
+ 252, 307, 307, 307, 307, 307, 307, 307, 182, 252,
+ 252, 252, 252, 252, 252, 307, 307, 307, 307, 307,
+ 183, 204, 204, 204, 204, 204, 253, 307, 307, 307,
+ 307, 307, 307, 307, 182, 253, 253, 253, 253, 253,
+ 253, 307, 307, 307, 307, 307, 183, 204, 204, 204,
+ 204, 204, 71, 307, 307, 307, 307, 307, 307, 307,
+
+ 182, 71, 71, 71, 71, 71, 71, 307, 307, 307,
+ 307, 307, 183, 210, 210, 210, 210, 210, 307, 307,
+ 307, 307, 307, 307, 307, 307, 182, 266, 235, 235,
+ 235, 266, 247, 206, 307, 307, 307, 307, 183, 307,
+ 267, 247, 247, 247, 247, 247, 247, 204, 204, 204,
+ 204, 210, 207, 212, 307, 307, 307, 307, 212, 212,
+ 213, 307, 307, 307, 307, 307, 214, 307, 307, 307,
+ 307, 307, 215, 257, 307, 214, 214, 214, 214, 214,
+ 214, 258, 257, 257, 257, 257, 257, 257, 307, 307,
+ 258, 258, 258, 258, 258, 258, 238, 268, 268, 268,
+
+ 238, 307, 206, 307, 307, 307, 307, 307, 307, 270,
+ 235, 235, 235, 270, 307, 269, 307, 307, 307, 307,
+ 206, 207, 271, 307, 269, 269, 269, 269, 269, 269,
+ 205, 205, 205, 237, 209, 307, 239, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 240,
+ 307, 307, 307, 307, 307, 241, 307, 307, 240, 240,
+ 240, 240, 240, 240, 243, 272, 272, 272, 243, 307,
+ 307, 307, 307, 307, 307, 206, 307, 307, 307, 307,
+ 307, 307, 307, 273, 307, 307, 307, 307, 307, 209,
+ 307, 307, 273, 273, 273, 273, 273, 273, 208, 208,
+
+ 208, 242, 274, 307, 307, 307, 307, 307, 307, 244,
+ 307, 274, 274, 274, 274, 274, 274, 245, 307, 307,
+ 307, 307, 307, 246, 28, 307, 245, 245, 245, 245,
+ 245, 245, 31, 28, 28, 28, 28, 28, 28, 34,
+ 307, 31, 31, 31, 31, 31, 31, 276, 34, 34,
+ 34, 34, 34, 34, 281, 307, 276, 276, 276, 276,
+ 276, 276, 282, 281, 281, 281, 281, 281, 281, 307,
+ 307, 282, 282, 282, 282, 282, 282, 270, 235, 235,
+ 235, 270, 283, 307, 307, 307, 307, 307, 206, 307,
+ 271, 283, 283, 283, 283, 283, 283, 284, 307, 307,
+
+ 307, 307, 209, 290, 307, 307, 284, 284, 284, 284,
+ 284, 284, 290, 290, 290, 290, 290, 290, 291, 307,
+ 307, 307, 307, 307, 292, 307, 307, 291, 291, 291,
+ 291, 291, 291, 292, 292, 292, 292, 292, 292, 293,
+ 307, 307, 307, 307, 307, 297, 307, 307, 293, 293,
+ 293, 293, 293, 293, 297, 297, 297, 297, 297, 297,
+ 298, 307, 307, 307, 307, 307, 299, 307, 307, 298,
+ 298, 298, 298, 298, 298, 299, 299, 299, 299, 299,
+ 299, 303, 307, 307, 307, 307, 307, 304, 307, 307,
+ 303, 303, 303, 303, 303, 303, 304, 304, 304, 304,
+
+ 304, 304, 179, 307, 307, 307, 307, 307, 205, 307,
+ 307, 179, 179, 179, 179, 179, 179, 205, 205, 205,
+ 205, 205, 205, 208, 307, 307, 307, 307, 307, 307,
+ 307, 307, 208, 208, 208, 208, 208, 208, 28, 307,
+ 28, 28, 28, 28, 28, 28, 28, 31, 31, 307,
+ 31, 31, 34, 307, 34, 34, 34, 34, 34, 34,
+ 34, 39, 307, 307, 39, 39, 67, 67, 67, 67,
+ 67, 67, 67, 71, 71, 71, 307, 71, 71, 79,
+ 79, 79, 79, 79, 79, 79, 79, 79, 83, 83,
+ 83, 83, 83, 83, 83, 86, 86, 86, 86, 86,
+
+ 86, 86, 86, 86, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, 48, 48, 93, 93, 93, 93,
+ 93, 93, 93, 95, 95, 307, 95, 95, 120, 120,
+ 120, 120, 120, 120, 120, 131, 131, 131, 131, 131,
+ 131, 131, 131, 131, 131, 134, 134, 134, 134, 134,
+ 134, 134, 151, 151, 151, 307, 151, 159, 159, 159,
+ 159, 159, 159, 159, 159, 159, 159, 174, 174, 174,
+ 307, 174, 179, 179, 179, 307, 179, 179, 179, 179,
+ 179, 199, 199, 199, 307, 199, 205, 307, 205, 205,
+ 205, 205, 205, 205, 205, 208, 307, 208, 208, 208,
+
+ 208, 208, 208, 208, 211, 211, 211, 211, 211, 211,
+ 211, 211, 211, 229, 229, 229, 307, 229, 238, 238,
+ 238, 238, 238, 238, 238, 238, 238, 243, 243, 243,
+ 243, 243, 243, 243, 243, 243, 259, 259, 259, 307,
+ 259, 3, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307
+
} ;
-static yyconst short int yy_chk[1635] =
+static yyconst short int yy_chk[1699] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -395,179 +404,186 @@ static yyconst short int yy_chk[1635] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 5, 5, 5, 5,
5, 6, 6, 6, 6, 6, 7, 7, 7, 7,
- 7, 8, 11, 34, 18, 52, 21, 28, 38, 22,
- 38, 44, 22, 44, 46, 52, 11, 34, 18, 21,
- 8, 18, 22, 47, 18, 19, 28, 64, 18, 46,
+ 7, 8, 11, 13, 18, 302, 21, 25, 25, 25,
+ 25, 25, 13, 39, 22, 34, 11, 22, 18, 21,
+ 8, 18, 300, 28, 18, 19, 39, 22, 18, 34,
- 47, 18, 7, 16, 19, 19, 19, 19, 19, 19,
- 64, 16, 22, 16, 25, 25, 25, 25, 25, 16,
- 295, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+ 49, 18, 7, 16, 19, 19, 19, 19, 19, 19,
+ 16, 16, 28, 16, 40, 49, 40, 22, 47, 16,
+ 47, 16, 16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 32, 48, 16, 26,
- 26, 26, 26, 26, 43, 32, 32, 32, 32, 32,
- 32, 49, 48, 43, 43, 43, 43, 43, 43, 50,
- 55, 68, 48, 55, 51, 76, 53, 54, 293, 77,
- 71, 49, 54, 287, 68, 26, 30, 30, 30, 30,
- 51, 53, 30, 71, 76, 50, 83, 53, 77, 54,
-
- 89, 75, 54, 82, 89, 30, 75, 71, 286, 94,
- 83, 30, 84, 82, 30, 30, 30, 30, 30, 30,
- 35, 35, 35, 35, 69, 75, 84, 82, 94, 285,
- 279, 35, 96, 69, 69, 69, 69, 69, 69, 35,
- 99, 96, 102, 99, 123, 35, 278, 117, 35, 35,
- 35, 35, 35, 35, 65, 65, 65, 65, 65, 108,
- 117, 121, 119, 123, 126, 108, 65, 157, 102, 119,
- 133, 157, 277, 65, 121, 135, 160, 133, 126, 65,
- 178, 135, 65, 65, 65, 65, 65, 65, 70, 148,
- 276, 160, 70, 177, 178, 202, 148, 70, 70, 70,
-
- 70, 70, 70, 78, 78, 78, 78, 78, 171, 78,
- 196, 205, 177, 226, 202, 171, 274, 196, 234, 258,
- 226, 255, 78, 234, 253, 205, 252, 251, 78, 245,
- 235, 78, 78, 78, 78, 78, 78, 79, 79, 79,
- 79, 93, 234, 79, 201, 201, 201, 201, 201, 235,
- 93, 93, 93, 93, 93, 93, 79, 201, 231, 230,
- 229, 228, 79, 227, 221, 79, 79, 79, 79, 79,
- 79, 81, 81, 81, 81, 81, 203, 203, 203, 203,
- 203, 232, 232, 232, 232, 232, 220, 213, 239, 203,
- 81, 266, 200, 199, 232, 267, 81, 219, 239, 81,
-
- 81, 81, 81, 81, 81, 85, 85, 85, 85, 85,
- 266, 219, 239, 240, 267, 219, 85, 270, 198, 236,
- 236, 236, 236, 236, 85, 236, 197, 240, 191, 190,
- 85, 270, 236, 85, 85, 85, 85, 85, 85, 86,
- 86, 86, 86, 116, 236, 256, 256, 256, 256, 256,
- 86, 271, 116, 116, 116, 116, 116, 116, 86, 249,
- 249, 249, 249, 249, 86, 271, 189, 86, 86, 86,
- 86, 86, 86, 91, 91, 91, 91, 91, 188, 187,
- 181, 174, 173, 172, 249, 166, 165, 265, 265, 265,
- 265, 265, 91, 265, 164, 163, 162, 161, 91, 156,
-
- 265, 91, 91, 91, 91, 91, 91, 118, 118, 118,
- 118, 118, 265, 152, 150, 149, 144, 143, 124, 142,
- 141, 140, 139, 137, 136, 134, 118, 124, 124, 124,
- 124, 124, 124, 125, 131, 118, 118, 118, 118, 118,
- 118, 127, 125, 125, 125, 125, 125, 125, 130, 128,
- 127, 127, 127, 127, 127, 127, 122, 130, 130, 130,
- 130, 130, 130, 132, 132, 132, 132, 132, 120, 115,
- 114, 113, 112, 111, 145, 110, 109, 107, 106, 105,
- 104, 103, 132, 145, 145, 145, 145, 145, 145, 146,
- 101, 132, 132, 132, 132, 132, 132, 147, 146, 146,
-
- 146, 146, 146, 146, 100, 98, 147, 147, 147, 147,
- 147, 147, 151, 151, 151, 151, 151, 153, 151, 97,
- 95, 92, 90, 151, 88, 151, 153, 153, 153, 153,
- 153, 153, 154, 80, 74, 63, 62, 151, 155, 61,
- 60, 154, 154, 154, 154, 154, 154, 155, 155, 155,
- 155, 155, 155, 158, 275, 275, 275, 275, 275, 159,
- 59, 58, 158, 158, 158, 158, 158, 158, 159, 159,
- 159, 159, 159, 159, 168, 57, 56, 45, 41, 275,
- 169, 40, 39, 168, 168, 168, 168, 168, 168, 169,
- 169, 169, 169, 169, 169, 170, 37, 31, 27, 24,
-
- 23, 20, 17, 15, 170, 170, 170, 170, 170, 170,
- 175, 175, 175, 175, 175, 182, 175, 14, 13, 12,
- 10, 175, 9, 175, 182, 182, 182, 182, 182, 182,
- 3, 0, 0, 0, 0, 175, 176, 176, 176, 176,
- 176, 183, 176, 0, 0, 0, 0, 176, 0, 176,
- 183, 183, 183, 183, 183, 183, 0, 0, 0, 0,
- 0, 176, 180, 180, 180, 180, 180, 0, 180, 0,
- 0, 0, 0, 180, 180, 180, 0, 0, 0, 0,
- 0, 180, 0, 0, 0, 0, 0, 180, 184, 0,
- 180, 180, 180, 180, 180, 180, 185, 184, 184, 184,
-
- 184, 184, 184, 186, 0, 185, 185, 185, 185, 185,
- 185, 193, 186, 186, 186, 186, 186, 186, 194, 0,
- 193, 193, 193, 193, 193, 193, 195, 194, 194, 194,
- 194, 194, 194, 0, 0, 195, 195, 195, 195, 195,
- 195, 204, 204, 204, 204, 214, 0, 204, 0, 0,
- 0, 0, 0, 0, 214, 214, 214, 214, 214, 214,
- 204, 0, 0, 0, 0, 0, 204, 0, 0, 204,
- 204, 204, 204, 204, 204, 206, 206, 206, 206, 215,
- 0, 0, 0, 0, 0, 0, 206, 0, 215, 215,
- 215, 215, 215, 215, 206, 0, 0, 0, 0, 0,
-
- 206, 0, 0, 206, 206, 206, 206, 206, 206, 207,
- 207, 207, 207, 207, 216, 207, 0, 0, 0, 0,
- 207, 0, 207, 216, 216, 216, 216, 216, 216, 0,
- 0, 0, 0, 0, 207, 208, 208, 208, 208, 208,
- 217, 208, 0, 0, 0, 0, 208, 0, 208, 217,
- 217, 217, 217, 217, 217, 0, 0, 0, 0, 0,
- 208, 209, 209, 209, 209, 209, 218, 209, 0, 0,
- 0, 0, 209, 0, 209, 218, 218, 218, 218, 218,
- 218, 0, 0, 0, 0, 0, 209, 210, 210, 210,
- 210, 210, 223, 210, 0, 0, 0, 0, 210, 0,
-
- 210, 223, 223, 223, 223, 223, 223, 0, 0, 0,
- 0, 0, 210, 211, 211, 211, 211, 211, 0, 211,
- 0, 0, 0, 0, 211, 0, 211, 0, 0, 0,
- 0, 0, 211, 0, 0, 0, 0, 0, 211, 0,
- 0, 211, 211, 211, 211, 211, 211, 212, 212, 212,
- 212, 212, 0, 212, 0, 0, 0, 0, 212, 212,
- 212, 0, 0, 0, 0, 0, 212, 0, 0, 0,
- 0, 0, 212, 224, 0, 212, 212, 212, 212, 212,
- 212, 225, 224, 224, 224, 224, 224, 224, 0, 0,
- 225, 225, 225, 225, 225, 225, 237, 237, 237, 237,
-
- 237, 0, 237, 0, 0, 0, 0, 0, 0, 241,
- 241, 241, 241, 241, 0, 237, 0, 0, 0, 0,
- 241, 237, 241, 0, 237, 237, 237, 237, 237, 237,
- 238, 238, 238, 238, 241, 0, 238, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 238,
- 0, 0, 0, 0, 0, 238, 0, 0, 238, 238,
- 238, 238, 238, 238, 242, 242, 242, 242, 242, 0,
- 0, 0, 0, 0, 0, 242, 0, 0, 0, 0,
- 0, 0, 0, 242, 0, 0, 0, 0, 0, 242,
- 0, 0, 242, 242, 242, 242, 242, 242, 243, 243,
-
- 243, 243, 244, 0, 0, 0, 0, 0, 0, 243,
- 0, 244, 244, 244, 244, 244, 244, 243, 0, 0,
- 0, 0, 0, 243, 246, 0, 243, 243, 243, 243,
- 243, 243, 247, 246, 246, 246, 246, 246, 246, 248,
- 0, 247, 247, 247, 247, 247, 247, 250, 248, 248,
- 248, 248, 248, 248, 257, 0, 250, 250, 250, 250,
- 250, 250, 268, 257, 257, 257, 257, 257, 257, 0,
- 0, 268, 268, 268, 268, 268, 268, 269, 269, 269,
- 269, 269, 272, 0, 0, 0, 0, 0, 269, 0,
- 269, 272, 272, 272, 272, 272, 272, 273, 0, 0,
-
- 0, 0, 269, 280, 0, 0, 273, 273, 273, 273,
- 273, 273, 280, 280, 280, 280, 280, 280, 281, 0,
- 0, 0, 0, 0, 282, 0, 0, 281, 281, 281,
- 281, 281, 281, 282, 282, 282, 282, 282, 282, 283,
- 0, 0, 0, 0, 0, 290, 0, 0, 283, 283,
- 283, 283, 283, 283, 290, 290, 290, 290, 290, 290,
- 291, 0, 0, 0, 0, 0, 292, 0, 0, 291,
- 291, 291, 291, 291, 291, 292, 292, 292, 292, 292,
- 292, 296, 0, 0, 0, 0, 0, 297, 0, 0,
- 296, 296, 296, 296, 296, 296, 297, 297, 297, 297,
-
- 297, 297, 298, 0, 0, 0, 0, 0, 301, 0,
- 0, 298, 298, 298, 298, 298, 298, 301, 301, 301,
- 301, 301, 301, 302, 0, 0, 0, 0, 0, 0,
- 0, 0, 302, 302, 302, 302, 302, 302, 304, 0,
- 304, 304, 304, 304, 304, 305, 0, 305, 306, 0,
- 306, 306, 306, 306, 306, 307, 307, 307, 307, 307,
- 308, 308, 0, 308, 309, 309, 309, 309, 309, 309,
- 309, 310, 310, 310, 310, 310, 311, 311, 311, 311,
- 311, 311, 311, 312, 312, 312, 312, 312, 312, 312,
- 312, 313, 313, 313, 313, 313, 314, 0, 314, 315,
-
- 315, 315, 315, 315, 316, 316, 316, 316, 316, 316,
- 316, 316, 317, 317, 317, 317, 317, 318, 318, 319,
- 319, 319, 319, 319, 319, 319, 319, 320, 320, 321,
- 321, 321, 0, 321, 321, 321, 322, 322, 323, 0,
- 323, 323, 323, 323, 323, 324, 0, 324, 324, 324,
- 324, 324, 325, 325, 325, 325, 325, 325, 325, 326,
- 326, 327, 327, 327, 327, 327, 327, 327, 328, 328,
- 328, 328, 328, 328, 328, 329, 329, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
-
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303, 303, 303, 303, 303, 303, 303,
- 303, 303, 303, 303
+ 16, 16, 16, 16, 16, 16, 32, 296, 16, 26,
+ 26, 26, 26, 26, 38, 32, 32, 32, 32, 32,
+ 32, 46, 50, 38, 38, 38, 38, 38, 38, 50,
+ 46, 46, 46, 46, 46, 46, 51, 52, 53, 54,
+ 55, 56, 295, 294, 86, 26, 30, 30, 30, 30,
+ 55, 51, 30, 288, 67, 54, 56, 52, 86, 71,
+
+ 74, 51, 56, 57, 53, 30, 58, 67, 57, 58,
+ 79, 30, 71, 74, 30, 30, 30, 30, 30, 30,
+ 35, 35, 35, 35, 72, 57, 111, 74, 57, 79,
+ 87, 35, 111, 72, 72, 72, 72, 72, 72, 35,
+ 80, 78, 97, 92, 87, 35, 78, 92, 35, 35,
+ 35, 35, 35, 35, 68, 68, 68, 68, 68, 80,
+ 99, 97, 120, 105, 129, 78, 68, 85, 102, 99,
+ 287, 102, 286, 68, 122, 120, 126, 85, 129, 68,
+ 124, 122, 68, 68, 68, 68, 68, 68, 73, 105,
+ 138, 85, 73, 124, 280, 126, 138, 73, 73, 73,
+
+ 73, 73, 73, 81, 81, 81, 81, 81, 136, 81,
+ 151, 163, 160, 174, 199, 136, 160, 151, 229, 279,
+ 174, 199, 81, 180, 278, 229, 163, 277, 81, 275,
+ 181, 81, 81, 81, 81, 81, 81, 82, 82, 82,
+ 82, 96, 180, 82, 181, 204, 204, 204, 204, 204,
+ 96, 96, 96, 96, 96, 96, 82, 205, 204, 237,
+ 259, 256, 82, 208, 237, 82, 82, 82, 82, 82,
+ 82, 84, 84, 84, 84, 84, 205, 208, 206, 206,
+ 206, 206, 206, 237, 235, 235, 235, 235, 235, 248,
+ 84, 206, 238, 234, 233, 267, 84, 235, 243, 84,
+
+ 84, 84, 84, 84, 84, 88, 88, 88, 88, 88,
+ 268, 238, 243, 254, 267, 232, 88, 231, 230, 239,
+ 239, 239, 239, 239, 88, 239, 224, 254, 223, 268,
+ 88, 254, 239, 88, 88, 88, 88, 88, 88, 89,
+ 89, 89, 89, 119, 239, 257, 257, 257, 257, 257,
+ 89, 271, 119, 119, 119, 119, 119, 119, 89, 252,
+ 252, 252, 252, 252, 89, 271, 272, 89, 89, 89,
+ 89, 89, 89, 94, 94, 94, 94, 94, 222, 216,
+ 272, 203, 202, 201, 252, 200, 194, 193, 192, 242,
+ 191, 190, 94, 184, 177, 176, 175, 169, 94, 242,
+
+ 168, 94, 94, 94, 94, 94, 94, 121, 121, 121,
+ 121, 121, 167, 242, 166, 165, 164, 159, 127, 155,
+ 153, 152, 147, 146, 145, 144, 121, 127, 127, 127,
+ 127, 127, 127, 128, 143, 121, 121, 121, 121, 121,
+ 121, 130, 128, 128, 128, 128, 128, 128, 133, 142,
+ 130, 130, 130, 130, 130, 130, 140, 133, 133, 133,
+ 133, 133, 133, 135, 135, 135, 135, 135, 139, 137,
+ 134, 131, 125, 123, 148, 118, 117, 116, 115, 114,
+ 113, 112, 135, 148, 148, 148, 148, 148, 148, 149,
+ 110, 135, 135, 135, 135, 135, 135, 150, 149, 149,
+
+ 149, 149, 149, 149, 109, 108, 150, 150, 150, 150,
+ 150, 150, 154, 154, 154, 154, 154, 156, 154, 107,
+ 106, 104, 103, 154, 101, 154, 156, 156, 156, 156,
+ 156, 156, 157, 100, 98, 95, 93, 154, 158, 91,
+ 83, 157, 157, 157, 157, 157, 157, 158, 158, 158,
+ 158, 158, 158, 161, 276, 276, 276, 276, 276, 162,
+ 77, 66, 161, 161, 161, 161, 161, 161, 162, 162,
+ 162, 162, 162, 162, 171, 65, 64, 63, 62, 276,
+ 172, 61, 60, 171, 171, 171, 171, 171, 171, 172,
+ 172, 172, 172, 172, 172, 173, 59, 48, 44, 43,
+
+ 42, 41, 37, 31, 173, 173, 173, 173, 173, 173,
+ 178, 178, 178, 178, 178, 185, 178, 27, 24, 23,
+ 20, 178, 17, 178, 185, 185, 185, 185, 185, 185,
+ 15, 14, 12, 10, 9, 178, 179, 179, 179, 179,
+ 179, 186, 179, 3, 0, 0, 0, 179, 0, 179,
+ 186, 186, 186, 186, 186, 186, 0, 0, 0, 0,
+ 0, 179, 183, 183, 183, 183, 183, 0, 183, 0,
+ 0, 0, 0, 183, 183, 183, 0, 0, 0, 0,
+ 0, 183, 0, 0, 0, 0, 0, 183, 187, 0,
+ 183, 183, 183, 183, 183, 183, 188, 187, 187, 187,
+
+ 187, 187, 187, 189, 0, 188, 188, 188, 188, 188,
+ 188, 196, 189, 189, 189, 189, 189, 189, 197, 0,
+ 196, 196, 196, 196, 196, 196, 198, 197, 197, 197,
+ 197, 197, 197, 0, 0, 198, 198, 198, 198, 198,
+ 198, 207, 207, 207, 207, 217, 0, 207, 0, 0,
+ 0, 0, 0, 0, 217, 217, 217, 217, 217, 217,
+ 207, 0, 0, 0, 0, 0, 207, 0, 0, 207,
+ 207, 207, 207, 207, 207, 209, 209, 209, 209, 218,
+ 0, 0, 0, 0, 0, 0, 209, 0, 218, 218,
+ 218, 218, 218, 218, 209, 0, 0, 0, 0, 0,
+
+ 209, 0, 0, 209, 209, 209, 209, 209, 209, 210,
+ 210, 210, 210, 210, 219, 210, 0, 0, 0, 0,
+ 210, 0, 210, 219, 219, 219, 219, 219, 219, 0,
+ 0, 0, 0, 0, 210, 211, 211, 211, 211, 211,
+ 220, 211, 0, 0, 0, 0, 211, 0, 211, 220,
+ 220, 220, 220, 220, 220, 0, 0, 0, 0, 0,
+ 211, 212, 212, 212, 212, 212, 221, 212, 0, 0,
+ 0, 0, 212, 0, 212, 221, 221, 221, 221, 221,
+ 221, 0, 0, 0, 0, 0, 212, 213, 213, 213,
+ 213, 213, 226, 213, 0, 0, 0, 0, 213, 0,
+
+ 213, 226, 226, 226, 226, 226, 226, 0, 0, 0,
+ 0, 0, 213, 214, 214, 214, 214, 214, 0, 214,
+ 0, 0, 0, 0, 214, 0, 214, 266, 266, 266,
+ 266, 266, 214, 266, 0, 0, 0, 0, 214, 0,
+ 266, 214, 214, 214, 214, 214, 214, 215, 215, 215,
+ 215, 215, 266, 215, 0, 0, 0, 0, 215, 215,
+ 215, 0, 0, 0, 0, 0, 215, 0, 0, 0,
+ 0, 0, 215, 227, 0, 215, 215, 215, 215, 215,
+ 215, 228, 227, 227, 227, 227, 227, 227, 0, 0,
+ 228, 228, 228, 228, 228, 228, 240, 240, 240, 240,
+
+ 240, 0, 240, 0, 0, 0, 0, 0, 0, 244,
+ 244, 244, 244, 244, 0, 240, 0, 0, 0, 0,
+ 244, 240, 244, 0, 240, 240, 240, 240, 240, 240,
+ 241, 241, 241, 241, 244, 0, 241, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 241,
+ 0, 0, 0, 0, 0, 241, 0, 0, 241, 241,
+ 241, 241, 241, 241, 245, 245, 245, 245, 245, 0,
+ 0, 0, 0, 0, 0, 245, 0, 0, 0, 0,
+ 0, 0, 0, 245, 0, 0, 0, 0, 0, 245,
+ 0, 0, 245, 245, 245, 245, 245, 245, 246, 246,
+
+ 246, 246, 247, 0, 0, 0, 0, 0, 0, 246,
+ 0, 247, 247, 247, 247, 247, 247, 246, 0, 0,
+ 0, 0, 0, 246, 249, 0, 246, 246, 246, 246,
+ 246, 246, 250, 249, 249, 249, 249, 249, 249, 251,
+ 0, 250, 250, 250, 250, 250, 250, 253, 251, 251,
+ 251, 251, 251, 251, 258, 0, 253, 253, 253, 253,
+ 253, 253, 269, 258, 258, 258, 258, 258, 258, 0,
+ 0, 269, 269, 269, 269, 269, 269, 270, 270, 270,
+ 270, 270, 273, 0, 0, 0, 0, 0, 270, 0,
+ 270, 273, 273, 273, 273, 273, 273, 274, 0, 0,
+
+ 0, 0, 270, 281, 0, 0, 274, 274, 274, 274,
+ 274, 274, 281, 281, 281, 281, 281, 281, 282, 0,
+ 0, 0, 0, 0, 283, 0, 0, 282, 282, 282,
+ 282, 282, 282, 283, 283, 283, 283, 283, 283, 284,
+ 0, 0, 0, 0, 0, 291, 0, 0, 284, 284,
+ 284, 284, 284, 284, 291, 291, 291, 291, 291, 291,
+ 292, 0, 0, 0, 0, 0, 293, 0, 0, 292,
+ 292, 292, 292, 292, 292, 293, 293, 293, 293, 293,
+ 293, 297, 0, 0, 0, 0, 0, 298, 0, 0,
+ 297, 297, 297, 297, 297, 297, 298, 298, 298, 298,
+
+ 298, 298, 299, 0, 0, 0, 0, 0, 303, 0,
+ 0, 299, 299, 299, 299, 299, 299, 303, 303, 303,
+ 303, 303, 303, 304, 0, 0, 0, 0, 0, 0,
+ 0, 0, 304, 304, 304, 304, 304, 304, 308, 0,
+ 308, 308, 308, 308, 308, 308, 308, 309, 309, 0,
+ 309, 309, 310, 0, 310, 310, 310, 310, 310, 310,
+ 310, 311, 0, 0, 311, 311, 312, 312, 312, 312,
+ 312, 312, 312, 313, 313, 313, 0, 313, 313, 314,
+ 314, 314, 314, 314, 314, 314, 314, 314, 315, 315,
+ 315, 315, 315, 315, 315, 316, 316, 316, 316, 316,
+
+ 316, 316, 316, 316, 317, 317, 317, 317, 317, 317,
+ 317, 317, 317, 317, 318, 318, 319, 319, 319, 319,
+ 319, 319, 319, 320, 320, 0, 320, 320, 321, 321,
+ 321, 321, 321, 321, 321, 322, 322, 322, 322, 322,
+ 322, 322, 322, 322, 322, 323, 323, 323, 323, 323,
+ 323, 323, 324, 324, 324, 0, 324, 325, 325, 325,
+ 325, 325, 325, 325, 325, 325, 325, 326, 326, 326,
+ 0, 326, 327, 327, 327, 0, 327, 327, 327, 327,
+ 327, 328, 328, 328, 0, 328, 329, 0, 329, 329,
+ 329, 329, 329, 329, 329, 330, 0, 330, 330, 330,
+
+ 330, 330, 330, 330, 331, 331, 331, 331, 331, 331,
+ 331, 331, 331, 332, 332, 332, 0, 332, 333, 333,
+ 333, 333, 333, 333, 333, 333, 333, 334, 334, 334,
+ 334, 334, 334, 334, 334, 334, 335, 335, 335, 0,
+ 335, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307, 307, 307,
+ 307, 307, 307, 307, 307, 307, 307, 307
+
} ;
YY_DECL
@@ -599,13 +615,13 @@ YY_DECL
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 304 )
+ if ( yy_current_state >= 308 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 1578 );
+ while ( yy_base[yy_current_state] != 1642 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -718,17 +734,17 @@ YY_RULE_SETUP
case 18:
YY_RULE_SETUP
#line 48 "tokenizer.flex"
-{yyTok = KONQ_RULE_SYM; return yyTok; }
+{yyTok = KHTML_RULE_SYM; return yyTok; }
YY_BREAK
case 19:
YY_RULE_SETUP
#line 49 "tokenizer.flex"
-{yyTok = KONQ_DECLS_SYM; return yyTok; }
+{yyTok = KHTML_DECLS_SYM; return yyTok; }
YY_BREAK
case 20:
YY_RULE_SETUP
#line 50 "tokenizer.flex"
-{yyTok = KONQ_VALUE_SYM; return yyTok; }
+{yyTok = KHTML_VALUE_SYM; return yyTok; }
YY_BREAK
case 21:
YY_RULE_SETUP
@@ -865,7 +881,7 @@ YY_RULE_SETUP
#line 83 "tokenizer.flex"
ECHO;
YY_BREAK
-#line 1304 "lex.yy.c"
+#line 1320 "lex.yy.c"
case YY_STATE_EOF(INITIAL):
case YY_END_OF_BUFFER:
yyterminate();
diff --git a/WebCore/khtml/css/tokenizer.flex b/WebCore/khtml/css/tokenizer.flex
index 9bb0726..d0631cb 100644
--- a/WebCore/khtml/css/tokenizer.flex
+++ b/WebCore/khtml/css/tokenizer.flex
@@ -11,7 +11,7 @@ nmchar [_a-zA-Z0-9-]|{nonascii}|{escape}
string1 \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\"
string2 \'([\t !#$%&(-~]|\\{nl}|\"|{nonascii}|{escape})*\'
-ident {nmstart}{nmchar}*
+ident -?{nmstart}{nmchar}*
name {nmchar}+
num [0-9]+|[0-9]*"."[0-9]+
string {string1}|{string2}
@@ -45,9 +45,9 @@ range \?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|
"@media" {yyTok = MEDIA_SYM; return yyTok;}
"@font-face" {yyTok = FONT_FACE_SYM; return yyTok;}
"@charset" {yyTok = CHARSET_SYM; return yyTok;}
-"@-konq-rule" {yyTok = KONQ_RULE_SYM; return yyTok; }
-"@-konq-decls" {yyTok = KONQ_DECLS_SYM; return yyTok; }
-"@-konq-value" {yyTok = KONQ_VALUE_SYM; return yyTok; }
+"@-khtml-rule" {yyTok = KHTML_RULE_SYM; return yyTok; }
+"@-khtml-decls" {yyTok = KHTML_DECLS_SYM; return yyTok; }
+"@-khtml-value" {yyTok = KHTML_VALUE_SYM; return yyTok; }
"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}
diff --git a/WebCore/khtml/html/html_blockimpl.cpp b/WebCore/khtml/html/html_blockimpl.cpp
index db49a94..700a352 100644
--- a/WebCore/khtml/html/html_blockimpl.cpp
+++ b/WebCore/khtml/html/html_blockimpl.cpp
@@ -74,11 +74,11 @@ 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);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
else if (strcasecmp(attr->value(), "left") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_LEFT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
else if (strcasecmp(attr->value(), "right") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_RIGHT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
@@ -201,11 +201,11 @@ 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);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER);
else if (strcasecmp(attr->value(), "left") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_LEFT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
else if (strcasecmp(attr->value(), "right") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_RIGHT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 1212518..af4ef92 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -538,7 +538,7 @@ void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
} else if ( strcasecmp( alignment, "top" ) == 0 ) {
propvalign = CSS_VAL_TOP;
} else if ( strcasecmp( alignment, "middle" ) == 0 ) {
- propvalign = CSS_VAL__KONQ_BASELINE_MIDDLE;
+ propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE;
} else if ( strcasecmp( alignment, "center" ) == 0 ) {
propvalign = CSS_VAL_MIDDLE;
} else if ( strcasecmp( alignment, "bottom" ) == 0 ) {
diff --git a/WebCore/khtml/html/html_inlineimpl.cpp b/WebCore/khtml/html/html_inlineimpl.cpp
index 6824a1f..3d14337 100644
--- a/WebCore/khtml/html/html_inlineimpl.cpp
+++ b/WebCore/khtml/html/html_inlineimpl.cpp
@@ -308,7 +308,7 @@ void HTMLFontElementImpl::parseAttribute(AttributeImpl *attr)
case 6: size = CSS_VAL_XX_LARGE; break;
default:
if (num > 6)
- size = CSS_VAL__KONQ_XXX_LARGE;
+ size = CSS_VAL__KHTML_XXX_LARGE;
else
size = CSS_VAL_X_SMALL;
}
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index 0ce5a0d..6740c25 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -599,13 +599,13 @@ 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);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_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);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT);
else if (strcasecmp(attr->value(), "right") == 0)
- addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KONQ_RIGHT);
+ addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT);
else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break;
@@ -863,7 +863,7 @@ void HTMLTableCellElementImpl::parseAttribute(AttributeImpl *attr)
break;
case ATTR_NOWRAP:
if (attr->val() != 0)
- addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__KONQ_NOWRAP);
+ addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP);
else
removeCSSProperty(CSS_PROP_WHITE_SPACE);
break;
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 170dd44..794cb4c 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -644,7 +644,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
int availableWidth = lineWidth(m_height);
switch(style()->textAlign()) {
case LEFT:
- case KONQ_LEFT:
+ case KHTML_LEFT:
numSpaces = 0;
break;
case JUSTIFY:
@@ -657,12 +657,12 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
if (endEmbed->basicDir == QChar::DirL)
break;
case RIGHT:
- case KONQ_RIGHT:
+ case KHTML_RIGHT:
x += availableWidth - totWidth;
numSpaces = 0;
break;
case CENTER:
- case KONQ_CENTER:
+ case KHTML_CENTER:
int xd = (availableWidth - totWidth)/2;
x += xd >0 ? xd : 0;
numSpaces = 0;
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 5234c38..f341475 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -2197,7 +2197,7 @@ void RenderBlock::calcBlockMinMaxWidth()
Length ml = child->style()->marginLeft();
Length mr = child->style()->marginRight();
- if (style()->textAlign() == KONQ_CENTER)
+ if (style()->textAlign() == KHTML_CENTER)
{
if (ml.type==Fixed) margin+=ml.value;
if (mr.type==Fixed) margin+=mr.value;
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 7d4d0fb..a8b7492 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -807,7 +807,7 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw
{
if ( (ml.type == Variable && mr.type == Variable) ||
(ml.type != Variable && mr.type != Variable &&
- containingBlock()->style()->textAlign() == KONQ_CENTER) )
+ containingBlock()->style()->textAlign() == KHTML_CENTER) )
{
m_marginLeft = (cw - m_width)/2;
if (m_marginLeft<0) m_marginLeft=0;
@@ -815,14 +815,14 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw
}
else if (mr.type == Variable ||
(ml.type != Variable && containingBlock()->style()->direction() == RTL &&
- containingBlock()->style()->textAlign() == KONQ_LEFT))
+ containingBlock()->style()->textAlign() == KHTML_LEFT))
{
m_marginLeft = ml.width(cw);
m_marginRight = cw - m_width - m_marginLeft;
}
else if (ml.type == Variable ||
(mr.type != Variable && containingBlock()->style()->direction() == LTR &&
- containingBlock()->style()->textAlign() == KONQ_RIGHT))
+ containingBlock()->style()->textAlign() == KHTML_RIGHT))
{
m_marginRight = mr.width(cw);
m_marginLeft = cw - m_width - m_marginRight;
diff --git a/WebCore/khtml/rendering/render_flexbox.cpp b/WebCore/khtml/rendering/render_flexbox.cpp
index 81cbf95..07253c1 100644
--- a/WebCore/khtml/rendering/render_flexbox.cpp
+++ b/WebCore/khtml/rendering/render_flexbox.cpp
@@ -172,7 +172,7 @@ void RenderFlexibleBox::calcVerticalMinMaxWidth()
Length ml = child->style()->marginLeft();
Length mr = child->style()->marginRight();
- if (style()->textAlign() == KONQ_CENTER)
+ if (style()->textAlign() == KHTML_CENTER)
{
if (ml.type==Fixed) margin+=ml.value;
if (mr.type==Fixed) margin+=mr.value;
diff --git a/WebCore/khtml/rendering/render_style.h b/WebCore/khtml/rendering/render_style.h
index b421325..fcafa6d 100644
--- a/WebCore/khtml/rendering/render_style.h
+++ b/WebCore/khtml/rendering/render_style.h
@@ -473,11 +473,11 @@ public:
//
enum EWhiteSpace {
- NORMAL, PRE, NOWRAP, KONQ_NOWRAP
+ NORMAL, PRE, NOWRAP, KHTML_NOWRAP
};
enum ETextAlign {
- TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, KONQ_LEFT, KONQ_RIGHT, KONQ_CENTER
+ TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, KHTML_LEFT, KHTML_RIGHT, KHTML_CENTER
};
enum ETextTransform {
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 4a94ccb..f68fb23 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -1535,7 +1535,7 @@ void RenderTableCell::setStyle( RenderStyle *style )
RenderBlock::setStyle( style );
setShouldPaintBackgroundOrBorder(true);
- if (style->whiteSpace() == KONQ_NOWRAP) {
+ if (style->whiteSpace() == KHTML_NOWRAP) {
// Figure out if we are really nowrapping or if we should just
// use normal instead. If the width of the cell is fixed, then
// we don't actually use NOWRAP.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list