Attachment 1916 Details for Bug 1825 – tdelibs CSS -khtml extension patch

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdelibs CSS -khtml extension patch

036_tdelibs_CSS_khtml.diff (text/plain), 47.02 KB, created by Michele Calgaro on 2014-02-06 08:45:46 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Michele Calgaro

Created: 2014-02-06 08:45:46 CST

Size: 47.02 KB

patch

obsolete

>diff -Nur ori/tdelibs/kate/data/ccss.xml new/tdelibs/kate/data/ccss.xml
>--- ori/tdelibs/kate/data/ccss.xml	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/kate/data/ccss.xml	2014-02-06 23:16:26.443624416 +0900
>@@ -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>
> 
> 		
>-		<item> -tdehtml-background-size </item>
>+		<item> -khtml-background-size </item>
> 		<item> konq_bgpos_x </item>
> 		<item> konq_bgpos_y </item>
> 
>diff -Nur ori/tdelibs/kate/data/css-php.xml new/tdelibs/kate/data/css-php.xml
>--- ori/tdelibs/kate/data/css-php.xml	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/kate/data/css-php.xml	2014-02-06 23:12:05.495631256 +0900
>@@ -21,7 +21,7 @@
> 
> 
> 
>-<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 @@
> 			
> 			<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>
> 
> 			
> 			<item> -webkit-appearance </item>
>diff -Nur ori/tdelibs/kate/data/css.xml new/tdelibs/kate/data/css.xml
>--- ori/tdelibs/kate/data/css.xml	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/kate/data/css.xml	2014-02-06 23:12:43.119630269 +0900
>@@ -15,7 +15,7 @@
> 
> -->
> 
>-<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 @@
> 			
> 			<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>
> 
> 			
> 			<item> -webkit-appearance </item>
>diff -Nur ori/tdelibs/kate/data/scss.xml new/tdelibs/kate/data/scss.xml
>--- ori/tdelibs/kate/data/scss.xml	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/kate/data/scss.xml	2014-02-06 23:12:23.699630779 +0900
>@@ -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>
> 
>             
>-            <item> -tdehtml-background-size </item>
>+            <item> -khtml-background-size </item>
>             <item> konq_bgpos_x </item>
>             <item> konq_bgpos_y </item>
> 
>diff -Nur ori/tdelibs/kate/data/update-files.xml new/tdelibs/kate/data/update-files.xml
>--- ori/tdelibs/kate/data/update-files.xml	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/kate/data/update-files.xml	2014-02-06 23:16:46.011623903 +0900
>@@ -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 -Nur ori/tdelibs/tdehtml/ChangeLog new/tdelibs/tdehtml/ChangeLog
>--- ori/tdelibs/tdehtml/ChangeLog	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/ChangeLog	2014-02-06 23:10:05.679634396 +0900
>@@ -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 -Nur ori/tdelibs/tdehtml/css/css_base.cpp new/tdelibs/tdehtml/css/css_base.cpp
>--- ori/tdelibs/tdehtml/css/css_base.cpp	2014-02-03 20:34:40.000000000 +0900
>+++ new/tdelibs/tdehtml/css/css_base.cpp	2014-02-06 23:10:05.215634409 +0900
>@@ -172,10 +172,10 @@
>         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 -Nur ori/tdelibs/tdehtml/css/cssparser.cpp new/tdelibs/tdehtml/css/cssparser.cpp
>--- ori/tdelibs/tdehtml/css/cssparser.cpp	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/css/cssparser.cpp	2014-02-06 23:10:05.243634408 +0900
>@@ -184,7 +184,7 @@
> {
>     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 @@
> 
>     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 @@
> 
>     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 @@
>         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 @@
>     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 -Nur ori/tdelibs/tdehtml/css/cssproperties.c new/tdelibs/tdehtml/css/cssproperties.c
>--- ori/tdelibs/tdehtml/css/cssproperties.c	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/css/cssproperties.c	2014-02-06 23:10:05.227634408 +0900
>@@ -295,7 +295,7 @@
> #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 @@
> #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 @@
> #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 @@
> #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 @@
> #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 @@
> #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 @@
> #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 @@
> #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 @@
> #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 @@
> #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 @@
> "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 @@
> "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 @@
> "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 @@
> "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 -Nur ori/tdelibs/tdehtml/css/cssproperties.in new/tdelibs/tdehtml/css/cssproperties.in
>--- ori/tdelibs/tdehtml/css/cssproperties.in	2014-02-03 20:34:40.000000000 +0900
>+++ new/tdelibs/tdehtml/css/cssproperties.in	2014-02-06 23:10:05.207634409 +0900
>@@ -20,14 +20,14 @@
> 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-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-right
> padding-bottom
> padding-left
>--tdehtml-padding-start
>+-khtml-padding-start
> #page
> page-break-after
> page-break-before
>@@ -144,5 +144,5 @@
> scrollbar-track-color
> scrollbar-arrow-color
> # tdehtml internals
>--tdehtml-flow-mode
>--tdehtml-user-input
>+-khtml-flow-mode
>+-khtml-user-input
>diff -Nur ori/tdelibs/tdehtml/css/css_renderstyledeclarationimpl.cpp new/tdelibs/tdehtml/css/css_renderstyledeclarationimpl.cpp
>--- ori/tdelibs/tdehtml/css/css_renderstyledeclarationimpl.cpp	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/css/css_renderstyledeclarationimpl.cpp	2014-02-06 23:10:05.259634407 +0900
>@@ -199,23 +199,23 @@
>         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 @@
>         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 -Nur ori/tdelibs/tdehtml/css/cssstyleselector.cpp new/tdelibs/tdehtml/css/cssstyleselector.cpp
>--- ori/tdelibs/tdehtml/css/cssstyleselector.cpp	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/css/cssstyleselector.cpp	2014-02-06 23:10:05.271634407 +0900
>@@ -3964,7 +3964,7 @@
>         }
>         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 -Nur ori/tdelibs/tdehtml/css/cssvalues.c new/tdelibs/tdehtml/css/cssvalues.c
>--- ori/tdelibs/tdehtml/css/cssvalues.c	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/css/cssvalues.c	2014-02-06 23:10:05.231634408 +0900
>@@ -454,7 +454,7 @@
> #line 240 "cssvalues.gperf"
>       {"both", CSS_VAL_BOTH},
> #line 141 "cssvalues.gperf"
>-      {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},
>+      {"-khtml-left", CSS_VAL__TDEHTML_LEFT},
> #line 261 "cssvalues.gperf"
>       {"show", CSS_VAL_SHOW},
> #line 21 "cssvalues.gperf"
>@@ -504,13 +504,13 @@
> #line 92 "cssvalues.gperf"
>       {"white", CSS_VAL_WHITE},
> #line 154 "cssvalues.gperf"
>-      {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},
>+      {"-khtml-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},
>+      {"-khtml-center", CSS_VAL__TDEHTML_CENTER},
> #line 148 "cssvalues.gperf"
>       {"square", CSS_VAL_SQUARE},
> #line 106 "cssvalues.gperf"
>@@ -544,7 +544,7 @@
> #line 272 "cssvalues.gperf"
>       {"forwards", CSS_VAL_FORWARDS},
> #line 150 "cssvalues.gperf"
>-      {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
>+      {"-khtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
> #line 238 "cssvalues.gperf"
>       {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
> #line 254 "cssvalues.gperf"
>@@ -554,13 +554,13 @@
> #line 227 "cssvalues.gperf"
>       {"nowrap", CSS_VAL_NOWRAP},
> #line 158 "cssvalues.gperf"
>-      {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
>+      {"-khtml-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},
>+      {"-khtml-normal", CSS_VAL__TDEHTML_NORMAL},
> #line 199 "cssvalues.gperf"
>       {"auto", CSS_VAL_AUTO},
> #line 60 "cssvalues.gperf"
>@@ -568,9 +568,9 @@
> #line 219 "cssvalues.gperf"
>       {"uppercase", CSS_VAL_UPPERCASE},
> #line 157 "cssvalues.gperf"
>-      {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},
>+      {"-khtml-thai", CSS_VAL__TDEHTML_THAI},
> #line 155 "cssvalues.gperf"
>-      {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},
>+      {"-khtml-persian", CSS_VAL__TDEHTML_PERSIAN},
> #line 102 "cssvalues.gperf"
>       {"captiontext", CSS_VAL_CAPTIONTEXT},
> #line 176 "cssvalues.gperf"
>@@ -596,7 +596,7 @@
> #line 201 "cssvalues.gperf"
>       {"default", CSS_VAL_DEFAULT},
> #line 16 "cssvalues.gperf"
>-      {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},
>+      {"-khtml-native", CSS_VAL__TDEHTML_NATIVE},
> #line 111 "cssvalues.gperf"
>       {"menutext", CSS_VAL_MENUTEXT},
> #line 98 "cssvalues.gperf"
>@@ -610,7 +610,7 @@
> #line 224 "cssvalues.gperf"
>       {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
> #line 136 "cssvalues.gperf"
>-      {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},
>+      {"-khtml-auto", CSS_VAL__TDEHTML_AUTO},
> #line 218 "cssvalues.gperf"
>       {"capitalize", CSS_VAL_CAPITALIZE},
> #line 232 "cssvalues.gperf"
>@@ -620,7 +620,7 @@
> #line 273 "cssvalues.gperf"
>       {"backwards", CSS_VAL_BACKWARDS},
> #line 122 "cssvalues.gperf"
>-      {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},
>+      {"-khtml-text", CSS_VAL__TDEHTML_TEXT},
> #line 212 "cssvalues.gperf"
>       {"w-resize", CSS_VAL_W_RESIZE},
> #line 104 "cssvalues.gperf"
>@@ -632,7 +632,7 @@
> #line 163 "cssvalues.gperf"
>       {"georgian", CSS_VAL_GEORGIAN},
> #line 135 "cssvalues.gperf"
>-      {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
>+      {"-khtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
> #line 164 "cssvalues.gperf"
>       {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
> #line 124 "cssvalues.gperf"
>@@ -652,21 +652,21 @@
> #line 177 "cssvalues.gperf"
>       {"hiragana", CSS_VAL_HIRAGANA},
> #line 181 "cssvalues.gperf"
>-      {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
>+      {"-khtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
> #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},
>+      {"-khtml-right", CSS_VAL__TDEHTML_RIGHT},
> #line 182 "cssvalues.gperf"
>-      {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
>+      {"-khtml-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},
>+      {"-khtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
> #line 231 "cssvalues.gperf"
>-      {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
>+      {"-khtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
> #line 61 "cssvalues.gperf"
>       {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
> #line 119 "cssvalues.gperf"
>@@ -674,7 +674,7 @@
> #line 175 "cssvalues.gperf"
>       {"upper-alpha", CSS_VAL_UPPER_ALPHA},
> #line 156 "cssvalues.gperf"
>-      {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},
>+      {"-khtml-urdu", CSS_VAL__TDEHTML_URDU},
> #line 101 "cssvalues.gperf"
>       {"buttontext", CSS_VAL_BUTTONTEXT},
> #line 173 "cssvalues.gperf"
>@@ -690,9 +690,9 @@
> #line 30 "cssvalues.gperf"
>       {"message-box", CSS_VAL_MESSAGE_BOX},
> #line 167 "cssvalues.gperf"
>-      {"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
>+      {"-khtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
> #line 168 "cssvalues.gperf"
>-      {"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
>+      {"-khtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
> #line 207 "cssvalues.gperf"
>       {"nw-resize", CSS_VAL_NW_RESIZE},
> #line 62 "cssvalues.gperf"
>@@ -704,15 +704,15 @@
> #line 113 "cssvalues.gperf"
>       {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
> #line 267 "cssvalues.gperf"
>-      {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
>+      {"-khtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
> #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},
>+      {"-khtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
> #line 166 "cssvalues.gperf"
>-      {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
>+      {"-khtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
> #line 49 "cssvalues.gperf"
>       {"xx-small", CSS_VAL_XX_SMALL},
> #line 115 "cssvalues.gperf"
>@@ -722,13 +722,13 @@
> #line 105 "cssvalues.gperf"
>       {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
> #line 169 "cssvalues.gperf"
>-      {"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
>+      {"-khtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
> #line 170 "cssvalues.gperf"
>-      {"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
>+      {"-khtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
> #line 116 "cssvalues.gperf"
>       {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
> #line 172 "cssvalues.gperf"
>-      {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK},
>+      {"-khtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK},
> #line 179 "cssvalues.gperf"
>       {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
> #line 191 "cssvalues.gperf"
>@@ -748,7 +748,7 @@
> #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}
>     };
> 
>   static const short lookup[] =
>@@ -1038,7 +1038,7 @@
> "",
> "inherit", 
> "initial", 
>-"-tdehtml-native", 
>+"-khtml-native", 
> "none", 
> "hidden", 
> "inset", 
>@@ -1078,7 +1078,7 @@
> "large", 
> "x-large", 
> "xx-large", 
>-"-tdehtml-xxx-large", 
>+"-khtml-xxx-large", 
> "smaller", 
> "larger", 
> "wider", 
>@@ -1144,7 +1144,7 @@
> "windowframe", 
> "windowtext", 
> "grey", 
>-"-tdehtml-text", 
>+"-khtml-text", 
> "repeat", 
> "repeat-x", 
> "repeat-y", 
>@@ -1157,44 +1157,44 @@
> "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 +1203,8 @@
> "katakana", 
> "hiragana-iroha", 
> "katakana-iroha", 
>-"-tdehtml-open-quote", 
>-"-tdehtml-close-quote", 
>+"-khtml-open-quote", 
>+"-khtml-close-quote", 
> "inline", 
> "block", 
> "list-item", 
>@@ -1253,7 +1253,7 @@
> "pre", 
> "pre-wrap", 
> "pre-line", 
>-"-tdehtml-nowrap", 
>+"-khtml-nowrap", 
> "break-word", 
> "above", 
> "absolute", 
>@@ -1288,8 +1288,8 @@
> "thick", 
> "thin", 
> "underline", 
>-"-tdehtml-normal", 
>-"-tdehtml-around-floats", 
>+"-khtml-normal", 
>+"-khtml-around-floats", 
> "border-box", 
> "content-box", 
> "enabled", 
>diff -Nur ori/tdelibs/tdehtml/css/cssvalues.in new/tdelibs/tdehtml/css/cssvalues.in
>--- ori/tdelibs/tdehtml/css/cssvalues.in	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/css/cssvalues.in	2014-02-06 23:10:05.211634409 +0900
>@@ -16,7 +16,7 @@
> # 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 @@
> large
> x-large
> xx-large
>--tdehtml-xxx-large
>+-khtml-xxx-large
> smaller
> larger
> #
>@@ -156,7 +156,7 @@
> #
> # colors in non strict mode
> grey
>--tdehtml-text
>+-khtml-text
> #
> # CSS_PROP_BACKGROUND_REPEAT:
> #
>@@ -176,18 +176,18 @@
> 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 @@
> 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 @@
> 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 @@
> pre
> pre-wrap
> pre-line
>--tdehtml-nowrap
>+-khtml-nowrap
> #
> # CSS_PROP_WORD_WRAP
> #
>@@ -351,8 +351,8 @@
> underline
> #
> # CSS_PROP__TDEHTML_FLOW_MODE
>--tdehtml-normal
>--tdehtml-around-floats
>+-khtml-normal
>+-khtml-around-floats
> 
> # CSS3 Values
> # CSS_PROP__TDEHTML_BOX_SIZING
>diff -Nur ori/tdelibs/tdehtml/css/html4.css new/tdelibs/tdehtml/css/html4.css
>--- ori/tdelibs/tdehtml/css/html4.css	2014-02-03 20:34:40.000000000 +0900
>+++ new/tdelibs/tdehtml/css/html4.css	2014-02-06 23:10:05.235634408 +0900
>@@ -11,7 +11,7 @@
> 
> html {
> 	display: block;
>-	color: -tdehtml-text;
>+	color: -khtml-text;
> }
> 
> /*
>@@ -99,7 +99,7 @@
> 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 @@
>         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 @@
> 	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="left"] {
>-	float: -tdehtml-left;
>+	float: -khtml-left;
> }
> 
> table[align="right"] {
>-	float: -tdehtml-right;
>+	float: -khtml-right;
> }
> 
> thead {
>@@ -232,7 +232,7 @@
> 
> caption {
> 	display: table-caption;
>-	text-align: -tdehtml-center;
>+	text-align: -khtml-center;
> }
> 
> /*
>@@ -243,19 +243,19 @@
>         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 @@
> }
> 
> dl > dd {
>-	-tdehtml-margin-start: 40px;
>+	-khtml-margin-start: 40px;
> }
> 
> dl {
>@@ -329,7 +329,7 @@
>         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 @@
> }
> 
> input, textarea {
>-        text-align: -tdehtml-auto;
>+        text-align: -khtml-auto;
> }
> 
> input, textarea, select, button {
>@@ -357,7 +357,7 @@
> 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 @@
> textarea {
>         color: windowtext;
>         font-family: monospace;
>-        border: 2px -tdehtml-native;
>+        border: 2px -khtml-native;
> }
> 
> /*
>diff -Nur ori/tdelibs/tdehtml/css/quirks.css new/tdelibs/tdehtml/css/quirks.css
>--- ori/tdelibs/tdehtml/css/quirks.css	2014-02-03 20:34:40.000000000 +0900
>+++ new/tdelibs/tdehtml/css/quirks.css	2014-02-06 23:10:05.203634409 +0900
>@@ -21,10 +21,10 @@
> 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 -Nur ori/tdelibs/tdehtml/css/tokenizer.flex new/tdelibs/tdehtml/css/tokenizer.flex
>--- ori/tdelibs/tdehtml/css/tokenizer.flex	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/css/tokenizer.flex	2014-02-06 23:10:05.199634409 +0900
>@@ -50,9 +50,9 @@
> "@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 -Nur ori/tdelibs/tdehtml/rendering/render_generated.cpp new/tdelibs/tdehtml/rendering/render_generated.cpp
>--- ori/tdelibs/tdehtml/rendering/render_generated.cpp	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/rendering/render_generated.cpp	2014-02-06 23:10:05.399634404 +0900
>@@ -259,7 +259,7 @@
>         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 -Nur ori/tdelibs/tdehtml/rendering/render_object.cpp new/tdelibs/tdehtml/rendering/render_object.cpp
>--- ori/tdelibs/tdehtml/rendering/render_object.cpp	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/rendering/render_object.cpp	2014-02-06 23:10:05.423634403 +0900
>@@ -2077,7 +2077,7 @@
>                 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 @@
> //             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 -Nur ori/tdelibs/tdehtml/tdehtml_printsettings.cpp new/tdelibs/tdehtml/tdehtml_printsettings.cpp
>--- ori/tdelibs/tdehtml/tdehtml_printsettings.cpp	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/tdehtml_printsettings.cpp	2014-02-06 23:10:05.615634398 +0900
>@@ -93,16 +93,16 @@
> 
> 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 -Nur ori/tdelibs/tdehtml/tdehtmlview.cpp new/tdelibs/tdehtml/tdehtmlview.cpp
>--- ori/tdelibs/tdehtml/tdehtmlview.cpp	2014-02-05 16:54:13.000000000 +0900
>+++ new/tdelibs/tdehtml/tdehtmlview.cpp	2014-02-06 23:10:05.291634407 +0900
>@@ -2801,7 +2801,7 @@
>         // 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 @@
> 
>         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 @@
> 
>         // 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);

Actions: View | Diff

Attachments on bug 1825: 1895 | 1896 | 1901 | 1902 | 1903 | 1916 | 1917 | 1919 | 1920 | 1921