diff --git a/kate/data/ccss.xml b/kate/data/ccss.xml
index a16acfdf5..08aa11715 100644
--- a/kate/data/ccss.xml
+++ b/kate/data/ccss.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="CleanCSS" version="1.01" kateversion="2.5" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD">
+<language name="CleanCSS" version="1.02" kateversion="2.5" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD">
 
 <highlighting>
 	<list name="properties">
@@ -171,7 +171,7 @@
 		<item> -o-text-overflow </item>
 
 		<!-- konq specific -->
-		<item> -tdehtml-background-size </item>
+		<item> -khtml-background-size </item>
 		<item> konq_bgpos_x </item>
 		<item> konq_bgpos_y </item>
 
diff --git a/kate/data/css-php.xml b/kate/data/css-php.xml
index c30853198..3be8ab76a 100644
--- a/kate/data/css-php.xml
+++ b/kate/data/css-php.xml
@@ -21,7 +21,7 @@ Changelog:
 
 
 
-<language name="CSS/PHP" hidden="true" version="2.07" kateversion="2.5" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="CSS/PHP" hidden="true" version="2.08" kateversion="2.5" section="Other" extensions="" indenter="cstyle" mimetype="" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 	<highlighting>
 		<list name="properties">
@@ -263,14 +263,14 @@ Changelog:
 			<!-- konq specific -->
 			<item> konq_bgpos_x </item>
 			<item> konq_bgpos_y </item>
-			<item> -tdehtml-background-size </item>
-			<item> -tdehtml-border-top-left-radius </item>
-			<item> -tdehtml-border-top-right-radius </item>
-			<item> -tdehtml-border-bottom-left-radius </item>
-			<item> -tdehtml-border-bottom-right-radius </item>
-			<item> -tdehtml-border-radius </item>
-			<item> -tdehtml-box-shadow </item>
-			<item> -tdehtml-opacity </item>
+			<item> -khtml-background-size </item>
+			<item> -khtml-border-top-left-radius </item>
+			<item> -khtml-border-top-right-radius </item>
+			<item> -khtml-border-bottom-left-radius </item>
+			<item> -khtml-border-bottom-right-radius </item>
+			<item> -khtml-border-radius </item>
+			<item> -khtml-box-shadow </item>
+			<item> -khtml-opacity </item>
 
 			<!-- Webkit rendering engine CSS property extensions -->
 			<item> -webkit-appearance </item>
diff --git a/kate/data/css.xml b/kate/data/css.xml
index dafbb2c68..14d4cc3dd 100644
--- a/kate/data/css.xml
+++ b/kate/data/css.xml
@@ -15,7 +15,7 @@ Changelog:
 
 -->
 
-<language name="CSS" version="2.08" kateversion="2.5" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="CSS" version="2.09" kateversion="2.5" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 	<highlighting>
 		<list name="properties">
@@ -257,14 +257,14 @@ Changelog:
 			<!-- konq specific -->
 			<item> konq_bgpos_x </item>
 			<item> konq_bgpos_y </item>
-			<item> -tdehtml-background-size </item>
-			<item> -tdehtml-border-top-left-radius </item>
-			<item> -tdehtml-border-top-right-radius </item>
-			<item> -tdehtml-border-bottom-left-radius </item>
-			<item> -tdehtml-border-bottom-right-radius </item>
-			<item> -tdehtml-border-radius </item>
-			<item> -tdehtml-box-shadow </item>
-			<item> -tdehtml-opacity </item>
+			<item> -khtml-background-size </item>
+			<item> -khtml-border-top-left-radius </item>
+			<item> -khtml-border-top-right-radius </item>
+			<item> -khtml-border-bottom-left-radius </item>
+			<item> -khtml-border-bottom-right-radius </item>
+			<item> -khtml-border-radius </item>
+			<item> -khtml-box-shadow </item>
+			<item> -khtml-opacity </item>
 
 			<!-- Webkit rendering engine CSS property extensions -->
 			<item> -webkit-appearance </item>
diff --git a/kate/data/scss.xml b/kate/data/scss.xml
index 7ac0dbbff..e80c169a2 100644
--- a/kate/data/scss.xml
+++ b/kate/data/scss.xml
@@ -21,7 +21,7 @@
 
 -->
 
-<language name="SCSS" version="2.05" kateversion="2.5" section="Markup" extensions="*.scss" indenter="cstyle"
+<language name="SCSS" version="2.06" kateversion="2.5" section="Markup" extensions="*.scss" indenter="cstyle"
           mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
     <highlighting>
@@ -189,7 +189,7 @@
             <item> -o-text-overflow </item>
 
             <!-- konq specific -->
-            <item> -tdehtml-background-size </item>
+            <item> -khtml-background-size </item>
             <item> konq_bgpos_x </item>
             <item> konq_bgpos_y </item>
 
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index 9884a9e71..5bf975995 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -24,7 +24,7 @@
 <Definition name="BibTeX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bibtex.xml" version="1.18"/>
 <Definition name="B-Method" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bmethod.xml" version="0.3"/>
 <Definition name="C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/c.xml" version="1.46"/>
-<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.01"/>
+<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.02"/>
 <Definition name="Cg" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cg.xml" version="1.12"/>
 <Definition name="CGiS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cgis.xml" version="1.03"/>
 <Definition name="ChangeLog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/changelog.xml" version="1.05"/>
@@ -42,8 +42,8 @@
 <Definition name="C++11" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp11.xml" version="1.64"/>
 <Definition name="Crack" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/crk.xml" version="1.2"/>
 <Definition name="C#" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cs.xml" version="1.16"/>
-<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.07"/>
-<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.08"/>
+<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.08"/>
+<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.09"/>
 <Definition name="CUE Sheet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cue.xml" version="0.92"/>
 <Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.4"/>
 <Definition name="D" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/d.xml" version="1.63"/>
@@ -173,7 +173,7 @@
 <Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="1.01"/>
 <Definition name="Scheme" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scheme.xml" version="1.14"/>
 <Definition name="scilab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sci.xml" version="1.04"/>
-<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.05"/>
+<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.06"/>
 <Definition name="sed" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sed.xml" version="1.01"/>
 <Definition name="SGML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sgml.xml" version="1.03"/>
 <Definition name="Sieve" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sieve.xml" version="1.06"/>
diff --git a/tdehtml/ChangeLog b/tdehtml/ChangeLog
index 302c414de..eb70686e1 100644
--- a/tdehtml/ChangeLog
+++ b/tdehtml/ChangeLog
@@ -314,7 +314,7 @@
 2005-12-09  Germain Garand  <germain@ebooksfrance.org>
 
         implement quirky HTML alignment ; introduce special float values
-        -tdehtml-left/-tdehtml-right to this effect.
+        -khtml-left/-khtml-right to this effect.
 
         * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
         * css/cssstyleselector.cpp: ditto.
@@ -662,7 +662,7 @@
         Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft).
         Also add three more numeric: (Lao, Thai and Tibetan)
 
-        * css/cssvalues.in: Add new CSS3 values with -tdehtml-
+        * css/cssvalues.in: Add new CSS3 values with -khtml-
         * rendering/render_style.h: Add new enums
         * rendering/enumerate.cpp: Implement the ideographic algorithm.
 
@@ -1393,8 +1393,8 @@
         * rendering/render_list.cpp: New algorithms for hiragana, katakana,
             armenian, georgian and decimal-leading-zero.
             Also fix greek and latin list-styles for larger values.
-        * css/cssvalues.cpp: Parse box, -tdehtml-diamond, -tdehtml-arabic-indic,
-            -tdehtml-persian, -tdehtml-urdu and -tdehtml-upper-greek
+        * css/cssvalues.cpp: Parse box, -khtml-diamond, -khtml-arabic-indic,
+            -khtml-persian, -khtml-urdu and -khtml-upper-greek
         * rendering/render_style.h: Expand list-style enum
 
 2004-11-30  Germain Garand  <germain@ebooksfrance.org>
@@ -1451,10 +1451,10 @@
 
         Implement CSS border on form-widgets
 
-        * css/cssvalues.in: Add -tdehtml-native
-        * css/cssparser.cpp: Accept -tdehtml-native as a border-type
+        * css/cssvalues.in: Add -khtml-native
+        * css/cssparser.cpp: Accept -khtml-native as a border-type
         * css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style
-        * css/html4.css: Make -tdehtml-native default border-style for form-widgets
+        * css/html4.css: Make -khtml-native default border-style for form-widgets
         * render/render_style.h: Add BNATIVE
         * render/render_object.cpp: Treat BNATIVE like BNONE
         * render/render_replaced.cpp: Remove native, and paint CSS border when allowed
@@ -1463,7 +1463,7 @@
 
         float and flowAroundFloat fixes.
 
-        * css/html4.css: make fieldset -tdehtml-around-floats (#92979)
+        * css/html4.css: make fieldset -khtml-around-floats (#92979)
 
         * rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats
         logic. Merges: add better RTL layouting of fAFs.
@@ -2095,14 +2095,14 @@
 	* tdehtml_part.cpp: (clear) Stopping marquees.
 	* css/cssparser.cpp: (parserValue) Parse overflow: marquee.
 	Inserted CSS3 Properties section.
-	Moved -tdehtml-user-input to CSS3 Properties.
-	Added parsing of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
+	Moved -khtml-user-input to CSS3 Properties.
+	Added parsing of -khtml-marquee{,-direction,-increment,-style,-repetition,
 	-speed}.
 	* css/cssproperties.{c,h}: Regenerated.
-	* css/cssproperties.in: Added -tdehtml-marquee{,-direction,-increment,
+	* css/cssproperties.in: Added -khtml-marquee{,-direction,-increment,
 	-style,-repetition,	-speed} keywords.
 	* css/cssstyleselector: (applyRule) Handle overflow: marquee.
-	Handle applying of -tdehtml-marquee{,-direction,-increment,-style,-repetition,
+	Handle applying of -khtml-marquee{,-direction,-increment,-style,-repetition,
 	-speed}.
 	* css/cssvalues.{c,h}: Regenerated.
 	* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,
diff --git a/tdehtml/css/css_base.cpp b/tdehtml/css/css_base.cpp
index a4dda95a0..699ff6554 100644
--- a/tdehtml/css/css_base.cpp
+++ b/tdehtml/css/css_base.cpp
@@ -172,10 +172,10 @@ void CSSSelector::extractPseudoType() const
         value = value.lower();
         switch (value[0]) {
             case '-':
-                if (value == "-tdehtml-replaced")
+                if (value == "-khtml-replaced")
                     _pseudoType = PseudoReplaced;
                 else
-                if (value == "-tdehtml-marker")
+                if (value == "-khtml-marker")
                     _pseudoType = PseudoMarker;
                 element = true;
                 break;
diff --git a/tdehtml/css/css_renderstyledeclarationimpl.cpp b/tdehtml/css/css_renderstyledeclarationimpl.cpp
index 00e6f5382..c126007fd 100644
--- a/tdehtml/css/css_renderstyledeclarationimpl.cpp
+++ b/tdehtml/css/css_renderstyledeclarationimpl.cpp
@@ -199,23 +199,23 @@ DOMString tdehtml::stringForListStyleType(EListStyleType type)
         case tdehtml::LBOX:
             return "box";
         case tdehtml::LDIAMOND:
-            return "-tdehtml-diamond";
+            return "-khtml-diamond";
         case tdehtml::LDECIMAL:
             return "decimal";
         case tdehtml::DECIMAL_LEADING_ZERO:
             return "decimal-leading-zero";
         case tdehtml::ARABIC_INDIC:
-            return "-tdehtml-arabic-indic";
+            return "-khtml-arabic-indic";
         case tdehtml::LAO:
-            return "-tdehtml-lao";
+            return "-khtml-lao";
         case tdehtml::PERSIAN:
-            return "-tdehtml-persian";
+            return "-khtml-persian";
         case tdehtml::URDU:
-            return "-tdehtml-urdu";
+            return "-khtml-urdu";
         case tdehtml::THAI:
-            return "-tdehtml-thai";
+            return "-khtml-thai";
         case tdehtml::TIBETAN:
-            return "-tdehtml-tibetan";
+            return "-khtml-tibetan";
         case tdehtml::LOWER_ROMAN:
             return "lower-roman";
         case tdehtml::UPPER_ROMAN:
@@ -229,21 +229,21 @@ DOMString tdehtml::stringForListStyleType(EListStyleType type)
         case tdehtml::CJK_IDEOGRAPHIC:
             return "cjk-ideographic";
         case tdehtml::JAPANESE_FORMAL:
-            return "-tdehtml-japanese-formal";
+            return "-khtml-japanese-formal";
         case tdehtml::JAPANESE_INFORMAL:
-            return "-tdehtml-japanese-informal";
+            return "-khtml-japanese-informal";
         case tdehtml::SIMP_CHINESE_FORMAL:
-            return "-tdehtml-simp-chinese-formal";
+            return "-khtml-simp-chinese-formal";
         case tdehtml::SIMP_CHINESE_INFORMAL:
-            return "-tdehtml-simp-chinese-informal";
+            return "-khtml-simp-chinese-informal";
         case tdehtml::TRAD_CHINESE_FORMAL:
-            return "-tdehtml-trad-chinese-formal";
+            return "-khtml-trad-chinese-formal";
         case tdehtml::TRAD_CHINESE_INFORMAL:
-            return "-tdehtml-trad-chinese-informal";
+            return "-khtml-trad-chinese-informal";
         case tdehtml::LOWER_GREEK:
             return "lower-greek";
         case tdehtml::UPPER_GREEK:
-            return "-tdehtml-upper-greek";
+            return "-khtml-upper-greek";
         case tdehtml::LOWER_ALPHA:
             return "lower-alpha";
         case tdehtml::UPPER_ALPHA:
diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp
index b515388dc..94cca8840 100644
--- a/tdehtml/css/css_valueimpl.cpp
+++ b/tdehtml/css/css_valueimpl.cpp
@@ -308,10 +308,9 @@ bool CSSStyleDeclarationImpl::setProperty(int id, const DOMString &value, bool i
 
     CSSParser parser( strictParsing );
     bool success = parser.parseValue( this, id, value, important, nonCSSHint );
-    if(!success) {
+    if(!success)
 	kdDebug( 6080 ) << "CSSStyleDeclarationImpl::setProperty invalid property: [" << getPropertyName(id).string()
 			<< "] value: [" << value.string() << "]"<< endl;
-    }
     else
         setChanged();
     return success;
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index 8b11c78d2..130fa8b61 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -184,7 +184,7 @@ CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOM
 {
     styleElement = sheet;
 
-    const char tdehtml_rule[] = "@-tdehtml-rule{";
+    const char tdehtml_rule[] = "@-khtml-rule{";
     int length = string.length() + 4 + strlen(tdehtml_rule);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
@@ -212,7 +212,7 @@ bool CSSParser::parseValue( DOM::CSSStyleDeclarationImpl *declaration, int _id,
 
     styleElement = declaration->stylesheet();
 
-    const char tdehtml_value[] = "@-tdehtml-value{";
+    const char tdehtml_value[] = "@-khtml-value{";
     int length = string.length() + 4 + strlen(tdehtml_value);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
@@ -254,7 +254,7 @@ bool CSSParser::parseDeclaration( DOM::CSSStyleDeclarationImpl *declaration, con
 
     styleElement = declaration->stylesheet();
 
-    const char tdehtml_decls[] = "@-tdehtml-decls{";
+    const char tdehtml_decls[] = "@-khtml-decls{";
     int length = string.length() + 4 + strlen(tdehtml_decls);
     assert( !data );
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
@@ -572,7 +572,7 @@ bool CSSParser::parseValue( int propId, bool important )
         break;
 
     case CSS_PROP_DISPLAY:
-        // inline | block | list-item | run-in | inline-block | -tdehtml-ruler | table |
+        // inline | block | list-item | run-in | inline-block | -khtml-ruler | table |
         // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
         // table-column-group | table-column | table-cell | table-caption | none | inherit
         if ((id >= CSS_VAL_INLINE && id <= CSS_VAL_TABLE_CAPTION) || id == CSS_VAL_NONE)
@@ -611,7 +611,7 @@ bool CSSParser::parseValue( int propId, bool important )
     case CSS_PROP_OUTLINE_STYLE:        // <border-style> | inherit
     case CSS_PROP_BORDER_TOP_STYLE:     //// <border-style> | inherit
     case CSS_PROP_BORDER_RIGHT_STYLE:   //   Defined as:    none | hidden | dotted | dashed |
-    case CSS_PROP_BORDER_BOTTOM_STYLE:  //   solid | double | groove | ridge | inset | outset | -tdehtml-native
+    case CSS_PROP_BORDER_BOTTOM_STYLE:  //   solid | double | groove | ridge | inset | outset | -khtml-native
     case CSS_PROP_BORDER_LEFT_STYLE:    ////
         if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
             valid_primitive = true;
diff --git a/tdehtml/css/cssproperties.c b/tdehtml/css/cssproperties.c
index 384982aba..bbaeb0d02 100644
--- a/tdehtml/css/cssproperties.c
+++ b/tdehtml/css/cssproperties.c
@@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
 #line 104 "cssproperties.gperf"
       {"text-indent", CSS_PROP_TEXT_INDENT},
 #line 69 "cssproperties.gperf"
-      {"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
+      {"-khtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
 #line 14 "cssproperties.gperf"
       {"background-color", CSS_PROP_BACKGROUND_COLOR},
 #line 100 "cssproperties.gperf"
@@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
 #line 47 "cssproperties.gperf"
       {"counter-reset", CSS_PROP_COUNTER_RESET},
 #line 93 "cssproperties.gperf"
-      {"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
+      {"-khtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
 #line 15 "cssproperties.gperf"
       {"background-image", CSS_PROP_BACKGROUND_IMAGE},
 #line 96 "cssproperties.gperf"
@@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
 #line 52 "cssproperties.gperf"
       {"float", CSS_PROP_FLOAT},
 #line 21 "cssproperties.gperf"
-      {"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
+      {"-khtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
 #line 70 "cssproperties.gperf"
-      {"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
+      {"-khtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
 #line 27 "cssproperties.gperf"
-      {"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
+      {"-khtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
 #line 46 "cssproperties.gperf"
       {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
 #line 128 "cssproperties.gperf"
@@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
 #line 31 "cssproperties.gperf"
       {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
 #line 22 "cssproperties.gperf"
-      {"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
+      {"-khtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
 #line 17 "cssproperties.gperf"
       {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
 #line 126 "cssproperties.gperf"
@@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
 #line 68 "cssproperties.gperf"
       {"margin-left", CSS_PROP_MARGIN_LEFT},
 #line 142 "cssproperties.gperf"
-      {"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
+      {"-khtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
 #line 79 "cssproperties.gperf"
       {"min-width", CSS_PROP_MIN_WIDTH},
 #line 127 "cssproperties.gperf"
@@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
 #line 92 "cssproperties.gperf"
       {"padding-left", CSS_PROP_PADDING_LEFT},
 #line 71 "cssproperties.gperf"
-      {"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
+      {"-khtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
 #line 73 "cssproperties.gperf"
-      {"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
+      {"-khtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
 #line 95 "cssproperties.gperf"
       {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
 #line 74 "cssproperties.gperf"
-      {"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
+      {"-khtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
 #line 94 "cssproperties.gperf"
       {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
 #line 81 "cssproperties.gperf"
@@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
 #line 134 "cssproperties.gperf"
       {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
 #line 72 "cssproperties.gperf"
-      {"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
+      {"-khtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
 #line 116 "cssproperties.gperf"
       {"word-spacing", CSS_PROP_WORD_SPACING},
 #line 111 "cssproperties.gperf"
@@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
 #line 32 "cssproperties.gperf"
       {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
 #line 26 "cssproperties.gperf"
-      {"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
+      {"-khtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
 #line 33 "cssproperties.gperf"
       {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
 #line 34 "cssproperties.gperf"
       {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
 #line 23 "cssproperties.gperf"
-      {"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
+      {"-khtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
 #line 135 "cssproperties.gperf"
       {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
 #line 129 "cssproperties.gperf"
@@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
 #line 84 "cssproperties.gperf"
       {"outline-style", CSS_PROP_OUTLINE_STYLE},
 #line 141 "cssproperties.gperf"
-      {"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
+      {"-khtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
 #line 87 "cssproperties.gperf"
       {"overflow-x", CSS_PROP_OVERFLOW_X},
 #line 113 "cssproperties.gperf"
@@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
 #line 83 "cssproperties.gperf"
       {"outline-offset", CSS_PROP_OUTLINE_OFFSET},
 #line 75 "cssproperties.gperf"
-      {"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
+      {"-khtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
 #line 55 "cssproperties.gperf"
       {"font-style", CSS_PROP_FONT_STYLE},
 #line 35 "cssproperties.gperf"
@@ -544,13 +544,13 @@ static const char * const propertyList[] = {
 "background-position", 
 "background-position-x", 
 "background-position-y", 
-"-tdehtml-background-clip", 
-"-tdehtml-background-origin", 
-"-tdehtml-background-size", 
+"-khtml-background-clip", 
+"-khtml-background-origin", 
+"-khtml-background-size", 
 "border-collapse", 
 "border-spacing", 
-"-tdehtml-border-horizontal-spacing", 
-"-tdehtml-border-vertical-spacing", 
+"-khtml-border-horizontal-spacing", 
+"-khtml-border-vertical-spacing", 
 "border-top-color", 
 "border-right-color", 
 "border-bottom-color", 
@@ -592,13 +592,13 @@ static const char * const propertyList[] = {
 "margin-right", 
 "margin-bottom", 
 "margin-left", 
-"-tdehtml-margin-start", 
-"-tdehtml-marquee", 
-"-tdehtml-marquee-direction", 
-"-tdehtml-marquee-increment", 
-"-tdehtml-marquee-repetition", 
-"-tdehtml-marquee-speed", 
-"-tdehtml-marquee-style", 
+"-khtml-margin-start", 
+"-khtml-marquee", 
+"-khtml-marquee-direction", 
+"-khtml-marquee-increment", 
+"-khtml-marquee-repetition", 
+"-khtml-marquee-speed", 
+"-khtml-marquee-style", 
 "max-height", 
 "max-width", 
 "min-height", 
@@ -616,7 +616,7 @@ static const char * const propertyList[] = {
 "padding-right", 
 "padding-bottom", 
 "padding-left", 
-"-tdehtml-padding-start", 
+"-khtml-padding-start", 
 "page-break-after", 
 "page-break-before", 
 "page-break-inside", 
@@ -664,8 +664,8 @@ static const char * const propertyList[] = {
 "scrollbar-darkshadow-color", 
 "scrollbar-track-color", 
 "scrollbar-arrow-color", 
-"-tdehtml-flow-mode", 
-"-tdehtml-user-input", 
+"-khtml-flow-mode", 
+"-khtml-user-input", 
     0
 };
 DOMString getPropertyName(unsigned short id)
diff --git a/tdehtml/css/cssproperties.in b/tdehtml/css/cssproperties.in
index 27e452322..6f39745d6 100644
--- a/tdehtml/css/cssproperties.in
+++ b/tdehtml/css/cssproperties.in
@@ -20,14 +20,14 @@ background-position
 background-position-x
 background-position-y
 # CSS3 Extensions
--tdehtml-background-clip
--tdehtml-background-origin
--tdehtml-background-size
+-khtml-background-clip
+-khtml-background-origin
+-khtml-background-size
 
 border-collapse
 border-spacing
--tdehtml-border-horizontal-spacing
--tdehtml-border-vertical-spacing
+-khtml-border-horizontal-spacing
+-khtml-border-vertical-spacing
 border-top-color
 border-right-color
 border-bottom-color
@@ -69,13 +69,13 @@ margin-top
 margin-right
 margin-bottom
 margin-left
--tdehtml-margin-start
--tdehtml-marquee
--tdehtml-marquee-direction
--tdehtml-marquee-increment
--tdehtml-marquee-repetition
--tdehtml-marquee-speed
--tdehtml-marquee-style
+-khtml-margin-start
+-khtml-marquee
+-khtml-marquee-direction
+-khtml-marquee-increment
+-khtml-marquee-repetition
+-khtml-marquee-speed
+-khtml-marquee-style
 max-height
 max-width
 min-height
@@ -93,7 +93,7 @@ padding-top
 padding-right
 padding-bottom
 padding-left
--tdehtml-padding-start
+-khtml-padding-start
 #page
 page-break-after
 page-break-before
@@ -144,5 +144,5 @@ scrollbar-darkshadow-color
 scrollbar-track-color
 scrollbar-arrow-color
 # tdehtml internals
--tdehtml-flow-mode
--tdehtml-user-input
+-khtml-flow-mode
+-khtml-user-input
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 79f8ba251..40dbcb2ec 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -3964,7 +3964,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
         }
         break;
     case CSS_PROP_TEXT_OVERFLOW: {
-        // This property is supported by WinIE, and so we leave off the "-tdehtml-" in order to
+        // This property is supported by WinIE, and so we leave off the "-khtml-" in order to
         // work with WinIE-specific pages that use the property.
         HANDLE_INHERIT_AND_INITIAL(textOverflow, TextOverflow)
         if (!primitiveValue || !primitiveValue->getIdent())
diff --git a/tdehtml/css/cssvalues.c b/tdehtml/css/cssvalues.c
index a90b32120..2bd3746ec 100644
--- a/tdehtml/css/cssvalues.c
+++ b/tdehtml/css/cssvalues.c
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.0.2 */
 /* Command-line: gperf -L ANSI-C -E -c -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D cssvalues.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -40,7 +40,7 @@ struct css_value {
 };
 
 static const css_value* findValue (register const char *str, register unsigned int len);
-/* maximum key range = 2576, duplicates = 0 */
+/* maximum key range = 2876, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -54,44 +54,38 @@ hash_val (register const char *str, register unsigned int len)
 {
   static const unsigned short asso_values[] =
     {
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576,   80,  315, 2576,    0,    0,
-       105,  100,   40,   35,   20,   15,   10,    5, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576,  175,   60,    0,
-        20,   45,   23,  340,  160,    5,   73,   35,    0,   35,
-         0,    5,    3,  108,  100,   20,    5,  300,  203,  350,
-       460,   18,  425, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576, 2576,
-      2576, 2576, 2576, 2576, 2576, 2576, 2576
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876,  420,   23, 2876,    0,    0,
+       105,  100,   40,   35,   20,   15,   10,    5, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876,  175,   60,    0,
+        20,   45,   18,  380,  270,    5,    3,   65,    0,   35,
+         0,    5,  265,  465,  100,   20,    5,  195,   18,   13,
+         3,  133,   10, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876, 2876,
+      2876, 2876, 2876, 2876, 2876, 2876, 2876
     };
   register int hval = 0;
 
   switch (len)
     {
       default:
-        hval += asso_values[(unsigned char)str[29]];
-      /*FALLTHROUGH*/
-      case 29:
-        hval += asso_values[(unsigned char)str[28]];
-      /*FALLTHROUGH*/
-      case 28:
         hval += asso_values[(unsigned char)str[27]];
       /*FALLTHROUGH*/
       case 27:
@@ -181,9 +175,6 @@ hash_val (register const char *str, register unsigned int len)
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
 #endif
 const struct css_value *
 findValue (register const char *str, register unsigned int len)
@@ -192,9 +183,9 @@ findValue (register const char *str, register unsigned int len)
     {
       TOTAL_KEYWORDS = 275,
       MIN_WORD_LENGTH = 2,
-      MAX_WORD_LENGTH = 30,
+      MAX_WORD_LENGTH = 28,
       MIN_HASH_VALUE = 0,
-      MAX_HASH_VALUE = 2575
+      MAX_HASH_VALUE = 2875
     };
 
   static const struct css_value wordlist_value[] =
@@ -203,8 +194,6 @@ findValue (register const char *str, register unsigned int len)
       {"100", CSS_VAL_100},
 #line 48 "cssvalues.gperf"
       {"900", CSS_VAL_900},
-#line 28 "cssvalues.gperf"
-      {"icon", CSS_VAL_ICON},
 #line 47 "cssvalues.gperf"
       {"800", CSS_VAL_800},
 #line 46 "cssvalues.gperf"
@@ -213,748 +202,773 @@ findValue (register const char *str, register unsigned int len)
       {"600", CSS_VAL_600},
 #line 216 "cssvalues.gperf"
       {"ltr", CSS_VAL_LTR},
+#line 277 "cssvalues.gperf"
+      {"down", CSS_VAL_DOWN},
 #line 146 "cssvalues.gperf"
       {"disc", CSS_VAL_DISC},
 #line 44 "cssvalues.gperf"
       {"500", CSS_VAL_500},
 #line 43 "cssvalues.gperf"
       {"400", CSS_VAL_400},
+#line 252 "cssvalues.gperf"
+      {"loud", CSS_VAL_LOUD},
 #line 259 "cssvalues.gperf"
       {"scroll", CSS_VAL_SCROLL},
 #line 83 "cssvalues.gperf"
       {"lime", CSS_VAL_LIME},
 #line 17 "cssvalues.gperf"
       {"none", CSS_VAL_NONE},
-#line 255 "cssvalues.gperf"
-      {"mix", CSS_VAL_MIX},
 #line 19 "cssvalues.gperf"
       {"inset", CSS_VAL_INSET},
+#line 118 "cssvalues.gperf"
+      {"window", CSS_VAL_WINDOW},
 #line 287 "cssvalues.gperf"
       {"content", CSS_VAL_CONTENT},
 #line 147 "cssvalues.gperf"
       {"circle", CSS_VAL_CIRCLE},
-#line 213 "cssvalues.gperf"
-      {"text", CSS_VAL_TEXT},
+#line 86 "cssvalues.gperf"
+      {"olive", CSS_VAL_OLIVE},
 #line 33 "cssvalues.gperf"
       {"italic", CSS_VAL_ITALIC},
-#line 284 "cssvalues.gperf"
-      {"clip", CSS_VAL_CLIP},
 #line 145 "cssvalues.gperf"
       {"inside", CSS_VAL_INSIDE},
-#line 149 "cssvalues.gperf"
-      {"box", CSS_VAL_BOX},
 #line 25 "cssvalues.gperf"
       {"solid", CSS_VAL_SOLID},
+#line 281 "cssvalues.gperf"
+      {"slide", CSS_VAL_SLIDE},
 #line 183 "cssvalues.gperf"
       {"inline", CSS_VAL_INLINE},
 #line 262 "cssvalues.gperf"
       {"static", CSS_VAL_STATIC},
-#line 184 "cssvalues.gperf"
-      {"block", CSS_VAL_BLOCK},
+#line 204 "cssvalues.gperf"
+      {"move", CSS_VAL_MOVE},
 #line 42 "cssvalues.gperf"
       {"300", CSS_VAL_300},
+#line 250 "cssvalues.gperf"
+      {"level", CSS_VAL_LEVEL},
 #line 41 "cssvalues.gperf"
       {"200", CSS_VAL_200},
-#line 241 "cssvalues.gperf"
-      {"crop", CSS_VAL_CROP},
-#line 91 "cssvalues.gperf"
-      {"teal", CSS_VAL_TEAL},
-#line 244 "cssvalues.gperf"
-      {"fixed", CSS_VAL_FIXED},
 #line 69 "cssvalues.gperf"
       {"serif", CSS_VAL_SERIF},
+#line 91 "cssvalues.gperf"
+      {"teal", CSS_VAL_TEAL},
 #line 51 "cssvalues.gperf"
       {"small", CSS_VAL_SMALL},
-#line 133 "cssvalues.gperf"
-      {"top", CSS_VAL_TOP},
+#line 120 "cssvalues.gperf"
+      {"windowtext", CSS_VAL_WINDOWTEXT},
 #line 37 "cssvalues.gperf"
       {"bold", CSS_VAL_BOLD},
-#line 228 "cssvalues.gperf"
-      {"pre", CSS_VAL_PRE},
-#line 285 "cssvalues.gperf"
-      {"ellipsis", CSS_VAL_ELLIPSIS},
+#line 77 "cssvalues.gperf"
+      {"blue", CSS_VAL_BLUE},
+#line 239 "cssvalues.gperf"
+      {"blink", CSS_VAL_BLINK},
+#line 221 "cssvalues.gperf"
+      {"visible", CSS_VAL_VISIBLE},
 #line 217 "cssvalues.gperf"
       {"rtl", CSS_VAL_RTL},
-#line 242 "cssvalues.gperf"
-      {"cross", CSS_VAL_CROSS},
 #line 243 "cssvalues.gperf"
       {"embed", CSS_VAL_EMBED},
+#line 26 "cssvalues.gperf"
+      {"double", CSS_VAL_DOUBLE},
 #line 128 "cssvalues.gperf"
       {"middle", CSS_VAL_MIDDLE},
-#line 76 "cssvalues.gperf"
-      {"black", CSS_VAL_BLACK},
-#line 281 "cssvalues.gperf"
-      {"slide", CSS_VAL_SLIDE},
+#line 253 "cssvalues.gperf"
+      {"lower", CSS_VAL_LOWER},
+#line 237 "cssvalues.gperf"
+      {"below", CSS_VAL_BELOW},
 #line 63 "cssvalues.gperf"
       {"condensed", CSS_VAL_CONDENSED},
+#line 78 "cssvalues.gperf"
+      {"crimson", CSS_VAL_CRIMSON},
 #line 14 "cssvalues.gperf"
       {"inherit", CSS_VAL_INHERIT},
-#line 131 "cssvalues.gperf"
-      {"text-top", CSS_VAL_TEXT_TOP},
-#line 239 "cssvalues.gperf"
-      {"blink", CSS_VAL_BLINK},
-#line 185 "cssvalues.gperf"
-      {"list-item", CSS_VAL_LIST_ITEM},
-#line 187 "cssvalues.gperf"
-      {"compact", CSS_VAL_COMPACT},
+#line 248 "cssvalues.gperf"
+      {"invert", CSS_VAL_INVERT},
+#line 255 "cssvalues.gperf"
+      {"mix", CSS_VAL_MIX},
+#line 76 "cssvalues.gperf"
+      {"black", CSS_VAL_BLACK},
+#line 213 "cssvalues.gperf"
+      {"text", CSS_VAL_TEXT},
 #line 89 "cssvalues.gperf"
       {"red", CSS_VAL_RED},
+#line 256 "cssvalues.gperf"
+      {"overline", CSS_VAL_OVERLINE},
+#line 15 "cssvalues.gperf"
+      {"initial", CSS_VAL_INITIAL},
+#line 214 "cssvalues.gperf"
+      {"wait", CSS_VAL_WAIT},
+#line 149 "cssvalues.gperf"
+      {"box", CSS_VAL_BOX},
 #line 139 "cssvalues.gperf"
       {"center", CSS_VAL_CENTER},
 #line 279 "cssvalues.gperf"
       {"fast", CSS_VAL_FAST},
+#line 59 "cssvalues.gperf"
+      {"wider", CSS_VAL_WIDER},
+#line 129 "cssvalues.gperf"
+      {"sub", CSS_VAL_SUB},
+#line 244 "cssvalues.gperf"
+      {"fixed", CSS_VAL_FIXED},
+#line 90 "cssvalues.gperf"
+      {"silver", CSS_VAL_SILVER},
 #line 189 "cssvalues.gperf"
       {"table", CSS_VAL_TABLE},
-#line 252 "cssvalues.gperf"
-      {"loud", CSS_VAL_LOUD},
 #line 270 "cssvalues.gperf"
       {"enabled", CSS_VAL_ENABLED},
-#line 202 "cssvalues.gperf"
-      {"pointer", CSS_VAL_POINTER},
-#line 78 "cssvalues.gperf"
-      {"crimson", CSS_VAL_CRIMSON},
+#line 93 "cssvalues.gperf"
+      {"yellow", CSS_VAL_YELLOW},
 #line 36 "cssvalues.gperf"
       {"normal", CSS_VAL_NORMAL},
-#line 264 "cssvalues.gperf"
-      {"thin", CSS_VAL_THIN},
 #line 84 "cssvalues.gperf"
       {"maroon", CSS_VAL_MAROON},
-#line 215 "cssvalues.gperf"
-      {"help", CSS_VAL_HELP},
 #line 286 "cssvalues.gperf"
       {"border", CSS_VAL_BORDER},
-#line 246 "cssvalues.gperf"
-      {"hide", CSS_VAL_HIDE},
-#line 230 "cssvalues.gperf"
-      {"pre-line", CSS_VAL_PRE_LINE},
+#line 49 "cssvalues.gperf"
+      {"xx-small", CSS_VAL_XX_SMALL},
 #line 57 "cssvalues.gperf"
       {"smaller", CSS_VAL_SMALLER},
-#line 15 "cssvalues.gperf"
-      {"initial", CSS_VAL_INITIAL},
+#line 207 "cssvalues.gperf"
+      {"nw-resize", CSS_VAL_NW_RESIZE},
 #line 38 "cssvalues.gperf"
       {"bolder", CSS_VAL_BOLDER},
-#line 132 "cssvalues.gperf"
-      {"text-bottom", CSS_VAL_TEXT_BOTTOM},
-#line 188 "cssvalues.gperf"
-      {"inline-block", CSS_VAL_INLINE_BLOCK},
-#line 263 "cssvalues.gperf"
-      {"thick", CSS_VAL_THICK},
-#line 18 "cssvalues.gperf"
-      {"hidden", CSS_VAL_HIDDEN},
-#line 222 "cssvalues.gperf"
-      {"collapse", CSS_VAL_COLLAPSE},
-#line 73 "cssvalues.gperf"
-      {"monospace", CSS_VAL_MONOSPACE},
-#line 27 "cssvalues.gperf"
-      {"caption", CSS_VAL_CAPTION},
+#line 284 "cssvalues.gperf"
+      {"clip", CSS_VAL_CLIP},
+#line 28 "cssvalues.gperf"
+      {"icon", CSS_VAL_ICON},
+#line 264 "cssvalues.gperf"
+      {"thin", CSS_VAL_THIN},
+#line 29 "cssvalues.gperf"
+      {"menu", CSS_VAL_MENU},
+#line 210 "cssvalues.gperf"
+      {"sw-resize", CSS_VAL_SW_RESIZE},
+#line 23 "cssvalues.gperf"
+      {"dotted", CSS_VAL_DOTTED},
+#line 206 "cssvalues.gperf"
+      {"ne-resize", CSS_VAL_NE_RESIZE},
+#line 278 "cssvalues.gperf"
+      {"slow", CSS_VAL_SLOW},
 #line 151 "cssvalues.gperf"
       {"decimal", CSS_VAL_DECIMAL},
-#line 276 "cssvalues.gperf"
-      {"up", CSS_VAL_UP},
-#line 64 "cssvalues.gperf"
-      {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
-#line 77 "cssvalues.gperf"
-      {"blue", CSS_VAL_BLUE},
-#line 257 "cssvalues.gperf"
-      {"portrait", CSS_VAL_PORTRAIT},
-#line 129 "cssvalues.gperf"
-      {"sub", CSS_VAL_SUB},
-#line 221 "cssvalues.gperf"
-      {"visible", CSS_VAL_VISIBLE},
-#line 86 "cssvalues.gperf"
-      {"olive", CSS_VAL_OLIVE},
+#line 71 "cssvalues.gperf"
+      {"cursive", CSS_VAL_CURSIVE},
+#line 134 "cssvalues.gperf"
+      {"bottom", CSS_VAL_BOTTOM},
+#line 209 "cssvalues.gperf"
+      {"se-resize", CSS_VAL_SE_RESIZE},
+#line 85 "cssvalues.gperf"
+      {"navy", CSS_VAL_NAVY},
 #line 271 "cssvalues.gperf"
       {"disabled", CSS_VAL_DISABLED},
-#line 26 "cssvalues.gperf"
-      {"double", CSS_VAL_DOUBLE},
 #line 127 "cssvalues.gperf"
       {"baseline", CSS_VAL_BASELINE},
-#line 197 "cssvalues.gperf"
-      {"table-cell", CSS_VAL_TABLE_CELL},
-#line 245 "cssvalues.gperf"
-      {"hand", CSS_VAL_HAND},
-#line 88 "cssvalues.gperf"
-      {"purple", CSS_VAL_PURPLE},
-#line 278 "cssvalues.gperf"
-      {"slow", CSS_VAL_SLOW},
+#line 92 "cssvalues.gperf"
+      {"white", CSS_VAL_WHITE},
+#line 111 "cssvalues.gperf"
+      {"menutext", CSS_VAL_MENUTEXT},
+#line 263 "cssvalues.gperf"
+      {"thick", CSS_VAL_THICK},
+#line 52 "cssvalues.gperf"
+      {"medium", CSS_VAL_MEDIUM},
+#line 140 "cssvalues.gperf"
+      {"justify", CSS_VAL_JUSTIFY},
+#line 246 "cssvalues.gperf"
+      {"hide", CSS_VAL_HIDE},
+#line 275 "cssvalues.gperf"
+      {"reverse", CSS_VAL_REVERSE},
+#line 272 "cssvalues.gperf"
+      {"forwards", CSS_VAL_FORWARDS},
 #line 112 "cssvalues.gperf"
       {"scrollbar", CSS_VAL_SCROLLBAR},
-#line 256 "cssvalues.gperf"
-      {"overline", CSS_VAL_OVERLINE},
-#line 29 "cssvalues.gperf"
-      {"menu", CSS_VAL_MENU},
-#line 31 "cssvalues.gperf"
-      {"small-caption", CSS_VAL_SMALL_CAPTION},
+#line 228 "cssvalues.gperf"
+      {"pre", CSS_VAL_PRE},
+#line 18 "cssvalues.gperf"
+      {"hidden", CSS_VAL_HIDDEN},
+#line 184 "cssvalues.gperf"
+      {"block", CSS_VAL_BLOCK},
+#line 220 "cssvalues.gperf"
+      {"lowercase", CSS_VAL_LOWERCASE},
+#line 285 "cssvalues.gperf"
+      {"ellipsis", CSS_VAL_ELLIPSIS},
+#line 242 "cssvalues.gperf"
+      {"cross", CSS_VAL_CROSS},
+#line 202 "cssvalues.gperf"
+      {"pointer", CSS_VAL_POINTER},
+#line 258 "cssvalues.gperf"
+      {"relative", CSS_VAL_RELATIVE},
 #line 137 "cssvalues.gperf"
       {"left", CSS_VAL_LEFT},
-#line 35 "cssvalues.gperf"
-      {"small-caps", CSS_VAL_SMALL_CAPS},
-#line 23 "cssvalues.gperf"
-      {"dotted", CSS_VAL_DOTTED},
+#line 119 "cssvalues.gperf"
+      {"windowframe", CSS_VAL_WINDOWFRAME},
+#line 265 "cssvalues.gperf"
+      {"underline", CSS_VAL_UNDERLINE},
 #line 82 "cssvalues.gperf"
       {"indigo", CSS_VAL_INDIGO},
 #line 280 "cssvalues.gperf"
       {"infinite", CSS_VAL_INFINITE},
+#line 110 "cssvalues.gperf"
+      {"infotext", CSS_VAL_INFOTEXT},
+#line 187 "cssvalues.gperf"
+      {"compact", CSS_VAL_COMPACT},
+#line 60 "cssvalues.gperf"
+      {"narrower", CSS_VAL_NARROWER},
+#line 276 "cssvalues.gperf"
+      {"up", CSS_VAL_UP},
+#line 22 "cssvalues.gperf"
+      {"outset", CSS_VAL_OUTSET},
+#line 106 "cssvalues.gperf"
+      {"inactiveborder", CSS_VAL_INACTIVEBORDER},
+#line 245 "cssvalues.gperf"
+      {"hand", CSS_VAL_HAND},
+#line 161 "cssvalues.gperf"
+      {"hebrew", CSS_VAL_HEBREW},
+#line 133 "cssvalues.gperf"
+      {"top", CSS_VAL_TOP},
 #line 236 "cssvalues.gperf"
       {"avoid", CSS_VAL_AVOID},
-#line 90 "cssvalues.gperf"
-      {"silver", CSS_VAL_SILVER},
-#line 134 "cssvalues.gperf"
-      {"bottom", CSS_VAL_BOTTOM},
-#line 72 "cssvalues.gperf"
-      {"fantasy", CSS_VAL_FANTASY},
-#line 24 "cssvalues.gperf"
-      {"dashed", CSS_VAL_DASHED},
-#line 140 "cssvalues.gperf"
-      {"justify", CSS_VAL_JUSTIFY},
-#line 138 "cssvalues.gperf"
-      {"right", CSS_VAL_RIGHT},
-#line 204 "cssvalues.gperf"
-      {"move", CSS_VAL_MOVE},
-#line 250 "cssvalues.gperf"
-      {"level", CSS_VAL_LEVEL},
-#line 249 "cssvalues.gperf"
-      {"landscape", CSS_VAL_LANDSCAPE},
-#line 93 "cssvalues.gperf"
-      {"yellow", CSS_VAL_YELLOW},
-#line 190 "cssvalues.gperf"
-      {"inline-table", CSS_VAL_INLINE_TABLE},
-#line 52 "cssvalues.gperf"
-      {"medium", CSS_VAL_MEDIUM},
-#line 39 "cssvalues.gperf"
-      {"lighter", CSS_VAL_LIGHTER},
-#line 123 "cssvalues.gperf"
-      {"repeat", CSS_VAL_REPEAT},
-#line 121 "cssvalues.gperf"
-      {"grey", CSS_VAL_GREY},
-#line 277 "cssvalues.gperf"
-      {"down", CSS_VAL_DOWN},
-#line 233 "cssvalues.gperf"
-      {"above", CSS_VAL_ABOVE},
-#line 186 "cssvalues.gperf"
-      {"run-in", CSS_VAL_RUN_IN},
-#line 70 "cssvalues.gperf"
-      {"sans-serif", CSS_VAL_SANS_SERIF},
-#line 237 "cssvalues.gperf"
-      {"below", CSS_VAL_BELOW},
-#line 198 "cssvalues.gperf"
-      {"table-caption", CSS_VAL_TABLE_CAPTION},
+#line 144 "cssvalues.gperf"
+      {"outside", CSS_VAL_OUTSIDE},
+#line 234 "cssvalues.gperf"
+      {"absolute", CSS_VAL_ABSOLUTE},
 #line 162 "cssvalues.gperf"
       {"armenian", CSS_VAL_ARMENIAN},
-#line 248 "cssvalues.gperf"
-      {"invert", CSS_VAL_INVERT},
-#line 81 "cssvalues.gperf"
-      {"green", CSS_VAL_GREEN},
-#line 74 "cssvalues.gperf"
-      {"transparent", CSS_VAL_TRANSPARENT},
-#line 107 "cssvalues.gperf"
-      {"inactivecaption", CSS_VAL_INACTIVECAPTION},
-#line 80 "cssvalues.gperf"
-      {"gray", CSS_VAL_GRAY},
+#line 235 "cssvalues.gperf"
+      {"always", CSS_VAL_ALWAYS},
+#line 101 "cssvalues.gperf"
+      {"buttontext", CSS_VAL_BUTTONTEXT},
+#line 185 "cssvalues.gperf"
+      {"list-item", CSS_VAL_LIST_ITEM},
 #line 240 "cssvalues.gperf"
       {"both", CSS_VAL_BOTH},
-#line 141 "cssvalues.gperf"
-      {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},
+#line 72 "cssvalues.gperf"
+      {"fantasy", CSS_VAL_FANTASY},
+#line 24 "cssvalues.gperf"
+      {"dashed", CSS_VAL_DASHED},
+#line 81 "cssvalues.gperf"
+      {"green", CSS_VAL_GREEN},
+#line 222 "cssvalues.gperf"
+      {"collapse", CSS_VAL_COLLAPSE},
+#line 227 "cssvalues.gperf"
+      {"nowrap", CSS_VAL_NOWRAP},
+#line 269 "cssvalues.gperf"
+      {"content-box", CSS_VAL_CONTENT_BOX},
+#line 73 "cssvalues.gperf"
+      {"monospace", CSS_VAL_MONOSPACE},
+#line 233 "cssvalues.gperf"
+      {"above", CSS_VAL_ABOVE},
+#line 208 "cssvalues.gperf"
+      {"n-resize", CSS_VAL_N_RESIZE},
 #line 261 "cssvalues.gperf"
       {"show", CSS_VAL_SHOW},
+#line 199 "cssvalues.gperf"
+      {"auto", CSS_VAL_AUTO},
 #line 21 "cssvalues.gperf"
       {"ridge", CSS_VAL_RIDGE},
-#line 114 "cssvalues.gperf"
-      {"threedface", CSS_VAL_THREEDFACE},
-#line 265 "cssvalues.gperf"
-      {"underline", CSS_VAL_UNDERLINE},
-#line 85 "cssvalues.gperf"
-      {"navy", CSS_VAL_NAVY},
-#line 59 "cssvalues.gperf"
-      {"wider", CSS_VAL_WIDER},
-#line 87 "cssvalues.gperf"
-      {"orange", CSS_VAL_ORANGE},
-#line 274 "cssvalues.gperf"
-      {"ahead", CSS_VAL_AHEAD},
-#line 34 "cssvalues.gperf"
-      {"oblique", CSS_VAL_OBLIQUE},
-#line 130 "cssvalues.gperf"
-      {"super", CSS_VAL_SUPER},
-#line 226 "cssvalues.gperf"
-      {"open-quote", CSS_VAL_OPEN_QUOTE},
-#line 125 "cssvalues.gperf"
-      {"repeat-y", CSS_VAL_REPEAT_Y},
-#line 53 "cssvalues.gperf"
-      {"large", CSS_VAL_LARGE},
-#line 200 "cssvalues.gperf"
-      {"crosshair", CSS_VAL_CROSSHAIR},
-#line 288 "cssvalues.gperf"
-      {"padding", CSS_VAL_PADDING},
-#line 71 "cssvalues.gperf"
-      {"cursive", CSS_VAL_CURSIVE},
-#line 234 "cssvalues.gperf"
-      {"absolute", CSS_VAL_ABSOLUTE},
-#line 214 "cssvalues.gperf"
-      {"wait", CSS_VAL_WAIT},
-#line 253 "cssvalues.gperf"
-      {"lower", CSS_VAL_LOWER},
-#line 223 "cssvalues.gperf"
-      {"close-quote", CSS_VAL_CLOSE_QUOTE},
-#line 258 "cssvalues.gperf"
-      {"relative", CSS_VAL_RELATIVE},
-#line 247 "cssvalues.gperf"
-      {"higher", CSS_VAL_HIGHER},
-#line 203 "cssvalues.gperf"
-      {"progress", CSS_VAL_PROGRESS},
-#line 92 "cssvalues.gperf"
-      {"white", CSS_VAL_WHITE},
-#line 154 "cssvalues.gperf"
-      {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},
-#line 208 "cssvalues.gperf"
-      {"n-resize", CSS_VAL_N_RESIZE},
-#line 196 "cssvalues.gperf"
-      {"table-column", CSS_VAL_TABLE_COLUMN},
-#line 143 "cssvalues.gperf"
-      {"-tdehtml-center", CSS_VAL__TDEHTML_CENTER},
-#line 148 "cssvalues.gperf"
-      {"square", CSS_VAL_SQUARE},
-#line 106 "cssvalues.gperf"
-      {"inactiveborder", CSS_VAL_INACTIVEBORDER},
+#line 212 "cssvalues.gperf"
+      {"w-resize", CSS_VAL_W_RESIZE},
+#line 257 "cssvalues.gperf"
+      {"portrait", CSS_VAL_PORTRAIT},
 #line 211 "cssvalues.gperf"
       {"s-resize", CSS_VAL_S_RESIZE},
-#line 75 "cssvalues.gperf"
-      {"aqua", CSS_VAL_AQUA},
-#line 269 "cssvalues.gperf"
-      {"content-box", CSS_VAL_CONTENT_BOX},
-#line 260 "cssvalues.gperf"
-      {"separate", CSS_VAL_SEPARATE},
-#line 22 "cssvalues.gperf"
-      {"outset", CSS_VAL_OUTSET},
-#line 58 "cssvalues.gperf"
-      {"larger", CSS_VAL_LARGER},
+#line 87 "cssvalues.gperf"
+      {"orange", CSS_VAL_ORANGE},
+#line 107 "cssvalues.gperf"
+      {"inactivecaption", CSS_VAL_INACTIVECAPTION},
 #line 205 "cssvalues.gperf"
       {"e-resize", CSS_VAL_E_RESIZE},
+#line 215 "cssvalues.gperf"
+      {"help", CSS_VAL_HELP},
+#line 53 "cssvalues.gperf"
+      {"large", CSS_VAL_LARGE},
+#line 241 "cssvalues.gperf"
+      {"crop", CSS_VAL_CROP},
+#line 121 "cssvalues.gperf"
+      {"grey", CSS_VAL_GREY},
+#line 50 "cssvalues.gperf"
+      {"x-small", CSS_VAL_X_SMALL},
+#line 188 "cssvalues.gperf"
+      {"inline-block", CSS_VAL_INLINE_BLOCK},
+#line 114 "cssvalues.gperf"
+      {"threedface", CSS_VAL_THREEDFACE},
+#line 64 "cssvalues.gperf"
+      {"semi-condensed", CSS_VAL_SEMI_CONDENSED},
+#line 273 "cssvalues.gperf"
+      {"backwards", CSS_VAL_BACKWARDS},
+#line 138 "cssvalues.gperf"
+      {"right", CSS_VAL_RIGHT},
+#line 108 "cssvalues.gperf"
+      {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
+#line 27 "cssvalues.gperf"
+      {"caption", CSS_VAL_CAPTION},
+#line 274 "cssvalues.gperf"
+      {"ahead", CSS_VAL_AHEAD},
 #line 126 "cssvalues.gperf"
       {"no-repeat", CSS_VAL_NO_REPEAT},
-#line 144 "cssvalues.gperf"
-      {"outside", CSS_VAL_OUTSIDE},
-#line 20 "cssvalues.gperf"
-      {"groove", CSS_VAL_GROOVE},
-#line 161 "cssvalues.gperf"
-      {"hebrew", CSS_VAL_HEBREW},
+#line 80 "cssvalues.gperf"
+      {"gray", CSS_VAL_GRAY},
+#line 197 "cssvalues.gperf"
+      {"table-cell", CSS_VAL_TABLE_CELL},
+#line 39 "cssvalues.gperf"
+      {"lighter", CSS_VAL_LIGHTER},
+#line 98 "cssvalues.gperf"
+      {"buttonface", CSS_VAL_BUTTONFACE},
 #line 79 "cssvalues.gperf"
       {"fuchsia", CSS_VAL_FUCHSIA},
-#line 275 "cssvalues.gperf"
-      {"reverse", CSS_VAL_REVERSE},
-#line 272 "cssvalues.gperf"
-      {"forwards", CSS_VAL_FORWARDS},
-#line 150 "cssvalues.gperf"
-      {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
-#line 238 "cssvalues.gperf"
-      {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
-#line 254 "cssvalues.gperf"
-      {"marquee", CSS_VAL_MARQUEE},
-#line 118 "cssvalues.gperf"
-      {"window", CSS_VAL_WINDOW},
-#line 227 "cssvalues.gperf"
-      {"nowrap", CSS_VAL_NOWRAP},
-#line 158 "cssvalues.gperf"
-      {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
-#line 50 "cssvalues.gperf"
-      {"x-small", CSS_VAL_X_SMALL},
-#line 194 "cssvalues.gperf"
-      {"table-row", CSS_VAL_TABLE_ROW},
-#line 266 "cssvalues.gperf"
-      {"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL},
-#line 199 "cssvalues.gperf"
-      {"auto", CSS_VAL_AUTO},
-#line 60 "cssvalues.gperf"
-      {"narrower", CSS_VAL_NARROWER},
-#line 219 "cssvalues.gperf"
-      {"uppercase", CSS_VAL_UPPERCASE},
-#line 157 "cssvalues.gperf"
-      {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},
-#line 155 "cssvalues.gperf"
-      {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},
+#line 249 "cssvalues.gperf"
+      {"landscape", CSS_VAL_LANDSCAPE},
 #line 102 "cssvalues.gperf"
       {"captiontext", CSS_VAL_CAPTIONTEXT},
-#line 176 "cssvalues.gperf"
-      {"upper-latin", CSS_VAL_UPPER_LATIN},
-#line 32 "cssvalues.gperf"
-      {"status-bar", CSS_VAL_STATUS_BAR},
-#line 229 "cssvalues.gperf"
-      {"pre-wrap", CSS_VAL_PRE_WRAP},
-#line 282 "cssvalues.gperf"
-      {"alternate", CSS_VAL_ALTERNATE},
-#line 235 "cssvalues.gperf"
-      {"always", CSS_VAL_ALWAYS},
-#line 220 "cssvalues.gperf"
-      {"lowercase", CSS_VAL_LOWERCASE},
+#line 58 "cssvalues.gperf"
+      {"larger", CSS_VAL_LARGER},
+#line 132 "cssvalues.gperf"
+      {"text-bottom", CSS_VAL_TEXT_BOTTOM},
+#line 186 "cssvalues.gperf"
+      {"run-in", CSS_VAL_RUN_IN},
+#line 55 "cssvalues.gperf"
+      {"xx-large", CSS_VAL_XX_LARGE},
+#line 103 "cssvalues.gperf"
+      {"graytext", CSS_VAL_GRAYTEXT},
 #line 268 "cssvalues.gperf"
       {"border-box", CSS_VAL_BORDER_BOX},
-#line 110 "cssvalues.gperf"
-      {"infotext", CSS_VAL_INFOTEXT},
-#line 66 "cssvalues.gperf"
-      {"expanded", CSS_VAL_EXPANDED},
+#line 282 "cssvalues.gperf"
+      {"alternate", CSS_VAL_ALTERNATE},
 #line 174 "cssvalues.gperf"
       {"lower-latin", CSS_VAL_LOWER_LATIN},
-#line 201 "cssvalues.gperf"
-      {"default", CSS_VAL_DEFAULT},
-#line 16 "cssvalues.gperf"
-      {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},
-#line 111 "cssvalues.gperf"
-      {"menutext", CSS_VAL_MENUTEXT},
-#line 98 "cssvalues.gperf"
-      {"buttonface", CSS_VAL_BUTTONFACE},
-#line 225 "cssvalues.gperf"
-      {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
-#line 65 "cssvalues.gperf"
-      {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
-#line 95 "cssvalues.gperf"
-      {"activecaption", CSS_VAL_ACTIVECAPTION},
-#line 224 "cssvalues.gperf"
-      {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
-#line 136 "cssvalues.gperf"
-      {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},
+#line 194 "cssvalues.gperf"
+      {"table-row", CSS_VAL_TABLE_ROW},
+#line 94 "cssvalues.gperf"
+      {"activeborder", CSS_VAL_ACTIVEBORDER},
+#line 66 "cssvalues.gperf"
+      {"expanded", CSS_VAL_EXPANDED},
+#line 74 "cssvalues.gperf"
+      {"transparent", CSS_VAL_TRANSPARENT},
+#line 88 "cssvalues.gperf"
+      {"purple", CSS_VAL_PURPLE},
+#line 190 "cssvalues.gperf"
+      {"inline-table", CSS_VAL_INLINE_TABLE},
+#line 34 "cssvalues.gperf"
+      {"oblique", CSS_VAL_OBLIQUE},
+#line 20 "cssvalues.gperf"
+      {"groove", CSS_VAL_GROOVE},
+#line 201 "cssvalues.gperf"
+      {"default", CSS_VAL_DEFAULT},
+#line 148 "cssvalues.gperf"
+      {"square", CSS_VAL_SQUARE},
+#line 130 "cssvalues.gperf"
+      {"super", CSS_VAL_SUPER},
+#line 70 "cssvalues.gperf"
+      {"sans-serif", CSS_VAL_SANS_SERIF},
+#line 75 "cssvalues.gperf"
+      {"aqua", CSS_VAL_AQUA},
+#line 123 "cssvalues.gperf"
+      {"repeat", CSS_VAL_REPEAT},
+#line 230 "cssvalues.gperf"
+      {"pre-line", CSS_VAL_PRE_LINE},
+#line 283 "cssvalues.gperf"
+      {"unfurl", CSS_VAL_UNFURL},
+#line 238 "cssvalues.gperf"
+      {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
+#line 196 "cssvalues.gperf"
+      {"table-column", CSS_VAL_TABLE_COLUMN},
+#line 131 "cssvalues.gperf"
+      {"text-top", CSS_VAL_TEXT_TOP},
 #line 218 "cssvalues.gperf"
       {"capitalize", CSS_VAL_CAPITALIZE},
-#line 232 "cssvalues.gperf"
-      {"break-word", CSS_VAL_BREAK_WORD},
-#line 160 "cssvalues.gperf"
-      {"upper-roman", CSS_VAL_UPPER_ROMAN},
-#line 273 "cssvalues.gperf"
-      {"backwards", CSS_VAL_BACKWARDS},
-#line 122 "cssvalues.gperf"
-      {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},
-#line 212 "cssvalues.gperf"
-      {"w-resize", CSS_VAL_W_RESIZE},
-#line 104 "cssvalues.gperf"
-      {"highlight", CSS_VAL_HIGHLIGHT},
-#line 206 "cssvalues.gperf"
-      {"ne-resize", CSS_VAL_NE_RESIZE},
 #line 159 "cssvalues.gperf"
       {"lower-roman", CSS_VAL_LOWER_ROMAN},
-#line 163 "cssvalues.gperf"
-      {"georgian", CSS_VAL_GEORGIAN},
-#line 135 "cssvalues.gperf"
-      {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
-#line 164 "cssvalues.gperf"
-      {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
-#line 124 "cssvalues.gperf"
-      {"repeat-x", CSS_VAL_REPEAT_X},
-#line 96 "cssvalues.gperf"
-      {"appworkspace", CSS_VAL_APPWORKSPACE},
-#line 209 "cssvalues.gperf"
-      {"se-resize", CSS_VAL_SE_RESIZE},
+#line 288 "cssvalues.gperf"
+      {"padding", CSS_VAL_PADDING},
+#line 95 "cssvalues.gperf"
+      {"activecaption", CSS_VAL_ACTIVECAPTION},
 #line 117 "cssvalues.gperf"
       {"threedshadow", CSS_VAL_THREEDSHADOW},
-#line 108 "cssvalues.gperf"
-      {"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
-#line 103 "cssvalues.gperf"
-      {"graytext", CSS_VAL_GRAYTEXT},
-#line 283 "cssvalues.gperf"
-      {"unfurl", CSS_VAL_UNFURL},
-#line 177 "cssvalues.gperf"
-      {"hiragana", CSS_VAL_HIRAGANA},
-#line 181 "cssvalues.gperf"
-      {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
+#line 200 "cssvalues.gperf"
+      {"crosshair", CSS_VAL_CROSSHAIR},
+#line 247 "cssvalues.gperf"
+      {"higher", CSS_VAL_HIGHER},
+#line 100 "cssvalues.gperf"
+      {"buttonshadow", CSS_VAL_BUTTONSHADOW},
+#line 232 "cssvalues.gperf"
+      {"break-word", CSS_VAL_BREAK_WORD},
+#line 254 "cssvalues.gperf"
+      {"marquee", CSS_VAL_MARQUEE},
+#line 31 "cssvalues.gperf"
+      {"small-caption", CSS_VAL_SMALL_CAPTION},
+#line 35 "cssvalues.gperf"
+      {"small-caps", CSS_VAL_SMALL_CAPS},
+#line 122 "cssvalues.gperf"
+      {"-khtml-text", CSS_VAL__TDEHTML_TEXT},
+#line 141 "cssvalues.gperf"
+      {"-khtml-left", CSS_VAL__TDEHTML_LEFT},
 #line 97 "cssvalues.gperf"
       {"background", CSS_VAL_BACKGROUND},
-#line 94 "cssvalues.gperf"
-      {"activeborder", CSS_VAL_ACTIVEBORDER},
-#line 142 "cssvalues.gperf"
-      {"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT},
-#line 182 "cssvalues.gperf"
-      {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
 #line 178 "cssvalues.gperf"
       {"katakana", CSS_VAL_KATAKANA},
-#line 153 "cssvalues.gperf"
-      {"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
-#line 231 "cssvalues.gperf"
-      {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
-#line 61 "cssvalues.gperf"
-      {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
-#line 119 "cssvalues.gperf"
-      {"windowframe", CSS_VAL_WINDOWFRAME},
-#line 175 "cssvalues.gperf"
-      {"upper-alpha", CSS_VAL_UPPER_ALPHA},
-#line 156 "cssvalues.gperf"
-      {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},
-#line 101 "cssvalues.gperf"
-      {"buttontext", CSS_VAL_BUTTONTEXT},
-#line 173 "cssvalues.gperf"
-      {"lower-alpha", CSS_VAL_LOWER_ALPHA},
-#line 251 "cssvalues.gperf"
-      {"line-through", CSS_VAL_LINE_THROUGH},
+#line 260 "cssvalues.gperf"
+      {"separate", CSS_VAL_SEPARATE},
+#line 32 "cssvalues.gperf"
+      {"status-bar", CSS_VAL_STATUS_BAR},
+#line 65 "cssvalues.gperf"
+      {"semi-expanded", CSS_VAL_SEMI_EXPANDED},
+#line 62 "cssvalues.gperf"
+      {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
+#line 198 "cssvalues.gperf"
+      {"table-caption", CSS_VAL_TABLE_CAPTION},
+#line 154 "cssvalues.gperf"
+      {"-khtml-lao", CSS_VAL__TDEHTML_LAO},
+#line 143 "cssvalues.gperf"
+      {"-khtml-center", CSS_VAL__TDEHTML_CENTER},
 #line 54 "cssvalues.gperf"
       {"x-large", CSS_VAL_X_LARGE},
-#line 120 "cssvalues.gperf"
-      {"windowtext", CSS_VAL_WINDOWTEXT},
-#line 171 "cssvalues.gperf"
-      {"lower-greek", CSS_VAL_LOWER_GREEK},
 #line 30 "cssvalues.gperf"
       {"message-box", CSS_VAL_MESSAGE_BOX},
-#line 167 "cssvalues.gperf"
-      {"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
-#line 168 "cssvalues.gperf"
-      {"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
-#line 207 "cssvalues.gperf"
-      {"nw-resize", CSS_VAL_NW_RESIZE},
-#line 62 "cssvalues.gperf"
-      {"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
-#line 193 "cssvalues.gperf"
-      {"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP},
-#line 210 "cssvalues.gperf"
-      {"sw-resize", CSS_VAL_SW_RESIZE},
+#line 203 "cssvalues.gperf"
+      {"progress", CSS_VAL_PROGRESS},
+#line 16 "cssvalues.gperf"
+      {"-khtml-native", CSS_VAL__TDEHTML_NATIVE},
+#line 177 "cssvalues.gperf"
+      {"hiragana", CSS_VAL_HIRAGANA},
+#line 171 "cssvalues.gperf"
+      {"lower-greek", CSS_VAL_LOWER_GREEK},
+#line 150 "cssvalues.gperf"
+      {"-khtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
+#line 224 "cssvalues.gperf"
+      {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
+#line 61 "cssvalues.gperf"
+      {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
+#line 158 "cssvalues.gperf"
+      {"-khtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
+#line 124 "cssvalues.gperf"
+      {"repeat-x", CSS_VAL_REPEAT_X},
+#line 266 "cssvalues.gperf"
+      {"-khtml-normal", CSS_VAL__TDEHTML_NORMAL},
 #line 113 "cssvalues.gperf"
       {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
-#line 267 "cssvalues.gperf"
-      {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
+#line 219 "cssvalues.gperf"
+      {"uppercase", CSS_VAL_UPPERCASE},
+#line 136 "cssvalues.gperf"
+      {"-khtml-auto", CSS_VAL__TDEHTML_AUTO},
+#line 163 "cssvalues.gperf"
+      {"georgian", CSS_VAL_GEORGIAN},
+#line 229 "cssvalues.gperf"
+      {"pre-wrap", CSS_VAL_PRE_WRAP},
+#line 125 "cssvalues.gperf"
+      {"repeat-y", CSS_VAL_REPEAT_Y},
 #line 109 "cssvalues.gperf"
       {"infobackground", CSS_VAL_INFOBACKGROUND},
-#line 100 "cssvalues.gperf"
-      {"buttonshadow", CSS_VAL_BUTTONSHADOW},
-#line 165 "cssvalues.gperf"
-      {"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
-#line 166 "cssvalues.gperf"
-      {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
-#line 49 "cssvalues.gperf"
-      {"xx-small", CSS_VAL_XX_SMALL},
-#line 115 "cssvalues.gperf"
-      {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
-#line 195 "cssvalues.gperf"
-      {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
+#line 157 "cssvalues.gperf"
+      {"-khtml-thai", CSS_VAL__TDEHTML_THAI},
+#line 226 "cssvalues.gperf"
+      {"open-quote", CSS_VAL_OPEN_QUOTE},
+#line 173 "cssvalues.gperf"
+      {"lower-alpha", CSS_VAL_LOWER_ALPHA},
+#line 156 "cssvalues.gperf"
+      {"-khtml-urdu", CSS_VAL__TDEHTML_URDU},
+#line 223 "cssvalues.gperf"
+      {"close-quote", CSS_VAL_CLOSE_QUOTE},
+#line 104 "cssvalues.gperf"
+      {"highlight", CSS_VAL_HIGHLIGHT},
+#line 225 "cssvalues.gperf"
+      {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
+#line 231 "cssvalues.gperf"
+      {"-khtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
+#line 67 "cssvalues.gperf"
+      {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
 #line 105 "cssvalues.gperf"
       {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
-#line 169 "cssvalues.gperf"
-      {"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
-#line 170 "cssvalues.gperf"
-      {"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
+#line 155 "cssvalues.gperf"
+      {"-khtml-persian", CSS_VAL__TDEHTML_PERSIAN},
 #line 116 "cssvalues.gperf"
       {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
-#line 172 "cssvalues.gperf"
-      {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK},
-#line 179 "cssvalues.gperf"
-      {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
-#line 191 "cssvalues.gperf"
-      {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
-#line 180 "cssvalues.gperf"
-      {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
-#line 152 "cssvalues.gperf"
-      {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
-#line 192 "cssvalues.gperf"
-      {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
+#line 96 "cssvalues.gperf"
+      {"appworkspace", CSS_VAL_APPWORKSPACE},
 #line 68 "cssvalues.gperf"
       {"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
+#line 176 "cssvalues.gperf"
+      {"upper-latin", CSS_VAL_UPPER_LATIN},
+#line 164 "cssvalues.gperf"
+      {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
+#line 251 "cssvalues.gperf"
+      {"line-through", CSS_VAL_LINE_THROUGH},
+#line 142 "cssvalues.gperf"
+      {"-khtml-right", CSS_VAL__TDEHTML_RIGHT},
+#line 160 "cssvalues.gperf"
+      {"upper-roman", CSS_VAL_UPPER_ROMAN},
+#line 135 "cssvalues.gperf"
+      {"-khtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
+#line 153 "cssvalues.gperf"
+      {"-khtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
+#line 152 "cssvalues.gperf"
+      {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+#line 115 "cssvalues.gperf"
+      {"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
+#line 180 "cssvalues.gperf"
+      {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
 #line 99 "cssvalues.gperf"
       {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
-#line 55 "cssvalues.gperf"
-      {"xx-large", CSS_VAL_XX_LARGE},
-#line 67 "cssvalues.gperf"
-      {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
 #line 56 "cssvalues.gperf"
-      {"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE}
+      {"-khtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE},
+#line 267 "cssvalues.gperf"
+      {"-khtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
+#line 191 "cssvalues.gperf"
+      {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
+#line 182 "cssvalues.gperf"
+      {"-khtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
+#line 179 "cssvalues.gperf"
+      {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
+#line 193 "cssvalues.gperf"
+      {"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP},
+#line 195 "cssvalues.gperf"
+      {"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
+#line 175 "cssvalues.gperf"
+      {"upper-alpha", CSS_VAL_UPPER_ALPHA},
+#line 181 "cssvalues.gperf"
+      {"-khtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
+#line 165 "cssvalues.gperf"
+      {"-khtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
+#line 166 "cssvalues.gperf"
+      {"-khtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
+#line 192 "cssvalues.gperf"
+      {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
+#line 169 "cssvalues.gperf"
+      {"-khtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
+#line 170 "cssvalues.gperf"
+      {"-khtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
+#line 167 "cssvalues.gperf"
+      {"-khtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
+#line 168 "cssvalues.gperf"
+      {"-khtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
+#line 172 "cssvalues.gperf"
+      {"-khtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK}
     };
 
   static const short lookup[] =
     {
-        0,  -1,  -1,  -1,  -1,   1,  -1,  -1,   2,  -1,
-        3,  -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,
-        5,  -1,  -1,  -1,  -1,   6,  -1,  -1,  -1,  -1,
+        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,   6,  -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,  12,  -1,  -1,  13,  -1,
-       14,  -1,  -1,  -1,  -1,  15,  -1,  -1,  -1,  -1,
-       16,  -1,  -1,  17,  -1,  18,  19,  -1,  -1,  -1,
-       20,  -1,  -1,  21,  -1,  22,  -1,  -1,  -1,  -1,
+        9,  -1,  -1,  10,  -1,  11,  -1,  -1,  -1,  -1,
+       12,  -1,  -1,  -1,  -1,  13,  -1,  -1,  -1,  -1,
+       14,  15,  -1,  -1,  -1,  16,  -1,  -1,  -1,  -1,
+       17,  18,  -1,  -1,  -1,  19,  -1,  -1,  -1,  -1,
+       20,  -1,  -1,  -1,  -1,  21,  -1,  -1,  22,  -1,
        23,  -1,  -1,  -1,  -1,  24,  -1,  -1,  25,  -1,
-       26,  -1,  -1,  -1,  -1,  27,  28,  -1,  -1,  -1,
-       29,  30,  -1,  31,  -1,  32,  -1,  -1,  33,  -1,
-       34,  -1,  -1,  -1,  -1,  -1,  35,  -1,  -1,  -1,
-       -1,  -1,  -1,  36,  -1,  -1,  -1,  -1,  -1,  -1,
-       37,  -1,  -1,  38,  -1,  39,  -1,  -1,  -1,  -1,
-       40,  -1,  -1,  -1,  -1,  41,  -1,  -1,  42,  -1,
-       43,  -1,  -1,  -1,  -1,  44,  45,  -1,  46,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  47,  -1,  -1,  48,  -1,
-       49,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       50,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  51,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  52,  -1,  -1,  53,  -1,
-       54,  55,  -1,  56,  -1,  57,  -1,  -1,  58,  -1,
-       59,  -1,  -1,  60,  -1,  -1,  -1,  -1,  -1,  -1,
-       61,  -1,  -1,  -1,  -1,  62,  63,  -1,  -1,  -1,
-       64,  -1,  -1,  65,  -1,  66,  -1,  -1,  67,  -1,
-       68,  -1,  -1,  69,  -1,  70,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  71,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  72,  -1,  -1,  -1,  -1,  73,  -1,
-       74,  -1,  -1,  75,  -1,  76,  -1,  -1,  77,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  78,  -1,
-       79,  -1,  -1,  80,  -1,  -1,  81,  -1,  -1,  -1,
-       82,  -1,  -1,  83,  -1,  84,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       85,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       86,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  87,  -1,  88,  -1,  -1,  -1,  -1,  -1,  -1,
-       89,  90,  -1,  -1,  -1,  91,  -1,  -1,  92,  -1,
-       93,  -1,  -1,  94,  -1,  95,  -1,  -1,  -1,  -1,
-       96,  -1,  -1,  -1,  -1,  97,  98,  -1,  99,  -1,
-      100,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1, 101,  -1,  -1,  -1, 102,  -1,  -1,  -1, 103,
-      104,  -1,  -1,  -1,  -1, 105,  -1,  -1,  -1,  -1,
-      106,  -1,  -1, 107,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 108,  -1, 109,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 110,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 111,  -1,  -1, 112,  -1,
-       -1, 113,  -1,  -1,  -1, 114, 115,  -1,  -1,  -1,
-      116,  -1,  -1, 117,  -1, 118,  -1,  -1, 119,  -1,
-      120,  -1,  -1,  -1,  -1, 121,  -1,  -1, 122,  -1,
-       -1,  -1,  -1, 123,  -1,  -1, 124,  -1, 125,  -1,
-       -1,  -1,  -1,  -1,  -1, 126,  -1,  -1, 127,  -1,
-       -1,  -1,  -1, 128,  -1, 129,  -1,  -1, 130,  -1,
-      131,  -1,  -1, 132,  -1, 133,  -1,  -1,  -1,  -1,
-      134,  -1,  -1, 135,  -1,  -1,  -1,  -1, 136,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 137, 138,  -1, 139,  -1,  -1,  -1,
-      140,  -1,  -1, 141,  -1,  -1,  -1,  -1, 142,  -1,
-       -1,  -1,  -1, 143,  -1, 144,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 145,  -1,  -1,  -1,  -1,  -1,  -1,
-      146, 147,  -1, 148,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      149, 150,  -1, 151,  -1, 152,  -1,  -1,  -1,  -1,
-      153,  -1,  -1,  -1,  -1, 154,  -1,  -1,  -1,  -1,
-      155, 156,  -1, 157,  -1,  -1,  -1,  -1,  -1,  -1,
-      158, 159,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      160,  -1,  -1, 161,  -1, 162,  -1,  -1,  -1,  -1,
-      163,  -1,  -1,  -1,  -1, 164,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 165,  -1, 166, 167,  -1,  -1,  -1,
-      168,  -1,  -1, 169,  -1, 170,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 171,  -1, 172,  -1,  -1, 173,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 174,  -1,
-       -1,  -1,  -1,  -1,  -1, 175,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 176,  -1,  -1,  -1,  -1,  -1,  -1,
-      177,  -1,  -1,  -1,  -1, 178,  -1,  -1,  -1,  -1,
-      179,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      180,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      181,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 182, 183,  -1,  -1,  -1,
-      184,  -1,  -1, 185,  -1,  -1,  -1,  -1,  -1,  -1,
+       26,  -1,  -1,  27,  -1,  28,  -1,  -1,  29,  -1,
+       30,  -1,  -1,  -1,  -1,  31,  -1,  -1,  -1,  32,
+       33,  -1,  -1,  34,  -1,  -1,  -1,  -1,  35,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  36,  -1,
+       37,  -1,  -1,  -1,  -1,  38,  -1,  -1,  39,  -1,
+       40,  -1,  -1,  41,  -1,  -1,  -1,  -1,  42,  -1,
+       43,  -1,  -1,  44,  -1,  45,  -1,  -1,  46,  -1,
+       -1,  -1,  -1,  47,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  48,  -1,  -1,  49,  -1,
+       50,  51,  -1,  52,  -1,  -1,  53,  -1,  54,  -1,
+       55,  -1,  -1,  56,  -1,  -1,  -1,  -1,  57,  -1,
+       -1,  -1,  -1,  -1,  -1,  58,  -1,  -1,  -1,  -1,
+       -1,  59,  -1,  60,  -1,  61,  -1,  -1,  -1,  -1,
+       62,  63,  -1,  -1,  -1,  64,  -1,  -1,  -1,  -1,
+       65,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       66,  -1,  -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,  73,  -1,
+       74,  75,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       76,  -1,  -1,  77,  -1,  -1,  -1,  -1,  78,  -1,
+       79,  -1,  -1,  80,  -1,  81,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  82,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  83,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       84,  -1,  -1,  -1,  -1,  85,  86,  -1,  87,  -1,
+       -1,  -1,  -1,  88,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       89,  -1,  -1,  -1,  90,  91,  -1,  -1,  92,  -1,
+       -1,  93,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       94,  -1,  -1,  95,  -1,  96,  -1,  -1,  -1,  -1,
+       97,  -1,  -1,  98,  -1,  99,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 100,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 101,  -1,  -1,  -1,  -1, 102,  -1,
+      103,  -1,  -1,  -1, 104, 105,  -1,  -1,  -1,  -1,
+      106,  -1,  -1,  -1,  -1, 107,  -1,  -1, 108,  -1,
+      109,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 110,  -1,
+      111,  -1,  -1,  -1,  -1, 112,  -1,  -1, 113,  -1,
+      114,  -1,  -1, 115,  -1, 116,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 117,  -1, 118,  -1,  -1,  -1,  -1,
+      119,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      120,  -1,  -1,  -1,  -1,  -1, 121,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 122,  -1,
+       -1,  -1,  -1,  -1,  -1, 123,  -1,  -1,  -1,  -1,
+      124, 125,  -1,  -1,  -1, 126,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 127,  -1, 128,  -1,  -1, 129,  -1,
+       -1,  -1,  -1, 130,  -1, 131,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 132,  -1, 133,  -1,  -1, 134,  -1,
+      135,  -1,  -1,  -1,  -1, 136,  -1,  -1, 137,  -1,
+      138,  -1,  -1,  -1,  -1, 139,  -1,  -1,  -1,  -1,
+      140,  -1,  -1, 141,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      142,  -1,  -1,  -1,  -1, 143,  -1,  -1,  -1,  -1,
+      144,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      145, 146,  -1,  -1,  -1,  -1,  -1,  -1, 147,  -1,
+      148,  -1,  -1, 149,  -1, 150,  -1,  -1, 151,  -1,
+      152, 153,  -1,  -1,  -1, 154,  -1,  -1, 155,  -1,
+       -1,  -1,  -1, 156,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 157,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      158,  -1,  -1,  -1,  -1, 159,  -1,  -1, 160,  -1,
+       -1,  -1,  -1, 161,  -1, 162,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 163,  -1,  -1,  -1,  -1,  -1,  -1,
+      164,  -1,  -1, 165,  -1, 166,  -1,  -1,  -1, 167,
+       -1, 168,  -1,  -1,  -1,  -1,  -1,  -1, 169,  -1,
+      170,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 171,  -1,
+       -1,  -1,  -1, 172,  -1,  -1,  -1,  -1, 173,  -1,
+       -1,  -1,  -1, 174,  -1, 175,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      176,  -1,  -1,  -1,  -1, 177,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      178,  -1,  -1, 179,  -1,  -1,  -1,  -1,  -1,  -1,
+      180,  -1,  -1, 181,  -1, 182,  -1,  -1, 183,  -1,
+       -1,  -1,  -1, 184,  -1, 185,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1, 186,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1, 187,  -1,  -1,  -1, 188,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1, 189,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 190,  -1,  -1, 191,  -1,
-      192,  -1,  -1,  -1,  -1, 193,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 194,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 195,  -1, 196,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 197,  -1,  -1, 198,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      199,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 200,  -1,  -1, 201,  -1, 202,  -1,
-       -1, 203,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 204,  -1,  -1,  -1,  -1,  -1,  -1,
-      205,  -1,  -1, 206,  -1,  -1,  -1,  -1, 207,  -1,
-       -1, 208,  -1,  -1,  -1, 209,  -1,  -1,  -1,  -1,
+      187,  -1,  -1, 188,  -1,  -1,  -1,  -1,  -1,  -1,
+      189,  -1,  -1, 190,  -1, 191,  -1,  -1, 192,  -1,
+      193,  -1,  -1, 194,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 195,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      210,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      211,  -1,  -1,  -1,  -1, 212,  -1,  -1,  -1,  -1,
-      213,  -1,  -1,  -1,  -1, 214,  -1,  -1, 215,  -1,
-      216, 217,  -1,  -1,  -1,  -1,  -1,  -1, 218, 219,
-      220,  -1,  -1,  -1,  -1, 221,  -1,  -1,  -1,  -1,
-       -1, 222,  -1, 223,  -1,  -1,  -1,  -1,  -1,  -1,
-      224,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      225, 226,  -1,  -1,  -1, 227,  -1,  -1, 228,  -1,
-       -1,  -1,  -1,  -1,  -1, 229,  -1,  -1, 230,  -1,
-      231,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      232,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 233,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      234,  -1,  -1, 235,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 196,  -1,  -1,  -1,  -1,
+      197,  -1,  -1, 198,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1, 199,  -1,  -1,  -1,
+      200,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      201,  -1,  -1,  -1,  -1, 202,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 203,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 204,  -1,
+      205,  -1,  -1,  -1,  -1, 206,  -1,  -1,  -1,  -1,
+      207,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -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,
+      208,  -1,  -1, 209,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 237,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 238,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 210,  -1,  -1,  -1,  -1,  -1,  -1,
+      211,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 239,  -1, 240,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      212,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 213,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 214,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 241,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      242,  -1,  -1,  -1,  -1, 243,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      244,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 215,  -1, 216,  -1,  -1, 217,  -1,
+      218,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 219,  -1,
+      220,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1, 245,  -1,  -1,  -1,  -1, 246,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 247,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 248, 249,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 250,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 221,  -1,  -1,  -1,  -1,  -1,  -1,
+      222,  -1,  -1,  -1,  -1, 223,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 224,  -1,
+       -1,  -1,  -1,  -1,  -1, 225,  -1,  -1, 226,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 251,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 252,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 253,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      254,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 255,
-       -1,  -1,  -1,  -1, 256,  -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,
+      228,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      229,  -1,  -1,  -1,  -1,  -1, 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, 257,  -1,  -1,  -1,  -1,
-      258,  -1,  -1, 259,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 231,  -1,
+      232,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 233,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 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,
-      260,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 261,  -1,
-       -1,  -1,  -1, 262,  -1, 263,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 235,  -1,
+      236,  -1,  -1,  -1,  -1, 237,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 238,  -1,  -1, 239,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1, 264,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 265,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 266,  -1,
-       -1,  -1,  -1,  -1,  -1, 267,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 240,  -1,
+       -1, 241,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 242,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      243,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 244,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 245,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 246,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 247,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 248,  -1,  -1,  -1,  -1,  -1,  -1,
+      249,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      250,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-      268,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 269,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 251,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 252,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1, 270,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 253,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 254,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      255,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      256,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 271,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 257,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1, 272,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 258,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 259,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 273,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 260,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 261,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 262,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 263,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 264,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -967,10 +981,13 @@ findValue (register const char *str, register unsigned int len)
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 265,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+      266,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1, 267,  -1,  -1,  -1,  -1, 268,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -993,6 +1010,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,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1, 269,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -1006,7 +1024,10 @@ findValue (register const char *str, register unsigned int len)
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 270,  -1,
+       -1,  -1,  -1, 271,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+       -1,  -1,  -1, 272,  -1,  -1,  -1,  -1, 273,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
@@ -1038,7 +1059,7 @@ static const char * const valueList[] = {
 "",
 "inherit", 
 "initial", 
-"-tdehtml-native", 
+"-khtml-native", 
 "none", 
 "hidden", 
 "inset", 
@@ -1078,7 +1099,7 @@ static const char * const valueList[] = {
 "large", 
 "x-large", 
 "xx-large", 
-"-tdehtml-xxx-large", 
+"-khtml-xxx-large", 
 "smaller", 
 "larger", 
 "wider", 
@@ -1144,7 +1165,7 @@ static const char * const valueList[] = {
 "windowframe", 
 "windowtext", 
 "grey", 
-"-tdehtml-text", 
+"-khtml-text", 
 "repeat", 
 "repeat-x", 
 "repeat-y", 
@@ -1157,44 +1178,44 @@ static const char * const valueList[] = {
 "text-bottom", 
 "top", 
 "bottom", 
-"-tdehtml-baseline-middle", 
-"-tdehtml-auto", 
+"-khtml-baseline-middle", 
+"-khtml-auto", 
 "left", 
 "right", 
 "center", 
 "justify", 
-"-tdehtml-left", 
-"-tdehtml-right", 
-"-tdehtml-center", 
+"-khtml-left", 
+"-khtml-right", 
+"-khtml-center", 
 "outside", 
 "inside", 
 "disc", 
 "circle", 
 "square", 
 "box", 
-"-tdehtml-diamond", 
+"-khtml-diamond", 
 "decimal", 
 "decimal-leading-zero", 
-"-tdehtml-arabic-indic", 
-"-tdehtml-lao", 
-"-tdehtml-persian", 
-"-tdehtml-urdu", 
-"-tdehtml-thai", 
-"-tdehtml-tibetan", 
+"-khtml-arabic-indic", 
+"-khtml-lao", 
+"-khtml-persian", 
+"-khtml-urdu", 
+"-khtml-thai", 
+"-khtml-tibetan", 
 "lower-roman", 
 "upper-roman", 
 "hebrew", 
 "armenian", 
 "georgian", 
 "cjk-ideographic", 
-"-tdehtml-japanese-formal", 
-"-tdehtml-japanese-informal", 
-"-tdehtml-simp-chinese-formal", 
-"-tdehtml-simp-chinese-informal", 
-"-tdehtml-trad-chinese-formal", 
-"-tdehtml-trad-chinese-informal", 
+"-khtml-japanese-formal", 
+"-khtml-japanese-informal", 
+"-khtml-simp-chinese-formal", 
+"-khtml-simp-chinese-informal", 
+"-khtml-trad-chinese-formal", 
+"-khtml-trad-chinese-informal", 
 "lower-greek", 
-"-tdehtml-upper-greek", 
+"-khtml-upper-greek", 
 "lower-alpha", 
 "lower-latin", 
 "upper-alpha", 
@@ -1203,8 +1224,8 @@ static const char * const valueList[] = {
 "katakana", 
 "hiragana-iroha", 
 "katakana-iroha", 
-"-tdehtml-open-quote", 
-"-tdehtml-close-quote", 
+"-khtml-open-quote", 
+"-khtml-close-quote", 
 "inline", 
 "block", 
 "list-item", 
@@ -1253,7 +1274,7 @@ static const char * const valueList[] = {
 "pre", 
 "pre-wrap", 
 "pre-line", 
-"-tdehtml-nowrap", 
+"-khtml-nowrap", 
 "break-word", 
 "above", 
 "absolute", 
@@ -1288,8 +1309,8 @@ static const char * const valueList[] = {
 "thick", 
 "thin", 
 "underline", 
-"-tdehtml-normal", 
-"-tdehtml-around-floats", 
+"-khtml-normal", 
+"-khtml-around-floats", 
 "border-box", 
 "content-box", 
 "enabled", 
diff --git a/tdehtml/css/cssvalues.in b/tdehtml/css/cssvalues.in
index 30ed44475..499a3030c 100644
--- a/tdehtml/css/cssvalues.in
+++ b/tdehtml/css/cssvalues.in
@@ -16,7 +16,7 @@ initial
 # CSS_PROP_BORDER_TOP_STYLE
 # CSS_PROP_BORDER_BOTTOM_STYLE
 # CSS_PROP_BORDER_LEFT_STYLE
--tdehtml-native
+-khtml-native
 none
 hidden
 inset
@@ -73,7 +73,7 @@ medium
 large
 x-large
 xx-large
--tdehtml-xxx-large
+-khtml-xxx-large
 smaller
 larger
 #
@@ -156,7 +156,7 @@ windowtext
 #
 # colors in non strict mode
 grey
--tdehtml-text
+-khtml-text
 #
 # CSS_PROP_BACKGROUND_REPEAT:
 #
@@ -176,18 +176,18 @@ text-bottom
 top
 bottom
 # HTML alignment MIDDLE has no corresponding CSS alignment
--tdehtml-baseline-middle
+-khtml-baseline-middle
 #
 # CSS_PROP_TEXT_ALIGN:
 #
--tdehtml-auto
+-khtml-auto
 left
 right
 center
 justify
--tdehtml-left
--tdehtml-right
--tdehtml-center
+-khtml-left
+-khtml-right
+-khtml-center
 #
 # CSS_PROP_LIST_STYLE_POSITION:
 #
@@ -200,29 +200,29 @@ disc
 circle
 square
 box
--tdehtml-diamond
+-khtml-diamond
 decimal
 decimal-leading-zero
--tdehtml-arabic-indic
--tdehtml-lao
--tdehtml-persian
--tdehtml-urdu
--tdehtml-thai
--tdehtml-tibetan
+-khtml-arabic-indic
+-khtml-lao
+-khtml-persian
+-khtml-urdu
+-khtml-thai
+-khtml-tibetan
 lower-roman
 upper-roman
 hebrew
 armenian
 georgian
 cjk-ideographic
--tdehtml-japanese-formal
--tdehtml-japanese-informal
--tdehtml-simp-chinese-formal
--tdehtml-simp-chinese-informal
--tdehtml-trad-chinese-formal
--tdehtml-trad-chinese-informal
+-khtml-japanese-formal
+-khtml-japanese-informal
+-khtml-simp-chinese-formal
+-khtml-simp-chinese-informal
+-khtml-trad-chinese-formal
+-khtml-trad-chinese-informal
 lower-greek
--tdehtml-upper-greek
+-khtml-upper-greek
 lower-alpha
 lower-latin
 upper-alpha
@@ -231,8 +231,8 @@ hiragana
 katakana
 hiragana-iroha
 katakana-iroha
--tdehtml-open-quote
--tdehtml-close-quote
+-khtml-open-quote
+-khtml-close-quote
 #none
 #
 # CSS_PROP_DISPLAY:
@@ -307,7 +307,7 @@ nowrap
 pre
 pre-wrap
 pre-line
--tdehtml-nowrap
+-khtml-nowrap
 #
 # CSS_PROP_WORD_WRAP
 #
@@ -351,8 +351,8 @@ thin
 underline
 #
 # CSS_PROP__TDEHTML_FLOW_MODE
--tdehtml-normal
--tdehtml-around-floats
+-khtml-normal
+-khtml-around-floats
 
 # CSS3 Values
 # CSS_PROP__TDEHTML_BOX_SIZING
diff --git a/tdehtml/css/html4.css b/tdehtml/css/html4.css
index ffd599601..025f6673d 100644
--- a/tdehtml/css/html4.css
+++ b/tdehtml/css/html4.css
@@ -11,7 +11,7 @@
 
 html {
 	display: block;
-	color: -tdehtml-text;
+	color: -khtml-text;
 }
 
 /*
@@ -99,7 +99,7 @@ q:after  {
 center {
 	display: block;
 	/* special centering to be able to emulate the html4/netscape behavior */
-	text-align: -tdehtml-center;
+	text-align: -khtml-center;
 }
 
 hr  {
@@ -107,7 +107,7 @@ hr  {
         margin: 12px auto;
         border-style: inset;
         border-width: 1px;
-        -tdehtml-flow-mode: -tdehtml-around-floats
+        -khtml-flow-mode: -khtml-around-floats
 }
 
 map {
@@ -171,7 +171,7 @@ table {
 	display: table;
 	border-collapse: separate;
 	border-spacing: 2px;
-        -tdehtml-flow-mode: -tdehtml-around-floats;
+        -khtml-flow-mode: -khtml-around-floats;
         box-sizing: border-box;
 }
 
@@ -181,11 +181,11 @@ table[align="center"] {
 }
 
 table[align="left"] {
-	float: -tdehtml-left;
+	float: -khtml-left;
 }
 
 table[align="right"] {
-	float: -tdehtml-right;
+	float: -khtml-right;
 }
 
 thead {
@@ -232,7 +232,7 @@ th {
 
 caption {
 	display: table-caption;
-	text-align: -tdehtml-center;
+	text-align: -khtml-center;
 }
 
 /*
@@ -243,19 +243,19 @@ ul, menu, dir {
         display: block;
         list-style-type: disc;
         margin: 1__qem 0 1em 0;
-        -tdehtml-padding-start: 40px
+        -khtml-padding-start: 40px
 }
 
 ol {
         display: block;
         list-style-type: decimal;
         margin: 1__qem 0 1em 0;
-        -tdehtml-padding-start: 40px
+        -khtml-padding-start: 40px
 }
 
 li {
         display: list-item;
-        -tdehtml-flow-mode: -tdehtml-around-floats;
+        -khtml-flow-mode: -khtml-around-floats;
 }
 
 
@@ -273,7 +273,7 @@ dd {
 }
 
 dl > dd {
-	-tdehtml-margin-start: 40px;
+	-khtml-margin-start: 40px;
 }
 
 dl {
@@ -329,7 +329,7 @@ fieldset {
         padding: 0.75em 0.625em;
 	margin: 1.0em 0;
         border: 2px groove threedface;
-        -tdehtml-flow-mode: -tdehtml-around-floats
+        -khtml-flow-mode: -khtml-around-floats
 }
 
 button {
@@ -346,7 +346,7 @@ button:active {
 }
 
 input, textarea {
-        text-align: -tdehtml-auto;
+        text-align: -khtml-auto;
 }
 
 input, textarea, select, button {
@@ -357,7 +357,7 @@ input, textarea, select, button {
 input { color: windowtext;
         font-family: sans-serif;
         font-size: small;
-        border: 2px -tdehtml-native;
+        border: 2px -khtml-native;
 }
 
 input[type="hidden"] {
@@ -396,7 +396,7 @@ select {
 textarea {
         color: windowtext;
         font-family: monospace;
-        border: 2px -tdehtml-native;
+        border: 2px -khtml-native;
 }
 
 /*
diff --git a/tdehtml/css/makevalues b/tdehtml/css/makevalues
index a61da67da..0f81f1612 100755
--- a/tdehtml/css/makevalues
+++ b/tdehtml/css/makevalues
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #   This file is part of the KDE libraries
 #
 #   Copyright (C) 1999 Waldo Bastian (bastian@kde.org)
diff --git a/tdehtml/css/parser.cpp b/tdehtml/css/parser.cpp
index 4cc238ee2..3e8ee89fd 100644
--- a/tdehtml/css/parser.cpp
+++ b/tdehtml/css/parser.cpp
@@ -1,37 +1,31 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
-
-/* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
+/* A Bison parser, made by GNU Bison 1.875d.  */
+
+/*  Skeleton parser for Yacc-like parsing with Bison,
+    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -43,32 +37,128 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
-/* Bison version.  */
-#define YYBISON_VERSION "2.5"
-
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
-/* Substitute the variable and function names.  */
-#define yyparse         cssyyparse
-#define yylex           cssyylex
-#define yyerror         cssyyerror
-#define yylval          cssyylval
-#define yychar          cssyychar
-#define yydebug         cssyydebug
-#define yynerrs         cssyynerrs
+/* If NAME_PREFIX is specified substitute the variables and functions
+   names.  */
+#define yyparse cssyyparse
+#define yylex   cssyylex
+#define yyerror cssyyerror
+#define yylval  cssyylval
+#define yychar  cssyychar
+#define yydebug cssyydebug
+#define yynerrs cssyynerrs
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     UNIMPORTANT_TOK = 258,
+     S = 259,
+     SGML_CD = 260,
+     INCLUDES = 261,
+     DASHMATCH = 262,
+     BEGINSWITH = 263,
+     ENDSWITH = 264,
+     CONTAINS = 265,
+     STRING = 266,
+     IDENT = 267,
+     NTH = 268,
+     HASH = 269,
+     IMPORT_SYM = 270,
+     PAGE_SYM = 271,
+     MEDIA_SYM = 272,
+     FONT_FACE_SYM = 273,
+     CHARSET_SYM = 274,
+     NAMESPACE_SYM = 275,
+     TDEHTML_RULE_SYM = 276,
+     TDEHTML_DECLS_SYM = 277,
+     TDEHTML_VALUE_SYM = 278,
+     IMPORTANT_SYM = 279,
+     QEMS = 280,
+     EMS = 281,
+     EXS = 282,
+     PXS = 283,
+     CMS = 284,
+     MMS = 285,
+     INS = 286,
+     PTS = 287,
+     PCS = 288,
+     DEGS = 289,
+     RADS = 290,
+     GRADS = 291,
+     MSECS = 292,
+     SECS = 293,
+     HERZ = 294,
+     KHERZ = 295,
+     DIMEN = 296,
+     PERCENTAGE = 297,
+     FLOAT = 298,
+     INTEGER = 299,
+     URI = 300,
+     FUNCTION = 301,
+     NOTFUNCTION = 302,
+     UNICODERANGE = 303
+   };
+#endif
+#define UNIMPORTANT_TOK 258
+#define S 259
+#define SGML_CD 260
+#define INCLUDES 261
+#define DASHMATCH 262
+#define BEGINSWITH 263
+#define ENDSWITH 264
+#define CONTAINS 265
+#define STRING 266
+#define IDENT 267
+#define NTH 268
+#define HASH 269
+#define IMPORT_SYM 270
+#define PAGE_SYM 271
+#define MEDIA_SYM 272
+#define FONT_FACE_SYM 273
+#define CHARSET_SYM 274
+#define NAMESPACE_SYM 275
+#define TDEHTML_RULE_SYM 276
+#define TDEHTML_DECLS_SYM 277
+#define TDEHTML_VALUE_SYM 278
+#define IMPORTANT_SYM 279
+#define QEMS 280
+#define EMS 281
+#define EXS 282
+#define PXS 283
+#define CMS 284
+#define MMS 285
+#define INS 286
+#define PTS 287
+#define PCS 288
+#define DEGS 289
+#define RADS 290
+#define GRADS 291
+#define MSECS 292
+#define SECS 293
+#define HERZ 294
+#define KHERZ 295
+#define DIMEN 296
+#define PERCENTAGE 297
+#define FLOAT 298
+#define INTEGER 299
+#define URI 300
+#define FUNCTION 301
+#define NOTFUNCTION 302
+#define UNICODERANGE 303
+
+
 
 
 /* Copy the first part of user declarations.  */
@@ -156,7 +246,6 @@ static inline int getValueID(const char *tagStr, int len)
 #define YYPARSE_PARAM parser
 
 
-
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -170,74 +259,9 @@ static inline int getValueID(const char *tagStr, int len)
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     UNIMPORTANT_TOK = 258,
-     S = 259,
-     SGML_CD = 260,
-     INCLUDES = 261,
-     DASHMATCH = 262,
-     BEGINSWITH = 263,
-     ENDSWITH = 264,
-     CONTAINS = 265,
-     STRING = 266,
-     IDENT = 267,
-     NTH = 268,
-     HASH = 269,
-     IMPORT_SYM = 270,
-     PAGE_SYM = 271,
-     MEDIA_SYM = 272,
-     FONT_FACE_SYM = 273,
-     CHARSET_SYM = 274,
-     NAMESPACE_SYM = 275,
-     TDEHTML_RULE_SYM = 276,
-     TDEHTML_DECLS_SYM = 277,
-     TDEHTML_VALUE_SYM = 278,
-     IMPORTANT_SYM = 279,
-     QEMS = 280,
-     EMS = 281,
-     EXS = 282,
-     PXS = 283,
-     CMS = 284,
-     MMS = 285,
-     INS = 286,
-     PTS = 287,
-     PCS = 288,
-     DEGS = 289,
-     RADS = 290,
-     GRADS = 291,
-     MSECS = 292,
-     SECS = 293,
-     HERZ = 294,
-     KHERZ = 295,
-     DIMEN = 296,
-     PERCENTAGE = 297,
-     FLOAT = 298,
-     INTEGER = 299,
-     URI = 300,
-     FUNCTION = 301,
-     NOTFUNCTION = 302,
-     UNICODERANGE = 303
-   };
-#endif
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 
+typedef union YYSTYPE {
     CSSRuleImpl *rule;
     CSSSelector *selector;
     TQPtrList<CSSSelector> *selectorList;
@@ -257,16 +281,16 @@ typedef union YYSTYPE
     char tok;
     Value value;
     ValueList *valueList;
-
-
-
 } YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+/* Line 191 of yacc.c.  */
+
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 /* Copy the second part of user declarations.  */
 
 
@@ -289,171 +313,58 @@ static int cssyylex( YYSTYPE *yylval ) {
 
 
 
+/* Line 214 of yacc.c.  */
 
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
 
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
 
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
+# ifndef YYFREE
+#  define YYFREE free
 # endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
+# ifndef YYMALLOC
+#  define YYMALLOC malloc
 # endif
-# ifndef YY_
-#  define YY_(msgid) msgid
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
-#endif
-{
-  return yyi;
-}
-#endif
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA
+#   define YYSTACK_ALLOC alloca
+#  endif
+# else
+#  if defined (alloca) || defined (_ALLOCA_H)
+#   define YYSTACK_ALLOC alloca
+#  else
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 # else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+#  if defined (__STDC__) || defined (__cplusplus)
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
+#   define YYSIZE_T size_t
 #  endif
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
 # endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
+  short int yyss;
+  YYSTYPE yyvs;
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -461,72 +372,74 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined (__GNUC__) && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+# define YYSTACK_RELOCATE(Stack)					\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (YYID (0))
+    while (0)
 
 #endif
 
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short int yysigned_char;
+#endif
 
-/* YYFINAL -- State number of the termination state.  */
+/* YYFINAL -- State number of the termination state. */
 #define YYFINAL  16
 /* YYLAST -- Last index in YYTABLE.  */
 #define YYLAST   479
 
-/* YYNTOKENS -- Number of terminals.  */
+/* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  67
-/* YYNNTS -- Number of nonterminals.  */
+/* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  54
-/* YYNRULES -- Number of rules.  */
+/* YYNRULES -- Number of rules. */
 #define YYNRULES  162
-/* YYNRULES -- Number of states.  */
+/* YYNRULES -- Number of states. */
 #define YYNSTATES  305
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   303
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX) 						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] =
+static const unsigned char yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -564,7 +477,7 @@ static const yytype_uint8 yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const yytype_uint16 yyprhs[] =
+static const unsigned short int yyprhs[] =
 {
        0,     0,     3,     9,    12,    15,    18,    25,    28,    34,
       35,    38,    39,    42,    45,    46,    52,    56,    60,    61,
@@ -585,8 +498,8 @@ static const yytype_uint16 yyprhs[] =
      530,   534,   536
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
 {
       68,     0,    -1,    74,    73,    75,    77,    80,    -1,    69,
       72,    -1,    70,    72,    -1,    71,    72,    -1,    26,    54,
@@ -645,7 +558,7 @@ static const yytype_int8 yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
+static const unsigned short int yyrline[] =
 {
        0,   257,   257,   258,   259,   260,   264,   271,   277,   302,
      303,   306,   308,   309,   312,   314,   319,   320,   323,   325,
@@ -667,24 +580,24 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "UNIMPORTANT_TOK", "S", "SGML_CD",
   "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING",
   "IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM",
   "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM",
-  "TDEHTML_RULE_SYM", "TDEHTML_DECLS_SYM", "TDEHTML_VALUE_SYM",
-  "IMPORTANT_SYM", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS",
-  "PCS", "DEGS", "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ",
-  "DIMEN", "PERCENTAGE", "FLOAT", "INTEGER", "URI", "FUNCTION",
-  "NOTFUNCTION", "UNICODERANGE", "'{'", "'}'", "';'", "','", "'+'", "'~'",
-  "'>'", "'-'", "']'", "'='", "')'", "'/'", "'@'", "$accept", "stylesheet",
-  "tdehtml_rule", "tdehtml_decls", "tdehtml_value", "maybe_space",
-  "maybe_sgml", "maybe_charset", "import_list", "import", "namespace_list",
-  "namespace", "maybe_ns_prefix", "rule_list", "rule", "string_or_uri",
+  "TDEHTML_RULE_SYM", "TDEHTML_DECLS_SYM", "TDEHTML_VALUE_SYM", "IMPORTANT_SYM",
+  "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS",
+  "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
+  "FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE",
+  "'{'", "'}'", "';'", "','", "'+'", "'~'", "'>'", "'-'", "']'", "'='",
+  "')'", "'/'", "'@'", "$accept", "stylesheet", "tdehtml_rule",
+  "tdehtml_decls", "tdehtml_value", "maybe_space", "maybe_sgml",
+  "maybe_charset", "import_list", "import", "namespace_list", "namespace",
+  "maybe_ns_prefix", "rule_list", "rule", "string_or_uri",
   "maybe_media_list", "media_list", "media", "ruleset_list", "medium",
   "page", "font_face", "combinator", "unary_operator", "ruleset",
   "selector_list", "selector", "namespace_selector", "simple_selector",
@@ -699,7 +612,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] =
+static const unsigned short int yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,    58,    46,    91,    42,   124,
@@ -712,7 +625,7 @@ static const yytype_uint16 yytoknum[] =
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+static const unsigned char yyr1[] =
 {
        0,    67,    68,    68,    68,    68,    69,    70,    71,    72,
       72,    73,    73,    73,    74,    74,    74,    74,    75,    75,
@@ -734,7 +647,7 @@ static const yytype_uint8 yyr1[] =
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+static const unsigned char yyr2[] =
 {
        0,     2,     5,     2,     2,     2,     6,     2,     5,     0,
        2,     0,     2,     2,     0,     5,     3,     3,     0,     3,
@@ -755,10 +668,10 @@ static const yytype_uint8 yyr2[] =
        3,     1,     3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const yytype_uint8 yydefact[] =
+static const unsigned char yydefact[] =
 {
       14,     0,     0,     0,     0,     0,     9,     9,     9,    11,
        0,     0,     9,     9,     7,     9,     1,     3,     4,     5,
@@ -793,8 +706,8 @@ static const yytype_uint8 yydefact[] =
        0,    90,    46,     9,    48
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short int yydefgoto[] =
 {
       -1,     5,     6,     7,     8,   232,    20,     9,    31,    92,
       93,   169,   253,   170,   218,   208,   269,   270,   219,   300,
@@ -807,7 +720,7 @@ static const yytype_int16 yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -167
-static const yytype_int16 yypact[] =
+static const short int yypact[] =
 {
      252,    19,   -46,   -32,   -20,    44,  -167,  -167,  -167,  -167,
      147,   183,  -167,  -167,  -167,  -167,  -167,    96,    96,    96,
@@ -843,7 +756,7 @@ static const yytype_int16 yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+static const short int yypgoto[] =
 {
     -167,  -167,  -167,  -167,  -167,    -1,   -82,  -167,  -167,   163,
     -167,  -167,  -167,  -167,  -167,    82,  -167,    76,  -167,  -167,
@@ -855,9 +768,10 @@ static const yytype_int16 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -120
-static const yytype_int16 yytable[] =
+static const short int yytable[] =
 {
       11,   200,    24,    23,   222,    17,    18,    19,    12,    24,
      167,    26,    27,   123,    28,   118,   206,   120,    24,   187,
@@ -909,13 +823,7 @@ static const yytype_int16 yytable[] =
       70,    71,    72,    73,    74,    75,     0,    77,    78,    79
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-167))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
-
-static const yytype_int16 yycheck[] =
+static const short int yycheck[] =
 {
        1,   158,     4,    10,   170,     6,     7,     8,    54,     4,
       92,    12,    13,    47,    15,    44,    11,    46,     4,   114,
@@ -969,7 +877,7 @@ static const yytype_int16 yycheck[] =
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+static const unsigned char yystos[] =
 {
        0,    24,    26,    27,    28,    68,    69,    70,    71,    74,
        1,    72,    54,    54,   106,    54,     0,    72,    72,    72,
@@ -1004,6 +912,22 @@ static const yytype_uint8 yystos[] =
       86,    62,    55,    92,    72
 };
 
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -1016,18 +940,9 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -1037,54 +952,31 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      YYPOPSTACK (1);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
+    { 								\
+      yyerror ("syntax error: cannot back up");\
       YYERROR;							\
     }								\
-while (YYID (0))
-
+while (0)
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).  */
 
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
-
-
-/* This macro is provided for backward compatibility. */
-
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# define YYLLOC_DEFAULT(Current, Rhs, N)		\
+   ((Current).first_line   = (Rhs)[1].first_line,	\
+    (Current).first_column = (Rhs)[1].first_column,	\
+    (Current).last_line    = (Rhs)[N].last_line,	\
+    (Current).last_column  = (Rhs)[N].last_column)
 #endif
 
-
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -1105,100 +997,43 @@ while (YYID (0))
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+} while (0)
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
-# endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
-}
+# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+do {								\
+  if (yydebug)							\
+    {								\
+      YYFPRINTF (stderr, "%s ", Title);				\
+      yysymprint (stderr, 					\
+                  Token, Value);	\
+      YYFPRINTF (stderr, "\n");					\
+    }								\
+} while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print (short int *bottom, short int *top)
 #else
 static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
+yy_stack_print (bottom, top)
+    short int *bottom;
+    short int *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1206,52 +1041,45 @@ yy_stack_print (yybottom, yytop)
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (int yyrule)
 #else
 static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
+yy_reduce_print (yyrule)
     int yyrule;
 #endif
 {
-  int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
-      YYFPRINTF (stderr, "\n");
-    }
+  unsigned int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+    yy_reduce_print (Rule);		\
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -1266,58 +1094,61 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
 
 
+
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
+#  if defined (__GLIBC__) && defined (_STRING_H)
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
+#   else
 yystrlen (yystr)
-    const char *yystr;
-#endif
+     const char *yystr;
+#   endif
 {
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
+  register const char *yys = yystr;
+
+  while (*yys++ != '\0')
     continue;
-  return yylen;
+
+  return yys - yystr - 1;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
+#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
+#   else
 yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
+     char *yydest;
+     const char *yysrc;
+#   endif
 {
-  char *yyd = yydest;
-  const char *yys = yysrc;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -1327,292 +1158,144 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
-    do_not_strip_quotes: ;
-    }
+#endif /* !YYERROR_VERBOSE */
 
-  if (! yyres)
-    return yystrlen (yystr);
 
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
 {
-  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = 0;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
-              }
-        }
-    }
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
 
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
     }
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
-
-  if (*yymsg_alloc < yysize)
+  switch (yytype)
     {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
+      default:
+        break;
     }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
+  YYFPRINTF (yyoutput, ")");
 }
-#endif /* YYERROR_VERBOSE */
 
+#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
+yydestruct (yytype, yyvaluep)
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
 {
-  YYUSE (yyvaluep);
-
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
 
   switch (yytype)
     {
-      case 83: /* "maybe_media_list" */
+      case 83: /* maybe_media_list */
 
-	{ delete (yyvaluep->mediaList); (yyvaluep->mediaList) = 0; };
+        { delete yyvaluep->mediaList; yyvaluep->mediaList = 0; };
 
-	break;
-      case 84: /* "media_list" */
+        break;
+      case 84: /* media_list */
 
-	{ delete (yyvaluep->mediaList); (yyvaluep->mediaList) = 0; };
+        { delete yyvaluep->mediaList; yyvaluep->mediaList = 0; };
 
-	break;
-      case 86: /* "ruleset_list" */
+        break;
+      case 86: /* ruleset_list */
 
-	{ delete (yyvaluep->ruleList); (yyvaluep->ruleList) = 0; };
+        { delete yyvaluep->ruleList; yyvaluep->ruleList = 0; };
 
-	break;
-      case 93: /* "selector_list" */
+        break;
+      case 93: /* selector_list */
 
-	{ delete (yyvaluep->selectorList); (yyvaluep->selectorList) = 0; };
+        { delete yyvaluep->selectorList; yyvaluep->selectorList = 0; };
 
-	break;
-      case 94: /* "selector" */
+        break;
+      case 94: /* selector */
 
-	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
+        { delete yyvaluep->selector; yyvaluep->selector = 0; };
 
-	break;
-      case 96: /* "simple_selector" */
+        break;
+      case 96: /* simple_selector */
 
-	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
+        { delete yyvaluep->selector; yyvaluep->selector = 0; };
 
-	break;
-      case 98: /* "specifier_list" */
+        break;
+      case 98: /* specifier_list */
 
-	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
+        { delete yyvaluep->selector; yyvaluep->selector = 0; };
 
-	break;
-      case 99: /* "specifier" */
+        break;
+      case 99: /* specifier */
 
-	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
+        { delete yyvaluep->selector; yyvaluep->selector = 0; };
 
-	break;
-      case 100: /* "class" */
+        break;
+      case 100: /* class */
 
-	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
+        { delete yyvaluep->selector; yyvaluep->selector = 0; };
 
-	break;
-      case 102: /* "attrib" */
+        break;
+      case 102: /* attrib */
 
-	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
+        { delete yyvaluep->selector; yyvaluep->selector = 0; };
 
-	break;
-      case 105: /* "pseudo" */
+        break;
+      case 105: /* pseudo */
 
-	{ delete (yyvaluep->selector); (yyvaluep->selector) = 0; };
+        { delete yyvaluep->selector; yyvaluep->selector = 0; };
 
-	break;
-      case 111: /* "expr" */
+        break;
+      case 111: /* expr */
 
-	{ delete (yyvaluep->valueList); (yyvaluep->valueList) = 0; };
+        { delete yyvaluep->valueList; yyvaluep->valueList = 0; };
 
-	break;
+        break;
 
       default:
-	break;
+        break;
     }
 }
 
 
 /* Prevent warnings from -Wmissing-prototypes.  */
+
 #ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
+# if defined (__STDC__) || defined (__cplusplus)
 int yyparse (void *YYPARSE_PARAM);
-#else
+# else
 int yyparse ();
-#endif
+# endif
 #else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
+#if defined (__STDC__) || defined (__cplusplus)
 int yyparse (void);
 #else
 int yyparse ();
@@ -1620,23 +1303,23 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
+
+
+
+
 /*----------.
 | yyparse.  |
 `----------*/
 
 #ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
 #else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#if defined (__STDC__) || defined (__cplusplus)
 int
 yyparse (void)
 #else
@@ -1646,78 +1329,72 @@ yyparse ()
 #endif
 #endif
 {
-/* The lookahead symbol.  */
+  /* The lookahead symbol.  */
 int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
-    /* Number of syntax errors so far.  */
-    int yynerrs;
+/* Number of syntax errors so far.  */
+int yynerrs;
 
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
+  register int yystate;
+  register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
 
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
 
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
+  /* The state stack.  */
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  register short int *yyssp;
 
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
 
-    YYSIZE_T yystacksize;
 
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+
+#define YYPOPSTACK   (yyvsp--, yyssp--)
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule.  */
+  int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
+
   yyssp = yyss;
   yyvsp = yyvs;
 
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1725,7 +1402,8 @@ YYSTYPE yylval;
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
+     have just been pushed. so pushing a state here evens the stacks.
+     */
   yyssp++;
 
  yysetstate:
@@ -1738,19 +1416,21 @@ YYSTYPE yylval;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
+	/* Give user a chance to reallocate the stack. Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
+	short int *yyss1 = yyss;
+
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
+	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1758,23 +1438,24 @@ YYSTYPE yylval;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
+      goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+	goto yyoverflowlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
+	short int *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+	  goto yyoverflowlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1785,6 +1466,7 @@ YYSTYPE yylval;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
+
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1794,9 +1476,6 @@ YYSTYPE yylval;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
   goto yybackup;
 
 /*-----------.
@@ -1804,12 +1483,14 @@ YYSTYPE yylval;
 `-----------*/
 yybackup:
 
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+/* Do appropriate processing given the current state.  */
+/* Read a lookahead token if we need one and don't already have one.  */
+/* yyresume: */
 
   /* First try to decide what to do without reference to lookahead token.  */
+
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1829,7 +1510,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1840,26 +1521,31 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
+  if (yyn == YYFINAL)
+    YYACCEPT;
 
   /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+  /* Discard the token being shifted unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
 
-  yystate = yyn;
   *++yyvsp = yylval;
 
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  yystate = yyn;
   goto yynewstate;
 
 
@@ -1898,23 +1584,23 @@ yyreduce:
 
     {
         CSSParser *p = static_cast<CSSParser *>(parser);
-	p->rule = (yyvsp[(4) - (6)].rule);
-    }
+	p->rule = yyvsp[-2].rule;
+    ;}
     break;
 
   case 7:
 
     {
 	/* can be empty */
-    }
+    ;}
     break;
 
   case 8:
 
     {
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( (yyvsp[(4) - (5)].valueList) ) {
-	    p->valueList = (yyvsp[(4) - (5)].valueList);
+	if ( yyvsp[-1].valueList ) {
+	    p->valueList = yyvsp[-1].valueList;
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got property for " << p->id <<
 		(p->important?" important":"")<< endl;
@@ -1932,223 +1618,223 @@ yyreduce:
 #endif
 	delete p->valueList;
 	p->valueList = 0;
-    }
+    ;}
     break;
 
   case 15:
 
     {
 #ifdef CSS_DEBUG
-     kdDebug( 6080 ) << "charset rule: " << qString((yyvsp[(3) - (5)].string)) << endl;
+     kdDebug( 6080 ) << "charset rule: " << qString(yyvsp[-2].string) << endl;
 #endif
- }
+ ;}
     break;
 
   case 19:
 
     {
      CSSParser *p = static_cast<CSSParser *>(parser);
-     if ( (yyvsp[(2) - (3)].rule) && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
-	 p->styleElement->append( (yyvsp[(2) - (3)].rule) );
+     if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
+	 p->styleElement->append( yyvsp[-1].rule );
      } else {
-	 delete (yyvsp[(2) - (3)].rule);
+	 delete yyvsp[-1].rule;
      }
- }
+ ;}
     break;
 
   case 20:
 
     {
 #ifdef CSS_DEBUG
-	kdDebug( 6080 ) << "@import: " << qString((yyvsp[(3) - (6)].string)) << endl;
+	kdDebug( 6080 ) << "@import: " << qString(yyvsp[-3].string) << endl;
 #endif
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( (yyvsp[(5) - (6)].mediaList) && p->styleElement && p->styleElement->isCSSStyleSheet() )
-	    (yyval.rule) = new CSSImportRuleImpl( p->styleElement, domString((yyvsp[(3) - (6)].string)), (yyvsp[(5) - (6)].mediaList) );
+	if ( yyvsp[-1].mediaList && p->styleElement && p->styleElement->isCSSStyleSheet() )
+	    yyval.rule = new CSSImportRuleImpl( p->styleElement, domString(yyvsp[-3].string), yyvsp[-1].mediaList );
 	else
-	    (yyval.rule) = 0;
-    }
+	    yyval.rule = 0;
+    ;}
     break;
 
   case 21:
 
     {
-        (yyval.rule) = 0;
-    }
+        yyval.rule = 0;
+    ;}
     break;
 
   case 22:
 
     {
-        (yyval.rule) = 0;
-    }
+        yyval.rule = 0;
+    ;}
     break;
 
   case 25:
 
     {
 #ifdef CSS_DEBUG
-    kdDebug( 6080 ) << "@namespace: " << qString((yyvsp[(4) - (6)].string)) << endl;
+    kdDebug( 6080 ) << "@namespace: " << qString(yyvsp[-2].string) << endl;
 #endif
       CSSParser *p = static_cast<CSSParser *>(parser);
     if (p->styleElement && p->styleElement->isCSSStyleSheet())
-        static_cast<CSSStyleSheetImpl*>(p->styleElement)->addNamespace(p, domString((yyvsp[(3) - (6)].string)), domString((yyvsp[(4) - (6)].string)));
- }
+        static_cast<CSSStyleSheetImpl*>(p->styleElement)->addNamespace(p, domString(yyvsp[-3].string), domString(yyvsp[-2].string));
+ ;}
     break;
 
   case 28:
 
-    { (yyval.string).string = 0; }
+    { yyval.string.string = 0; ;}
     break;
 
   case 29:
 
-    { (yyval.string) = (yyvsp[(1) - (2)].string); }
+    { yyval.string = yyvsp[-1].string; ;}
     break;
 
   case 31:
 
     {
      CSSParser *p = static_cast<CSSParser *>(parser);
-     if ( (yyvsp[(2) - (3)].rule) && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
-	 p->styleElement->append( (yyvsp[(2) - (3)].rule) );
+     if ( yyvsp[-1].rule && p->styleElement && p->styleElement->isCSSStyleSheet() ) {
+	 p->styleElement->append( yyvsp[-1].rule );
      } else {
-	 delete (yyvsp[(2) - (3)].rule);
+	 delete yyvsp[-1].rule;
      }
- }
+ ;}
     break;
 
   case 38:
 
-    { delete (yyvsp[(1) - (2)].rule); (yyval.rule) = 0; }
+    { delete yyvsp[-1].rule; yyval.rule = 0; ;}
     break;
 
   case 41:
 
     {
-	(yyval.mediaList) = new MediaListImpl();
-    }
+	yyval.mediaList = new MediaListImpl();
+    ;}
     break;
 
   case 43:
 
     {
-	(yyval.mediaList) = new MediaListImpl();
-	(yyval.mediaList)->appendMedium( domString((yyvsp[(1) - (1)].string)).lower() );
-    }
+	yyval.mediaList = new MediaListImpl();
+	yyval.mediaList->appendMedium( domString(yyvsp[0].string).lower() );
+    ;}
     break;
 
   case 44:
 
     {
-	(yyval.mediaList) = (yyvsp[(1) - (4)].mediaList);
-	if ((yyval.mediaList))
-	    (yyval.mediaList)->appendMedium( domString((yyvsp[(4) - (4)].string)).lower() );
-    }
+	yyval.mediaList = yyvsp[-3].mediaList;
+	if (yyval.mediaList)
+	    yyval.mediaList->appendMedium( domString(yyvsp[0].string).lower() );
+    ;}
     break;
 
   case 45:
 
     {
-       delete (yyvsp[(1) - (2)].mediaList);
-       (yyval.mediaList) = 0;
-    }
+       delete yyvsp[-1].mediaList;
+       yyval.mediaList = 0;
+    ;}
     break;
 
   case 46:
 
     {
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( (yyvsp[(3) - (7)].mediaList) && (yyvsp[(6) - (7)].ruleList) &&
+	if ( yyvsp[-4].mediaList && yyvsp[-1].ruleList &&
 	     p->styleElement && p->styleElement->isCSSStyleSheet() ) {
-	    (yyval.rule) = new CSSMediaRuleImpl( static_cast<CSSStyleSheetImpl*>(p->styleElement), (yyvsp[(3) - (7)].mediaList), (yyvsp[(6) - (7)].ruleList) );
+	    yyval.rule = new CSSMediaRuleImpl( static_cast<CSSStyleSheetImpl*>(p->styleElement), yyvsp[-4].mediaList, yyvsp[-1].ruleList );
 	} else {
-	    (yyval.rule) = 0;
-	    delete (yyvsp[(3) - (7)].mediaList);
-	    delete (yyvsp[(6) - (7)].ruleList);
+	    yyval.rule = 0;
+	    delete yyvsp[-4].mediaList;
+	    delete yyvsp[-1].ruleList;
 	}
-    }
+    ;}
     break;
 
   case 47:
 
-    { (yyval.ruleList) = 0; }
+    { yyval.ruleList = 0; ;}
     break;
 
   case 48:
 
     {
-      (yyval.ruleList) = (yyvsp[(1) - (3)].ruleList);
-      if ( (yyvsp[(2) - (3)].rule) ) {
-	  if ( !(yyval.ruleList) ) (yyval.ruleList) = new CSSRuleListImpl();
-	  (yyval.ruleList)->append( (yyvsp[(2) - (3)].rule) );
+      yyval.ruleList = yyvsp[-2].ruleList;
+      if ( yyvsp[-1].rule ) {
+	  if ( !yyval.ruleList ) yyval.ruleList = new CSSRuleListImpl();
+	  yyval.ruleList->append( yyvsp[-1].rule );
       }
-  }
+  ;}
     break;
 
   case 49:
 
     {
-      (yyval.string) = (yyvsp[(1) - (2)].string);
-  }
+      yyval.string = yyvsp[-1].string;
+  ;}
     break;
 
   case 50:
 
     {
-      (yyval.rule) = 0;
-    }
+      yyval.rule = 0;
+    ;}
     break;
 
   case 51:
 
     {
-      (yyval.rule) = 0;
-    }
+      yyval.rule = 0;
+    ;}
     break;
 
   case 52:
 
     {
-      (yyval.rule) = 0;
-    }
+      yyval.rule = 0;
+    ;}
     break;
 
   case 53:
 
     {
-      (yyval.rule) = 0;
-    }
+      yyval.rule = 0;
+    ;}
     break;
 
   case 54:
 
-    { (yyval.relation) = CSSSelector::DirectAdjacent; }
+    { yyval.relation = CSSSelector::DirectAdjacent; ;}
     break;
 
   case 55:
 
-    { (yyval.relation) = CSSSelector::IndirectAdjacent; }
+    { yyval.relation = CSSSelector::IndirectAdjacent; ;}
     break;
 
   case 56:
 
-    { (yyval.relation) = CSSSelector::Child; }
+    { yyval.relation = CSSSelector::Child; ;}
     break;
 
   case 57:
 
-    { (yyval.relation) = CSSSelector::Descendant; }
+    { yyval.relation = CSSSelector::Descendant; ;}
     break;
 
   case 58:
 
-    { (yyval.val) = -1; }
+    { yyval.val = -1; ;}
     break;
 
   case 59:
 
-    { (yyval.val) = 1; }
+    { yyval.val = 1; ;}
     break;
 
   case 60:
@@ -2158,174 +1844,174 @@ yyreduce:
 	kdDebug( 6080 ) << "got ruleset" << endl << "  selector:" << endl;
 #endif
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( (yyvsp[(1) - (2)].selectorList) && (yyvsp[(2) - (2)].ok) && p->numParsedProperties ) {
+	if ( yyvsp[-1].selectorList && yyvsp[0].ok && p->numParsedProperties ) {
 	    CSSStyleRuleImpl *rule = new CSSStyleRuleImpl( p->styleElement );
 	    CSSStyleDeclarationImpl *decl = p->createStyleDeclaration( rule );
-	    rule->setSelector( (yyvsp[(1) - (2)].selectorList) );
+	    rule->setSelector( yyvsp[-1].selectorList );
 	    rule->setDeclaration(decl);
-	    (yyval.rule) = rule;
+	    yyval.rule = rule;
 	} else {
-	    (yyval.rule) = 0;
-	    delete (yyvsp[(1) - (2)].selectorList);
+	    yyval.rule = 0;
+	    delete yyvsp[-1].selectorList;
 	    p->clearProperties();
 	}
-    }
+    ;}
     break;
 
   case 61:
 
     {
-	if ( (yyvsp[(1) - (1)].selector) ) {
-	    (yyval.selectorList) = new TQPtrList<CSSSelector>;
-            (yyval.selectorList)->setAutoDelete( true );
+	if ( yyvsp[0].selector ) {
+	    yyval.selectorList = new TQPtrList<CSSSelector>;
+            yyval.selectorList->setAutoDelete( true );
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
-	    (yyvsp[(1) - (1)].selector)->print();
+	    yyvsp[0].selector->print();
 #endif
-	    (yyval.selectorList)->append( (yyvsp[(1) - (1)].selector) );
-	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), (yyvsp[(1) - (1)].selector));
+	    yyval.selectorList->append( yyvsp[0].selector );
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
 	} else {
-	    (yyval.selectorList) = 0;
+	    yyval.selectorList = 0;
 	}
-    }
+    ;}
     break;
 
   case 62:
 
     {
-	if ( (yyvsp[(1) - (4)].selectorList) && (yyvsp[(4) - (4)].selector) ) {
-	    (yyval.selectorList) = (yyvsp[(1) - (4)].selectorList);
-	    (yyval.selectorList)->append( (yyvsp[(4) - (4)].selector) );
-	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), (yyvsp[(4) - (4)].selector));
+	if ( yyvsp[-3].selectorList && yyvsp[0].selector ) {
+	    yyval.selectorList = yyvsp[-3].selectorList;
+	    yyval.selectorList->append( yyvsp[0].selector );
+	    tdehtml::CSSStyleSelector::precomputeAttributeDependencies(static_cast<CSSParser *>(parser)->document(), yyvsp[0].selector);
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
-	    (yyvsp[(4) - (4)].selector)->print();
+	    yyvsp[0].selector->print();
 #endif
 	} else {
-	    delete (yyvsp[(1) - (4)].selectorList);
-	    delete (yyvsp[(4) - (4)].selector);
-	    (yyval.selectorList) = 0;
+	    delete yyvsp[-3].selectorList;
+	    delete yyvsp[0].selector;
+	    yyval.selectorList = 0;
 	}
-    }
+    ;}
     break;
 
   case 63:
 
     {
-	delete (yyvsp[(1) - (2)].selectorList);
-	(yyval.selectorList) = 0;
-    }
+	delete yyvsp[-1].selectorList;
+	yyval.selectorList = 0;
+    ;}
     break;
 
   case 64:
 
     {
-	(yyval.selector) = (yyvsp[(1) - (1)].selector);
-    }
+	yyval.selector = yyvsp[0].selector;
+    ;}
     break;
 
   case 65:
 
     {
-	if ( !(yyvsp[(1) - (3)].selector) || !(yyvsp[(3) - (3)].selector) ) {
-	    delete (yyvsp[(1) - (3)].selector);
-	    delete (yyvsp[(3) - (3)].selector);
-	    (yyval.selector) = 0;
+	if ( !yyvsp[-2].selector || !yyvsp[0].selector ) {
+	    delete yyvsp[-2].selector;
+	    delete yyvsp[0].selector;
+	    yyval.selector = 0;
 	} else {
-	    (yyval.selector) = (yyvsp[(3) - (3)].selector);
-	    CSSSelector *end = (yyvsp[(3) - (3)].selector);
+	    yyval.selector = yyvsp[0].selector;
+	    CSSSelector *end = yyvsp[0].selector;
 	    while( end->tagHistory )
 		end = end->tagHistory;
-	    end->relation = (yyvsp[(2) - (3)].relation);
-	    end->tagHistory = (yyvsp[(1) - (3)].selector);
+	    end->relation = yyvsp[-1].relation;
+	    end->tagHistory = yyvsp[-2].selector;
 	}
-    }
+    ;}
     break;
 
   case 66:
 
     {
-	delete (yyvsp[(1) - (2)].selector);
-	(yyval.selector) = 0;
-    }
+	delete yyvsp[-1].selector;
+	yyval.selector = 0;
+    ;}
     break;
 
   case 67:
 
-    { (yyval.string).string = 0; (yyval.string).length = 0; }
+    { yyval.string.string = 0; yyval.string.length = 0; ;}
     break;
 
   case 68:
 
-    { static unsigned short star = '*'; (yyval.string).string = &star; (yyval.string).length = 1; }
+    { static unsigned short star = '*'; yyval.string.string = &star; yyval.string.length = 1; ;}
     break;
 
   case 69:
 
-    { (yyval.string) = (yyvsp[(1) - (2)].string); }
+    { yyval.string = yyvsp[-1].string; ;}
     break;
 
   case 70:
 
     {
-	(yyval.selector) = new CSSSelector();
-	(yyval.selector)->tag = (yyvsp[(1) - (2)].element);
-    }
+	yyval.selector = new CSSSelector();
+	yyval.selector->tag = yyvsp[-1].element;
+    ;}
     break;
 
   case 71:
 
     {
-	(yyval.selector) = (yyvsp[(2) - (3)].selector);
-        if ( (yyval.selector) )
-	    (yyval.selector)->tag = (yyvsp[(1) - (3)].element);
-    }
+	yyval.selector = yyvsp[-1].selector;
+        if ( yyval.selector )
+	    yyval.selector->tag = yyvsp[-2].element;
+    ;}
     break;
 
   case 72:
 
     {
-	(yyval.selector) = (yyvsp[(1) - (2)].selector);
-        if ( (yyval.selector) )
-            (yyval.selector)->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
-    }
+	yyval.selector = yyvsp[-1].selector;
+        if ( yyval.selector )
+            yyval.selector->tag = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
+    ;}
     break;
 
   case 73:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->tag = (yyvsp[(2) - (3)].element);
+        yyval.selector = new CSSSelector();
+        yyval.selector->tag = yyvsp[-1].element;
 	CSSParser *p = static_cast<CSSParser *>(parser);
         if (p->styleElement && p->styleElement->isCSSStyleSheet())
-            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->tag, domString((yyvsp[(1) - (3)].string)));
-    }
+            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->tag, domString(yyvsp[-2].string));
+    ;}
     break;
 
   case 74:
 
     {
-        (yyval.selector) = (yyvsp[(3) - (4)].selector);
-        if ((yyval.selector)) {
-            (yyval.selector)->tag = (yyvsp[(2) - (4)].element);
+        yyval.selector = yyvsp[-1].selector;
+        if (yyval.selector) {
+            yyval.selector->tag = yyvsp[-2].element;
             CSSParser *p = static_cast<CSSParser *>(parser);
             if (p->styleElement && p->styleElement->isCSSStyleSheet())
-                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->tag, domString((yyvsp[(1) - (4)].string)));
+                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->tag, domString(yyvsp[-3].string));
         }
-    }
+    ;}
     break;
 
   case 75:
 
     {
-        (yyval.selector) = (yyvsp[(2) - (3)].selector);
-        if ((yyval.selector)) {
-            (yyval.selector)->tag = makeId(anyNamespace, anyLocalName);
+        yyval.selector = yyvsp[-1].selector;
+        if (yyval.selector) {
+            yyval.selector->tag = makeId(anyNamespace, anyLocalName);
             CSSParser *p = static_cast<CSSParser *>(parser);
             if (p->styleElement && p->styleElement->isCSSStyleSheet())
-                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->tag, domString((yyvsp[(1) - (3)].string)));
+                static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->tag, domString(yyvsp[-2].string));
         }
-    }
+    ;}
     break;
 
   case 76:
@@ -2333,76 +2019,76 @@ yyreduce:
     {
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
-	QString tag = qString((yyvsp[(1) - (1)].string));
+	TQString tag = qString(yyvsp[0].string);
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		tag = tag.lower();
 	    const DOMString dtag(tag);
-            (yyval.element) = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
+            yyval.element = makeId(p->defaultNamespace(), doc->getId(NodeImpl::ElementId, dtag.implementation(), false, true));
 	} else {
-	    (yyval.element) = makeId(p->defaultNamespace(), tdehtml::getTagID(tag.lower().ascii(), tag.length()));
+	    yyval.element = makeId(p->defaultNamespace(), tdehtml::getTagID(tag.lower().ascii(), tag.length()));
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown tags
 // 	    assert($$ != 0);
 	}
-    }
+    ;}
     break;
 
   case 77:
 
     {
-	(yyval.element) = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
-    }
+	yyval.element = makeId(static_cast<CSSParser*>(parser)->defaultNamespace(), anyLocalName);
+    ;}
     break;
 
   case 78:
 
     {
-	(yyval.selector) = (yyvsp[(1) - (1)].selector);
-	(yyval.selector)->nonCSSHint = static_cast<CSSParser *>(parser)->nonCSSHint;
-    }
+	yyval.selector = yyvsp[0].selector;
+	yyval.selector->nonCSSHint = static_cast<CSSParser *>(parser)->nonCSSHint;
+    ;}
     break;
 
   case 79:
 
     {
-	(yyval.selector) = (yyvsp[(1) - (2)].selector);
-	if ( (yyval.selector) ) {
-            CSSSelector *end = (yyvsp[(1) - (2)].selector);
+	yyval.selector = yyvsp[-1].selector;
+	if ( yyval.selector ) {
+            CSSSelector *end = yyvsp[-1].selector;
             while( end->tagHistory )
                 end = end->tagHistory;
             end->relation = CSSSelector::SubSelector;
-            end->tagHistory = (yyvsp[(2) - (2)].selector);
+            end->tagHistory = yyvsp[0].selector;
 	}
-    }
+    ;}
     break;
 
   case 80:
 
     {
-	delete (yyvsp[(1) - (2)].selector);
-	(yyval.selector) = 0;
-    }
+	delete yyvsp[-1].selector;
+	yyval.selector = 0;
+    ;}
     break;
 
   case 81:
 
     {
-	(yyval.selector) = new CSSSelector();
-	(yyval.selector)->match = CSSSelector::Id;
-	(yyval.selector)->attr = ATTR_ID;
-	(yyval.selector)->value = domString((yyvsp[(1) - (1)].string));
-    }
+	yyval.selector = new CSSSelector();
+	yyval.selector->match = CSSSelector::Id;
+	yyval.selector->attr = ATTR_ID;
+	yyval.selector->value = domString(yyvsp[0].string);
+    ;}
     break;
 
   case 85:
 
     {
-	(yyval.selector) = new CSSSelector();
-	(yyval.selector)->match = CSSSelector::Class;
-	(yyval.selector)->attr = ATTR_CLASS;
-	(yyval.selector)->value = domString((yyvsp[(2) - (2)].string));
-    }
+	yyval.selector = new CSSSelector();
+	yyval.selector->match = CSSSelector::Class;
+	yyval.selector->attr = ATTR_CLASS;
+	yyval.selector->value = domString(yyvsp[0].string);
+    ;}
     break;
 
   case 86:
@@ -2411,572 +2097,564 @@ yyreduce:
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
 
-	QString attr = qString((yyvsp[(1) - (2)].string));
+	TQString attr = qString(yyvsp[-1].string);
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		attr = attr.lower();
 	    const DOMString dattr(attr);
 #ifdef APPLE_CHANGES
-            (yyval.attribute) = doc->attrId(0, dattr.implementation(), false);
+            yyval.attribute = doc->attrId(0, dattr.implementation(), false);
 #else
-	    (yyval.attribute) = doc->getId(NodeImpl::AttributeId, dattr.implementation(), false, true);
+	    yyval.attribute = doc->getId(NodeImpl::AttributeId, dattr.implementation(), false, true);
 #endif
 	} else {
-	    (yyval.attribute) = tdehtml::getAttrID(attr.lower().ascii(), attr.length());
+	    yyval.attribute = tdehtml::getAttrID(attr.lower().ascii(), attr.length());
 	    // this case should never happen - only when loading
 	    // the default stylesheet - which must not contain unknown attributes
-	    assert((yyval.attribute) != 0);
+	    assert(yyval.attribute != 0);
 	    }
-    }
+    ;}
     break;
 
   case 87:
 
     {
-	(yyval.selector) = new CSSSelector();
-	(yyval.selector)->attr = (yyvsp[(3) - (4)].attribute);
-	(yyval.selector)->match = CSSSelector::Set;
-    }
+	yyval.selector = new CSSSelector();
+	yyval.selector->attr = yyvsp[-1].attribute;
+	yyval.selector->match = CSSSelector::Set;
+    ;}
     break;
 
   case 88:
 
     {
-	(yyval.selector) = new CSSSelector();
-	(yyval.selector)->attr = (yyvsp[(3) - (8)].attribute);
-	(yyval.selector)->match = (yyvsp[(4) - (8)].match);
-	(yyval.selector)->value = domString((yyvsp[(6) - (8)].string));
-    }
+	yyval.selector = new CSSSelector();
+	yyval.selector->attr = yyvsp[-5].attribute;
+	yyval.selector->match = yyvsp[-4].match;
+	yyval.selector->value = domString(yyvsp[-2].string);
+    ;}
     break;
 
   case 89:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->attr = (yyvsp[(4) - (5)].attribute);
-        (yyval.selector)->match = CSSSelector::Set;
+        yyval.selector = new CSSSelector();
+        yyval.selector->attr = yyvsp[-1].attribute;
+        yyval.selector->match = CSSSelector::Set;
         CSSParser *p = static_cast<CSSParser *>(parser);
         if (p->styleElement && p->styleElement->isCSSStyleSheet())
-            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->attr, domString((yyvsp[(3) - (5)].string)));
-    }
+            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-2].string));
+    ;}
     break;
 
   case 90:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->attr = (yyvsp[(4) - (9)].attribute);
-        (yyval.selector)->match = (CSSSelector::Match)(yyvsp[(5) - (9)].match);
-        (yyval.selector)->value = domString((yyvsp[(7) - (9)].string));
+        yyval.selector = new CSSSelector();
+        yyval.selector->attr = yyvsp[-5].attribute;
+        yyval.selector->match = (CSSSelector::Match)yyvsp[-4].match;
+        yyval.selector->value = domString(yyvsp[-2].string);
         CSSParser *p = static_cast<CSSParser *>(parser);
         if (p->styleElement && p->styleElement->isCSSStyleSheet())
-            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace((yyval.selector)->attr, domString((yyvsp[(3) - (9)].string)));
-   }
+            static_cast<CSSStyleSheetImpl*>(p->styleElement)->determineNamespace(yyval.selector->attr, domString(yyvsp[-6].string));
+   ;}
     break;
 
   case 91:
 
     {
-	(yyval.match) = CSSSelector::Exact;
-    }
+	yyval.match = CSSSelector::Exact;
+    ;}
     break;
 
   case 92:
 
     {
-	(yyval.match) = CSSSelector::List;
-    }
+	yyval.match = CSSSelector::List;
+    ;}
     break;
 
   case 93:
 
     {
-	(yyval.match) = CSSSelector::Hyphen;
-    }
+	yyval.match = CSSSelector::Hyphen;
+    ;}
     break;
 
   case 94:
 
     {
-	(yyval.match) = CSSSelector::Begin;
-    }
+	yyval.match = CSSSelector::Begin;
+    ;}
     break;
 
   case 95:
 
     {
-	(yyval.match) = CSSSelector::End;
-    }
+	yyval.match = CSSSelector::End;
+    ;}
     break;
 
   case 96:
 
     {
-	(yyval.match) = CSSSelector::Contain;
-    }
+	yyval.match = CSSSelector::Contain;
+    ;}
     break;
 
   case 99:
 
     {
-	(yyval.selector) = new CSSSelector();
-	(yyval.selector)->match = CSSSelector::PseudoClass;
-	(yyval.selector)->value = domString((yyvsp[(2) - (2)].string));
-    }
+	yyval.selector = new CSSSelector();
+	yyval.selector->match = CSSSelector::PseudoClass;
+	yyval.selector->value = domString(yyvsp[0].string);
+    ;}
     break;
 
   case 100:
 
     {
-	(yyval.selector) = new CSSSelector();
-	(yyval.selector)->match = CSSSelector::PseudoElement;
-        (yyval.selector)->value = domString((yyvsp[(3) - (3)].string));
-    }
+	yyval.selector = new CSSSelector();
+	yyval.selector->match = CSSSelector::PseudoElement;
+        yyval.selector->value = domString(yyvsp[0].string);
+    ;}
     break;
 
   case 101:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->match = CSSSelector::PseudoClass;
-        (yyval.selector)->string_arg = domString((yyvsp[(3) - (4)].string));
-        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
-    }
+        yyval.selector = new CSSSelector();
+        yyval.selector->match = CSSSelector::PseudoClass;
+        yyval.selector->string_arg = domString(yyvsp[-1].string);
+        yyval.selector->value = domString(yyvsp[-2].string);
+    ;}
     break;
 
   case 102:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->match = CSSSelector::PseudoClass;
-        (yyval.selector)->string_arg = QString::number((yyvsp[(3) - (4)].val));
-        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
-    }
+        yyval.selector = new CSSSelector();
+        yyval.selector->match = CSSSelector::PseudoClass;
+        yyval.selector->string_arg = TQString::number(yyvsp[-1].val);
+        yyval.selector->value = domString(yyvsp[-2].string);
+    ;}
     break;
 
   case 103:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->match = CSSSelector::PseudoClass;
-        (yyval.selector)->string_arg = domString((yyvsp[(3) - (4)].string));
-        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
-    }
+        yyval.selector = new CSSSelector();
+        yyval.selector->match = CSSSelector::PseudoClass;
+        yyval.selector->string_arg = domString(yyvsp[-1].string);
+        yyval.selector->value = domString(yyvsp[-2].string);
+    ;}
     break;
 
   case 104:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->match = CSSSelector::PseudoClass;
-        (yyval.selector)->string_arg = domString((yyvsp[(3) - (4)].string));
-        (yyval.selector)->value = domString((yyvsp[(2) - (4)].string));
-    }
+        yyval.selector = new CSSSelector();
+        yyval.selector->match = CSSSelector::PseudoClass;
+        yyval.selector->string_arg = domString(yyvsp[-1].string);
+        yyval.selector->value = domString(yyvsp[-2].string);
+    ;}
     break;
 
   case 105:
 
     {
-        (yyval.selector) = new CSSSelector();
-        (yyval.selector)->match = CSSSelector::PseudoClass;
-        (yyval.selector)->simpleSelector = (yyvsp[(4) - (5)].selector);
-        (yyval.selector)->value = domString((yyvsp[(2) - (5)].string));
-    }
+        yyval.selector = new CSSSelector();
+        yyval.selector->match = CSSSelector::PseudoClass;
+        yyval.selector->simpleSelector = yyvsp[-1].selector;
+        yyval.selector->value = domString(yyvsp[-3].string);
+    ;}
     break;
 
   case 106:
 
     {
-	(yyval.ok) = (yyvsp[(3) - (4)].ok);
-    }
+	yyval.ok = yyvsp[-1].ok;
+    ;}
     break;
 
   case 107:
 
     {
-	(yyval.ok) = false;
-    }
+	yyval.ok = false;
+    ;}
     break;
 
   case 108:
 
     {
-	(yyval.ok) = (yyvsp[(3) - (4)].ok);
-    }
+	yyval.ok = yyvsp[-1].ok;
+    ;}
     break;
 
   case 109:
 
     {
-	(yyval.ok) = (yyvsp[(3) - (5)].ok);
-	if ( (yyvsp[(4) - (5)].ok) )
-	    (yyval.ok) = (yyvsp[(4) - (5)].ok);
-    }
+	yyval.ok = yyvsp[-2].ok;
+	if ( yyvsp[-1].ok )
+	    yyval.ok = yyvsp[-1].ok;
+    ;}
     break;
 
   case 110:
 
     {
-	(yyval.ok) = (yyvsp[(3) - (5)].ok);
-    }
+	yyval.ok = yyvsp[-2].ok;
+    ;}
     break;
 
   case 111:
 
     {
-	(yyval.ok) = (yyvsp[(1) - (3)].ok);
-    }
+	yyval.ok = yyvsp[-2].ok;
+    ;}
     break;
 
   case 112:
 
     {
-        (yyval.ok) = false;
-    }
+        yyval.ok = false;
+    ;}
     break;
 
   case 113:
 
     {
-	(yyval.ok) = (yyvsp[(1) - (4)].ok);
-	if ( (yyvsp[(2) - (4)].ok) )
-	    (yyval.ok) = (yyvsp[(2) - (4)].ok);
-    }
+	yyval.ok = yyvsp[-3].ok;
+	if ( yyvsp[-2].ok )
+	    yyval.ok = yyvsp[-2].ok;
+    ;}
     break;
 
   case 114:
 
     {
-        (yyval.ok) = (yyvsp[(1) - (4)].ok);
-    }
+        yyval.ok = yyvsp[-3].ok;
+    ;}
     break;
 
   case 115:
 
     {
-	(yyval.ok) = false;
+	yyval.ok = false;
 	CSSParser *p = static_cast<CSSParser *>(parser);
-	if ( (yyvsp[(1) - (5)].prop_id) && (yyvsp[(4) - (5)].valueList) ) {
-	    p->valueList = (yyvsp[(4) - (5)].valueList);
+	if ( yyvsp[-4].prop_id && yyvsp[-1].valueList ) {
+	    p->valueList = yyvsp[-1].valueList;
 #ifdef CSS_DEBUG
-	    kdDebug( 6080 ) << "   got property: " << (yyvsp[(1) - (5)].prop_id) <<
-		((yyvsp[(5) - (5)].b)?" important":"")<< endl;
+	    kdDebug( 6080 ) << "   got property: " << yyvsp[-4].prop_id <<
+		(yyvsp[0].b?" important":"")<< endl;
 #endif
-	        bool ok = p->parseValue( (yyvsp[(1) - (5)].prop_id), (yyvsp[(5) - (5)].b) );
+	        bool ok = p->parseValue( yyvsp[-4].prop_id, yyvsp[0].b );
                 if ( ok )
-		    (yyval.ok) = ok;
+		    yyval.ok = ok;
 #ifdef CSS_DEBUG
 	        else
 		    kdDebug( 6080 ) << "     couldn't parse value!" << endl;
 #endif
 	} else {
-            delete (yyvsp[(4) - (5)].valueList);
+            delete yyvsp[-1].valueList;
         }
 	delete p->valueList;
 	p->valueList = 0;
-    }
+    ;}
     break;
 
   case 116:
 
     {
-        (yyval.ok) = false;
-    }
+        yyval.ok = false;
+    ;}
     break;
 
   case 117:
 
     {
-	QString str = qString((yyvsp[(1) - (2)].string));
-	(yyval.prop_id) = getPropertyID( str.lower().latin1(), str.length() );
-    }
+	TQString str = qString(yyvsp[-1].string);
+	yyval.prop_id = getPropertyID( str.lower().latin1(), str.length() );
+    ;}
     break;
 
   case 118:
 
-    { (yyval.b) = true; }
+    { yyval.b = true; ;}
     break;
 
   case 119:
 
-    { (yyval.b) = false; }
+    { yyval.b = false; ;}
     break;
 
   case 120:
 
     {
-	(yyval.valueList) = new ValueList;
-	(yyval.valueList)->addValue( (yyvsp[(1) - (1)].value) );
-    }
+	yyval.valueList = new ValueList;
+	yyval.valueList->addValue( yyvsp[0].value );
+    ;}
     break;
 
   case 121:
 
     {
-	(yyval.valueList) = (yyvsp[(1) - (3)].valueList);
-	if ( (yyval.valueList) ) {
-	    if ( (yyvsp[(2) - (3)].tok) ) {
+	yyval.valueList = yyvsp[-2].valueList;
+	if ( yyval.valueList ) {
+	    if ( yyvsp[-1].tok ) {
 		Value v;
 		v.id = 0;
 		v.unit = Value::Operator;
-		v.iValue = (yyvsp[(2) - (3)].tok);
-		(yyval.valueList)->addValue( v );
+		v.iValue = yyvsp[-1].tok;
+		yyval.valueList->addValue( v );
 	    }
-	    (yyval.valueList)->addValue( (yyvsp[(3) - (3)].value) );
+	    yyval.valueList->addValue( yyvsp[0].value );
 	}
-    }
+    ;}
     break;
 
   case 122:
 
     {
-	(yyval.tok) = '/';
-    }
+	yyval.tok = '/';
+    ;}
     break;
 
   case 123:
 
     {
-	(yyval.tok) = ',';
-    }
+	yyval.tok = ',';
+    ;}
     break;
 
   case 124:
 
     {
-        (yyval.tok) = 0;
-  }
+        yyval.tok = 0;
+  ;}
     break;
 
   case 125:
 
-    { (yyval.value) = (yyvsp[(1) - (1)].value); }
+    { yyval.value = yyvsp[0].value; ;}
     break;
 
   case 126:
 
-    { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].val); }
+    { yyval.value = yyvsp[0].value; yyval.value.fValue *= yyvsp[-1].val; ;}
     break;
 
   case 127:
 
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; }
+    { yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_DIMENSION; ;}
     break;
 
   case 128:
 
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; }
+    { yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_STRING; ;}
     break;
 
   case 129:
 
     {
-      QString str = qString( (yyvsp[(1) - (2)].string) );
-      (yyval.value).id = getValueID( str.lower().latin1(), str.length() );
-      (yyval.value).unit = CSSPrimitiveValue::CSS_IDENT;
-      (yyval.value).string = (yyvsp[(1) - (2)].string);
-  }
+      TQString str = qString( yyvsp[-1].string );
+      yyval.value.id = getValueID( str.lower().latin1(), str.length() );
+      yyval.value.unit = CSSPrimitiveValue::CSS_IDENT;
+      yyval.value.string = yyvsp[-1].string;
+  ;}
     break;
 
   case 130:
 
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; }
+    { yyval.value.id = 0; yyval.value.string = yyvsp[-1].string; yyval.value.unit = CSSPrimitiveValue::CSS_URI; ;}
     break;
 
   case 131:
 
-    { (yyval.value).id = 0; (yyval.value).iValue = 0; (yyval.value).unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ }
+    { yyval.value.id = 0; yyval.value.iValue = 0; yyval.value.unit = CSSPrimitiveValue::CSS_UNKNOWN;/* ### */ ;}
     break;
 
   case 132:
 
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (1)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_RGBCOLOR; }
+    { yyval.value.id = 0; yyval.value.string = yyvsp[0].string; yyval.value.unit = CSSPrimitiveValue::CSS_RGBCOLOR; ;}
     break;
 
   case 133:
 
     {
-      (yyval.value) = (yyvsp[(1) - (1)].value);
-  }
+      yyval.value = yyvsp[0].value;
+  ;}
     break;
 
   case 134:
 
-    { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; }
+    { yyval.value.id = 0; yyval.value.isInt = true; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;}
     break;
 
   case 135:
 
-    { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; }
+    { yyval.value.id = 0; yyval.value.isInt = false; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_NUMBER; ;}
     break;
 
   case 136:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;}
     break;
 
   case 137:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PX; ;}
     break;
 
   case 138:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_CM; ;}
     break;
 
   case 139:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MM; ;}
     break;
 
   case 140:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_IN; ;}
     break;
 
   case 141:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PT; ;}
     break;
 
   case 142:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_PC; ;}
     break;
 
   case 143:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_DEG; ;}
     break;
 
   case 144:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_RAD; ;}
     break;
 
   case 145:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_GRAD; ;}
     break;
 
   case 146:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_MS; ;}
     break;
 
   case 147:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_S; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_S; ;}
     break;
 
   case 148:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_HZ; ;}
     break;
 
   case 149:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_KHZ; ;}
     break;
 
   case 150:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EMS; ;}
     break;
 
   case 151:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = Value::Q_EMS; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = Value::Q_EMS; ;}
     break;
 
   case 152:
 
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].val); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; }
+    { yyval.value.id = 0; yyval.value.fValue = yyvsp[-1].val; yyval.value.unit = CSSPrimitiveValue::CSS_EXS; ;}
     break;
 
   case 153:
 
     {
       Function *f = new Function;
-      f->name = (yyvsp[(1) - (5)].string);
-      f->args = (yyvsp[(3) - (5)].valueList);
-      (yyval.value).id = 0;
-      (yyval.value).unit = Value::Function;
-      (yyval.value).function = f;
-  }
+      f->name = yyvsp[-4].string;
+      f->args = yyvsp[-2].valueList;
+      yyval.value.id = 0;
+      yyval.value.unit = Value::Function;
+      yyval.value.function = f;
+  ;}
     break;
 
   case 154:
 
     {
       Function *f = new Function;
-      f->name = (yyvsp[(1) - (3)].string);
+      f->name = yyvsp[-2].string;
       f->args = 0;
-      (yyval.value).id = 0;
-      (yyval.value).unit = Value::Function;
-      (yyval.value).function = f;
-  }
+      yyval.value.id = 0;
+      yyval.value.unit = Value::Function;
+      yyval.value.function = f;
+  ;}
     break;
 
   case 155:
 
-    { (yyval.string) = (yyvsp[(1) - (2)].string); }
+    { yyval.string = yyvsp[-1].string; ;}
     break;
 
   case 156:
 
     {
-	(yyval.rule) = 0;
+	yyval.rule = 0;
 #ifdef CSS_DEBUG
 	kdDebug( 6080 ) << "skipped invalid @-rule" << endl;
 #endif
-    }
+    ;}
     break;
 
   case 157:
 
     {
-	(yyval.rule) = 0;
+	yyval.rule = 0;
 #ifdef CSS_DEBUG
 	kdDebug( 6080 ) << "skipped invalid @-rule" << endl;
 #endif
-    }
+    ;}
     break;
 
   case 158:
 
     {
-	(yyval.rule) = 0;
+	yyval.rule = 0;
 #ifdef CSS_DEBUG
 	kdDebug( 6080 ) << "skipped invalid rule" << endl;
 #endif
-    }
+    ;}
     break;
 
 
-
-      default: break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
+
+/* Line 1010 of yacc.c.  */
+
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+
+
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
+
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -2996,48 +2674,70 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
+#if YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
+	{
+	  YYSIZE_T yysize = 0;
+	  int yytype = YYTRANSLATE (yychar);
+	  const char* yyprefix;
+	  char *yymsg;
+	  int yyx;
+
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = YYLAST - yyn;
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	  int yycount = 0;
+
+	  yyprefix = ", expecting ";
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	      {
+		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+		yycount += 1;
+		if (yycount == 5)
+		  {
+		    yysize = 0;
+		    break;
+		  }
+	      }
+	  yysize += (sizeof ("syntax error, unexpected ")
+		     + yystrlen (yytname[yytype]));
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
+	    {
+	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[yytype]);
+
+	      if (yycount < 5)
+		{
+		  yyprefix = ", expecting ";
+		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+		      {
+			yyp = yystpcpy (yyp, yyprefix);
+			yyp = yystpcpy (yyp, yytname[yyx]);
+			yyprefix = " or ";
+		      }
+		}
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
+	    }
+	  else
+	    yyerror ("syntax error; also virtual memory exhausted");
+	}
+      else
+#endif /* YYERROR_VERBOSE */
+	yyerror ("syntax error");
     }
 
 
@@ -3048,16 +2748,25 @@ yyerrlab:
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
+        {
+          /* If at end of input, pop the error token,
+	     then the rest of the stack, then return failure.  */
 	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+	     for (;;)
+	       {
+		 YYPOPSTACK;
+		 if (yyssp == yyss)
+		   YYABORT;
+		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+		 yydestruct (yystos[*yyssp], yyvsp);
+	       }
+        }
       else
 	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
+	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+	  yydestruct (yytoken, &yylval);
 	  yychar = YYEMPTY;
+
 	}
     }
 
@@ -3071,17 +2780,15 @@ yyerrlab:
 `---------------------------------------------------*/
 yyerrorlab:
 
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
+#ifdef __GNUC__
+  /* Pacify GCC when the user code never invokes YYERROR and the label
+     yyerrorlab therefore never appears in user code.  */
+  if (0)
      goto yyerrorlab;
+#endif
 
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
+  yyvsp -= yylen;
+  yyssp -= yylen;
   yystate = *yyssp;
   goto yyerrlab1;
 
@@ -3095,7 +2802,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
+      if (yyn != YYPACT_NINF)
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -3110,19 +2817,20 @@ yyerrlab1:
       if (yyssp == yyss)
 	YYABORT;
 
-
-      yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp);
+      YYPOPSTACK;
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  *++yyvsp = yylval;
+  if (yyn == YYFINAL)
+    YYACCEPT;
 
+  YYDPRINTF ((stderr, "Shifting error token, "));
+
+  *++yyvsp = yylval;
 
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -3142,45 +2850,22 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
-    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
 
 
diff --git a/tdehtml/css/parser.h b/tdehtml/css/parser.h
index 251c1b0c6..2920fd9de 100644
--- a/tdehtml/css/parser.h
+++ b/tdehtml/css/parser.h
@@ -1,35 +1,28 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
-
-/* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
+/* A Bison parser, made by GNU Bison 1.875d.  */
 
+/*  Skeleton parser for Yacc-like parsing with Bison,
+    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -85,14 +78,59 @@
      UNICODERANGE = 303
    };
 #endif
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-
+#define UNIMPORTANT_TOK 258
+#define S 259
+#define SGML_CD 260
+#define INCLUDES 261
+#define DASHMATCH 262
+#define BEGINSWITH 263
+#define ENDSWITH 264
+#define CONTAINS 265
+#define STRING 266
+#define IDENT 267
+#define NTH 268
+#define HASH 269
+#define IMPORT_SYM 270
+#define PAGE_SYM 271
+#define MEDIA_SYM 272
+#define FONT_FACE_SYM 273
+#define CHARSET_SYM 274
+#define NAMESPACE_SYM 275
+#define TDEHTML_RULE_SYM 276
+#define TDEHTML_DECLS_SYM 277
+#define TDEHTML_VALUE_SYM 278
+#define IMPORTANT_SYM 279
+#define QEMS 280
+#define EMS 281
+#define EXS 282
+#define PXS 283
+#define CMS 284
+#define MMS 285
+#define INS 286
+#define PTS 287
+#define PCS 288
+#define DEGS 289
+#define RADS 290
+#define GRADS 291
+#define MSECS 292
+#define SECS 293
+#define HERZ 294
+#define KHERZ 295
+#define DIMEN 296
+#define PERCENTAGE 297
+#define FLOAT 298
+#define INTEGER 299
+#define URI 300
+#define FUNCTION 301
+#define NOTFUNCTION 302
+#define UNICODERANGE 303
+
+
+
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+
+typedef union YYSTYPE {
     CSSRuleImpl *rule;
     CSSSelector *selector;
     TQPtrList<CSSSelector> *selectorList;
@@ -112,15 +150,15 @@ typedef union YYSTYPE
     char tok;
     Value value;
     ValueList *valueList;
-
-
-
 } YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
+/* Line 1285 of yacc.c.  */
+
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
 
+
diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y
index 9bb993ac1..6d8b18e9a 100644
--- a/tdehtml/css/parser.y
+++ b/tdehtml/css/parser.y
@@ -86,7 +86,7 @@ static inline int getValueID(const char *tagStr, int len)
 %union {
     CSSRuleImpl *rule;
     CSSSelector *selector;
-    TQPtrList<CSSSelector> *selectorList;
+    QPtrList<CSSSelector> *selectorList;
     bool ok;
     MediaListImpl *mediaList;
     CSSMediaRuleImpl *mediaRule;
@@ -525,7 +525,7 @@ ruleset:
 selector_list:
     selector %prec UNIMPORTANT_TOK {
 	if ( $1 ) {
-	    $$ = new TQPtrList<CSSSelector>;
+	    $$ = new QPtrList<CSSSelector>;
             $$->setAutoDelete( true );
 #ifdef CSS_DEBUG
 	    kdDebug( 6080 ) << "   got simple selector:" << endl;
diff --git a/tdehtml/css/quirks.css b/tdehtml/css/quirks.css
index b979b77c9..69da699c1 100644
--- a/tdehtml/css/quirks.css
+++ b/tdehtml/css/quirks.css
@@ -21,10 +21,10 @@ img[align="right"] {
 table {
     white-space: normal;
     line-height: normal;
-    color: -tdehtml-text;
+    color: -khtml-text;
     font-size: medium;
     empty-cells: hide;
-    text-align: -tdehtml-auto;
+    text-align: -khtml-auto;
     font-weight: initial;
 }
 
diff --git a/tdehtml/css/tokenizer.cpp b/tdehtml/css/tokenizer.cpp
index cb1f893c1..48fd174d1 100644
--- a/tdehtml/css/tokenizer.cpp
+++ b/tdehtml/css/tokenizer.cpp
@@ -37,54 +37,50 @@
 
 */
 
-#define flex_int16_t short int
-#define flex_int32_t int
-
 // --------- begin generated code -------------------
 #define YY_NUM_RULES 51
 #define YY_END_OF_BUFFER 52
-static yyconst flex_int16_t yy_accept[333] =
+static yyconst short int yy_accept[331] =
     {   0,
         0,    0,   52,   50,    2,    2,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   42,   50,   50,   11,   11,
-       11,   50,   50,   50,   50,    2,    0,    0,    0,   10,
-        0,   13,    0,    8,    0,    0,    9,    0,    0,   11,
-       11,    0,   43,    0,   41,    0,    0,   42,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   12,   40,   40,
-       37,    0,   40,    0,    0,    0,    0,    0,    0,    0,
-        0,   47,   11,    0,    0,   11,   11,    0,   11,   11,
-       11,    7,    6,    5,    0,    0,    0,   10,    0,    0,
+       50,   50,   50,   50,   50,   42,   50,   50,   50,   50,
+       11,   11,   11,   50,   50,    2,    0,    0,    0,   10,
+        0,   13,    0,    8,    0,    0,    9,    0,    0,    0,
+       11,   11,   43,    0,   41,    0,    0,   42,    0,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   12,
+       40,   40,   37,    0,    0,    0,    0,    0,    0,    0,
+        0,   11,   11,    7,   47,   11,    0,    0,   11,   11,
+        0,   11,    6,    5,    0,    0,    0,   10,    0,    0,
        13,   13,    0,    0,   10,    0,    0,    4,   12,    0,
 
-        0,   40,    0,   28,   40,   24,   26,   40,   38,   30,
-       40,   29,   36,   40,   32,   31,   27,   40,   40,   40,
+        0,   40,   40,   40,    0,   40,   28,   40,   24,   26,
+       40,   38,   30,   40,   29,   36,   40,   32,   31,   27,
        40,    0,    0,    0,    0,    0,    0,    0,    0,   11,
-       11,   12,   11,   11,   48,   48,   11,   11,    0,    0,
-        0,   13,    0,    0,    0,    1,   40,   40,   33,   40,
-       39,   12,   34,   40,   40,    3,    0,    0,    0,    0,
-        0,    0,    0,   11,   44,    0,   48,   48,   48,   47,
-       11,    0,    0,   13,    0,    0,    0,   40,   35,   40,
-       40,    0,    0,    0,    0,    0,    0,   15,   11,   49,
-       48,   48,   48,   48,    0,    0,    0,    0,   46,    0,
-
-       11,    0,    0,   13,    0,   40,   40,   25,    0,    0,
-        0,    0,   16,    0,   11,   49,   48,   48,   48,   48,
-       48,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       46,    0,    0,   11,    0,    0,   13,    0,   40,   40,
-        0,    0,    0,   14,    0,   11,   49,   48,   48,   48,
-       48,   48,   48,    0,   45,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   11,    0,    0,   13,
+       11,   11,   12,   11,   11,   48,   48,   11,    0,    0,
+        0,   13,    0,    0,    0,    1,   40,   40,   40,   40,
+       33,   40,   39,   12,   34,    3,    0,    0,    0,    0,
+        0,    0,    0,   11,   11,   44,    0,   48,   48,   48,
+       47,    0,    0,   13,    0,    0,    0,   40,   40,   40,
+       35,    0,    0,    0,    0,    0,    0,   15,   11,   11,
+       49,   48,   48,   48,   48,    0,    0,    0,    0,   46,
+
+        0,    0,    0,   13,    0,   40,   40,   25,    0,    0,
+        0,    0,   16,    0,   11,   11,   49,   48,   48,   48,
+       48,   48,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   46,    0,    0,    0,    0,   13,    0,   40,   40,
+        0,    0,    0,   14,    0,   11,   11,   49,   48,   48,
+       48,   48,   48,   48,    0,   45,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   13,
         0,   40,   40,    0,   18,    0,    0,   11,   49,   48,
        48,   48,   48,   48,   48,   48,    0,   45,    0,    0,
         0,   45,    0,    0,    0,    0,   40,    0,    0,    0,
 
-       49,    0,    0,    0,   23,    0,   17,   19,   49,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   20,    0,   21,
-       22,    0
+        0,    0,   49,    0,    0,    0,   23,    0,    0,    0,
+       17,   19,   49,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   20,    0,    0,    0,   21,   22,    0
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    4,    5,    1,    1,    1,    1,    1,    1,    1,
@@ -92,1018 +88,582 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    6,    7,    8,    9,   10,   11,   12,   13,   14,
        15,   16,   17,   12,   18,   19,   20,   21,   21,   21,
        21,   21,   21,   21,   21,   21,   21,   12,   12,   22,
-       23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
-       33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
-       43,   44,   45,   46,   47,   48,   36,   49,   36,   50,
-       12,   51,   12,   52,   53,   12,   54,   28,   55,   56,
-
-       57,   58,   59,   60,   61,   36,   62,   63,   64,   65,
-       66,   67,   68,   69,   70,   71,   72,   73,   36,   74,
-       36,   75,   12,   76,   12,   77,    1,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78,   78,   78,   78,   78,   78,
-       78,   78,   78,   78,   78
+       23,   24,   25,   26,   30,   31,   32,   33,   34,   35,
+       36,   37,   38,   39,   40,   41,   42,   43,   44,   45,
+       46,   47,   48,   49,   50,   51,   39,   52,   39,   53,
+       12,   27,   12,   28,   29,   12,   30,   31,   32,   33,
+
+       34,   35,   36,   37,   38,   39,   40,   41,   42,   43,
+       44,   45,   46,   47,   48,   49,   50,   51,   39,   52,
+       39,   53,   12,   54,   12,   55,    1,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56
     } ;
 
-static yyconst flex_int32_t yy_meta[79] =
+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,
-        7,    4,    4,    4,    8,    4,    9,    9,    9,    9,
-        9,    9,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,    4,   10,    9,    9,    9,    9,    9,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,    4,    4,   10
+        6,    4,    4,    4,    7,    4,    8,    4,    8,    9,
+        9,    9,    9,    9,    9,    8,    8,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,    4,    4,    8
     } ;
 
-static yyconst flex_int16_t yy_base[368] =
+static yyconst short int yy_base[359] =
     {   0,
-        0,    0,  811, 3602,   77,   82,   87,   86,  758,  785,
-       82,  784,   78,  785,  788,  138,  786,  199,   83,   84,
-       94,  246,  769,  767,  766,  101,  218,   75,  101, 3602,
-      303,  737,  341, 3602,  100,  398, 3602,  763,   79,   96,
-      103,  436,  206,  769, 3602,  732,  761,    0,  730,   76,
-       85,  191,  175,   80,  178,  198,  217,  197,  243,  232,
-      729,  474,   73,  760,   82,   98,  195,  206,  133,  242,
-      255, 3602,  109,  512,  745,  270,  274,  739,  285,  271,
-      569, 3602, 3602, 3602,  248,  244,  229,  242,  626,  683,
-      712,  740,  313,  299,  300,  797,  854, 3602,  144,  739,
-
-      321,  703,  892,  702,  296,  701,  700,  292,  699,  698,
-      277,  697,  696,  289,  685,  684,  682,  288,  681,  949,
-      323,  713,  319,  311,  302,  311,  326,  324,  346,  362,
-     1006,  705,  363,  366,  365,  700,  367, 1044,  344,  381,
-     1082, 1120,  373, 1158,  708, 3602,  658, 1215,  656,  364,
-      655,  371,  646, 1253,  385, 3602,  376,  343,  360,  368,
-      386,  404,  412, 1291, 3602,    0,  419,  665,  664,  468,
-     1329,  379, 1367, 1405, 1443,  603,  388, 1481,  566, 1519,
-      411,  417,  414,  568,  416,  453,  441, 3602, 1557,    0,
-      420,  530,  528,  483,  510,  543,  431,  427, 3602, 1614,
-
-     1652,  450, 1690, 1728, 1766, 1804, 1842,  448,  451,  467,
-      468,  463, 3602,  468, 1880,    0,  502,  463,  462,  433,
-      368,  574,  438,  600, 1937,  428, 1994,  657,  714,  771,
-      828, 2051, 2108, 2146,  509, 2184, 2222, 2260, 2298, 2336,
-      498,  511,  511, 3602,  527, 2374,    0,  534,  272,  226,
-      210,  208,  121,  606, 3602,  584,  509,  885, 2431, 2488,
-      582,  537,  912, 2545, 2602, 2640, 2678,  551, 2716, 2754,
-     2792, 2830, 2868,  555, 3602,  584,  585,  639,    0,  123,
-     3602, 3602, 3602, 3602, 3602, 3602,  980,  556,  628, 2906,
-     1015,  571,  624, 2944, 2982,  600,  646,   94,  607,  635,
-
-        0, 3020, 3058, 3096, 3602,  791, 3602, 3602, 3602, 3134,
-     3172, 3210,  636,  622,  641, 3248, 3286, 3324,  644,  638,
-      640,  754,  810,  658,  643,  651,  660, 3602,  671, 3602,
-     3602, 3602, 3381, 3386, 3395, 3400, 3406, 3413, 3422, 3429,
-     3438, 3448, 3450, 3455, 3462, 3469, 3473, 3482, 3489, 3494,
-     3503, 3507, 3511, 3519, 3523, 3527, 3535, 3544, 3553, 3557,
-     3561, 3569, 3578, 3582, 3586, 3589, 3592
+        0,    0,  807, 1638,   55,   60,   65,   64,  779,  781,
+       60,  780,   56,  781,  785,   93,  793,   63,  126,  773,
+       61,   75,  136,  772,  771,  162,  167,  751,   70, 1638,
+      204,  764,  154, 1638,   63,  238, 1638,  760,   64,  160,
+       82,  183,  133,  767, 1638,  755,  760,    0,  183,   53,
+      753,   52,   83,  169,  135,  121,   57,  192,  205,  206,
+      225,   86,  745,  752,  729,  731,  723,  716,  723,  726,
+      725,  231,  276, 1638, 1638,  234,  254,  733,  235,  249,
+      291,  277, 1638, 1638,  701,  195,  172,  219,  325,  359,
+      717,  393,  217,  237,  286,  427,  461, 1638,  160,  727,
+
+      135,  715,  495,  714,  344,  256,  700,  265,  699,  698,
+       88,  697,  696,  175,  695,  694,  233,  693,  679,  678,
+      267,  684,  664,  670,  656,  640,  651,  622,  627,  446,
+      305,  529,  639,  320,  321,  318,  634,  323,  614,  287,
+      521,  536,  326,  544,  641, 1638,  551,  621,  585,  311,
+      619,  339,  618,  360,  617, 1638,  594,  582,  556,  559,
+      564,  567,  566,  577,  592, 1638,  600,  324,  574,  572,
+      634,  549,  620,  635,  641,  579,  324,  656,  662,  278,
+      567,  551,  544,  562,  526,  528,  501, 1638,  677,  683,
+      698,  382,  523,  522,  521,  732,  758,  288,  341, 1638,
+
+      784,  496,  718,  744,  791,  799,  806,  517,  502,  489,
+      486,  471, 1638,  474,  814,  821,  829,  383,  493,  485,
+      484,  481,  400,  343,  407,  863,  356,  897,  931,  957,
+      983, 1009, 1035, 1069,  475,  848,  882,  917,  943,  969,
+      486,  453,  460, 1638,  445,  995, 1076, 1084,  416,  448,
+      447,  444,  443,  426,  440, 1638,  444,  408,  509, 1118,
+     1152,  601,  358, 1131, 1186, 1220, 1205,  407, 1227, 1235,
+     1242,  481, 1250,  456, 1638,  417,  406,  535, 1257,  403,
+     1638, 1638, 1638, 1638, 1638, 1638, 1049,  409,  410, 1265,
+     1299,  426,  443, 1285, 1300,  370,  676,  354,  334,  352,
+
+      339,  283, 1306, 1321, 1327, 1342, 1638,  261,  226,  225,
+     1638, 1638, 1638, 1348, 1363, 1369,  214,  192,  129, 1384,
+     1390, 1405,   73, 1638,   52, 1411, 1426, 1638, 1638, 1638,
+     1460, 1464, 1472, 1476, 1482, 1487, 1495, 1501, 1509, 1518,
+     1520, 1526, 1530, 1536, 1545, 1551, 1555, 1564, 1568, 1576,
+     1580, 1588, 1596, 1604, 1608, 1616, 1624, 1628
     } ;
 
-static yyconst flex_int16_t yy_def[368] =
+static yyconst short int yy_def[359] =
     {   0,
-      332,    1,  332,  332,  332,  332,  332,  333,  334,  332,
-      335,  332,  336,  332,  332,  332,  332,  332,  337,  337,
-      337,  338,  332,  332,  332,  332,  332,  332,  333,  332,
-      339,  334,  340,  332,  335,  341,  332,  332,  332,  337,
-      337,  338,   16,  342,  332,  343,  332,   16,  344,  344,
-      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
-      344,  345,  344,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  337,  346,  332,  337,  337,  347,  337,  337,
-      337,  332,  332,  332,  332,  333,  333,  333,  333,  339,
-      334,  334,  335,  335,  335,  335,  341,  332,  332,  342,
-
-      348,  344,  349,  344,  344,  344,  344,  344,  344,  344,
-      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
-      344,  332,  332,  332,  332,  332,  332,  332,  332,  337,
-       81,  332,  337,  337,  350,  332,  337,   81,  332,  333,
-       89,   92,  335,   96,  351,  332,  344,  120,  344,  344,
-      344,  344,  344,  120,  344,  332,  332,  332,  332,  332,
-      332,  332,  332,  131,  332,  352,  353,  332,  332,  354,
-       81,  332,   89,   92,   96,  351,  348,  148,  344,  120,
-      344,  332,  332,  332,  332,  332,  332,  332,  131,  355,
-      356,  332,  332,  332,  354,  354,  357,  358,  332,  359,
-
-       81,  332,   89,   92,   96,  148,  120,  344,  332,  332,
-      332,  332,  332,  332,  131,  360,  361,  332,  332,  332,
-      332,  332,  357,  332,  362,  358,  363,  354,  354,  354,
-      354,  354,  359,   81,  332,   89,   92,   96,  148,  120,
-      332,  332,  332,  332,  332,  131,  364,  365,  332,  332,
-      332,  332,  332,  332,  332,  357,  357,  357,  357,  362,
-      358,  358,  358,  358,  363,  232,   81,  332,   89,   92,
-       96,  148,  120,  332,  332,  332,  332,  267,  366,  332,
-      332,  332,  332,  332,  332,  332,  357,  357,  357,  259,
-      358,  358,  358,  264,  232,  332,  273,  332,  332,  332,
-
-      367,  259,  264,  232,  332,  332,  332,  332,  332,  259,
-      264,  232,  332,  332,  332,  259,  264,  232,  332,  332,
-      332,  357,  358,  332,  332,  332,  332,  332,  332,  332,
-      332,    0,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332
+      330,    1,  330,  330,  330,  330,  330,  331,  332,  330,
+      333,  330,  334,  330,  330,  330,  330,  330,  335,  330,
+      336,  336,  336,  330,  330,  330,  330,  330,  331,  330,
+      337,  332,  338,  330,  333,  339,  330,  330,  330,  335,
+      336,  336,   16,  340,  330,  341,  330,   16,  342,  343,
+      343,  343,  343,  343,  343,  343,  343,  343,  343,  343,
+      343,  343,  343,  330,  330,  330,  330,  330,  330,  330,
+      330,  336,  336,  330,  330,  336,  344,  330,  336,  336,
+      330,  336,  330,  330,  330,  331,  331,  331,  331,  337,
+      332,  332,  333,  333,  333,  333,  339,  330,  330,  340,
+
+      345,  343,  343,  343,  346,  343,  343,  343,  343,  343,
+      343,  343,  343,  343,  343,  343,  343,  343,  343,  343,
+      343,  330,  330,  330,  330,  330,  330,  330,  330,   73,
+      336,   73,  330,  336,  336,  347,  330,  336,  330,  331,
+       89,   92,  333,   96,  348,  330,  103,  343,  103,  343,
+      343,  343,  343,  343,  343,  330,  330,  330,  330,  330,
+      330,  330,  330,   73,  132,  330,  330,  349,  330,  330,
+      350,  330,   89,   92,   96,  348,  345,  103,  149,  343,
+      343,  330,  330,  330,  330,  330,  330,  330,   73,  132,
+      330,  351,  330,  330,  330,  350,  350,  352,  353,  330,
+
+      354,  330,   89,   92,   96,  103,  149,  343,  330,  330,
+      330,  330,  330,  330,   73,  132,  330,  355,  330,  330,
+      330,  330,  330,  352,  330,  356,  353,  357,  350,  350,
+      350,  350,  350,  354,  330,   89,   92,   96,  103,  149,
+      330,  330,  330,  330,  330,   73,  132,  330,  358,  330,
+      330,  330,  330,  330,  330,  330,  352,  352,  352,  352,
+      356,  353,  353,  353,  353,  357,  233,  330,   89,   92,
+       96,  343,  149,  330,  330,  330,  330,  246,  330,  330,
+      330,  330,  330,  330,  330,  330,  352,  352,  352,  260,
+      353,  353,  353,  265,  233,  330,  343,  330,  330,  330,
+
+      330,  330,  330,  260,  265,  233,  330,  330,  330,  330,
+      330,  330,  330,  260,  265,  233,  330,  330,  330,  260,
+      265,  233,  330,  330,  330,  260,  265,  330,  330,    0,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330
     } ;
 
-static yyconst flex_int16_t yy_nxt[3681] =
+static yyconst short int yy_nxt[1695] =
     {   0,
         4,    5,    6,    5,    5,    5,    7,    8,    9,   10,
         4,    4,   11,    4,    4,   12,    4,   13,   14,   15,
-       16,   17,    4,    4,    4,   18,   19,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   19,   19,   19,   20,
-       19,   19,   19,   19,   19,   19,   21,   19,   19,   19,
-       22,   23,   19,   19,   19,   19,   19,   19,   19,   19,
-       19,   19,   19,   19,   20,   19,   19,   19,   19,   19,
-       19,   21,   19,   19,   19,   24,   25,   19,   26,   26,
-       26,   26,   26,   26,   26,   26,   26,   26,   27,   27,
-       27,   27,   27,   30,   30,   38,   72,   72,   39,   39,
-
-       75,   76,   26,   26,   26,   26,   26,   72,   30,   72,
-       78,  306,   30,   85,  104,  105,   72,   41,   99,   75,
-       76,   28,   72,  103,   77,  121,  103,  123,   42,  109,
-      103,  124,   36,   74,   74,  103,   31,   79,   85,  104,
-      166,  105,   41,   99,   74,  286,   74,   28,   45,   77,
-       36,   31,  123,   74,  109,   46,   47,  124,   48,   74,
-       75,   75,   79,  127,   49,   49,   50,   51,   52,   49,
-       53,   54,   55,   49,   56,   49,   57,   58,   49,   59,
-       49,   60,   61,   49,   49,   49,   49,   49,   62,  127,
-       63,   49,   50,   51,   52,   49,   53,   54,   55,   56,
-
-       49,   57,   58,   49,   59,   49,   60,   61,   49,   49,
-       49,   49,   49,   75,  114,   49,   65,  110,  108,   27,
-       27,   27,   27,   27,  332,  103,   43,   66,  103,  106,
-       67,  111,  285,   68,  284,  125,   30,   69,   70,  107,
-       71,  103,  110,  108,  126,   49,   29,  103,  103,   30,
-      283,   30,   28,   66,  106,  112,   67,  111,  118,   68,
-      125,  113,   69,   70,  107,   71,   81,  103,  128,  126,
-       49,  115,   81,   81,   81,   81,   81,   81,   28,   31,
-      112,  129,  103,   72,   72,  118,  113,   72,  116,  139,
-      133,  117,   31,  103,   31,  128,  282,  115,   72,   81,
-
-       81,   81,   81,   81,   29,   29,   29,   86,  129,  152,
-       88,   30,   30,  116,  139,   35,  117,  153,  150,  134,
-       74,   74,  137,   89,   74,   30,  151,  103,  149,   89,
-       89,   89,   89,   89,   89,   74,  101,  158,  103,  103,
-      146,  159,  103,  153,  134,  150,  103,  137,  157,   36,
-       36,  151,  160,   90,  149,  161,   89,   89,   89,   89,
-       89,   92,  162,   36,  158,  155,  159,   92,   92,   92,
-       92,   92,   92,  103,  157,   72,   72,  160,  163,  165,
-      170,  161,  166,  133,  172,   30,  183,  162,   30,  168,
-      155,  152,  253,  179,   92,   92,   92,   92,   92,   35,
-
-       35,   35,   93,  177,  163,  184,  182,  146,  185,  172,
-       95,  183,   74,   74,  103,  181,   74,   74,   96,  179,
-      186,  103,  202,   36,   96,   96,   96,   96,   96,   96,
-      184,   31,  182,  185,  187,  103,  166,  166,  224,  224,
-      224,  181,  188,  192,  218,  224,  186,  202,   97,  208,
-      209,   96,   96,   96,   96,   96,   81,  252,  210,  212,
-      187,  103,   81,   81,   81,   81,   81,   81,  188,  195,
-      195,  195,  195,  195,  208,  197,  209,  227,  227,  213,
-      198,  225,  199,  210,  212,  214,  251,  250,  225,   81,
-       81,   81,   81,   81,  120,  235,  241,  242,  103,  243,
-
-      120,  120,  120,  120,  120,  120,  213,  221,  244,  245,
-      214,  195,  195,  195,  195,  195,  224,  197,  200,  166,
-      235,  241,  198,  242,  199,  243,  249,  120,  120,  120,
-      120,  120,  131,  244,  245,  268,  274,  276,  131,  131,
-      131,  131,  131,  131,  222,  222,  222,  222,  222,  224,
-      332,  166,  220,  277,  219,  332,  275,  199,  281,  225,
-      200,  274,  268,  224,  276,  131,  131,  131,  131,  131,
-       80,   80,   80,   80,   80,  222,  222,  222,  222,  222,
-      277,  275,   72,  224,  226,  211,  223,  227,  199,  138,
-      296,  224,  298,  200,  224,  138,  138,  138,  138,  138,
-
-      138,  254,  254,  254,  254,  254,  225,  254,  254,  254,
-      254,  254,  299,  300,  255,  296,  103,  298,  177,   74,
-      255,  227,  138,  138,  138,  138,  138,   87,  140,  140,
-      140,   87,  227,   30,  225,  224,  224,  307,  299,  300,
-      130,  130,  130,  130,  130,  305,  141,  147,  147,  147,
-      147,  147,  141,  141,  141,  141,  141,  141,  222,  222,
-      222,  222,  222,  307,  332,  308,  319,  321,  320,  332,
-      305,  199,  324,  328,  227,  325,   31,  326,  225,  141,
-      141,  141,  141,  141,   29,   29,   29,   86,  194,  193,
-       88,  308,  319,  320,  321,  327,  103,  329,  324,  328,
-
-      325,  331,  326,   89,  330,  103,  103,  200,  103,   89,
-       89,   89,   89,   89,   89,  222,  222,  222,  222,  222,
-      327,  332,  329,  177,  169,  132,  332,  331,  199,  330,
-      156,  103,  103,   90,  103,  103,   89,   89,   89,   89,
-       89,   91,   91,   91,   91,   91,  103,  103,  103,  103,
-      103,  103,  103,  103,  101,  257,  289,  289,  289,  257,
-      142,  224,   33,  136,  200,  132,  142,  142,  142,  142,
-      142,  142,  222,  222,  222,  222,  222,  122,  332,  103,
-      103,   43,   62,  332,  101,  199,   98,   33,   84,   83,
-       33,   82,   64,  142,  142,  142,  142,  142,   94,  143,
-
-      143,  143,   94,   44,  225,   43,   37,   34,   33,   30,
-      332,  262,  293,  293,  293,  262,  332,  144,  332,  332,
-      313,  200,  224,  144,  144,  144,  144,  144,  144,  222,
-      222,  222,  222,  222,  314,  332,  332,  332,  315,  332,
-      332,  332,  199,  332,  332,  332,  313,   36,  332,  332,
-      144,  144,  144,  144,  144,   35,   35,   35,   93,  314,
-      227,  332,  332,  315,  332,  332,   95,  332,  332,  332,
-      332,  332,  332,  332,   96,  332,  332,  332,  200,  332,
-       96,   96,   96,   96,   96,   96,  287,  254,  254,  254,
-      287,  332,  224,  332,  332,  332,  332,  332,  332,  288,
-
-      332,  332,  332,  332,   97,  332,  332,   96,   96,   96,
-       96,   96,  148,  291,  254,  254,  254,  291,  148,  148,
-      148,  148,  148,  148,  224,  332,  292,  332,  332,  332,
-      332,  332,  332,  332,  332,  225,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  148,  148,  148,  148,  148,
-      119,  119,  119,  119,  119,  332,  332,  332,  332,  332,
-      332,  332,  227,  332,  332,  332,  332,  332,  332,  154,
-      332,  332,  332,  332,  332,  154,  154,  154,  154,  154,
-      154,  287,  254,  254,  254,  287,  332,  224,  332,  332,
-      332,  332,  332,  332,  288,  332,  332,  332,  332,  103,
-
-      332,  332,  154,  154,  154,  154,  154,  130,  130,  130,
-      130,  130,  332,  332,  332,  332,  291,  254,  254,  254,
-      291,  332,  332,  332,  332,  332,  164,  224,  332,  292,
-      225,  332,  164,  164,  164,  164,  164,  164,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  164,
-      164,  164,  164,  164,  171,  227,  332,  332,  332,  332,
-      171,  171,  171,  171,  171,  171,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  171,  171,  171,
-
-      171,  171,  173,  332,  332,  332,  332,  332,  173,  173,
-      173,  173,  173,  173,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  173,  173,  173,  173,  173,
-      174,  332,  332,  332,  332,  332,  174,  174,  174,  174,
-      174,  174,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  174,  174,  174,  174,  174,  175,  332,
-      332,  332,  332,  332,  175,  175,  175,  175,  175,  175,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  175,  175,  175,  175,  175,  147,  147,  147,  147,
-      147,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  178,  332,  332,  332,  332,
-      332,  178,  178,  178,  178,  178,  178,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  178,  178,
-      178,  178,  178,  180,  332,  332,  332,  332,  332,  180,
-      180,  180,  180,  180,  180,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  180,  180,  180,  180,
-      180,  189,  332,  332,  332,  332,  332,  189,  189,  189,
-      189,  189,  189,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  189,  189,  189,  189,  189,  201,
-      332,  332,  332,  332,  332,  201,  201,  201,  201,  201,
-      201,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  201,  201,  201,  201,  201,  203,  332,  332,
-      332,  332,  332,  203,  203,  203,  203,  203,  203,  332,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      203,  203,  203,  203,  203,  204,  332,  332,  332,  332,
-      332,  204,  204,  204,  204,  204,  204,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  204,  204,
-      204,  204,  204,  205,  332,  332,  332,  332,  332,  205,
-      205,  205,  205,  205,  205,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  205,  205,  205,  205,
-
-      205,  206,  332,  332,  332,  332,  332,  206,  206,  206,
-      206,  206,  206,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  206,  206,  206,  206,  206,  207,
-      332,  332,  332,  332,  332,  207,  207,  207,  207,  207,
-      207,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  207,  207,  207,  207,  207,  215,  332,  332,
-      332,  332,  332,  215,  215,  215,  215,  215,  215,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      215,  215,  215,  215,  215,  222,  222,  222,  222,  228,
-      332,  230,  332,  332,  332,  332,  230,  230,  231,  332,
-      332,  332,  332,  332,  232,  332,  332,  332,  332,  332,
-      232,  232,  232,  232,  232,  232,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  233,  332,  332,  232,  232,  232,
-      232,  232,  234,  332,  332,  332,  332,  332,  234,  234,
-      234,  234,  234,  234,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  234,  234,  234,  234,  234,
-      236,  332,  332,  332,  332,  332,  236,  236,  236,  236,
-      236,  236,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  236,  236,  236,  236,  236,  237,  332,
-      332,  332,  332,  332,  237,  237,  237,  237,  237,  237,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  237,  237,  237,  237,  237,  238,  332,  332,  332,
-      332,  332,  238,  238,  238,  238,  238,  238,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  238,
-      238,  238,  238,  238,  239,  332,  332,  332,  332,  332,
-      239,  239,  239,  239,  239,  239,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  239,  239,  239,
-      239,  239,  240,  332,  332,  332,  332,  332,  240,  240,
-      240,  240,  240,  240,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  240,  240,  240,  240,  240,
-
-      246,  332,  332,  332,  332,  332,  246,  246,  246,  246,
-      246,  246,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  246,  246,  246,  246,  246,  223,  223,
-      223,  256,  332,  332,  258,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  259,  332,  332,
-      332,  332,  332,  259,  259,  259,  259,  259,  259,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  260,  332,  332,
-      259,  259,  259,  259,  259,  226,  226,  226,  261,  332,
-
-      332,  332,  332,  332,  332,  332,  263,  332,  332,  332,
-      332,  332,  332,  332,  264,  332,  332,  332,  332,  332,
-      264,  264,  264,  264,  264,  264,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  265,  332,  332,  264,  264,  264,
-      264,  264,  228,  228,  228,  228,  228,  332,  332,  332,
-      332,  332,  332,  332,  332,  199,  332,  332,  332,  332,
-      332,  266,  332,  332,  332,  332,  332,  266,  266,  266,
-      266,  266,  266,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  200,  332,  332,  266,  266,  266,  266,  266,  222,
-      222,  222,  222,  228,  332,  230,  332,  332,  332,  332,
-      230,  230,  231,  332,  332,  332,  332,  332,  232,  332,
-      332,  332,  332,  332,  232,  232,  232,  232,  232,  232,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  233,  332,
-      332,  232,  232,  232,  232,  232,  267,  332,  332,  332,
-      332,  332,  267,  267,  267,  267,  267,  267,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  267,
-
-      267,  267,  267,  267,  269,  332,  332,  332,  332,  332,
-      269,  269,  269,  269,  269,  269,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  269,  269,  269,
-      269,  269,  270,  332,  332,  332,  332,  332,  270,  270,
-      270,  270,  270,  270,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  270,  270,  270,  270,  270,
-      271,  332,  332,  332,  332,  332,  271,  271,  271,  271,
-      271,  271,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  271,  271,  271,  271,  271,  272,  332,
-      332,  332,  332,  332,  272,  272,  272,  272,  272,  272,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  272,  272,  272,  272,  272,  273,  332,  332,  332,
-      332,  332,  273,  273,  273,  273,  273,  273,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  273,
-      273,  273,  273,  273,  278,  332,  332,  332,  332,  332,
-
-      278,  278,  278,  278,  278,  278,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  278,  278,  278,
-      278,  278,  257,  289,  289,  289,  257,  332,  224,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  290,  332,  332,  332,  332,  332,  290,  290,  290,
-      290,  290,  290,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  225,  332,  332,  290,  290,  290,  290,  290,  223,
-      223,  223,  256,  332,  332,  258,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  259,  332,
-      332,  332,  332,  332,  259,  259,  259,  259,  259,  259,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  260,  332,
-      332,  259,  259,  259,  259,  259,  262,  293,  293,  293,
-      262,  332,  332,  332,  332,  332,  332,  224,  332,  332,
-      332,  332,  332,  332,  332,  294,  332,  332,  332,  332,
-      332,  294,  294,  294,  294,  294,  294,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  227,  332,  332,  294,  294,
-
-      294,  294,  294,  226,  226,  226,  261,  332,  332,  332,
-      332,  332,  332,  332,  263,  332,  332,  332,  332,  332,
-      332,  332,  264,  332,  332,  332,  332,  332,  264,  264,
-      264,  264,  264,  264,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  265,  332,  332,  264,  264,  264,  264,  264,
-      295,  332,  332,  332,  332,  332,  295,  295,  295,  295,
-      295,  295,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  295,  295,  295,  295,  295,   73,  332,
-
-      332,  332,  332,  332,   73,   73,   73,   73,   73,   73,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,   73,   73,   73,   73,   73,   29,  332,  332,  332,
-      332,  332,   29,   29,   29,   29,   29,   29,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,   29,
-       29,   29,   29,   29,   32,  332,  332,  332,  332,  332,
-       32,   32,   32,   32,   32,   32,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  332,   32,   32,   32,
-       32,   32,   35,  332,  332,  332,  332,  332,   35,   35,
-       35,   35,   35,   35,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,   35,   35,   35,   35,   35,
-      297,  332,  332,  332,  332,  332,  297,  297,  297,  297,
-      297,  297,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  297,  297,  297,  297,  297,  102,  332,
-      332,  332,  332,  332,  102,  102,  102,  102,  102,  102,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  102,  102,  102,  102,  102,  302,  332,  332,  332,
-      332,  332,  302,  302,  302,  302,  302,  302,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  302,
-      302,  302,  302,  302,  303,  332,  332,  332,  332,  332,
-      303,  303,  303,  303,  303,  303,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  303,  303,  303,
-
-      303,  303,  304,  332,  332,  332,  332,  332,  304,  304,
-      304,  304,  304,  304,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  304,  304,  304,  304,  304,
-      310,  332,  332,  332,  332,  332,  310,  310,  310,  310,
-      310,  310,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  310,  310,  310,  310,  310,  311,  332,
-      332,  332,  332,  332,  311,  311,  311,  311,  311,  311,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  311,  311,  311,  311,  311,  312,  332,  332,  332,
-      332,  332,  312,  312,  312,  312,  312,  312,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  312,
-      312,  312,  312,  312,  316,  332,  332,  332,  332,  332,
-      316,  316,  316,  316,  316,  316,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  316,  316,  316,
-      316,  316,  317,  332,  332,  332,  332,  332,  317,  317,
-
-      317,  317,  317,  317,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  317,  317,  317,  317,  317,
-      318,  332,  332,  332,  332,  332,  318,  318,  318,  318,
-      318,  318,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  318,  318,  318,  318,  318,  322,  332,
-      332,  332,  332,  332,  322,  322,  322,  322,  322,  322,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-
-      332,  322,  322,  322,  322,  322,  323,  332,  332,  332,
-      332,  332,  323,  323,  323,  323,  323,  323,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  323,
-      323,  323,  323,  323,  196,  332,  332,  332,  332,  332,
-      196,  196,  196,  196,  196,  196,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  196,  196,  196,
-      196,  196,   29,  332,   29,   29,   29,   29,   29,   29,
-       29,   32,   32,  332,   32,   32,   35,  332,   35,   35,
-
-       35,   35,   35,   35,   35,   40,   40,  332,   40,   40,
-       73,   73,   73,  332,   73,   73,   80,   80,   80,   80,
-       80,   80,   80,   87,   87,   87,   87,   87,   87,   87,
-       87,   87,   91,   91,   91,   91,   91,   91,   91,   94,
+       16,   17,    4,    4,    4,   18,   19,   20,   21,   21,
+       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
+       21,   21,   22,   21,   21,   21,   21,   21,   21,   23,
+       21,   21,   21,   24,   25,   21,   26,   26,   26,   26,
+       26,   26,   26,   26,   26,   26,   27,   27,   27,   27,
+       27,   30,   30,   38,   75,   30,   39,   30,  105,  105,
+       65,  106,   40,  105,   39,  329,   36,   77,   75,   36,
+       31,   78,   79,  107,   66,   75,   31,   67,   42,  113,
+
+       68,   77,   28,   45,   69,   70,   99,   71,   77,  105,
+       46,   47,  105,   48,  105,  121,  108,  152,   80,   49,
+      328,   50,   51,   51,   52,   53,   54,   51,   55,   56,
+       57,   51,   58,   51,   59,   60,   51,   61,   51,   62,
+       63,   51,   51,   51,   51,   51,   73,  105,   51,   75,
+      101,  330,   81,   43,  146,   73,   73,   73,   73,   73,
+       73,  105,   77,   26,   26,   26,   26,   26,   27,   27,
+       27,   27,   27,  112,   92,   51,   78,   78,  325,   30,
+       73,  111,   82,   92,   92,   92,   92,   92,   92,   73,
+       73,   73,   73,   73,   73,  105,   75,   29,   31,   78,
+
+       79,  105,   30,  103,   28,   29,   29,   29,   86,   77,
+      109,   88,  103,  103,  103,  103,  103,  103,  105,   35,
+      110,   31,   78,  117,   89,  324,   30,  153,  114,   30,
+       90,  105,  105,   89,   89,   89,   89,   89,   89,   35,
+       35,   35,   93,   36,   75,   31,  115,   75,   75,   30,
+       95,  105,  116,  154,  323,  134,  118,   77,   96,  105,
+       77,   77,   75,   36,   97,  319,  318,   96,   96,   96,
+       96,   96,   96,  119,  132,   77,  120,   72,   72,   72,
+       72,   72,  105,  132,  132,  132,  132,  132,  132,   75,
+       75,  105,  317,  105,   30,  225,  130,  135,   30,  155,
+
+      151,  150,   77,   77,  105,  130,  130,  130,  130,  130,
+      130,  136,   36,   31,  226,  137,  312,  138,   75,  208,
+      136,  136,  136,  136,  136,  136,   87,  140,  140,  140,
+       87,   77,   30,   75,  166,  167,  171,  105,   30,  177,
+      134,  167,  169,  146,  180,  141,   77,   77,  193,   77,
+      225,   31,   36,  225,  141,  141,  141,  141,  141,  141,
+       29,   29,   29,   86,  149,  105,   88,  228,  225,  226,
+      225,  181,  311,  149,  149,  149,  149,  149,  149,   89,
+      154,  310,  228,  309,  228,   90,  105,  308,   89,   89,
+       89,   89,   89,   89,   91,   91,   91,   91,   91,  167,
+
+      167,  223,  223,  223,  223,  223,  219,  250,  255,  255,
+      255,  255,  255,  142,  200,  225,  225,  225,  307,   33,
+      167,  256,  142,  142,  142,  142,  142,  142,   94,  143,
+      143,  143,   94,  167,  226,  226,  226,  302,  225,   30,
+      281,  255,  255,  255,  255,  255,  224,  144,  301,  296,
+      286,  225,  228,   36,  256,  225,  144,  144,  144,  144,
+      144,  144,   35,   35,   35,   93,  164,  285,  284,  228,
+      226,  283,  282,   95,  277,  164,  164,  164,  164,  164,
+      164,   96,  102,  102,  102,  102,  102,   97,  298,  276,
+       96,   96,   96,   96,   96,   96,  102,  102,  102,  102,
+
+      102,  275,  299,  274,  268,  254,  300,  105,  253,  252,
+      287,  255,  255,  255,  287,  147,  225,  251,  245,  244,
+      243,  105,  242,  288,  147,  147,  147,  147,  147,  147,
+      131,  131,  131,  131,  131,  226,  131,  131,  131,  131,
+      131,  173,  241,  105,  235,  222,  221,  220,  214,  165,
+      173,  173,  173,  173,  173,  173,  174,  213,  165,  165,
+      165,  165,  165,  165,  175,  174,  174,  174,  174,  174,
+      174,  178,  212,  175,  175,  175,  175,  175,  175,  211,
+      178,  178,  178,  178,  178,  178,  148,  148,  148,  148,
+      148,  210,  209,  105,  177,  202,  195,  189,  194,  188,
+
+      187,  186,  185,  227,  184,  179,  189,  189,  189,  189,
+      189,  189,  190,  225,  179,  179,  179,  179,  179,  179,
+      191,  190,  190,  190,  190,  190,  190,  228,  183,  191,
+      191,  191,  191,  191,  191,  196,  196,  196,  196,  196,
+      203,  198,  182,  105,  105,  105,  199,  105,  200,  203,
+      203,  203,  203,  203,  203,  204,  177,  172,  170,  133,
+      201,  205,  163,  162,  204,  204,  204,  204,  204,  204,
+      205,  205,  205,  205,  205,  205,  206,  148,  148,  148,
+      148,  148,  207,  161,  160,  206,  206,  206,  206,  206,
+      206,  207,  207,  207,  207,  207,  207,  215,  159,  158,
+
+      157,  156,  105,  216,  105,  105,  215,  215,  215,  215,
+      215,  215,  216,  216,  216,  216,  216,  216,  217,  105,
+      105,  105,  105,  105,  105,  105,  105,  217,  217,  217,
+      217,  217,  217,  196,  196,  196,  196,  196,  236,  198,
+      105,  105,  101,   33,  199,  139,  200,  236,  236,  236,
+      236,  236,  236,  133,  129,  128,  127,  126,  201,  223,
+      223,  223,  223,  223,  237,  330,  125,  124,  123,  122,
+      330,  105,  200,  237,  237,  237,  237,  237,  237,  105,
+       43,   49,  101,   98,  201,  223,  223,  223,  223,  229,
+       33,  231,   85,   84,   83,   74,  231,  231,  232,   64,
+
+       44,   43,   37,   34,  233,   33,  330,  330,  330,  330,
+      234,  238,  330,  233,  233,  233,  233,  233,  233,  239,
+      238,  238,  238,  238,  238,  238,  240,  330,  239,  239,
+      239,  239,  239,  239,  246,  240,  240,  240,  240,  240,
+      240,  247,  330,  246,  246,  246,  246,  246,  246,  248,
+      247,  247,  247,  247,  247,  247,  330,  330,  248,  248,
+      248,  248,  248,  248,  224,  224,  224,  257,  269,  330,
+      259,  330,  330,  330,  330,  330,  330,  269,  269,  269,
+      269,  269,  269,  260,  330,  330,  330,  330,  330,  261,
+      330,  330,  260,  260,  260,  260,  260,  260,  227,  227,
+
+      227,  262,  270,  330,  330,  330,  330,  330,  330,  264,
+      330,  270,  270,  270,  270,  270,  270,  265,  330,  330,
+      330,  330,  330,  266,  330,  330,  265,  265,  265,  265,
+      265,  265,  223,  223,  223,  223,  223,  271,  330,  330,
+      330,  330,  330,  330,  330,  200,  271,  271,  271,  271,
+      271,  271,  330,  330,  330,  330,  330,  201,  223,  223,
+      223,  223,  223,  272,  330,  330,  330,  330,  330,  330,
+      330,  200,  272,  272,  272,  272,  272,  272,  330,  330,
+      330,  330,  330,  201,  223,  223,  223,  223,  223,  273,
+      330,  330,  330,  330,  330,  330,  330,  200,  273,  273,
+
+      273,  273,  273,  273,  330,  330,  330,  330,  330,  201,
+      223,  223,  223,  223,  223,   76,  330,  330,  330,  330,
+      330,  330,  330,  200,   76,   76,   76,   76,   76,   76,
+      330,  330,  330,  330,  330,  201,  229,  229,  229,  229,
+      229,  330,  330,  330,  330,  330,  330,  330,  330,  200,
+      287,  255,  255,  255,  287,  267,  225,  330,  330,  330,
+      330,  201,  330,  288,  267,  267,  267,  267,  267,  267,
+      223,  223,  223,  223,  229,  226,  231,  330,  330,  330,
+      330,  231,  231,  232,  330,  330,  330,  330,  330,  233,
+      330,  330,  330,  330,  330,  234,  278,  330,  233,  233,
+
+      233,  233,  233,  233,  279,  278,  278,  278,  278,  278,
+      278,  330,  330,  279,  279,  279,  279,  279,  279,  258,
+      289,  289,  289,  258,  330,  225,  330,  330,  330,  330,
+      330,  330,  291,  255,  255,  255,  291,  330,  290,  330,
+      330,  330,  330,  225,  226,  292,  330,  290,  290,  290,
+      290,  290,  290,  224,  224,  224,  257,  228,  330,  259,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  260,  330,  330,  330,  330,  330,  261,  330,
+      330,  260,  260,  260,  260,  260,  260,  263,  293,  293,
+      293,  263,  330,  330,  330,  330,  330,  330,  225,  330,
+
+      330,  330,  330,  330,  330,  330,  294,  330,  330,  330,
+      330,  330,  228,  330,  330,  294,  294,  294,  294,  294,
+      294,  227,  227,  227,  262,  295,  330,  330,  330,  330,
+      330,  330,  264,  330,  295,  295,  295,  295,  295,  295,
+      265,  330,  330,  330,  330,  330,  266,   29,  330,  265,
+      265,  265,  265,  265,  265,   32,   29,   29,   29,   29,
+       29,   29,   35,  330,   32,   32,   32,   32,   32,   32,
+      297,   35,   35,   35,   35,   35,   35,  303,  330,  297,
+      297,  297,  297,  297,  297,  304,  303,  303,  303,  303,
+      303,  303,  330,  330,  304,  304,  304,  304,  304,  304,
+
+      291,  255,  255,  255,  291,  305,  330,  330,  330,  330,
+      330,  225,  330,  292,  305,  305,  305,  305,  305,  305,
+      306,  330,  330,  330,  330,  228,  313,  330,  330,  306,
+      306,  306,  306,  306,  306,  313,  313,  313,  313,  313,
+      313,  314,  330,  330,  330,  330,  330,  315,  330,  330,
+      314,  314,  314,  314,  314,  314,  315,  315,  315,  315,
+      315,  315,  316,  330,  330,  330,  330,  330,  320,  330,
+      330,  316,  316,  316,  316,  316,  316,  320,  320,  320,
+      320,  320,  320,  321,  330,  330,  330,  330,  330,  322,
+      330,  330,  321,  321,  321,  321,  321,  321,  322,  322,
+
+      322,  322,  322,  322,  326,  330,  330,  330,  330,  330,
+      327,  330,  330,  326,  326,  326,  326,  326,  326,  327,
+      327,  327,  327,  327,  327,  197,  330,  330,  330,  330,
+      330,  224,  330,  330,  197,  197,  197,  197,  197,  197,
+      224,  224,  224,  224,  224,  224,  227,  330,  330,  330,
+      330,  330,  330,  330,  330,  227,  227,  227,  227,  227,
+      227,   29,  330,   29,   29,   29,   29,   29,   29,   32,
+      330,   32,   32,   35,  330,   35,   35,   35,   35,   35,
+       35,   41,  330,   41,   41,   72,   72,   72,   72,   72,
+       72,   76,   76,  330,   76,   76,   87,   87,   87,   87,
+
+       87,   87,   87,   87,   91,   91,   91,   91,   91,   91,
        94,   94,   94,   94,   94,   94,   94,   94,  100,  100,
-      100,  100,  100,  100,  100,  100,  100,  100,   49,   49,
-      102,  102,  332,  102,  102,  119,  119,  119,  119,  119,
-      119,  119,  130,  130,  130,  130,  130,  130,  130,  135,
-      135,  135,  145,  145,  145,  145,  145,  145,  145,  145,
-      145,  145,  147,  147,  147,  147,  147,  147,  147,  167,
-
-      167,  167,  167,  176,  176,  176,  176,  176,  176,  176,
-      176,  176,  176,  190,  332,  190,  191,  191,  191,  191,
-      196,  196,  196,  332,  196,  196,  196,  196,  196,  216,
-      332,  216,  217,  217,  217,  217,  223,  332,  223,  223,
-      223,  223,  223,  223,  223,  226,  332,  226,  226,  226,
-      226,  226,  226,  226,  229,  229,  229,  229,  229,  229,
-      229,  229,  229,  247,  332,  247,  248,  248,  248,  248,
-      257,  257,  257,  257,  257,  257,  257,  257,  257,  262,
-      262,  262,  262,  262,  262,  262,  262,  262,  279,  332,
-      279,  280,  280,  280,  280,  301,  332,  301,  309,  332,
-
-      309,    3,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332
+      100,  100,  100,  100,  100,  100,  100,   51,   51,  102,
+      102,  102,  102,  102,  102,  104,  330,  104,  104,  131,
+      131,  131,  131,  131,  131,  145,  145,  145,  145,  145,
+      145,  145,  145,  145,  148,  148,  148,  148,  148,  148,
+      168,  168,  330,  168,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  192,  192,  330,  192,  197,  197,  197,
+      330,  197,  197,  197,  197,  218,  218,  330,  218,  224,
+      330,  224,  224,  224,  224,  224,  224,  227,  330,  227,
+
+      227,  227,  227,  227,  227,  230,  230,  230,  230,  230,
+      230,  230,  230,  249,  249,  330,  249,  258,  258,  258,
+      258,  258,  258,  258,  258,  263,  263,  263,  263,  263,
+      263,  263,  263,  280,  280,  330,  280,    3,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330
+
     } ;
 
-static yyconst flex_int16_t yy_chk[3681] =
+static yyconst short int yy_chk[1695] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    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,   13,   19,   20,   13,   39,
-
-       20,   20,   26,   26,   26,   26,   26,   21,   29,   40,
-       21,  298,   35,   28,   50,   51,   41,   13,   39,   41,
-       41,    7,   73,   63,   20,   63,   50,   65,   13,   54,
-       54,   66,   11,   19,   20,   51,    8,   21,   28,   50,
-      280,   51,   13,   39,   21,  253,   40,    7,   16,   20,
-       35,   29,   65,   41,   54,   16,   16,   66,   16,   73,
-       99,   99,   21,   69,   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,   69,
+        1,    1,    1,    1,    1,    1,    5,    5,    5,    5,
+        5,    6,    6,    6,    6,    6,    7,    7,    7,    7,
+        7,    8,   11,   13,   21,   35,   13,   29,   52,   50,
+       18,   50,   13,   57,   39,  325,   11,   21,   22,   35,
+        8,   22,   22,   52,   18,   41,   29,   18,   13,   57,
+
+       18,   22,    7,   16,   18,   18,   39,   18,   41,   53,
+       16,   16,   62,   16,  111,   62,   53,  111,   22,   16,
+      323,   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,   16,   16,   16,   16,
-       16,   16,   16,   58,   58,   16,   18,   55,   53,   27,
-       27,   27,   27,   27,   43,   53,   43,   18,   55,   52,
-       18,   56,  252,   18,  251,   67,   87,   18,   18,   52,
-       18,   52,   55,   53,   68,   43,   86,   58,   56,   88,
-      250,   86,   27,   18,   52,   57,   18,   56,   60,   18,
-       67,   57,   18,   18,   52,   18,   22,   57,   70,   68,
-       43,   59,   22,   22,   22,   22,   22,   22,   27,   87,
-       57,   71,   60,   76,   80,   60,   57,   77,   59,   85,
-       76,   59,   88,   59,   86,   70,  249,   59,   79,   22,
-
-       22,   22,   22,   22,   31,   31,   31,   31,   71,  114,
-       31,   94,   95,   59,   85,   93,   59,  118,  108,   77,
-       76,   80,   79,   31,   77,   93,  111,  111,  105,   31,
-       31,   31,   31,   31,   31,   79,  101,  124,  118,  114,
-      101,  125,  108,  118,   77,  108,  105,   79,  123,   94,
-       95,  111,  126,   31,  105,  127,   31,   31,   31,   31,
-       31,   33,  128,   93,  124,  121,  125,   33,   33,   33,
-       33,   33,   33,  121,  123,  130,  133,  126,  129,  134,
-      137,  127,  135,  133,  139,  143,  158,  128,  140,  135,
-      121,  152,  221,  150,   33,   33,   33,   33,   33,   36,
-
-       36,   36,   36,  177,  129,  159,  157,  177,  160,  139,
-       36,  158,  130,  133,  150,  155,  134,  137,   36,  150,
-      161,  152,  172,  143,   36,   36,   36,   36,   36,   36,
-      159,  140,  157,  160,  162,  155,  167,  191,  197,  198,
-      226,  155,  163,  167,  191,  223,  161,  172,   36,  181,
-      182,   36,   36,   36,   36,   36,   42,  220,  183,  185,
-      162,  181,   42,   42,   42,   42,   42,   42,  163,  170,
-      170,  170,  170,  170,  181,  170,  182,  198,  226,  186,
-      170,  197,  170,  183,  185,  187,  219,  218,  223,   42,
-       42,   42,   42,   42,   62,  202,  209,  210,  208,  211,
-
-       62,   62,   62,   62,   62,   62,  186,  194,  212,  214,
-      187,  195,  195,  195,  195,  195,  257,  195,  170,  217,
-      202,  209,  195,  210,  195,  211,  217,   62,   62,   62,
-       62,   62,   74,  212,  214,  235,  241,  243,   74,   74,
-       74,   74,   74,   74,  196,  196,  196,  196,  196,  262,
-      196,  248,  193,  245,  192,  196,  242,  196,  248,  257,
-      195,  241,  235,  288,  243,   74,   74,   74,   74,   74,
-       81,   81,   81,   81,   81,  222,  222,  222,  222,  222,
-      245,  242,   81,  292,  261,  184,  256,  262,  222,   81,
-      268,  256,  274,  196,  261,   81,   81,   81,   81,   81,
-
-       81,  224,  224,  224,  224,  224,  288,  254,  254,  254,
-      254,  254,  276,  277,  224,  268,  179,  274,  176,   81,
-      254,  292,   81,   81,   81,   81,   81,   89,   89,   89,
-       89,   89,  261,   89,  256,  289,  293,  299,  276,  277,
-      278,  278,  278,  278,  278,  296,   89,  297,  297,  297,
-      297,  297,   89,   89,   89,   89,   89,   89,  228,  228,
-      228,  228,  228,  299,  228,  300,  313,  315,  314,  228,
-      296,  228,  319,  325,  293,  320,   89,  321,  289,   89,
-       89,   89,   89,   89,   90,   90,   90,   90,  169,  168,
-       90,  300,  313,  314,  315,  324,  153,  326,  319,  325,
-
-      320,  329,  321,   90,  327,  151,  149,  228,  147,   90,
-       90,   90,   90,   90,   90,  229,  229,  229,  229,  229,
-      324,  229,  326,  145,  136,  132,  229,  329,  229,  327,
-      122,  119,  117,   90,  116,  115,   90,   90,   90,   90,
-       90,   92,   92,   92,   92,   92,  113,  112,  110,  109,
-      107,  106,  104,  102,  100,  322,  322,  322,  322,  322,
-       92,  322,   91,   78,  229,   75,   92,   92,   92,   92,
-       92,   92,  230,  230,  230,  230,  230,   64,  230,   61,
-       49,   47,   46,  230,   44,  230,   38,   32,   25,   24,
-       92,   23,   17,   92,   92,   92,   92,   92,   96,   96,
-
-       96,   96,   96,   15,  322,   14,   12,   10,    9,   96,
-        3,  323,  323,  323,  323,  323,    0,   96,    0,    0,
-      306,  230,  323,   96,   96,   96,   96,   96,   96,  231,
-      231,  231,  231,  231,  306,  231,    0,    0,  306,    0,
-      231,    0,  231,    0,    0,    0,  306,   96,    0,    0,
-       96,   96,   96,   96,   96,   97,   97,   97,   97,  306,
-      323,    0,    0,  306,    0,    0,   97,    0,    0,    0,
-        0,    0,    0,    0,   97,    0,    0,    0,  231,    0,
-       97,   97,   97,   97,   97,   97,  258,  258,  258,  258,
-      258,    0,  258,    0,    0,    0,    0,    0,    0,  258,
-
-        0,    0,    0,    0,   97,    0,    0,   97,   97,   97,
-       97,   97,  103,  263,  263,  263,  263,  263,  103,  103,
-      103,  103,  103,  103,  263,    0,  263,    0,    0,    0,
-        0,    0,    0,    0,    0,  258,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  103,  103,  103,  103,  103,
-      120,  120,  120,  120,  120,    0,    0,    0,    0,    0,
-        0,    0,  263,    0,    0,    0,    0,    0,    0,  120,
-        0,    0,    0,    0,    0,  120,  120,  120,  120,  120,
-      120,  287,  287,  287,  287,  287,    0,  287,    0,    0,
-        0,    0,    0,    0,  287,    0,    0,    0,    0,  120,
-
-        0,    0,  120,  120,  120,  120,  120,  131,  131,  131,
-      131,  131,    0,    0,    0,    0,  291,  291,  291,  291,
-      291,    0,    0,    0,    0,    0,  131,  291,    0,  291,
-      287,    0,  131,  131,  131,  131,  131,  131,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  131,
-      131,  131,  131,  131,  138,  291,    0,    0,    0,    0,
-      138,  138,  138,  138,  138,  138,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  138,  138,  138,
-
-      138,  138,  141,    0,    0,    0,    0,    0,  141,  141,
-      141,  141,  141,  141,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  141,  141,  141,  141,  141,
-      142,    0,    0,    0,    0,    0,  142,  142,  142,  142,
-      142,  142,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  142,  142,  142,  142,  142,  144,    0,
-        0,    0,    0,    0,  144,  144,  144,  144,  144,  144,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  144,  144,  144,  144,  144,  148,  148,  148,  148,
-      148,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  148,    0,    0,    0,    0,
-        0,  148,  148,  148,  148,  148,  148,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  148,  148,
-      148,  148,  148,  154,    0,    0,    0,    0,    0,  154,
-      154,  154,  154,  154,  154,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,  154,  154,  154,  154,
-      154,  164,    0,    0,    0,    0,    0,  164,  164,  164,
-      164,  164,  164,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  164,  164,  164,  164,  164,  171,
-        0,    0,    0,    0,    0,  171,  171,  171,  171,  171,
-      171,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  171,  171,  171,  171,  171,  173,    0,    0,
-        0,    0,    0,  173,  173,  173,  173,  173,  173,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      173,  173,  173,  173,  173,  174,    0,    0,    0,    0,
-        0,  174,  174,  174,  174,  174,  174,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  174,  174,
-      174,  174,  174,  175,    0,    0,    0,    0,    0,  175,
-      175,  175,  175,  175,  175,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  175,  175,  175,  175,
-
-      175,  178,    0,    0,    0,    0,    0,  178,  178,  178,
-      178,  178,  178,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  178,  178,  178,  178,  178,  180,
-        0,    0,    0,    0,    0,  180,  180,  180,  180,  180,
-      180,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  180,  180,  180,  180,  180,  189,    0,    0,
-        0,    0,    0,  189,  189,  189,  189,  189,  189,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      189,  189,  189,  189,  189,  200,  200,  200,  200,  200,
-        0,  200,    0,    0,    0,    0,  200,  200,  200,    0,
-        0,    0,    0,    0,  200,    0,    0,    0,    0,    0,
-      200,  200,  200,  200,  200,  200,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  200,    0,    0,  200,  200,  200,
-      200,  200,  201,    0,    0,    0,    0,    0,  201,  201,
-      201,  201,  201,  201,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,  201,  201,  201,  201,  201,
-      203,    0,    0,    0,    0,    0,  203,  203,  203,  203,
-      203,  203,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  203,  203,  203,  203,  203,  204,    0,
-        0,    0,    0,    0,  204,  204,  204,  204,  204,  204,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  204,  204,  204,  204,  204,  205,    0,    0,    0,
-        0,    0,  205,  205,  205,  205,  205,  205,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  205,
-      205,  205,  205,  205,  206,    0,    0,    0,    0,    0,
-      206,  206,  206,  206,  206,  206,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  206,  206,  206,
-      206,  206,  207,    0,    0,    0,    0,    0,  207,  207,
-      207,  207,  207,  207,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  207,  207,  207,  207,  207,
-
-      215,    0,    0,    0,    0,    0,  215,  215,  215,  215,
-      215,  215,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  215,  215,  215,  215,  215,  225,  225,
-      225,  225,    0,    0,  225,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  225,    0,    0,
-        0,    0,    0,  225,  225,  225,  225,  225,  225,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  225,    0,    0,
-      225,  225,  225,  225,  225,  227,  227,  227,  227,    0,
-
-        0,    0,    0,    0,    0,    0,  227,    0,    0,    0,
-        0,    0,    0,    0,  227,    0,    0,    0,    0,    0,
-      227,  227,  227,  227,  227,  227,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  227,    0,    0,  227,  227,  227,
-      227,  227,  232,  232,  232,  232,  232,    0,  232,    0,
-        0,    0,    0,  232,    0,  232,    0,    0,    0,    0,
-        0,  232,    0,    0,    0,    0,    0,  232,  232,  232,
-      232,  232,  232,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,  232,    0,    0,  232,  232,  232,  232,  232,  233,
-      233,  233,  233,  233,    0,  233,    0,    0,    0,    0,
-      233,  233,  233,    0,    0,    0,    0,    0,  233,    0,
-        0,    0,    0,    0,  233,  233,  233,  233,  233,  233,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  233,    0,
-        0,  233,  233,  233,  233,  233,  234,    0,    0,    0,
-        0,    0,  234,  234,  234,  234,  234,  234,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  234,
-
-      234,  234,  234,  234,  236,    0,    0,    0,    0,    0,
-      236,  236,  236,  236,  236,  236,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  236,  236,  236,
-      236,  236,  237,    0,    0,    0,    0,    0,  237,  237,
-      237,  237,  237,  237,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  237,  237,  237,  237,  237,
-      238,    0,    0,    0,    0,    0,  238,  238,  238,  238,
-      238,  238,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  238,  238,  238,  238,  238,  239,    0,
-        0,    0,    0,    0,  239,  239,  239,  239,  239,  239,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  239,  239,  239,  239,  239,  240,    0,    0,    0,
-        0,    0,  240,  240,  240,  240,  240,  240,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  240,
-      240,  240,  240,  240,  246,    0,    0,    0,    0,    0,
-
-      246,  246,  246,  246,  246,  246,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  246,  246,  246,
-      246,  246,  259,  259,  259,  259,  259,    0,  259,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  259,    0,    0,    0,    0,    0,  259,  259,  259,
-      259,  259,  259,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  259,    0,    0,  259,  259,  259,  259,  259,  260,
-      260,  260,  260,    0,    0,  260,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,  260,    0,
-        0,    0,    0,    0,  260,  260,  260,  260,  260,  260,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  260,    0,
-        0,  260,  260,  260,  260,  260,  264,  264,  264,  264,
-      264,    0,    0,    0,    0,    0,    0,  264,    0,    0,
-        0,    0,    0,    0,    0,  264,    0,    0,    0,    0,
-        0,  264,  264,  264,  264,  264,  264,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  264,    0,    0,  264,  264,
-
-      264,  264,  264,  265,  265,  265,  265,    0,    0,    0,
-        0,    0,    0,    0,  265,    0,    0,    0,    0,    0,
-        0,    0,  265,    0,    0,    0,    0,    0,  265,  265,
-      265,  265,  265,  265,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       16,   16,   16,   16,   16,   16,   19,   56,   16,   23,
+      101,   43,   23,   43,  101,   19,   19,   19,   19,   19,
+       19,   55,   23,   26,   26,   26,   26,   26,   27,   27,
+       27,   27,   27,   56,   33,   43,   99,   99,  319,   87,
+       40,   55,   23,   33,   33,   33,   33,   33,   33,   40,
+       40,   40,   40,   40,   40,   54,   42,   86,   87,   42,
+
+       42,  114,   86,   49,   27,   31,   31,   31,   31,   42,
+       54,   31,   49,   49,   49,   49,   49,   49,   58,   93,
+       54,   86,   60,   60,   31,  318,   88,  114,   58,   93,
+       31,   59,   60,   31,   31,   31,   31,   31,   31,   36,
+       36,   36,   36,   93,   72,   88,   59,   76,   79,   94,
+       36,   61,   59,  117,  317,   79,   61,   72,   36,  117,
+       76,   79,   80,   94,   36,  310,  309,   36,   36,   36,
+       36,   36,   36,   61,   77,   80,   61,   73,   73,   73,
+       73,   73,  106,   77,   77,   77,   77,   77,   77,   73,
+       82,  108,  308,  121,  140,  198,   73,   80,   95,  121,
+
+      108,  106,   73,   82,  180,   73,   73,   73,   73,   73,
+       73,   81,   95,  140,  198,   81,  302,   82,  131,  180,
+       81,   81,   81,   81,   81,   81,   89,   89,   89,   89,
+       89,  131,   89,  134,  135,  136,  138,  150,  143,  177,
+      134,  168,  136,  177,  150,   89,  134,  135,  168,  138,
+      224,   89,  143,  199,   89,   89,   89,   89,   89,   89,
+       90,   90,   90,   90,  105,  152,   90,  199,  227,  224,
+      263,  152,  301,  105,  105,  105,  105,  105,  105,   90,
+      154,  300,  227,  299,  263,   90,  154,  298,   90,   90,
+       90,   90,   90,   90,   92,   92,   92,   92,   92,  192,
+
+      218,  223,  223,  223,  223,  223,  192,  218,  225,  225,
+      225,  225,  225,   92,  223,  258,  288,  289,  296,   92,
+      280,  225,   92,   92,   92,   92,   92,   92,   96,   96,
+       96,   96,   96,  249,  258,  288,  289,  277,  292,   96,
+      249,  255,  255,  255,  255,  255,  257,   96,  276,  268,
+      254,  257,  292,   96,  255,  293,   96,   96,   96,   96,
+       96,   96,   97,   97,   97,   97,  130,  253,  252,  293,
+      257,  251,  250,   97,  245,  130,  130,  130,  130,  130,
+      130,   97,  272,  272,  272,  272,  272,   97,  274,  243,
+       97,   97,   97,   97,   97,   97,  103,  103,  103,  103,
+
+      103,  242,  274,  241,  235,  222,  274,  272,  221,  220,
+      259,  259,  259,  259,  259,  103,  259,  219,  214,  212,
+      211,  103,  210,  259,  103,  103,  103,  103,  103,  103,
+      132,  132,  132,  132,  132,  259,  278,  278,  278,  278,
+      278,  141,  209,  208,  202,  195,  194,  193,  187,  132,
+      141,  141,  141,  141,  141,  141,  142,  186,  132,  132,
+      132,  132,  132,  132,  144,  142,  142,  142,  142,  142,
+      142,  147,  185,  144,  144,  144,  144,  144,  144,  184,
+      147,  147,  147,  147,  147,  147,  149,  149,  149,  149,
+      149,  183,  182,  181,  176,  172,  170,  164,  169,  163,
+
+      162,  161,  160,  262,  159,  149,  164,  164,  164,  164,
+      164,  164,  165,  262,  149,  149,  149,  149,  149,  149,
+      167,  165,  165,  165,  165,  165,  165,  262,  158,  167,
+      167,  167,  167,  167,  167,  171,  171,  171,  171,  171,
+      173,  171,  157,  155,  153,  151,  171,  148,  171,  173,
+      173,  173,  173,  173,  173,  174,  145,  139,  137,  133,
+      171,  175,  129,  128,  174,  174,  174,  174,  174,  174,
+      175,  175,  175,  175,  175,  175,  178,  297,  297,  297,
+      297,  297,  179,  127,  126,  178,  178,  178,  178,  178,
+      178,  179,  179,  179,  179,  179,  179,  189,  125,  124,
+
+      123,  122,  297,  190,  120,  119,  189,  189,  189,  189,
+      189,  189,  190,  190,  190,  190,  190,  190,  191,  118,
+      116,  115,  113,  112,  110,  109,  107,  191,  191,  191,
+      191,  191,  191,  196,  196,  196,  196,  196,  203,  196,
+      104,  102,  100,   91,  196,   85,  196,  203,  203,  203,
+      203,  203,  203,   78,   71,   70,   69,   68,  196,  197,
+      197,  197,  197,  197,  204,  197,   67,   66,   65,   64,
+      197,   63,  197,  204,  204,  204,  204,  204,  204,   51,
+       47,   46,   44,   38,  197,  201,  201,  201,  201,  201,
+       32,  201,   28,   25,   24,   20,  201,  201,  201,   17,
+
+       15,   14,   12,   10,  201,    9,    3,    0,    0,    0,
+      201,  205,    0,  201,  201,  201,  201,  201,  201,  206,
+      205,  205,  205,  205,  205,  205,  207,    0,  206,  206,
+      206,  206,  206,  206,  215,  207,  207,  207,  207,  207,
+      207,  216,    0,  215,  215,  215,  215,  215,  215,  217,
+      216,  216,  216,  216,  216,  216,    0,    0,  217,  217,
+      217,  217,  217,  217,  226,  226,  226,  226,  236,    0,
+      226,    0,    0,    0,    0,    0,    0,  236,  236,  236,
+      236,  236,  236,  226,    0,    0,    0,    0,    0,  226,
+        0,    0,  226,  226,  226,  226,  226,  226,  228,  228,
+
+      228,  228,  237,    0,    0,    0,    0,    0,    0,  228,
+        0,  237,  237,  237,  237,  237,  237,  228,    0,    0,
+        0,    0,    0,  228,    0,    0,  228,  228,  228,  228,
+      228,  228,  229,  229,  229,  229,  229,  238,  229,    0,
+        0,    0,    0,  229,    0,  229,  238,  238,  238,  238,
+      238,  238,    0,    0,    0,    0,    0,  229,  230,  230,
+      230,  230,  230,  239,  230,    0,    0,    0,    0,  230,
+        0,  230,  239,  239,  239,  239,  239,  239,    0,    0,
+        0,    0,    0,  230,  231,  231,  231,  231,  231,  240,
+      231,    0,    0,    0,    0,  231,    0,  231,  240,  240,
+
+      240,  240,  240,  240,    0,    0,    0,    0,    0,  231,
+      232,  232,  232,  232,  232,  246,  232,    0,    0,    0,
+        0,  232,    0,  232,  246,  246,  246,  246,  246,  246,
+        0,    0,    0,    0,    0,  232,  233,  233,  233,  233,
+      233,    0,  233,    0,    0,    0,    0,  233,    0,  233,
+      287,  287,  287,  287,  287,  233,  287,    0,    0,    0,
+        0,  233,    0,  287,  233,  233,  233,  233,  233,  233,
+      234,  234,  234,  234,  234,  287,  234,    0,    0,    0,
+        0,  234,  234,  234,    0,    0,    0,    0,    0,  234,
+        0,    0,    0,    0,    0,  234,  247,    0,  234,  234,
+
+      234,  234,  234,  234,  248,  247,  247,  247,  247,  247,
+      247,    0,    0,  248,  248,  248,  248,  248,  248,  260,
+      260,  260,  260,  260,    0,  260,    0,    0,    0,    0,
+        0,    0,  264,  264,  264,  264,  264,    0,  260,    0,
+        0,    0,    0,  264,  260,  264,    0,  260,  260,  260,
+      260,  260,  260,  261,  261,  261,  261,  264,    0,  261,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  261,    0,    0,    0,    0,    0,  261,    0,
+        0,  261,  261,  261,  261,  261,  261,  265,  265,  265,
+      265,  265,    0,    0,    0,    0,    0,    0,  265,    0,
+
+        0,    0,    0,    0,    0,    0,  265,    0,    0,    0,
         0,    0,  265,    0,    0,  265,  265,  265,  265,  265,
-      266,    0,    0,    0,    0,    0,  266,  266,  266,  266,
-      266,  266,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  266,  266,  266,  266,  266,  267,    0,
-
-        0,    0,    0,    0,  267,  267,  267,  267,  267,  267,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  267,  267,  267,  267,  267,  269,    0,    0,    0,
-        0,    0,  269,  269,  269,  269,  269,  269,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  269,
-      269,  269,  269,  269,  270,    0,    0,    0,    0,    0,
-      270,  270,  270,  270,  270,  270,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,  270,  270,  270,
-      270,  270,  271,    0,    0,    0,    0,    0,  271,  271,
-      271,  271,  271,  271,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  271,  271,  271,  271,  271,
-      272,    0,    0,    0,    0,    0,  272,  272,  272,  272,
-      272,  272,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  272,  272,  272,  272,  272,  273,    0,
-        0,    0,    0,    0,  273,  273,  273,  273,  273,  273,
+      265,  266,  266,  266,  266,  267,    0,    0,    0,    0,
+        0,    0,  266,    0,  267,  267,  267,  267,  267,  267,
+      266,    0,    0,    0,    0,    0,  266,  269,    0,  266,
+      266,  266,  266,  266,  266,  270,  269,  269,  269,  269,
+      269,  269,  271,    0,  270,  270,  270,  270,  270,  270,
+      273,  271,  271,  271,  271,  271,  271,  279,    0,  273,
+      273,  273,  273,  273,  273,  290,  279,  279,  279,  279,
+      279,  279,    0,    0,  290,  290,  290,  290,  290,  290,
+
+      291,  291,  291,  291,  291,  294,    0,    0,    0,    0,
+        0,  291,    0,  291,  294,  294,  294,  294,  294,  294,
+      295,    0,    0,    0,    0,  291,  303,    0,    0,  295,
+      295,  295,  295,  295,  295,  303,  303,  303,  303,  303,
+      303,  304,    0,    0,    0,    0,    0,  305,    0,    0,
+      304,  304,  304,  304,  304,  304,  305,  305,  305,  305,
+      305,  305,  306,    0,    0,    0,    0,    0,  314,    0,
+        0,  306,  306,  306,  306,  306,  306,  314,  314,  314,
+      314,  314,  314,  315,    0,    0,    0,    0,    0,  316,
+        0,    0,  315,  315,  315,  315,  315,  315,  316,  316,
+
+      316,  316,  316,  316,  320,    0,    0,    0,    0,    0,
+      321,    0,    0,  320,  320,  320,  320,  320,  320,  321,
+      321,  321,  321,  321,  321,  322,    0,    0,    0,    0,
+        0,  326,    0,    0,  322,  322,  322,  322,  322,  322,
+      326,  326,  326,  326,  326,  326,  327,    0,    0,    0,
+        0,    0,    0,    0,    0,  327,  327,  327,  327,  327,
+      327,  331,    0,  331,  331,  331,  331,  331,  331,  332,
+        0,  332,  332,  333,    0,  333,  333,  333,  333,  333,
+      333,  334,    0,  334,  334,  335,  335,  335,  335,  335,
+      335,  336,  336,    0,  336,  336,  337,  337,  337,  337,
+
+      337,  337,  337,  337,  338,  338,  338,  338,  338,  338,
+      339,  339,  339,  339,  339,  339,  339,  339,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  341,  341,  342,
+      342,  342,  342,  342,  342,  343,    0,  343,  343,  344,
+      344,  344,  344,  344,  344,  345,  345,  345,  345,  345,
+      345,  345,  345,  345,  346,  346,  346,  346,  346,  346,
+      347,  347,    0,  347,  348,  348,  348,  348,  348,  348,
+      348,  348,  348,  349,  349,    0,  349,  350,  350,  350,
+        0,  350,  350,  350,  350,  351,  351,    0,  351,  352,
+        0,  352,  352,  352,  352,  352,  352,  353,    0,  353,
+
+      353,  353,  353,  353,  353,  354,  354,  354,  354,  354,
+      354,  354,  354,  355,  355,    0,  355,  356,  356,  356,
+      356,  356,  356,  356,  356,  357,  357,  357,  357,  357,
+      357,  357,  357,  358,  358,    0,  358,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330,  330,  330,  330,  330,  330,  330,
+      330,  330,  330,  330
 
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  273,  273,  273,  273,  273,  290,    0,    0,    0,
-        0,    0,  290,  290,  290,  290,  290,  290,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  290,
-      290,  290,  290,  290,  294,    0,    0,    0,    0,    0,
-      294,  294,  294,  294,  294,  294,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  294,  294,  294,
-
-      294,  294,  295,    0,    0,    0,    0,    0,  295,  295,
-      295,  295,  295,  295,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  295,  295,  295,  295,  295,
-      302,    0,    0,    0,    0,    0,  302,  302,  302,  302,
-      302,  302,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  302,  302,  302,  302,  302,  303,    0,
-        0,    0,    0,    0,  303,  303,  303,  303,  303,  303,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  303,  303,  303,  303,  303,  304,    0,    0,    0,
-        0,    0,  304,  304,  304,  304,  304,  304,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  304,
-      304,  304,  304,  304,  310,    0,    0,    0,    0,    0,
-      310,  310,  310,  310,  310,  310,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  310,  310,  310,
-      310,  310,  311,    0,    0,    0,    0,    0,  311,  311,
-
-      311,  311,  311,  311,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  311,  311,  311,  311,  311,
-      312,    0,    0,    0,    0,    0,  312,  312,  312,  312,
-      312,  312,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  312,  312,  312,  312,  312,  316,    0,
-        0,    0,    0,    0,  316,  316,  316,  316,  316,  316,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,  316,  316,  316,  316,  316,  317,    0,    0,    0,
-        0,    0,  317,  317,  317,  317,  317,  317,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  317,
-      317,  317,  317,  317,  318,    0,    0,    0,    0,    0,
-      318,  318,  318,  318,  318,  318,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  318,  318,  318,
-      318,  318,  333,    0,  333,  333,  333,  333,  333,  333,
-      333,  334,  334,    0,  334,  334,  335,    0,  335,  335,
-
-      335,  335,  335,  335,  335,  336,  336,    0,  336,  336,
-      337,  337,  337,    0,  337,  337,  338,  338,  338,  338,
-      338,  338,  338,  339,  339,  339,  339,  339,  339,  339,
-      339,  339,  340,  340,  340,  340,  340,  340,  340,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  342,  342,
-      342,  342,  342,  342,  342,  342,  342,  342,  343,  343,
-      344,  344,    0,  344,  344,  345,  345,  345,  345,  345,
-      345,  345,  346,  346,  346,  346,  346,  346,  346,  347,
-      347,  347,  348,  348,  348,  348,  348,  348,  348,  348,
-      348,  348,  349,  349,  349,  349,  349,  349,  349,  350,
-
-      350,  350,  350,  351,  351,  351,  351,  351,  351,  351,
-      351,  351,  351,  352,    0,  352,  353,  353,  353,  353,
-      354,  354,  354,    0,  354,  354,  354,  354,  354,  355,
-        0,  355,  356,  356,  356,  356,  357,    0,  357,  357,
-      357,  357,  357,  357,  357,  358,    0,  358,  358,  358,
-      358,  358,  358,  358,  359,  359,  359,  359,  359,  359,
-      359,  359,  359,  360,    0,  360,  361,  361,  361,  361,
-      362,  362,  362,  362,  362,  362,  362,  362,  362,  363,
-      363,  363,  363,  363,  363,  363,  363,  363,  364,    0,
-      364,  365,  365,  365,  365,  366,    0,  366,  367,    0,
-
-      367,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332,
-      332,  332,  332,  332,  332,  332,  332,  332,  332,  332
     } ;
 
 YY_DECL
-{
+	{
 	register yy_state_type yy_current_state;
-	register short unsigned int *yy_cp;
-	register short unsigned int *yy_bp;
+	register unsigned short *yy_cp, *yy_bp;
 	register int yy_act;
-    
-// #line 25 "tokenizer.flex"
+
+#line 25 "tokenizer.flex"
+
+
+#line 1009 "tok"
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = (yy_c_buf_p);
+		yy_cp = yy_c_buf_p;
 
 		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = (yy_start);
+		yy_current_state = yy_start;
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
+				yy_last_accepting_state = yy_current_state;
+				yy_last_accepting_cpos = yy_cp;
 				}
 			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 >= 333 )
+				if ( yy_current_state >= 331 )
 					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] != 3602 );
+		while ( yy_base[yy_current_state] != 1638 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
+
 do_action:	/* This label is used only to access EOF actions. */
 
+
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
+			*yy_cp = yy_hold_char;
+			yy_cp = yy_last_accepting_cpos;
+			yy_current_state = yy_last_accepting_state;
 			goto yy_find_action;
 
 case 1:
-/* rule 1 can match eol */
 YY_RULE_SETUP
-// #line 27 "tokenizer.flex"
+#line 27 "tokenizer.flex"
 /* ignore comments */
 	YY_BREAK
 case 2:
-/* rule 2 can match eol */
 YY_RULE_SETUP
 #line 29 "tokenizer.flex"
 {yyTok = S; return yyTok;}
@@ -1144,13 +704,11 @@ YY_RULE_SETUP
 {yyTok = CONTAINS; return yyTok;}
 	YY_BREAK
 case 10:
-/* rule 10 can match eol */
 YY_RULE_SETUP
 #line 39 "tokenizer.flex"
 {yyTok = STRING; return yyTok;}
 	YY_BREAK
 case 11:
-/* rule 11 can match eol */
 YY_RULE_SETUP
 #line 41 "tokenizer.flex"
 {yyTok = IDENT; return yyTok;}
@@ -1161,7 +719,6 @@ YY_RULE_SETUP
 {yyTok = NTH; return yyTok;}
 	YY_BREAK
 case 13:
-/* rule 13 can match eol */
 YY_RULE_SETUP
 #line 45 "tokenizer.flex"
 {yyTok = HASH; return yyTok;}
@@ -1212,7 +769,6 @@ YY_RULE_SETUP
 {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
 	YY_BREAK
 case 23:
-/* rule 23 can match eol */
 YY_RULE_SETUP
 #line 57 "tokenizer.flex"
 {yyTok = IMPORTANT_SYM; return yyTok;}
@@ -1298,7 +854,6 @@ YY_RULE_SETUP
 {yyTok = KHERZ; return yyTok;}
 	YY_BREAK
 case 40:
-/* rule 40 can match eol */
 YY_RULE_SETUP
 #line 75 "tokenizer.flex"
 {yyTok = DIMEN; return yyTok;}
@@ -1324,19 +879,16 @@ YY_RULE_SETUP
 {yyTok = NOTFUNCTION; return yyTok;}
 	YY_BREAK
 case 45:
-/* rule 45 can match eol */
 YY_RULE_SETUP
 #line 82 "tokenizer.flex"
 {yyTok = URI; return yyTok;}
 	YY_BREAK
 case 46:
-/* rule 46 can match eol */
 YY_RULE_SETUP
 #line 83 "tokenizer.flex"
 {yyTok = URI; return yyTok;}
 	YY_BREAK
 case 47:
-/* rule 47 can match eol */
 YY_RULE_SETUP
 #line 84 "tokenizer.flex"
 {yyTok = FUNCTION; return yyTok;}
@@ -1361,7 +913,7 @@ YY_RULE_SETUP
 #line 91 "tokenizer.flex"
 ECHO;
 	YY_BREAK
-#line 1926 "lex.yy.c"
+#line 1347 "tok"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
diff --git a/tdehtml/css/tokenizer.flex b/tdehtml/css/tokenizer.flex
index 330d13042..4ad07e2ad 100644
--- a/tdehtml/css/tokenizer.flex
+++ b/tdehtml/css/tokenizer.flex
@@ -50,9 +50,9 @@ nth             (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
 "@font-face"            {yyTok = FONT_FACE_SYM; return yyTok;}
 "@charset"              {yyTok = CHARSET_SYM; return yyTok;}
 "@namespace"		{yyTok = NAMESPACE_SYM; return yyTok; }
-"@-tdehtml-rule"    {yyTok = TDEHTML_RULE_SYM; return yyTok; }
-"@-tdehtml-decls"   {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
-"@-tdehtml-value"   {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
+"@-khtml-rule"    {yyTok = TDEHTML_RULE_SYM; return yyTok; }
+"@-khtml-decls"   {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
+"@-khtml-value"   {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
 
 "!"{w}"important"         {yyTok = IMPORTANT_SYM; return yyTok;}
 
diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index bdd7183fe..3ded567fe 100644
--- a/tdehtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -355,7 +355,7 @@ void KJSProxyImpl::applyUserAgent()
     // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
     if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
         userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
-        userAgent.find(TQString::fromLatin1("TDEHTML")) == -1)
+        userAgent.find(TQString::fromLatin1("KHTML")) == -1)
     {
       m_script->setCompatMode(Interpreter::NetscapeCompat);
 #ifdef KJS_VERBOSE
diff --git a/tdehtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index fc116caf3..c3137b5bb 100644
--- a/tdehtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -436,9 +436,8 @@ void HTMLElementImpl::addHTMLColor( int id, const DOMString &c )
 
 	    color.sprintf("#%02x%02x%02x", colors[0], colors[1], colors[2] );
 // 	    tqDebug( "trying to add fixed color string '%s'", color.latin1() );
-	    if ( m_styleDecls->setProperty(id, DOMString(color), false, true) ) {
+	    if ( m_styleDecls->setProperty(id, DOMString(color), false, true) )
 		return;
-	    }
 	}
     }
     m_styleDecls->setProperty(id, CSS_VAL_BLACK, false, true);
diff --git a/tdehtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp
index d9991c501..7916a9c4f 100644
--- a/tdehtml/rendering/bidi.cpp
+++ b/tdehtml/rendering/bidi.cpp
@@ -877,7 +877,7 @@ bool RenderBlock::clearLineOfPageBreaks(InlineFlowBox* lineBox)
                 lineBox->verticallyAlignBoxes(m_height);
             }
 #ifdef PAGE_DEBUG
-            kdDebug(6040) << "Cleared line " << lineBox->yPos() << "px" << endl;
+            kdDebug(6040) << "Cleared line " << lineBox->yPos() - oldYPos << "px" << endl;
 #endif
             setContainsPageBreak(true);
         }
@@ -1254,8 +1254,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
     }
 
 #if BIDI_DEBUG > 0
-//    kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
-//		  << ", eor=" << eor.obj << "/" << eor.pos << endl;
+    kdDebug(6041) << "reached end of line current=" << current.obj << "/" << current.pos
+		  << ", eor=" << eor.obj << "/" << eor.pos << endl;
 #endif
     if ( !emptyRun && bidi.sor != bidi.current ) {
 	    bidi.eor = bidi.last;
@@ -1286,10 +1286,10 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
 #if BIDI_DEBUG > 0
     kdDebug(6041) << "lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh << endl;
     kdDebug(6041) << "logical order is:" << endl;
-//    TQPtrListIterator<BidiRun> it2(runs);
-//    BidiRun *r2;
-//    for ( ; (r2 = it2.current()); ++it2 )
-//        kdDebug(6041) << "    " << r2 << "  start=" << r2->start << "  stop=" << r2->stop << "  level=" << (uint)r2->level << endl;
+    TQPtrListIterator<BidiRun> it2(runs);
+    BidiRun *r2;
+    for ( ; (r2 = it2.current()); ++it2 )
+        kdDebug(6041) << "    " << r2 << "  start=" << r2->start << "  stop=" << r2->stop << "  level=" << (uint)r2->level << endl;
 #endif
 
     int count = sBidiRunCount - 1;
@@ -1318,8 +1318,8 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
 
 #if BIDI_DEBUG > 0
     kdDebug(6041) << "visual order is:" << endl;
-//    for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
-//        kdDebug(6041) << "    " << curr << endl;
+    for (BidiRun* curr = sFirstRun; curr; curr = curr->nextRun)
+        kdDebug(6041) << "    " << curr << endl;
 #endif
 }
 
diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp
index 593d5d8c0..82d99cf41 100644
--- a/tdehtml/rendering/render_block.cpp
+++ b/tdehtml/rendering/render_block.cpp
@@ -26,11 +26,11 @@
  *
  */
 
-// #define DEBUG
-// #define DEBUG_LAYOUT
-// #define BOX_DEBUG
-// #define FLOAT_DEBUG
-// #define PAGE_DEBUG
+//#define DEBUG
+//#define DEBUG_LAYOUT
+//#define BOX_DEBUG
+//#define FLOAT_DEBUG
+//#define PAGE_DEBUG
 
 #include <kdebug.h>
 #include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp
index d8e7a1be1..3f8d6e8f0 100644
--- a/tdehtml/rendering/render_generated.cpp
+++ b/tdehtml/rendering/render_generated.cpp
@@ -259,7 +259,7 @@ void RenderQuote::generateContent()
         visual = true;
 
     if (!m_counterNode)
-        m_counterNode = getCounter("-tdehtml-quotes", visual, false);
+        m_counterNode = getCounter("-khtml-quotes", visual, false);
 
     int value = m_counterNode->count();
     if (m_counterNode->isReset()) value = m_counterNode->value();
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index a979e1dc1..eacbb4d16 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -2077,7 +2077,7 @@ bool RenderObject::hasCounter(const TQString& counter) const
                 element()->id() == ID_DIR))
             return true;
     } else
-    if (counter == "-tdehtml-quotes" && isQuote()) {
+    if (counter == "-khtml-quotes" && isQuote()) {
         return (static_cast<const RenderQuote*>(this)->quoteCount() != 0);
     }
     return false;
@@ -2146,7 +2146,7 @@ CounterNode* RenderObject::getCounter(const TQString& counter, bool view, bool c
 //             kdDebug( 6040 ) << renderName() << " counter-reset: " << counter << " " << val << endl;
         }
     }
-    else if (counter == "-tdehtml-quotes" && isQuote()) {
+    else if (counter == "-khtml-quotes" && isQuote()) {
         i = new CounterNode(this);
         val = static_cast<RenderQuote*>(this)->quoteCount();
     }
diff --git a/tdehtml/tdehtml_printsettings.cpp b/tdehtml/tdehtml_printsettings.cpp
index 19fe7bdbf..2dc3279a8 100644
--- a/tdehtml/tdehtml_printsettings.cpp
+++ b/tdehtml/tdehtml_printsettings.cpp
@@ -93,16 +93,16 @@ TDEHTMLPrintSettings::~TDEHTMLPrintSettings()
 
 void TDEHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/)
 {
-	opts["app-tdehtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
-	opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
-	opts["app-tdehtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
+	opts["app-khtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
+	opts["app-khtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
+	opts["app-khtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
 }
 
 void TDEHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	m_printfriendly->setChecked(opts["app-tdehtml-printfriendly"] != "false");
-	m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false");
-	m_printheader->setChecked(opts["app-tdehtml-printheader"] != "false");
+	m_printfriendly->setChecked(opts["app-khtml-printfriendly"] != "false");
+	m_printimages->setChecked(opts["app-khtml-printimages"] != "false");
+	m_printheader->setChecked(opts["app-khtml-printheader"] != "false");
 }
 
 #include "tdehtml_printsettings.moc"
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 16b274cbd..9e921809c 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -2801,7 +2801,7 @@ void TDEHTMLView::print(bool quick)
         // We ignore margin settings for html and body when printing
         // and use the default margins from the print-system
         // (In Qt 3.0.x the default margins are hardcoded in Qt)
-        m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-tdehtml-printfriendly") == "true" ?
+        m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-khtml-printfriendly") == "true" ?
                                                   "* { background-image: none !important;"
                                                   "    background-color: white !important;"
                                                   "    color: black !important; }"
@@ -2825,7 +2825,7 @@ void TDEHTMLView::print(bool quick)
 
         m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);
         m_part->xmlDocImpl()->updateStyleSelector();
-        root->setPrintImages( printer->option("app-tdehtml-printimages") == "true");
+        root->setPrintImages( printer->option("app-khtml-printimages") == "true");
         root->makePageBreakAvoidBlocks();
 
         root->setNeedsLayoutAndMinMaxRecalc();
@@ -2834,7 +2834,7 @@ void TDEHTMLView::print(bool quick)
 
         // check sizes ask for action.. (scale or clip)
 
-        bool printHeader = (printer->option("app-tdehtml-printheader") == "true");
+        bool printHeader = (printer->option("app-khtml-printheader") == "true");
 
         int headerHeight = 0;
         TQFont headerFont("Sans Serif", 8);
diff --git a/tdehtml/xml/dom2_rangeimpl.cpp b/tdehtml/xml/dom2_rangeimpl.cpp
index c7b19de5c..f8ff4fc89 100644
--- a/tdehtml/xml/dom2_rangeimpl.cpp
+++ b/tdehtml/xml/dom2_rangeimpl.cpp
@@ -1139,7 +1139,7 @@ DOMString RangeImpl::toHTML( int &exceptioncode )
       text = DOMString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
 		      "<head>\n"
 		      "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
-		      "<meta name=\"Generator\" content=\"TDEHTML, the KDE Web Page Viewer\" />\n"
+		      "<meta name=\"Generator\" content=\"TDEHTML, the TDE Web Page Viewer\" />\n"
 		      "</head>\n") +
 	    text +
 	    "</html>";
diff --git a/tdeio/tdeio/tdeprotocolmanager.cpp b/tdeio/tdeio/tdeprotocolmanager.cpp
index 04d0de5bb..6f64fe922 100644
--- a/tdeio/tdeio/tdeprotocolmanager.cpp
+++ b/tdeio/tdeio/tdeprotocolmanager.cpp
@@ -72,7 +72,7 @@ KProtocolManagerPrivate::~KProtocolManagerPrivate()
 
 // DEFAULT USERAGENT STRING
 #define CFG_DEFAULT_UAGENT(X) \
-TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) TDEHTML/%4.%5.%6 (like Gecko)") \
+TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/TDEHTML/%4.%5.%6 (like Gecko)") \
         .arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(X).arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)
 
 void KProtocolManager::reparseConfiguration()