Attachment #1916 for bug #1825

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. View | Details | Raw Unified | Return to bug 1825
Collapse All | Expand All

Lines 1-7 Link Here

(-)ori/tdelibs/kate/data/ccss.xml (-2 / +2 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<!DOCTYPE language SYSTEM "language.dtd">	2	<!DOCTYPE language SYSTEM "language.dtd">
3		3
4	<language name="CleanCSS" version="1.01" kateversion="2.5" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD">	4	<language name="CleanCSS" version="1.02" kateversion="2.5" section="Markup" extensions="*.ccss" author="Massimiliano Torromeo" license="BSD">
5		5
6	<highlighting>	6	<highlighting>
7	<list name="properties">	7	<list name="properties">
Lines 171-177 Link Here
171	<item> -o-text-overflow </item>	171	<item> -o-text-overflow </item>
172		172
173	<!-- konq specific -->	173	<!-- konq specific -->
174	<item> -tdehtml-background-size </item>	174	<item> -khtml-background-size </item>
175	<item> konq_bgpos_x </item>	175	<item> konq_bgpos_x </item>
176	<item> konq_bgpos_y </item>	176	<item> konq_bgpos_y </item>
177		177







<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">

			<!-- konq specific -->
			<item> konq_bgpos_x </item>
			<item> konq_bgpos_y </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>





-->

<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">

			<!-- konq specific -->
			<item> konq_bgpos_x </item>
			<item> konq_bgpos_y </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>

Lines 21-27 Link Here

(-)ori/tdelibs/kate/data/scss.xml (-2 / +2 lines)
21		21
22	-->	22	-->
23		23
24	<language name="SCSS" version="2.05" kateversion="2.5" section="Markup" extensions="*.scss" indenter="cstyle"	24	<language name="SCSS" version="2.06" kateversion="2.5" section="Markup" extensions="*.scss" indenter="cstyle"
25	mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">	25	mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
26		26
27	<highlighting>	27	<highlighting>
Lines 189-195 Link Here
189	<item> -o-text-overflow </item>	189	<item> -o-text-overflow </item>
190		190
191	<!-- konq specific -->	191	<!-- konq specific -->
192	<item> -tdehtml-background-size </item>	192	<item> -khtml-background-size </item>
193	<item> konq_bgpos_x </item>	193	<item> konq_bgpos_x </item>
194	<item> konq_bgpos_y </item>	194	<item> konq_bgpos_y </item>
195		195




<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.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"/>

<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.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"/>

<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.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"/>




2005-12-09  Germain Garand  <germain@ebooksfrance.org>

        implement quirky HTML alignment ; introduce special float values
        -khtml-left/-khtml-right to this effect.

        * css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
        * css/cssstyleselector.cpp: ditto.

        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 -khtml-
        * rendering/render_style.h: Add new enums
        * rendering/enumerate.cpp: Implement the ideographic algorithm.


        * 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, -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>


        Implement CSS border on form-widgets

        * 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 -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


        float and flowAroundFloat fixes.

        * 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.

	* tdehtml_part.cpp: (clear) Stopping marquees.
	* css/cssparser.cpp: (parserValue) Parse overflow: marquee.
	Inserted CSS3 Properties section.
	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 -khtml-marquee{,-direction,-increment,
	-style,-repetition,	-speed} keywords.
	* css/cssstyleselector: (applyRule) Handle overflow: marquee.
	Handle applying of -khtml-marquee{,-direction,-increment,-style,-repetition,
	-speed}.
	* css/cssvalues.{c,h}: Regenerated.
	* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,

Lines 172-181 Link Here

(-)ori/tdelibs/tdehtml/css/css_base.cpp (-2 / +2 lines)
172	value = value.lower();	172	value = value.lower();
173	switch (value[0]) {	173	switch (value[0]) {
174	case '-':	174	case '-':
175	if (value == "-tdehtml-replaced")	175	if (value == "-khtml-replaced")
176	_pseudoType = PseudoReplaced;	176	_pseudoType = PseudoReplaced;
177	else	177	else
178	if (value == "-tdehtml-marker")	178	if (value == "-khtml-marker")
179	_pseudoType = PseudoMarker;	179	_pseudoType = PseudoMarker;
180	element = true;	180	element = true;
181	break;	181	break;




{
    styleElement = sheet;

    const char tdehtml_rule[] = "@-khtml-rule{";
    int length = string.length() + 4 + strlen(tdehtml_rule);
    assert( !data );
    data = (unsigned short *)malloc( length *sizeof( unsigned short ) );


    styleElement = declaration->stylesheet();

    const char tdehtml_value[] = "@-khtml-value{";
    int length = string.length() + 4 + strlen(tdehtml_value);
    assert( !data );
    data = (unsigned short *)malloc( length *sizeof( unsigned short ) );


    styleElement = declaration->stylesheet();

    const char tdehtml_decls[] = "@-khtml-decls{";
    int length = string.length() + 4 + strlen(tdehtml_decls);
    assert( !data );
    data = (unsigned short *)malloc( length *sizeof( unsigned short ) );

        break;

    case CSS_PROP_DISPLAY:
        // 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)

    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 | -khtml-native
    case CSS_PROP_BORDER_LEFT_STYLE:    ////
        if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
            valid_primitive = true;




#line 104 "cssproperties.gperf"
      {"text-indent", CSS_PROP_TEXT_INDENT},
#line 69 "cssproperties.gperf"
      {"-khtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
#line 14 "cssproperties.gperf"
      {"background-color", CSS_PROP_BACKGROUND_COLOR},
#line 100 "cssproperties.gperf"

#line 47 "cssproperties.gperf"
      {"counter-reset", CSS_PROP_COUNTER_RESET},
#line 93 "cssproperties.gperf"
      {"-khtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
#line 15 "cssproperties.gperf"
      {"background-image", CSS_PROP_BACKGROUND_IMAGE},
#line 96 "cssproperties.gperf"

#line 52 "cssproperties.gperf"
      {"float", CSS_PROP_FLOAT},
#line 21 "cssproperties.gperf"
      {"-khtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
#line 70 "cssproperties.gperf"
      {"-khtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
#line 27 "cssproperties.gperf"
      {"-khtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
#line 46 "cssproperties.gperf"
      {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
#line 128 "cssproperties.gperf"

#line 31 "cssproperties.gperf"
      {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
#line 22 "cssproperties.gperf"
      {"-khtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
#line 17 "cssproperties.gperf"
      {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
#line 126 "cssproperties.gperf"

#line 68 "cssproperties.gperf"
      {"margin-left", CSS_PROP_MARGIN_LEFT},
#line 142 "cssproperties.gperf"
      {"-khtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
#line 79 "cssproperties.gperf"
      {"min-width", CSS_PROP_MIN_WIDTH},
#line 127 "cssproperties.gperf"

#line 92 "cssproperties.gperf"
      {"padding-left", CSS_PROP_PADDING_LEFT},
#line 71 "cssproperties.gperf"
      {"-khtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
#line 73 "cssproperties.gperf"
      {"-khtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
#line 95 "cssproperties.gperf"
      {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
#line 74 "cssproperties.gperf"
      {"-khtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
#line 94 "cssproperties.gperf"
      {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
#line 81 "cssproperties.gperf"

#line 134 "cssproperties.gperf"
      {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
#line 72 "cssproperties.gperf"
      {"-khtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
#line 116 "cssproperties.gperf"
      {"word-spacing", CSS_PROP_WORD_SPACING},
#line 111 "cssproperties.gperf"

#line 32 "cssproperties.gperf"
      {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
#line 26 "cssproperties.gperf"
      {"-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"
      {"-khtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
#line 135 "cssproperties.gperf"
      {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
#line 129 "cssproperties.gperf"

#line 84 "cssproperties.gperf"
      {"outline-style", CSS_PROP_OUTLINE_STYLE},
#line 141 "cssproperties.gperf"
      {"-khtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
#line 87 "cssproperties.gperf"
      {"overflow-x", CSS_PROP_OVERFLOW_X},
#line 113 "cssproperties.gperf"

#line 83 "cssproperties.gperf"
      {"outline-offset", CSS_PROP_OUTLINE_OFFSET},
#line 75 "cssproperties.gperf"
      {"-khtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
#line 55 "cssproperties.gperf"
      {"font-style", CSS_PROP_FONT_STYLE},
#line 35 "cssproperties.gperf"

"background-position", 
"background-position-x", 
"background-position-y", 
"-khtml-background-clip", 
"-khtml-background-origin", 
"-khtml-background-size", 
"border-collapse", 
"border-spacing", 
"-khtml-border-horizontal-spacing", 
"-khtml-border-vertical-spacing", 
"border-top-color", 
"border-right-color", 
"border-bottom-color", 

"margin-right", 
"margin-bottom", 
"margin-left", 
"-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", 

"padding-right", 
"padding-bottom", 
"padding-left", 
"-khtml-padding-start", 
"page-break-after", 
"page-break-before", 
"page-break-inside", 

"scrollbar-darkshadow-color", 
"scrollbar-track-color", 
"scrollbar-arrow-color", 
"-khtml-flow-mode", 
"-khtml-user-input", 
    0
};
DOMString getPropertyName(unsigned short id)




background-position-x
background-position-y
# CSS3 Extensions
-khtml-background-clip
-khtml-background-origin
-khtml-background-size

border-collapse
border-spacing
-khtml-border-horizontal-spacing
-khtml-border-vertical-spacing
border-top-color
border-right-color
border-bottom-color

margin-right
margin-bottom
margin-left
-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

padding-right
padding-bottom
padding-left
-khtml-padding-start
#page
page-break-after
page-break-before

scrollbar-track-color
scrollbar-arrow-color
# tdehtml internals
-khtml-flow-mode
-khtml-user-input




        case tdehtml::LBOX:
            return "box";
        case tdehtml::LDIAMOND:
            return "-khtml-diamond";
        case tdehtml::LDECIMAL:
            return "decimal";
        case tdehtml::DECIMAL_LEADING_ZERO:
            return "decimal-leading-zero";
        case tdehtml::ARABIC_INDIC:
            return "-khtml-arabic-indic";
        case tdehtml::LAO:
            return "-khtml-lao";
        case tdehtml::PERSIAN:
            return "-khtml-persian";
        case tdehtml::URDU:
            return "-khtml-urdu";
        case tdehtml::THAI:
            return "-khtml-thai";
        case tdehtml::TIBETAN:
            return "-khtml-tibetan";
        case tdehtml::LOWER_ROMAN:
            return "lower-roman";
        case tdehtml::UPPER_ROMAN:

        case tdehtml::CJK_IDEOGRAPHIC:
            return "cjk-ideographic";
        case tdehtml::JAPANESE_FORMAL:
            return "-khtml-japanese-formal";
        case tdehtml::JAPANESE_INFORMAL:
            return "-khtml-japanese-informal";
        case tdehtml::SIMP_CHINESE_FORMAL:
            return "-khtml-simp-chinese-formal";
        case tdehtml::SIMP_CHINESE_INFORMAL:
            return "-khtml-simp-chinese-informal";
        case tdehtml::TRAD_CHINESE_FORMAL:
            return "-khtml-trad-chinese-formal";
        case tdehtml::TRAD_CHINESE_INFORMAL:
            return "-khtml-trad-chinese-informal";
        case tdehtml::LOWER_GREEK:
            return "lower-greek";
        case tdehtml::UPPER_GREEK:
            return "-khtml-upper-greek";
        case tdehtml::LOWER_ALPHA:
            return "lower-alpha";
        case tdehtml::UPPER_ALPHA:

Lines 3964-3970 Link Here

(-)ori/tdelibs/tdehtml/css/cssstyleselector.cpp (-1 / +1 lines)
3964	}	3964	}
3965	break;	3965	break;
3966	case CSS_PROP_TEXT_OVERFLOW: {	3966	case CSS_PROP_TEXT_OVERFLOW: {
3967	// This property is supported by WinIE, and so we leave off the "-tdehtml-" in order to	3967	// This property is supported by WinIE, and so we leave off the "-khtml-" in order to
3968	// work with WinIE-specific pages that use the property.	3968	// work with WinIE-specific pages that use the property.
3969	HANDLE_INHERIT_AND_INITIAL(textOverflow, TextOverflow)	3969	HANDLE_INHERIT_AND_INITIAL(textOverflow, TextOverflow)
3970	if (!primitiveValue \|\| !primitiveValue->getIdent())	3970	if (!primitiveValue \|\| !primitiveValue->getIdent())




#line 240 "cssvalues.gperf"
      {"both", CSS_VAL_BOTH},
#line 141 "cssvalues.gperf"
      {"-khtml-left", CSS_VAL__TDEHTML_LEFT},
#line 261 "cssvalues.gperf"
      {"show", CSS_VAL_SHOW},
#line 21 "cssvalues.gperf"

#line 92 "cssvalues.gperf"
      {"white", CSS_VAL_WHITE},
#line 154 "cssvalues.gperf"
      {"-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"
      {"-khtml-center", CSS_VAL__TDEHTML_CENTER},
#line 148 "cssvalues.gperf"
      {"square", CSS_VAL_SQUARE},
#line 106 "cssvalues.gperf"

#line 272 "cssvalues.gperf"
      {"forwards", CSS_VAL_FORWARDS},
#line 150 "cssvalues.gperf"
      {"-khtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
#line 238 "cssvalues.gperf"
      {"bidi-override", CSS_VAL_BIDI_OVERRIDE},
#line 254 "cssvalues.gperf"

#line 227 "cssvalues.gperf"
      {"nowrap", CSS_VAL_NOWRAP},
#line 158 "cssvalues.gperf"
      {"-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"
      {"-khtml-normal", CSS_VAL__TDEHTML_NORMAL},
#line 199 "cssvalues.gperf"
      {"auto", CSS_VAL_AUTO},
#line 60 "cssvalues.gperf"

#line 219 "cssvalues.gperf"
      {"uppercase", CSS_VAL_UPPERCASE},
#line 157 "cssvalues.gperf"
      {"-khtml-thai", CSS_VAL__TDEHTML_THAI},
#line 155 "cssvalues.gperf"
      {"-khtml-persian", CSS_VAL__TDEHTML_PERSIAN},
#line 102 "cssvalues.gperf"
      {"captiontext", CSS_VAL_CAPTIONTEXT},
#line 176 "cssvalues.gperf"

#line 201 "cssvalues.gperf"
      {"default", CSS_VAL_DEFAULT},
#line 16 "cssvalues.gperf"
      {"-khtml-native", CSS_VAL__TDEHTML_NATIVE},
#line 111 "cssvalues.gperf"
      {"menutext", CSS_VAL_MENUTEXT},
#line 98 "cssvalues.gperf"

#line 224 "cssvalues.gperf"
      {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
#line 136 "cssvalues.gperf"
      {"-khtml-auto", CSS_VAL__TDEHTML_AUTO},
#line 218 "cssvalues.gperf"
      {"capitalize", CSS_VAL_CAPITALIZE},
#line 232 "cssvalues.gperf"

#line 273 "cssvalues.gperf"
      {"backwards", CSS_VAL_BACKWARDS},
#line 122 "cssvalues.gperf"
      {"-khtml-text", CSS_VAL__TDEHTML_TEXT},
#line 212 "cssvalues.gperf"
      {"w-resize", CSS_VAL_W_RESIZE},
#line 104 "cssvalues.gperf"

#line 163 "cssvalues.gperf"
      {"georgian", CSS_VAL_GEORGIAN},
#line 135 "cssvalues.gperf"
      {"-khtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
#line 164 "cssvalues.gperf"
      {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
#line 124 "cssvalues.gperf"

#line 177 "cssvalues.gperf"
      {"hiragana", CSS_VAL_HIRAGANA},
#line 181 "cssvalues.gperf"
      {"-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"
      {"-khtml-right", CSS_VAL__TDEHTML_RIGHT},
#line 182 "cssvalues.gperf"
      {"-khtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
#line 178 "cssvalues.gperf"
      {"katakana", CSS_VAL_KATAKANA},
#line 153 "cssvalues.gperf"
      {"-khtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
#line 231 "cssvalues.gperf"
      {"-khtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
#line 61 "cssvalues.gperf"
      {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
#line 119 "cssvalues.gperf"

#line 175 "cssvalues.gperf"
      {"upper-alpha", CSS_VAL_UPPER_ALPHA},
#line 156 "cssvalues.gperf"
      {"-khtml-urdu", CSS_VAL__TDEHTML_URDU},
#line 101 "cssvalues.gperf"
      {"buttontext", CSS_VAL_BUTTONTEXT},
#line 173 "cssvalues.gperf"

#line 30 "cssvalues.gperf"
      {"message-box", CSS_VAL_MESSAGE_BOX},
#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 207 "cssvalues.gperf"
      {"nw-resize", CSS_VAL_NW_RESIZE},
#line 62 "cssvalues.gperf"

#line 113 "cssvalues.gperf"
      {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
#line 267 "cssvalues.gperf"
      {"-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"
      {"-khtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
#line 166 "cssvalues.gperf"
      {"-khtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
#line 49 "cssvalues.gperf"
      {"xx-small", CSS_VAL_XX_SMALL},
#line 115 "cssvalues.gperf"

#line 105 "cssvalues.gperf"
      {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
#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 116 "cssvalues.gperf"
      {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
#line 172 "cssvalues.gperf"
      {"-khtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK},
#line 179 "cssvalues.gperf"
      {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
#line 191 "cssvalues.gperf"

#line 67 "cssvalues.gperf"
      {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
#line 56 "cssvalues.gperf"
      {"-khtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE}
    };

  static const short lookup[] =

"",
"inherit", 
"initial", 
"-khtml-native", 
"none", 
"hidden", 
"inset", 

"large", 
"x-large", 
"xx-large", 
"-khtml-xxx-large", 
"smaller", 
"larger", 
"wider", 

"windowframe", 
"windowtext", 
"grey", 
"-khtml-text", 
"repeat", 
"repeat-x", 
"repeat-y", 

"text-bottom", 
"top", 
"bottom", 
"-khtml-baseline-middle", 
"-khtml-auto", 
"left", 
"right", 
"center", 
"justify", 
"-khtml-left", 
"-khtml-right", 
"-khtml-center", 
"outside", 
"inside", 
"disc", 
"circle", 
"square", 
"box", 
"-khtml-diamond", 
"decimal", 
"decimal-leading-zero", 
"-khtml-arabic-indic", 
"-khtml-lao", 
"-khtml-persian", 
"-khtml-urdu", 
"-khtml-thai", 
"-khtml-tibetan", 
"lower-roman", 
"upper-roman", 
"hebrew", 
"armenian", 
"georgian", 
"cjk-ideographic", 
"-khtml-japanese-formal", 
"-khtml-japanese-informal", 
"-khtml-simp-chinese-formal", 
"-khtml-simp-chinese-informal", 
"-khtml-trad-chinese-formal", 
"-khtml-trad-chinese-informal", 
"lower-greek", 
"-khtml-upper-greek", 
"lower-alpha", 
"lower-latin", 
"upper-alpha", 

"katakana", 
"hiragana-iroha", 
"katakana-iroha", 
"-khtml-open-quote", 
"-khtml-close-quote", 
"inline", 
"block", 
"list-item", 

"pre", 
"pre-wrap", 
"pre-line", 
"-khtml-nowrap", 
"break-word", 
"above", 
"absolute", 

"thick", 
"thin", 
"underline", 
"-khtml-normal", 
"-khtml-around-floats", 
"border-box", 
"content-box", 
"enabled", 




# CSS_PROP_BORDER_TOP_STYLE
# CSS_PROP_BORDER_BOTTOM_STYLE
# CSS_PROP_BORDER_LEFT_STYLE
-khtml-native
none
hidden
inset

large
x-large
xx-large
-khtml-xxx-large
smaller
larger
#

#
# colors in non strict mode
grey
-khtml-text
#
# CSS_PROP_BACKGROUND_REPEAT:
#

top
bottom
# HTML alignment MIDDLE has no corresponding CSS alignment
-khtml-baseline-middle
#
# CSS_PROP_TEXT_ALIGN:
#
-khtml-auto
left
right
center
justify
-khtml-left
-khtml-right
-khtml-center
#
# CSS_PROP_LIST_STYLE_POSITION:
#

circle
square
box
-khtml-diamond
decimal
decimal-leading-zero
-khtml-arabic-indic
-khtml-lao
-khtml-persian
-khtml-urdu
-khtml-thai
-khtml-tibetan
lower-roman
upper-roman
hebrew
armenian
georgian
cjk-ideographic
-khtml-japanese-formal
-khtml-japanese-informal
-khtml-simp-chinese-formal
-khtml-simp-chinese-informal
-khtml-trad-chinese-formal
-khtml-trad-chinese-informal
lower-greek
-khtml-upper-greek
lower-alpha
lower-latin
upper-alpha

katakana
hiragana-iroha
katakana-iroha
-khtml-open-quote
-khtml-close-quote
#none
#
# CSS_PROP_DISPLAY:

pre
pre-wrap
pre-line
-khtml-nowrap
#
# CSS_PROP_WORD_WRAP
#

underline
#
# CSS_PROP__TDEHTML_FLOW_MODE
-khtml-normal
-khtml-around-floats

# CSS3 Values
# CSS_PROP__TDEHTML_BOX_SIZING





html {
	display: block;
	color: -khtml-text;
}

/*

center {
	display: block;
	/* special centering to be able to emulate the html4/netscape behavior */
	text-align: -khtml-center;
}

hr  {

        margin: 12px auto;
        border-style: inset;
        border-width: 1px;
        -khtml-flow-mode: -khtml-around-floats
}

map {

	display: table;
	border-collapse: separate;
	border-spacing: 2px;
        -khtml-flow-mode: -khtml-around-floats;
        box-sizing: border-box;
}


}

table[align="left"] {
	float: -khtml-left;
}

table[align="right"] {
	float: -khtml-right;
}

thead {


caption {
	display: table-caption;
	text-align: -khtml-center;
}

/*

        display: block;
        list-style-type: disc;
        margin: 1__qem 0 1em 0;
        -khtml-padding-start: 40px
}

ol {
        display: block;
        list-style-type: decimal;
        margin: 1__qem 0 1em 0;
        -khtml-padding-start: 40px
}

li {
        display: list-item;
        -khtml-flow-mode: -khtml-around-floats;
}



}

dl > dd {
	-khtml-margin-start: 40px;
}

dl {

        padding: 0.75em 0.625em;
	margin: 1.0em 0;
        border: 2px groove threedface;
        -khtml-flow-mode: -khtml-around-floats
}

button {

}

input, textarea {
        text-align: -khtml-auto;
}

input, textarea, select, button {

input { color: windowtext;
        font-family: sans-serif;
        font-size: small;
        border: 2px -khtml-native;
}

input[type="hidden"] {

textarea {
        color: windowtext;
        font-family: monospace;
        border: 2px -khtml-native;
}

/*

Lines 21-30 Link Here

(-)ori/tdelibs/tdehtml/css/quirks.css (-2 / +2 lines)
21	table {	21	table {
22	white-space: normal;	22	white-space: normal;
23	line-height: normal;	23	line-height: normal;
24	color: -tdehtml-text;	24	color: -khtml-text;
25	font-size: medium;	25	font-size: medium;
26	empty-cells: hide;	26	empty-cells: hide;
27	text-align: -tdehtml-auto;	27	text-align: -khtml-auto;
28	font-weight: initial;	28	font-weight: initial;
29	}	29	}
30		30

Lines 50-58 Link Here

(-)ori/tdelibs/tdehtml/css/tokenizer.flex (-3 / +3 lines)
50	"@font-face" {yyTok = FONT_FACE_SYM; return yyTok;}	50	"@font-face" {yyTok = FONT_FACE_SYM; return yyTok;}
51	"@charset" {yyTok = CHARSET_SYM; return yyTok;}	51	"@charset" {yyTok = CHARSET_SYM; return yyTok;}
52	"@namespace" {yyTok = NAMESPACE_SYM; return yyTok; }	52	"@namespace" {yyTok = NAMESPACE_SYM; return yyTok; }
53	"@-tdehtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; }	53	"@-khtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; }
54	"@-tdehtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; }	54	"@-khtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
55	"@-tdehtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; }	55	"@-khtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
56		56
57	"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}	57	"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}
58		58

Lines 259-265 Link Here

(-)ori/tdelibs/tdehtml/rendering/render_generated.cpp (-1 / +1 lines)
259	visual = true;	259	visual = true;
260		260
261	if (!m_counterNode)	261	if (!m_counterNode)
262	m_counterNode = getCounter("-tdehtml-quotes", visual, false);	262	m_counterNode = getCounter("-khtml-quotes", visual, false);
263		263
264	int value = m_counterNode->count();	264	int value = m_counterNode->count();
265	if (m_counterNode->isReset()) value = m_counterNode->value();	265	if (m_counterNode->isReset()) value = m_counterNode->value();

Lines 2077-2083 Link Here

(-)ori/tdelibs/tdehtml/rendering/render_object.cpp (-2 / +2 lines)
2077	element()->id() == ID_DIR))	2077	element()->id() == ID_DIR))
2078	return true;	2078	return true;
2079	} else	2079	} else
2080	if (counter == "-tdehtml-quotes" && isQuote()) {	2080	if (counter == "-khtml-quotes" && isQuote()) {
2081	return (static_cast<const RenderQuote*>(this)->quoteCount() != 0);	2081	return (static_cast<const RenderQuote*>(this)->quoteCount() != 0);
2082	}	2082	}
2083	return false;	2083	return false;
Lines 2146-2152 Link Here
2146	// kdDebug( 6040 ) << renderName() << " counter-reset: " << counter << " " << val << endl;	2146	// kdDebug( 6040 ) << renderName() << " counter-reset: " << counter << " " << val << endl;
2147	}	2147	}
2148	}	2148	}
2149	else if (counter == "-tdehtml-quotes" && isQuote()) {	2149	else if (counter == "-khtml-quotes" && isQuote()) {
2150	i = new CounterNode(this);	2150	i = new CounterNode(this);
2151	val = static_cast<RenderQuote*>(this)->quoteCount();	2151	val = static_cast<RenderQuote*>(this)->quoteCount();
2152	}	2152	}





void TDEHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/)
{
	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-khtml-printfriendly"] != "false");
	m_printimages->setChecked(opts["app-khtml-printimages"] != "false");
	m_printheader->setChecked(opts["app-khtml-printheader"] != "false");
}

#include "tdehtml_printsettings.moc"




        // 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-khtml-printfriendly") == "true" ?
                                                  "* { background-image: none !important;"
                                                  "    background-color: white !important;"
                                                  "    color: black !important; }"


        m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);
        m_part->xmlDocImpl()->updateStyleSelector();
        root->setPrintImages( printer->option("app-khtml-printimages") == "true");
        root->makePageBreakAvoidBlocks();

        root->setNeedsLayoutAndMinMaxRecalc();


        // check sizes ask for action.. (scale or clip)

        bool printHeader = (printer->option("app-khtml-printheader") == "true");

        int headerHeight = 0;
        TQFont headerFont("Sans Serif", 8);

Return to bug 1825

Lines 21-27 Link Here

(-)ori/tdelibs/kate/data/css-php.xml (-9 / +9 lines)
21		21
22		22
23		23
24	<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">	24	<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">
25		25
26	<highlighting>	26	<highlighting>
27	<list name="properties">	27	<list name="properties">
Lines 263-276 Link Here
263	<!-- konq specific -->	263	<!-- konq specific -->
264	<item> konq_bgpos_x </item>	264	<item> konq_bgpos_x </item>
265	<item> konq_bgpos_y </item>	265	<item> konq_bgpos_y </item>
266	<item> -tdehtml-background-size </item>	266	<item> -khtml-background-size </item>
267	<item> -tdehtml-border-top-left-radius </item>	267	<item> -khtml-border-top-left-radius </item>
268	<item> -tdehtml-border-top-right-radius </item>	268	<item> -khtml-border-top-right-radius </item>
269	<item> -tdehtml-border-bottom-left-radius </item>	269	<item> -khtml-border-bottom-left-radius </item>
270	<item> -tdehtml-border-bottom-right-radius </item>	270	<item> -khtml-border-bottom-right-radius </item>
271	<item> -tdehtml-border-radius </item>	271	<item> -khtml-border-radius </item>
272	<item> -tdehtml-box-shadow </item>	272	<item> -khtml-box-shadow </item>
273	<item> -tdehtml-opacity </item>	273	<item> -khtml-opacity </item>
274		274
275	<!-- Webkit rendering engine CSS property extensions -->	275	<!-- Webkit rendering engine CSS property extensions -->
276	<item> -webkit-appearance </item>	276	<item> -webkit-appearance </item>

Lines 15-21 Link Here

(-)ori/tdelibs/kate/data/css.xml (-9 / +9 lines)
15		15
16	-->	16	-->
17		17
18	<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">	18	<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">
19		19
20	<highlighting>	20	<highlighting>
21	<list name="properties">	21	<list name="properties">
Lines 257-270 Link Here
257	<!-- konq specific -->	257	<!-- konq specific -->
258	<item> konq_bgpos_x </item>	258	<item> konq_bgpos_x </item>
259	<item> konq_bgpos_y </item>	259	<item> konq_bgpos_y </item>
260	<item> -tdehtml-background-size </item>	260	<item> -khtml-background-size </item>
261	<item> -tdehtml-border-top-left-radius </item>	261	<item> -khtml-border-top-left-radius </item>
262	<item> -tdehtml-border-top-right-radius </item>	262	<item> -khtml-border-top-right-radius </item>
263	<item> -tdehtml-border-bottom-left-radius </item>	263	<item> -khtml-border-bottom-left-radius </item>
264	<item> -tdehtml-border-bottom-right-radius </item>	264	<item> -khtml-border-bottom-right-radius </item>
265	<item> -tdehtml-border-radius </item>	265	<item> -khtml-border-radius </item>
266	<item> -tdehtml-box-shadow </item>	266	<item> -khtml-box-shadow </item>
267	<item> -tdehtml-opacity </item>	267	<item> -khtml-opacity </item>
268		268
269	<!-- Webkit rendering engine CSS property extensions -->	269	<!-- Webkit rendering engine CSS property extensions -->
270	<item> -webkit-appearance </item>	270	<item> -webkit-appearance </item>

Lines 24-30 Link Here

(-)ori/tdelibs/kate/data/update-files.xml (-4 / +4 lines)
24	<Definition name="BibTeX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bibtex.xml" version="1.18"/>	24	<Definition name="BibTeX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bibtex.xml" version="1.18"/>
25	<Definition name="B-Method" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bmethod.xml" version="0.3"/>	25	<Definition name="B-Method" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bmethod.xml" version="0.3"/>
26	<Definition name="C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/c.xml" version="1.46"/>	26	<Definition name="C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/c.xml" version="1.46"/>
27	<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.01"/>	27	<Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.02"/>
28	<Definition name="Cg" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cg.xml" version="1.12"/>	28	<Definition name="Cg" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cg.xml" version="1.12"/>
29	<Definition name="CGiS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cgis.xml" version="1.03"/>	29	<Definition name="CGiS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cgis.xml" version="1.03"/>
30	<Definition name="ChangeLog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/changelog.xml" version="1.05"/>	30	<Definition name="ChangeLog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/changelog.xml" version="1.05"/>
Lines 42-49 Link Here
42	<Definition name="C++11" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp11.xml" version="1.64"/>	42	<Definition name="C++11" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp11.xml" version="1.64"/>
43	<Definition name="Crack" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/crk.xml" version="1.2"/>	43	<Definition name="Crack" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/crk.xml" version="1.2"/>
44	<Definition name="C#" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cs.xml" version="1.16"/>	44	<Definition name="C#" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cs.xml" version="1.16"/>
45	<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.07"/>	45	<Definition name="CSS/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css-php.xml" version="2.08"/>
46	<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.08"/>	46	<Definition name="CSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/css.xml" version="2.09"/>
47	<Definition name="CUE Sheet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cue.xml" version="0.92"/>	47	<Definition name="CUE Sheet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cue.xml" version="0.92"/>
48	<Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.4"/>	48	<Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.4"/>
49	<Definition name="D" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/d.xml" version="1.63"/>	49	<Definition name="D" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/d.xml" version="1.63"/>
Lines 173-179 Link Here
173	<Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="1.01"/>	173	<Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="1.01"/>
174	<Definition name="Scheme" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scheme.xml" version="1.14"/>	174	<Definition name="Scheme" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scheme.xml" version="1.14"/>
175	<Definition name="scilab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sci.xml" version="1.04"/>	175	<Definition name="scilab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sci.xml" version="1.04"/>
176	<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.05"/>	176	<Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.06"/>
177	<Definition name="sed" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sed.xml" version="1.01"/>	177	<Definition name="sed" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sed.xml" version="1.01"/>
178	<Definition name="SGML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sgml.xml" version="1.03"/>	178	<Definition name="SGML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sgml.xml" version="1.03"/>
179	<Definition name="Sieve" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sieve.xml" version="1.06"/>	179	<Definition name="Sieve" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sieve.xml" version="1.06"/>

Lines 314-320 Link Here

(-)ori/tdelibs/tdehtml/ChangeLog (-12 / +12 lines)
314	2005-12-09 Germain Garand <germain@ebooksfrance.org>	314	2005-12-09 Germain Garand <germain@ebooksfrance.org>
315		315
316	implement quirky HTML alignment ; introduce special float values	316	implement quirky HTML alignment ; introduce special float values
317	-tdehtml-left/-tdehtml-right to this effect.	317	-khtml-left/-khtml-right to this effect.
318		318
319	* css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.	319	* css/cssparser.cpp: ditto. Fix memory leak from Function struct deletion also.
320	* css/cssstyleselector.cpp: ditto.	320	* css/cssstyleselector.cpp: ditto.
Lines 662-668 Link Here
662	Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft).	662	Implement ideographic enumeration including the CSS 2.1 cjk-ideographic and several from CSS 3 List (working draft).
663	Also add three more numeric: (Lao, Thai and Tibetan)	663	Also add three more numeric: (Lao, Thai and Tibetan)
664		664
665	* css/cssvalues.in: Add new CSS3 values with -tdehtml-	665	* css/cssvalues.in: Add new CSS3 values with -khtml-
666	* rendering/render_style.h: Add new enums	666	* rendering/render_style.h: Add new enums
667	* rendering/enumerate.cpp: Implement the ideographic algorithm.	667	* rendering/enumerate.cpp: Implement the ideographic algorithm.
668		668
Lines 1393-1400 Link Here
1393	* rendering/render_list.cpp: New algorithms for hiragana, katakana,	1393	* rendering/render_list.cpp: New algorithms for hiragana, katakana,
1394	armenian, georgian and decimal-leading-zero.	1394	armenian, georgian and decimal-leading-zero.
1395	Also fix greek and latin list-styles for larger values.	1395	Also fix greek and latin list-styles for larger values.
1396	* css/cssvalues.cpp: Parse box, -tdehtml-diamond, -tdehtml-arabic-indic,	1396	* css/cssvalues.cpp: Parse box, -khtml-diamond, -khtml-arabic-indic,
1397	-tdehtml-persian, -tdehtml-urdu and -tdehtml-upper-greek	1397	-khtml-persian, -khtml-urdu and -khtml-upper-greek
1398	* rendering/render_style.h: Expand list-style enum	1398	* rendering/render_style.h: Expand list-style enum
1399		1399
1400	2004-11-30 Germain Garand <germain@ebooksfrance.org>	1400	2004-11-30 Germain Garand <germain@ebooksfrance.org>
Lines 1451-1460 Link Here
1451		1451
1452	Implement CSS border on form-widgets	1452	Implement CSS border on form-widgets
1453		1453
1454	* css/cssvalues.in: Add -tdehtml-native	1454	* css/cssvalues.in: Add -khtml-native
1455	* css/cssparser.cpp: Accept -tdehtml-native as a border-type	1455	* css/cssparser.cpp: Accept -khtml-native as a border-type
1456	* css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style	1456	* css/cssstyleselector.cpp: BNATIVE and not BNONE is now lowest border-style
1457	* css/html4.css: Make -tdehtml-native default border-style for form-widgets	1457	* css/html4.css: Make -khtml-native default border-style for form-widgets
1458	* render/render_style.h: Add BNATIVE	1458	* render/render_style.h: Add BNATIVE
1459	* render/render_object.cpp: Treat BNATIVE like BNONE	1459	* render/render_object.cpp: Treat BNATIVE like BNONE
1460	* render/render_replaced.cpp: Remove native, and paint CSS border when allowed	1460	* render/render_replaced.cpp: Remove native, and paint CSS border when allowed
Lines 1463-1469 Link Here
1463		1463
1464	float and flowAroundFloat fixes.	1464	float and flowAroundFloat fixes.
1465		1465
1466	* css/html4.css: make fieldset -tdehtml-around-floats (#92979)	1466	* css/html4.css: make fieldset -khtml-around-floats (#92979)
1467		1467
1468	* rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats	1468	* rendering/render_block.cpp (layoutBlockChildren): cleanup float/flowAroundFloats
1469	logic. Merges: add better RTL layouting of fAFs.	1469	logic. Merges: add better RTL layouting of fAFs.
Lines 2095-2108 Link Here
2095	* tdehtml_part.cpp: (clear) Stopping marquees.	2095	* tdehtml_part.cpp: (clear) Stopping marquees.
2096	* css/cssparser.cpp: (parserValue) Parse overflow: marquee.	2096	* css/cssparser.cpp: (parserValue) Parse overflow: marquee.
2097	Inserted CSS3 Properties section.	2097	Inserted CSS3 Properties section.
2098	Moved -tdehtml-user-input to CSS3 Properties.	2098	Moved -khtml-user-input to CSS3 Properties.
2099	Added parsing of -tdehtml-marquee{,-direction,-increment,-style,-repetition,	2099	Added parsing of -khtml-marquee{,-direction,-increment,-style,-repetition,
2100	-speed}.	2100	-speed}.
2101	* css/cssproperties.{c,h}: Regenerated.	2101	* css/cssproperties.{c,h}: Regenerated.
2102	* css/cssproperties.in: Added -tdehtml-marquee{,-direction,-increment,	2102	* css/cssproperties.in: Added -khtml-marquee{,-direction,-increment,
2103	-style,-repetition, -speed} keywords.	2103	-style,-repetition, -speed} keywords.
2104	* css/cssstyleselector: (applyRule) Handle overflow: marquee.	2104	* css/cssstyleselector: (applyRule) Handle overflow: marquee.
2105	Handle applying of -tdehtml-marquee{,-direction,-increment,-style,-repetition,	2105	Handle applying of -khtml-marquee{,-direction,-increment,-style,-repetition,
2106	-speed}.	2106	-speed}.
2107	* css/cssvalues.{c,h}: Regenerated.	2107	* css/cssvalues.{c,h}: Regenerated.
2108	* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,	2108	* css/cssvalues.in: Added marquee, forwards, backwards, ahead, reverse,

Lines 184-190 Link Here

(-)ori/tdelibs/tdehtml/css/cssparser.cpp (-5 / +5 lines)
184	{	184	{
185	styleElement = sheet;	185	styleElement = sheet;
186		186
187	const char tdehtml_rule[] = "@-tdehtml-rule{";	187	const char tdehtml_rule[] = "@-khtml-rule{";
188	int length = string.length() + 4 + strlen(tdehtml_rule);	188	int length = string.length() + 4 + strlen(tdehtml_rule);
189	assert( !data );	189	assert( !data );
190	data = (unsigned short )malloc( length sizeof( unsigned short ) );	190	data = (unsigned short )malloc( length sizeof( unsigned short ) );
Lines 212-218 Link Here
212		212
213	styleElement = declaration->stylesheet();	213	styleElement = declaration->stylesheet();
214		214
215	const char tdehtml_value[] = "@-tdehtml-value{";	215	const char tdehtml_value[] = "@-khtml-value{";
216	int length = string.length() + 4 + strlen(tdehtml_value);	216	int length = string.length() + 4 + strlen(tdehtml_value);
217	assert( !data );	217	assert( !data );
218	data = (unsigned short )malloc( length sizeof( unsigned short ) );	218	data = (unsigned short )malloc( length sizeof( unsigned short ) );
Lines 254-260 Link Here
254		254
255	styleElement = declaration->stylesheet();	255	styleElement = declaration->stylesheet();
256		256
257	const char tdehtml_decls[] = "@-tdehtml-decls{";	257	const char tdehtml_decls[] = "@-khtml-decls{";
258	int length = string.length() + 4 + strlen(tdehtml_decls);	258	int length = string.length() + 4 + strlen(tdehtml_decls);
259	assert( !data );	259	assert( !data );
260	data = (unsigned short )malloc( length sizeof( unsigned short ) );	260	data = (unsigned short )malloc( length sizeof( unsigned short ) );
Lines 572-578 Link Here
572	break;	572	break;
573		573
574	case CSS_PROP_DISPLAY:	574	case CSS_PROP_DISPLAY:
575	// inline \| block \| list-item \| run-in \| inline-block \| -tdehtml-ruler \| table \|	575	// inline \| block \| list-item \| run-in \| inline-block \| -khtml-ruler \| table \|
576	// inline-table \| table-row-group \| table-header-group \| table-footer-group \| table-row \|	576	// inline-table \| table-row-group \| table-header-group \| table-footer-group \| table-row \|
577	// table-column-group \| table-column \| table-cell \| table-caption \| none \| inherit	577	// table-column-group \| table-column \| table-cell \| table-caption \| none \| inherit
578	if ((id >= CSS_VAL_INLINE && id <= CSS_VAL_TABLE_CAPTION) \|\| id == CSS_VAL_NONE)	578	if ((id >= CSS_VAL_INLINE && id <= CSS_VAL_TABLE_CAPTION) \|\| id == CSS_VAL_NONE)
Lines 611-617 Link Here
611	case CSS_PROP_OUTLINE_STYLE: // <border-style> \| inherit	611	case CSS_PROP_OUTLINE_STYLE: // <border-style> \| inherit
612	case CSS_PROP_BORDER_TOP_STYLE: //// <border-style> \| inherit	612	case CSS_PROP_BORDER_TOP_STYLE: //// <border-style> \| inherit
613	case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none \| hidden \| dotted \| dashed \|	613	case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none \| hidden \| dotted \| dashed \|
614	case CSS_PROP_BORDER_BOTTOM_STYLE: // solid \| double \| groove \| ridge \| inset \| outset \| -tdehtml-native	614	case CSS_PROP_BORDER_BOTTOM_STYLE: // solid \| double \| groove \| ridge \| inset \| outset \| -khtml-native
615	case CSS_PROP_BORDER_LEFT_STYLE: ////	615	case CSS_PROP_BORDER_LEFT_STYLE: ////
616	if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)	616	if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
617	valid_primitive = true;	617	valid_primitive = true;

Lines 295-301 Link Here

(-)ori/tdelibs/tdehtml/css/cssproperties.c (-30 / +30 lines)
295	#line 104 "cssproperties.gperf"	295	#line 104 "cssproperties.gperf"
296	{"text-indent", CSS_PROP_TEXT_INDENT},	296	{"text-indent", CSS_PROP_TEXT_INDENT},
297	#line 69 "cssproperties.gperf"	297	#line 69 "cssproperties.gperf"
298	{"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},	298	{"-khtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
299	#line 14 "cssproperties.gperf"	299	#line 14 "cssproperties.gperf"
300	{"background-color", CSS_PROP_BACKGROUND_COLOR},	300	{"background-color", CSS_PROP_BACKGROUND_COLOR},
301	#line 100 "cssproperties.gperf"	301	#line 100 "cssproperties.gperf"
Lines 305-311 Link Here
305	#line 47 "cssproperties.gperf"	305	#line 47 "cssproperties.gperf"
306	{"counter-reset", CSS_PROP_COUNTER_RESET},	306	{"counter-reset", CSS_PROP_COUNTER_RESET},
307	#line 93 "cssproperties.gperf"	307	#line 93 "cssproperties.gperf"
308	{"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},	308	{"-khtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
309	#line 15 "cssproperties.gperf"	309	#line 15 "cssproperties.gperf"
310	{"background-image", CSS_PROP_BACKGROUND_IMAGE},	310	{"background-image", CSS_PROP_BACKGROUND_IMAGE},
311	#line 96 "cssproperties.gperf"	311	#line 96 "cssproperties.gperf"
Lines 319-329 Link Here
319	#line 52 "cssproperties.gperf"	319	#line 52 "cssproperties.gperf"
320	{"float", CSS_PROP_FLOAT},	320	{"float", CSS_PROP_FLOAT},
321	#line 21 "cssproperties.gperf"	321	#line 21 "cssproperties.gperf"
322	{"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},	322	{"-khtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
323	#line 70 "cssproperties.gperf"	323	#line 70 "cssproperties.gperf"
324	{"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},	324	{"-khtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
325	#line 27 "cssproperties.gperf"	325	#line 27 "cssproperties.gperf"
326	{"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},	326	{"-khtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
327	#line 46 "cssproperties.gperf"	327	#line 46 "cssproperties.gperf"
328	{"counter-increment", CSS_PROP_COUNTER_INCREMENT},	328	{"counter-increment", CSS_PROP_COUNTER_INCREMENT},
329	#line 128 "cssproperties.gperf"	329	#line 128 "cssproperties.gperf"
Lines 337-343 Link Here
337	#line 31 "cssproperties.gperf"	337	#line 31 "cssproperties.gperf"
338	{"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},	338	{"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
339	#line 22 "cssproperties.gperf"	339	#line 22 "cssproperties.gperf"
340	{"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},	340	{"-khtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
341	#line 17 "cssproperties.gperf"	341	#line 17 "cssproperties.gperf"
342	{"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},	342	{"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
343	#line 126 "cssproperties.gperf"	343	#line 126 "cssproperties.gperf"
Lines 353-359 Link Here
353	#line 68 "cssproperties.gperf"	353	#line 68 "cssproperties.gperf"
354	{"margin-left", CSS_PROP_MARGIN_LEFT},	354	{"margin-left", CSS_PROP_MARGIN_LEFT},
355	#line 142 "cssproperties.gperf"	355	#line 142 "cssproperties.gperf"
356	{"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},	356	{"-khtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
357	#line 79 "cssproperties.gperf"	357	#line 79 "cssproperties.gperf"
358	{"min-width", CSS_PROP_MIN_WIDTH},	358	{"min-width", CSS_PROP_MIN_WIDTH},
359	#line 127 "cssproperties.gperf"	359	#line 127 "cssproperties.gperf"
Lines 361-373 Link Here
361	#line 92 "cssproperties.gperf"	361	#line 92 "cssproperties.gperf"
362	{"padding-left", CSS_PROP_PADDING_LEFT},	362	{"padding-left", CSS_PROP_PADDING_LEFT},
363	#line 71 "cssproperties.gperf"	363	#line 71 "cssproperties.gperf"
364	{"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},	364	{"-khtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
365	#line 73 "cssproperties.gperf"	365	#line 73 "cssproperties.gperf"
366	{"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},	366	{"-khtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
367	#line 95 "cssproperties.gperf"	367	#line 95 "cssproperties.gperf"
368	{"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},	368	{"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
369	#line 74 "cssproperties.gperf"	369	#line 74 "cssproperties.gperf"
370	{"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},	370	{"-khtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
371	#line 94 "cssproperties.gperf"	371	#line 94 "cssproperties.gperf"
372	{"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},	372	{"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
373	#line 81 "cssproperties.gperf"	373	#line 81 "cssproperties.gperf"
Lines 383-389 Link Here
383	#line 134 "cssproperties.gperf"	383	#line 134 "cssproperties.gperf"
384	{"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},	384	{"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
385	#line 72 "cssproperties.gperf"	385	#line 72 "cssproperties.gperf"
386	{"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},	386	{"-khtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
387	#line 116 "cssproperties.gperf"	387	#line 116 "cssproperties.gperf"
388	{"word-spacing", CSS_PROP_WORD_SPACING},	388	{"word-spacing", CSS_PROP_WORD_SPACING},
389	#line 111 "cssproperties.gperf"	389	#line 111 "cssproperties.gperf"
Lines 405-417 Link Here
405	#line 32 "cssproperties.gperf"	405	#line 32 "cssproperties.gperf"
406	{"border-top-style", CSS_PROP_BORDER_TOP_STYLE},	406	{"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
407	#line 26 "cssproperties.gperf"	407	#line 26 "cssproperties.gperf"
408	{"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},	408	{"-khtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
409	#line 33 "cssproperties.gperf"	409	#line 33 "cssproperties.gperf"
410	{"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},	410	{"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
411	#line 34 "cssproperties.gperf"	411	#line 34 "cssproperties.gperf"
412	{"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},	412	{"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
413	#line 23 "cssproperties.gperf"	413	#line 23 "cssproperties.gperf"
414	{"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},	414	{"-khtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
415	#line 135 "cssproperties.gperf"	415	#line 135 "cssproperties.gperf"
416	{"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},	416	{"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
417	#line 129 "cssproperties.gperf"	417	#line 129 "cssproperties.gperf"
Lines 435-441 Link Here
435	#line 84 "cssproperties.gperf"	435	#line 84 "cssproperties.gperf"
436	{"outline-style", CSS_PROP_OUTLINE_STYLE},	436	{"outline-style", CSS_PROP_OUTLINE_STYLE},
437	#line 141 "cssproperties.gperf"	437	#line 141 "cssproperties.gperf"
438	{"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},	438	{"-khtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
439	#line 87 "cssproperties.gperf"	439	#line 87 "cssproperties.gperf"
440	{"overflow-x", CSS_PROP_OVERFLOW_X},	440	{"overflow-x", CSS_PROP_OVERFLOW_X},
441	#line 113 "cssproperties.gperf"	441	#line 113 "cssproperties.gperf"
Lines 449-455 Link Here
449	#line 83 "cssproperties.gperf"	449	#line 83 "cssproperties.gperf"
450	{"outline-offset", CSS_PROP_OUTLINE_OFFSET},	450	{"outline-offset", CSS_PROP_OUTLINE_OFFSET},
451	#line 75 "cssproperties.gperf"	451	#line 75 "cssproperties.gperf"
452	{"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},	452	{"-khtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
453	#line 55 "cssproperties.gperf"	453	#line 55 "cssproperties.gperf"
454	{"font-style", CSS_PROP_FONT_STYLE},	454	{"font-style", CSS_PROP_FONT_STYLE},
455	#line 35 "cssproperties.gperf"	455	#line 35 "cssproperties.gperf"
Lines 544-556 Link Here
544	"background-position",	544	"background-position",
545	"background-position-x",	545	"background-position-x",
546	"background-position-y",	546	"background-position-y",
547	"-tdehtml-background-clip",	547	"-khtml-background-clip",
548	"-tdehtml-background-origin",	548	"-khtml-background-origin",
549	"-tdehtml-background-size",	549	"-khtml-background-size",
550	"border-collapse",	550	"border-collapse",
551	"border-spacing",	551	"border-spacing",
552	"-tdehtml-border-horizontal-spacing",	552	"-khtml-border-horizontal-spacing",
553	"-tdehtml-border-vertical-spacing",	553	"-khtml-border-vertical-spacing",
554	"border-top-color",	554	"border-top-color",
555	"border-right-color",	555	"border-right-color",
556	"border-bottom-color",	556	"border-bottom-color",
Lines 592-604 Link Here
592	"margin-right",	592	"margin-right",
593	"margin-bottom",	593	"margin-bottom",
594	"margin-left",	594	"margin-left",
595	"-tdehtml-margin-start",	595	"-khtml-margin-start",
596	"-tdehtml-marquee",	596	"-khtml-marquee",
597	"-tdehtml-marquee-direction",	597	"-khtml-marquee-direction",
598	"-tdehtml-marquee-increment",	598	"-khtml-marquee-increment",
599	"-tdehtml-marquee-repetition",	599	"-khtml-marquee-repetition",
600	"-tdehtml-marquee-speed",	600	"-khtml-marquee-speed",
601	"-tdehtml-marquee-style",	601	"-khtml-marquee-style",
602	"max-height",	602	"max-height",
603	"max-width",	603	"max-width",
604	"min-height",	604	"min-height",
Lines 616-622 Link Here
616	"padding-right",	616	"padding-right",
617	"padding-bottom",	617	"padding-bottom",
618	"padding-left",	618	"padding-left",
619	"-tdehtml-padding-start",	619	"-khtml-padding-start",
620	"page-break-after",	620	"page-break-after",
621	"page-break-before",	621	"page-break-before",
622	"page-break-inside",	622	"page-break-inside",
Lines 664-671 Link Here
664	"scrollbar-darkshadow-color",	664	"scrollbar-darkshadow-color",
665	"scrollbar-track-color",	665	"scrollbar-track-color",
666	"scrollbar-arrow-color",	666	"scrollbar-arrow-color",
667	"-tdehtml-flow-mode",	667	"-khtml-flow-mode",
668	"-tdehtml-user-input",	668	"-khtml-user-input",
669	0	669	0
670	};	670	};
671	DOMString getPropertyName(unsigned short id)	671	DOMString getPropertyName(unsigned short id)

Lines 20-33 Link Here

(-)ori/tdelibs/tdehtml/css/cssproperties.in (-15 / +15 lines)
20	background-position-x	20	background-position-x
21	background-position-y	21	background-position-y
22	# CSS3 Extensions	22	# CSS3 Extensions
23	-tdehtml-background-clip	23	-khtml-background-clip
24	-tdehtml-background-origin	24	-khtml-background-origin
25	-tdehtml-background-size	25	-khtml-background-size
26		26
27	border-collapse	27	border-collapse
28	border-spacing	28	border-spacing
29	-tdehtml-border-horizontal-spacing	29	-khtml-border-horizontal-spacing
30	-tdehtml-border-vertical-spacing	30	-khtml-border-vertical-spacing
31	border-top-color	31	border-top-color
32	border-right-color	32	border-right-color
33	border-bottom-color	33	border-bottom-color
Lines 69-81 Link Here
69	margin-right	69	margin-right
70	margin-bottom	70	margin-bottom
71	margin-left	71	margin-left
72	-tdehtml-margin-start	72	-khtml-margin-start
73	-tdehtml-marquee	73	-khtml-marquee
74	-tdehtml-marquee-direction	74	-khtml-marquee-direction
75	-tdehtml-marquee-increment	75	-khtml-marquee-increment
76	-tdehtml-marquee-repetition	76	-khtml-marquee-repetition
77	-tdehtml-marquee-speed	77	-khtml-marquee-speed
78	-tdehtml-marquee-style	78	-khtml-marquee-style
79	max-height	79	max-height
80	max-width	80	max-width
81	min-height	81	min-height
Lines 93-99 Link Here
93	padding-right	93	padding-right
94	padding-bottom	94	padding-bottom
95	padding-left	95	padding-left
96	-tdehtml-padding-start	96	-khtml-padding-start
97	#page	97	#page
98	page-break-after	98	page-break-after
99	page-break-before	99	page-break-before
Lines 144-148 Link Here
144	scrollbar-track-color	144	scrollbar-track-color
145	scrollbar-arrow-color	145	scrollbar-arrow-color
146	# tdehtml internals	146	# tdehtml internals
147	-tdehtml-flow-mode	147	-khtml-flow-mode
148	-tdehtml-user-input	148	-khtml-user-input

Lines 199-221 Link Here

(-)ori/tdelibs/tdehtml/css/css_renderstyledeclarationimpl.cpp (-14 / +14 lines)
199	case tdehtml::LBOX:	199	case tdehtml::LBOX:
200	return "box";	200	return "box";
201	case tdehtml::LDIAMOND:	201	case tdehtml::LDIAMOND:
202	return "-tdehtml-diamond";	202	return "-khtml-diamond";
203	case tdehtml::LDECIMAL:	203	case tdehtml::LDECIMAL:
204	return "decimal";	204	return "decimal";
205	case tdehtml::DECIMAL_LEADING_ZERO:	205	case tdehtml::DECIMAL_LEADING_ZERO:
206	return "decimal-leading-zero";	206	return "decimal-leading-zero";
207	case tdehtml::ARABIC_INDIC:	207	case tdehtml::ARABIC_INDIC:
208	return "-tdehtml-arabic-indic";	208	return "-khtml-arabic-indic";
209	case tdehtml::LAO:	209	case tdehtml::LAO:
210	return "-tdehtml-lao";	210	return "-khtml-lao";
211	case tdehtml::PERSIAN:	211	case tdehtml::PERSIAN:
212	return "-tdehtml-persian";	212	return "-khtml-persian";
213	case tdehtml::URDU:	213	case tdehtml::URDU:
214	return "-tdehtml-urdu";	214	return "-khtml-urdu";
215	case tdehtml::THAI:	215	case tdehtml::THAI:
216	return "-tdehtml-thai";	216	return "-khtml-thai";
217	case tdehtml::TIBETAN:	217	case tdehtml::TIBETAN:
218	return "-tdehtml-tibetan";	218	return "-khtml-tibetan";
219	case tdehtml::LOWER_ROMAN:	219	case tdehtml::LOWER_ROMAN:
220	return "lower-roman";	220	return "lower-roman";
221	case tdehtml::UPPER_ROMAN:	221	case tdehtml::UPPER_ROMAN:
Lines 229-249 Link Here
229	case tdehtml::CJK_IDEOGRAPHIC:	229	case tdehtml::CJK_IDEOGRAPHIC:
230	return "cjk-ideographic";	230	return "cjk-ideographic";
231	case tdehtml::JAPANESE_FORMAL:	231	case tdehtml::JAPANESE_FORMAL:
232	return "-tdehtml-japanese-formal";	232	return "-khtml-japanese-formal";
233	case tdehtml::JAPANESE_INFORMAL:	233	case tdehtml::JAPANESE_INFORMAL:
234	return "-tdehtml-japanese-informal";	234	return "-khtml-japanese-informal";
235	case tdehtml::SIMP_CHINESE_FORMAL:	235	case tdehtml::SIMP_CHINESE_FORMAL:
236	return "-tdehtml-simp-chinese-formal";	236	return "-khtml-simp-chinese-formal";
237	case tdehtml::SIMP_CHINESE_INFORMAL:	237	case tdehtml::SIMP_CHINESE_INFORMAL:
238	return "-tdehtml-simp-chinese-informal";	238	return "-khtml-simp-chinese-informal";
239	case tdehtml::TRAD_CHINESE_FORMAL:	239	case tdehtml::TRAD_CHINESE_FORMAL:
240	return "-tdehtml-trad-chinese-formal";	240	return "-khtml-trad-chinese-formal";
241	case tdehtml::TRAD_CHINESE_INFORMAL:	241	case tdehtml::TRAD_CHINESE_INFORMAL:
242	return "-tdehtml-trad-chinese-informal";	242	return "-khtml-trad-chinese-informal";
243	case tdehtml::LOWER_GREEK:	243	case tdehtml::LOWER_GREEK:
244	return "lower-greek";	244	return "lower-greek";
245	case tdehtml::UPPER_GREEK:	245	case tdehtml::UPPER_GREEK:
246	return "-tdehtml-upper-greek";	246	return "-khtml-upper-greek";
247	case tdehtml::LOWER_ALPHA:	247	case tdehtml::LOWER_ALPHA:
248	return "lower-alpha";	248	return "lower-alpha";
249	case tdehtml::UPPER_ALPHA:	249	case tdehtml::UPPER_ALPHA:

Lines 454-460 Link Here

(-)ori/tdelibs/tdehtml/css/cssvalues.c (-54 / +54 lines)
454	#line 240 "cssvalues.gperf"	454	#line 240 "cssvalues.gperf"
455	{"both", CSS_VAL_BOTH},	455	{"both", CSS_VAL_BOTH},
456	#line 141 "cssvalues.gperf"	456	#line 141 "cssvalues.gperf"
457	{"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},	457	{"-khtml-left", CSS_VAL__TDEHTML_LEFT},
458	#line 261 "cssvalues.gperf"	458	#line 261 "cssvalues.gperf"
459	{"show", CSS_VAL_SHOW},	459	{"show", CSS_VAL_SHOW},
460	#line 21 "cssvalues.gperf"	460	#line 21 "cssvalues.gperf"
Lines 504-516 Link Here
504	#line 92 "cssvalues.gperf"	504	#line 92 "cssvalues.gperf"
505	{"white", CSS_VAL_WHITE},	505	{"white", CSS_VAL_WHITE},
506	#line 154 "cssvalues.gperf"	506	#line 154 "cssvalues.gperf"
507	{"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},	507	{"-khtml-lao", CSS_VAL__TDEHTML_LAO},
508	#line 208 "cssvalues.gperf"	508	#line 208 "cssvalues.gperf"
509	{"n-resize", CSS_VAL_N_RESIZE},	509	{"n-resize", CSS_VAL_N_RESIZE},
510	#line 196 "cssvalues.gperf"	510	#line 196 "cssvalues.gperf"
511	{"table-column", CSS_VAL_TABLE_COLUMN},	511	{"table-column", CSS_VAL_TABLE_COLUMN},
512	#line 143 "cssvalues.gperf"	512	#line 143 "cssvalues.gperf"
513	{"-tdehtml-center", CSS_VAL__TDEHTML_CENTER},	513	{"-khtml-center", CSS_VAL__TDEHTML_CENTER},
514	#line 148 "cssvalues.gperf"	514	#line 148 "cssvalues.gperf"
515	{"square", CSS_VAL_SQUARE},	515	{"square", CSS_VAL_SQUARE},
516	#line 106 "cssvalues.gperf"	516	#line 106 "cssvalues.gperf"
Lines 544-550 Link Here
544	#line 272 "cssvalues.gperf"	544	#line 272 "cssvalues.gperf"
545	{"forwards", CSS_VAL_FORWARDS},	545	{"forwards", CSS_VAL_FORWARDS},
546	#line 150 "cssvalues.gperf"	546	#line 150 "cssvalues.gperf"
547	{"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},	547	{"-khtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
548	#line 238 "cssvalues.gperf"	548	#line 238 "cssvalues.gperf"
549	{"bidi-override", CSS_VAL_BIDI_OVERRIDE},	549	{"bidi-override", CSS_VAL_BIDI_OVERRIDE},
550	#line 254 "cssvalues.gperf"	550	#line 254 "cssvalues.gperf"
Lines 554-566 Link Here
554	#line 227 "cssvalues.gperf"	554	#line 227 "cssvalues.gperf"
555	{"nowrap", CSS_VAL_NOWRAP},	555	{"nowrap", CSS_VAL_NOWRAP},
556	#line 158 "cssvalues.gperf"	556	#line 158 "cssvalues.gperf"
557	{"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},	557	{"-khtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
558	#line 50 "cssvalues.gperf"	558	#line 50 "cssvalues.gperf"
559	{"x-small", CSS_VAL_X_SMALL},	559	{"x-small", CSS_VAL_X_SMALL},
560	#line 194 "cssvalues.gperf"	560	#line 194 "cssvalues.gperf"
561	{"table-row", CSS_VAL_TABLE_ROW},	561	{"table-row", CSS_VAL_TABLE_ROW},
562	#line 266 "cssvalues.gperf"	562	#line 266 "cssvalues.gperf"
563	{"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL},	563	{"-khtml-normal", CSS_VAL__TDEHTML_NORMAL},
564	#line 199 "cssvalues.gperf"	564	#line 199 "cssvalues.gperf"
565	{"auto", CSS_VAL_AUTO},	565	{"auto", CSS_VAL_AUTO},
566	#line 60 "cssvalues.gperf"	566	#line 60 "cssvalues.gperf"
Lines 568-576 Link Here
568	#line 219 "cssvalues.gperf"	568	#line 219 "cssvalues.gperf"
569	{"uppercase", CSS_VAL_UPPERCASE},	569	{"uppercase", CSS_VAL_UPPERCASE},
570	#line 157 "cssvalues.gperf"	570	#line 157 "cssvalues.gperf"
571	{"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},	571	{"-khtml-thai", CSS_VAL__TDEHTML_THAI},
572	#line 155 "cssvalues.gperf"	572	#line 155 "cssvalues.gperf"
573	{"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},	573	{"-khtml-persian", CSS_VAL__TDEHTML_PERSIAN},
574	#line 102 "cssvalues.gperf"	574	#line 102 "cssvalues.gperf"
575	{"captiontext", CSS_VAL_CAPTIONTEXT},	575	{"captiontext", CSS_VAL_CAPTIONTEXT},
576	#line 176 "cssvalues.gperf"	576	#line 176 "cssvalues.gperf"
Lines 596-602 Link Here
596	#line 201 "cssvalues.gperf"	596	#line 201 "cssvalues.gperf"
597	{"default", CSS_VAL_DEFAULT},	597	{"default", CSS_VAL_DEFAULT},
598	#line 16 "cssvalues.gperf"	598	#line 16 "cssvalues.gperf"
599	{"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},	599	{"-khtml-native", CSS_VAL__TDEHTML_NATIVE},
600	#line 111 "cssvalues.gperf"	600	#line 111 "cssvalues.gperf"
601	{"menutext", CSS_VAL_MENUTEXT},	601	{"menutext", CSS_VAL_MENUTEXT},
602	#line 98 "cssvalues.gperf"	602	#line 98 "cssvalues.gperf"
Lines 610-616 Link Here
610	#line 224 "cssvalues.gperf"	610	#line 224 "cssvalues.gperf"
611	{"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},	611	{"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
612	#line 136 "cssvalues.gperf"	612	#line 136 "cssvalues.gperf"
613	{"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},	613	{"-khtml-auto", CSS_VAL__TDEHTML_AUTO},
614	#line 218 "cssvalues.gperf"	614	#line 218 "cssvalues.gperf"
615	{"capitalize", CSS_VAL_CAPITALIZE},	615	{"capitalize", CSS_VAL_CAPITALIZE},
616	#line 232 "cssvalues.gperf"	616	#line 232 "cssvalues.gperf"
Lines 620-626 Link Here
620	#line 273 "cssvalues.gperf"	620	#line 273 "cssvalues.gperf"
621	{"backwards", CSS_VAL_BACKWARDS},	621	{"backwards", CSS_VAL_BACKWARDS},
622	#line 122 "cssvalues.gperf"	622	#line 122 "cssvalues.gperf"
623	{"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},	623	{"-khtml-text", CSS_VAL__TDEHTML_TEXT},
624	#line 212 "cssvalues.gperf"	624	#line 212 "cssvalues.gperf"
625	{"w-resize", CSS_VAL_W_RESIZE},	625	{"w-resize", CSS_VAL_W_RESIZE},
626	#line 104 "cssvalues.gperf"	626	#line 104 "cssvalues.gperf"
Lines 632-638 Link Here
632	#line 163 "cssvalues.gperf"	632	#line 163 "cssvalues.gperf"
633	{"georgian", CSS_VAL_GEORGIAN},	633	{"georgian", CSS_VAL_GEORGIAN},
634	#line 135 "cssvalues.gperf"	634	#line 135 "cssvalues.gperf"
635	{"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},	635	{"-khtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
636	#line 164 "cssvalues.gperf"	636	#line 164 "cssvalues.gperf"
637	{"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},	637	{"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
638	#line 124 "cssvalues.gperf"	638	#line 124 "cssvalues.gperf"
Lines 652-672 Link Here
652	#line 177 "cssvalues.gperf"	652	#line 177 "cssvalues.gperf"
653	{"hiragana", CSS_VAL_HIRAGANA},	653	{"hiragana", CSS_VAL_HIRAGANA},
654	#line 181 "cssvalues.gperf"	654	#line 181 "cssvalues.gperf"
655	{"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},	655	{"-khtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
656	#line 97 "cssvalues.gperf"	656	#line 97 "cssvalues.gperf"
657	{"background", CSS_VAL_BACKGROUND},	657	{"background", CSS_VAL_BACKGROUND},
658	#line 94 "cssvalues.gperf"	658	#line 94 "cssvalues.gperf"
659	{"activeborder", CSS_VAL_ACTIVEBORDER},	659	{"activeborder", CSS_VAL_ACTIVEBORDER},
660	#line 142 "cssvalues.gperf"	660	#line 142 "cssvalues.gperf"
661	{"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT},	661	{"-khtml-right", CSS_VAL__TDEHTML_RIGHT},
662	#line 182 "cssvalues.gperf"	662	#line 182 "cssvalues.gperf"
663	{"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},	663	{"-khtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
664	#line 178 "cssvalues.gperf"	664	#line 178 "cssvalues.gperf"
665	{"katakana", CSS_VAL_KATAKANA},	665	{"katakana", CSS_VAL_KATAKANA},
666	#line 153 "cssvalues.gperf"	666	#line 153 "cssvalues.gperf"
667	{"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},	667	{"-khtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
668	#line 231 "cssvalues.gperf"	668	#line 231 "cssvalues.gperf"
669	{"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},	669	{"-khtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
670	#line 61 "cssvalues.gperf"	670	#line 61 "cssvalues.gperf"
671	{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},	671	{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
672	#line 119 "cssvalues.gperf"	672	#line 119 "cssvalues.gperf"
Lines 674-680 Link Here
674	#line 175 "cssvalues.gperf"	674	#line 175 "cssvalues.gperf"
675	{"upper-alpha", CSS_VAL_UPPER_ALPHA},	675	{"upper-alpha", CSS_VAL_UPPER_ALPHA},
676	#line 156 "cssvalues.gperf"	676	#line 156 "cssvalues.gperf"
677	{"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},	677	{"-khtml-urdu", CSS_VAL__TDEHTML_URDU},
678	#line 101 "cssvalues.gperf"	678	#line 101 "cssvalues.gperf"
679	{"buttontext", CSS_VAL_BUTTONTEXT},	679	{"buttontext", CSS_VAL_BUTTONTEXT},
680	#line 173 "cssvalues.gperf"	680	#line 173 "cssvalues.gperf"
Lines 690-698 Link Here
690	#line 30 "cssvalues.gperf"	690	#line 30 "cssvalues.gperf"
691	{"message-box", CSS_VAL_MESSAGE_BOX},	691	{"message-box", CSS_VAL_MESSAGE_BOX},
692	#line 167 "cssvalues.gperf"	692	#line 167 "cssvalues.gperf"
693	{"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},	693	{"-khtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
694	#line 168 "cssvalues.gperf"	694	#line 168 "cssvalues.gperf"
695	{"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},	695	{"-khtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
696	#line 207 "cssvalues.gperf"	696	#line 207 "cssvalues.gperf"
697	{"nw-resize", CSS_VAL_NW_RESIZE},	697	{"nw-resize", CSS_VAL_NW_RESIZE},
698	#line 62 "cssvalues.gperf"	698	#line 62 "cssvalues.gperf"
Lines 704-718 Link Here
704	#line 113 "cssvalues.gperf"	704	#line 113 "cssvalues.gperf"
705	{"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},	705	{"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
706	#line 267 "cssvalues.gperf"	706	#line 267 "cssvalues.gperf"
707	{"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},	707	{"-khtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
708	#line 109 "cssvalues.gperf"	708	#line 109 "cssvalues.gperf"
709	{"infobackground", CSS_VAL_INFOBACKGROUND},	709	{"infobackground", CSS_VAL_INFOBACKGROUND},
710	#line 100 "cssvalues.gperf"	710	#line 100 "cssvalues.gperf"
711	{"buttonshadow", CSS_VAL_BUTTONSHADOW},	711	{"buttonshadow", CSS_VAL_BUTTONSHADOW},
712	#line 165 "cssvalues.gperf"	712	#line 165 "cssvalues.gperf"
713	{"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},	713	{"-khtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
714	#line 166 "cssvalues.gperf"	714	#line 166 "cssvalues.gperf"
715	{"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},	715	{"-khtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
716	#line 49 "cssvalues.gperf"	716	#line 49 "cssvalues.gperf"
717	{"xx-small", CSS_VAL_XX_SMALL},	717	{"xx-small", CSS_VAL_XX_SMALL},
718	#line 115 "cssvalues.gperf"	718	#line 115 "cssvalues.gperf"
Lines 722-734 Link Here
722	#line 105 "cssvalues.gperf"	722	#line 105 "cssvalues.gperf"
723	{"highlighttext", CSS_VAL_HIGHLIGHTTEXT},	723	{"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
724	#line 169 "cssvalues.gperf"	724	#line 169 "cssvalues.gperf"
725	{"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},	725	{"-khtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
726	#line 170 "cssvalues.gperf"	726	#line 170 "cssvalues.gperf"
727	{"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},	727	{"-khtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
728	#line 116 "cssvalues.gperf"	728	#line 116 "cssvalues.gperf"
729	{"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},	729	{"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
730	#line 172 "cssvalues.gperf"	730	#line 172 "cssvalues.gperf"
731	{"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK},	731	{"-khtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK},
732	#line 179 "cssvalues.gperf"	732	#line 179 "cssvalues.gperf"
733	{"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},	733	{"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
734	#line 191 "cssvalues.gperf"	734	#line 191 "cssvalues.gperf"
Lines 748-754 Link Here
748	#line 67 "cssvalues.gperf"	748	#line 67 "cssvalues.gperf"
749	{"extra-expanded", CSS_VAL_EXTRA_EXPANDED},	749	{"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
750	#line 56 "cssvalues.gperf"	750	#line 56 "cssvalues.gperf"
751	{"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE}	751	{"-khtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE}
752	};	752	};
753		753
754	static const short lookup[] =	754	static const short lookup[] =
Lines 1038-1044 Link Here
1038	"",	1038	"",
1039	"inherit",	1039	"inherit",
1040	"initial",	1040	"initial",
1041	"-tdehtml-native",	1041	"-khtml-native",
1042	"none",	1042	"none",
1043	"hidden",	1043	"hidden",
1044	"inset",	1044	"inset",
Lines 1078-1084 Link Here
1078	"large",	1078	"large",
1079	"x-large",	1079	"x-large",
1080	"xx-large",	1080	"xx-large",
1081	"-tdehtml-xxx-large",	1081	"-khtml-xxx-large",
1082	"smaller",	1082	"smaller",
1083	"larger",	1083	"larger",
1084	"wider",	1084	"wider",
Lines 1144-1150 Link Here
1144	"windowframe",	1144	"windowframe",
1145	"windowtext",	1145	"windowtext",
1146	"grey",	1146	"grey",
1147	"-tdehtml-text",	1147	"-khtml-text",
1148	"repeat",	1148	"repeat",
1149	"repeat-x",	1149	"repeat-x",
1150	"repeat-y",	1150	"repeat-y",
Lines 1157-1200 Link Here
1157	"text-bottom",	1157	"text-bottom",
1158	"top",	1158	"top",
1159	"bottom",	1159	"bottom",
1160	"-tdehtml-baseline-middle",	1160	"-khtml-baseline-middle",
1161	"-tdehtml-auto",	1161	"-khtml-auto",
1162	"left",	1162	"left",
1163	"right",	1163	"right",
1164	"center",	1164	"center",
1165	"justify",	1165	"justify",
1166	"-tdehtml-left",	1166	"-khtml-left",
1167	"-tdehtml-right",	1167	"-khtml-right",
1168	"-tdehtml-center",	1168	"-khtml-center",
1169	"outside",	1169	"outside",
1170	"inside",	1170	"inside",
1171	"disc",	1171	"disc",
1172	"circle",	1172	"circle",
1173	"square",	1173	"square",
1174	"box",	1174	"box",
1175	"-tdehtml-diamond",	1175	"-khtml-diamond",
1176	"decimal",	1176	"decimal",
1177	"decimal-leading-zero",	1177	"decimal-leading-zero",
1178	"-tdehtml-arabic-indic",	1178	"-khtml-arabic-indic",
1179	"-tdehtml-lao",	1179	"-khtml-lao",
1180	"-tdehtml-persian",	1180	"-khtml-persian",
1181	"-tdehtml-urdu",	1181	"-khtml-urdu",
1182	"-tdehtml-thai",	1182	"-khtml-thai",
1183	"-tdehtml-tibetan",	1183	"-khtml-tibetan",
1184	"lower-roman",	1184	"lower-roman",
1185	"upper-roman",	1185	"upper-roman",
1186	"hebrew",	1186	"hebrew",
1187	"armenian",	1187	"armenian",
1188	"georgian",	1188	"georgian",
1189	"cjk-ideographic",	1189	"cjk-ideographic",
1190	"-tdehtml-japanese-formal",	1190	"-khtml-japanese-formal",
1191	"-tdehtml-japanese-informal",	1191	"-khtml-japanese-informal",
1192	"-tdehtml-simp-chinese-formal",	1192	"-khtml-simp-chinese-formal",
1193	"-tdehtml-simp-chinese-informal",	1193	"-khtml-simp-chinese-informal",
1194	"-tdehtml-trad-chinese-formal",	1194	"-khtml-trad-chinese-formal",
1195	"-tdehtml-trad-chinese-informal",	1195	"-khtml-trad-chinese-informal",
1196	"lower-greek",	1196	"lower-greek",
1197	"-tdehtml-upper-greek",	1197	"-khtml-upper-greek",
1198	"lower-alpha",	1198	"lower-alpha",
1199	"lower-latin",	1199	"lower-latin",
1200	"upper-alpha",	1200	"upper-alpha",
Lines 1203-1210 Link Here
1203	"katakana",	1203	"katakana",
1204	"hiragana-iroha",	1204	"hiragana-iroha",
1205	"katakana-iroha",	1205	"katakana-iroha",
1206	"-tdehtml-open-quote",	1206	"-khtml-open-quote",
1207	"-tdehtml-close-quote",	1207	"-khtml-close-quote",
1208	"inline",	1208	"inline",
1209	"block",	1209	"block",
1210	"list-item",	1210	"list-item",
Lines 1253-1259 Link Here
1253	"pre",	1253	"pre",
1254	"pre-wrap",	1254	"pre-wrap",
1255	"pre-line",	1255	"pre-line",
1256	"-tdehtml-nowrap",	1256	"-khtml-nowrap",
1257	"break-word",	1257	"break-word",
1258	"above",	1258	"above",
1259	"absolute",	1259	"absolute",
Lines 1288-1295 Link Here
1288	"thick",	1288	"thick",
1289	"thin",	1289	"thin",
1290	"underline",	1290	"underline",
1291	"-tdehtml-normal",	1291	"-khtml-normal",
1292	"-tdehtml-around-floats",	1292	"-khtml-around-floats",
1293	"border-box",	1293	"border-box",
1294	"content-box",	1294	"content-box",
1295	"enabled",	1295	"enabled",

Lines 16-22 Link Here

(-)ori/tdelibs/tdehtml/css/cssvalues.in (-27 / +27 lines)
16	# CSS_PROP_BORDER_TOP_STYLE	16	# CSS_PROP_BORDER_TOP_STYLE
17	# CSS_PROP_BORDER_BOTTOM_STYLE	17	# CSS_PROP_BORDER_BOTTOM_STYLE
18	# CSS_PROP_BORDER_LEFT_STYLE	18	# CSS_PROP_BORDER_LEFT_STYLE
19	-tdehtml-native	19	-khtml-native
20	none	20	none
21	hidden	21	hidden
22	inset	22	inset
Lines 73-79 Link Here
73	large	73	large
74	x-large	74	x-large
75	xx-large	75	xx-large
76	-tdehtml-xxx-large	76	-khtml-xxx-large
77	smaller	77	smaller
78	larger	78	larger
79	#	79	#
Lines 156-162 Link Here
156	#	156	#
157	# colors in non strict mode	157	# colors in non strict mode
158	grey	158	grey
159	-tdehtml-text	159	-khtml-text
160	#	160	#
161	# CSS_PROP_BACKGROUND_REPEAT:	161	# CSS_PROP_BACKGROUND_REPEAT:
162	#	162	#
Lines 176-193 Link Here
176	top	176	top
177	bottom	177	bottom
178	# HTML alignment MIDDLE has no corresponding CSS alignment	178	# HTML alignment MIDDLE has no corresponding CSS alignment
179	-tdehtml-baseline-middle	179	-khtml-baseline-middle
180	#	180	#
181	# CSS_PROP_TEXT_ALIGN:	181	# CSS_PROP_TEXT_ALIGN:
182	#	182	#
183	-tdehtml-auto	183	-khtml-auto
184	left	184	left
185	right	185	right
186	center	186	center
187	justify	187	justify
188	-tdehtml-left	188	-khtml-left
189	-tdehtml-right	189	-khtml-right
190	-tdehtml-center	190	-khtml-center
191	#	191	#
192	# CSS_PROP_LIST_STYLE_POSITION:	192	# CSS_PROP_LIST_STYLE_POSITION:
193	#	193	#
Lines 200-228 Link Here
200	circle	200	circle
201	square	201	square
202	box	202	box
203	-tdehtml-diamond	203	-khtml-diamond
204	decimal	204	decimal
205	decimal-leading-zero	205	decimal-leading-zero
206	-tdehtml-arabic-indic	206	-khtml-arabic-indic
207	-tdehtml-lao	207	-khtml-lao
208	-tdehtml-persian	208	-khtml-persian
209	-tdehtml-urdu	209	-khtml-urdu
210	-tdehtml-thai	210	-khtml-thai
211	-tdehtml-tibetan	211	-khtml-tibetan
212	lower-roman	212	lower-roman
213	upper-roman	213	upper-roman
214	hebrew	214	hebrew
215	armenian	215	armenian
216	georgian	216	georgian
217	cjk-ideographic	217	cjk-ideographic
218	-tdehtml-japanese-formal	218	-khtml-japanese-formal
219	-tdehtml-japanese-informal	219	-khtml-japanese-informal
220	-tdehtml-simp-chinese-formal	220	-khtml-simp-chinese-formal
221	-tdehtml-simp-chinese-informal	221	-khtml-simp-chinese-informal
222	-tdehtml-trad-chinese-formal	222	-khtml-trad-chinese-formal
223	-tdehtml-trad-chinese-informal	223	-khtml-trad-chinese-informal
224	lower-greek	224	lower-greek
225	-tdehtml-upper-greek	225	-khtml-upper-greek
226	lower-alpha	226	lower-alpha
227	lower-latin	227	lower-latin
228	upper-alpha	228	upper-alpha
Lines 231-238 Link Here
231	katakana	231	katakana
232	hiragana-iroha	232	hiragana-iroha
233	katakana-iroha	233	katakana-iroha
234	-tdehtml-open-quote	234	-khtml-open-quote
235	-tdehtml-close-quote	235	-khtml-close-quote
236	#none	236	#none
237	#	237	#
238	# CSS_PROP_DISPLAY:	238	# CSS_PROP_DISPLAY:
Lines 307-313 Link Here
307	pre	307	pre
308	pre-wrap	308	pre-wrap
309	pre-line	309	pre-line
310	-tdehtml-nowrap	310	-khtml-nowrap
311	#	311	#
312	# CSS_PROP_WORD_WRAP	312	# CSS_PROP_WORD_WRAP
313	#	313	#
Lines 351-358 Link Here
351	underline	351	underline
352	#	352	#
353	# CSS_PROP__TDEHTML_FLOW_MODE	353	# CSS_PROP__TDEHTML_FLOW_MODE
354	-tdehtml-normal	354	-khtml-normal
355	-tdehtml-around-floats	355	-khtml-around-floats
356		356
357	# CSS3 Values	357	# CSS3 Values
358	# CSS_PROP__TDEHTML_BOX_SIZING	358	# CSS_PROP__TDEHTML_BOX_SIZING

Lines 11-17 Link Here

(-)ori/tdelibs/tdehtml/css/html4.css (-15 / +15 lines)
11		11
12	html {	12	html {
13	display: block;	13	display: block;
14	color: -tdehtml-text;	14	color: -khtml-text;
15	}	15	}
16		16
17	/*	17	/*
Lines 99-105 Link Here
99	center {	99	center {
100	display: block;	100	display: block;
101	/* special centering to be able to emulate the html4/netscape behavior */	101	/* special centering to be able to emulate the html4/netscape behavior */
102	text-align: -tdehtml-center;	102	text-align: -khtml-center;
103	}	103	}
104		104
105	hr {	105	hr {
Lines 107-113 Link Here
107	margin: 12px auto;	107	margin: 12px auto;
108	border-style: inset;	108	border-style: inset;
109	border-width: 1px;	109	border-width: 1px;
110	-tdehtml-flow-mode: -tdehtml-around-floats	110	-khtml-flow-mode: -khtml-around-floats
111	}	111	}
112		112
113	map {	113	map {
Lines 171-177 Link Here
171	display: table;	171	display: table;
172	border-collapse: separate;	172	border-collapse: separate;
173	border-spacing: 2px;	173	border-spacing: 2px;
174	-tdehtml-flow-mode: -tdehtml-around-floats;	174	-khtml-flow-mode: -khtml-around-floats;
175	box-sizing: border-box;	175	box-sizing: border-box;
176	}	176	}
177		177
Lines 181-191 Link Here
181	}	181	}
182		182
183	table[align="left"] {	183	table[align="left"] {
184	float: -tdehtml-left;	184	float: -khtml-left;
185	}	185	}
186		186
187	table[align="right"] {	187	table[align="right"] {
188	float: -tdehtml-right;	188	float: -khtml-right;
189	}	189	}
190		190
191	thead {	191	thead {
Lines 232-238 Link Here
232		232
233	caption {	233	caption {
234	display: table-caption;	234	display: table-caption;
235	text-align: -tdehtml-center;	235	text-align: -khtml-center;
236	}	236	}
237		237
238	/*	238	/*
Lines 243-261 Link Here
243	display: block;	243	display: block;
244	list-style-type: disc;	244	list-style-type: disc;
245	margin: 1__qem 0 1em 0;	245	margin: 1__qem 0 1em 0;
246	-tdehtml-padding-start: 40px	246	-khtml-padding-start: 40px
247	}	247	}
248		248
249	ol {	249	ol {
250	display: block;	250	display: block;
251	list-style-type: decimal;	251	list-style-type: decimal;
252	margin: 1__qem 0 1em 0;	252	margin: 1__qem 0 1em 0;
253	-tdehtml-padding-start: 40px	253	-khtml-padding-start: 40px
254	}	254	}
255		255
256	li {	256	li {
257	display: list-item;	257	display: list-item;
258	-tdehtml-flow-mode: -tdehtml-around-floats;	258	-khtml-flow-mode: -khtml-around-floats;
259	}	259	}
260		260
261		261
Lines 273-279 Link Here
273	}	273	}
274		274
275	dl > dd {	275	dl > dd {
276	-tdehtml-margin-start: 40px;	276	-khtml-margin-start: 40px;
277	}	277	}
278		278
279	dl {	279	dl {
Lines 329-335 Link Here
329	padding: 0.75em 0.625em;	329	padding: 0.75em 0.625em;
330	margin: 1.0em 0;	330	margin: 1.0em 0;
331	border: 2px groove threedface;	331	border: 2px groove threedface;
332	-tdehtml-flow-mode: -tdehtml-around-floats	332	-khtml-flow-mode: -khtml-around-floats
333	}	333	}
334		334
335	button {	335	button {
Lines 346-352 Link Here
346	}	346	}
347		347
348	input, textarea {	348	input, textarea {
349	text-align: -tdehtml-auto;	349	text-align: -khtml-auto;
350	}	350	}
351		351
352	input, textarea, select, button {	352	input, textarea, select, button {
Lines 357-363 Link Here
357	input { color: windowtext;	357	input { color: windowtext;
358	font-family: sans-serif;	358	font-family: sans-serif;
359	font-size: small;	359	font-size: small;
360	border: 2px -tdehtml-native;	360	border: 2px -khtml-native;
361	}	361	}
362		362
363	input[type="hidden"] {	363	input[type="hidden"] {
Lines 396-402 Link Here
396	textarea {	396	textarea {
397	color: windowtext;	397	color: windowtext;
398	font-family: monospace;	398	font-family: monospace;
399	border: 2px -tdehtml-native;	399	border: 2px -khtml-native;
400	}	400	}
401		401
402	/*	402	/*

Lines 93-108 Link Here

(-)ori/tdelibs/tdehtml/tdehtml_printsettings.cpp (-6 / +6 lines)
93		93
94	void TDEHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /incldef/)	94	void TDEHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /incldef/)
95	{	95	{
96	opts["app-tdehtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");	96	opts["app-khtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
97	opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");	97	opts["app-khtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
98	opts["app-tdehtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");	98	opts["app-khtml-printheader"] = (m_printheader->isChecked() ? "true" : "false");
99	}	99	}
100		100
101	void TDEHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts)	101	void TDEHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts)
102	{	102	{
103	m_printfriendly->setChecked(opts["app-tdehtml-printfriendly"] != "false");	103	m_printfriendly->setChecked(opts["app-khtml-printfriendly"] != "false");
104	m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false");	104	m_printimages->setChecked(opts["app-khtml-printimages"] != "false");
105	m_printheader->setChecked(opts["app-tdehtml-printheader"] != "false");	105	m_printheader->setChecked(opts["app-khtml-printheader"] != "false");
106	}	106	}
107		107
108	#include "tdehtml_printsettings.moc"	108	#include "tdehtml_printsettings.moc"

Lines 2801-2807 Link Here

(-)ori/tdelibs/tdehtml/tdehtmlview.cpp (-3 / +3 lines)
2801	// We ignore margin settings for html and body when printing	2801	// We ignore margin settings for html and body when printing
2802	// and use the default margins from the print-system	2802	// and use the default margins from the print-system
2803	// (In Qt 3.0.x the default margins are hardcoded in Qt)	2803	// (In Qt 3.0.x the default margins are hardcoded in Qt)
2804	m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-tdehtml-printfriendly") == "true" ?	2804	m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-khtml-printfriendly") == "true" ?
2805	"* { background-image: none !important;"	2805	"* { background-image: none !important;"
2806	" background-color: white !important;"	2806	" background-color: white !important;"
2807	" color: black !important; }"	2807	" color: black !important; }"
Lines 2825-2831 Link Here
2825		2825
2826	m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);	2826	m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);
2827	m_part->xmlDocImpl()->updateStyleSelector();	2827	m_part->xmlDocImpl()->updateStyleSelector();
2828	root->setPrintImages( printer->option("app-tdehtml-printimages") == "true");	2828	root->setPrintImages( printer->option("app-khtml-printimages") == "true");
2829	root->makePageBreakAvoidBlocks();	2829	root->makePageBreakAvoidBlocks();
2830		2830
2831	root->setNeedsLayoutAndMinMaxRecalc();	2831	root->setNeedsLayoutAndMinMaxRecalc();
Lines 2834-2840 Link Here
2834		2834
2835	// check sizes ask for action.. (scale or clip)	2835	// check sizes ask for action.. (scale or clip)
2836		2836
2837	bool printHeader = (printer->option("app-tdehtml-printheader") == "true");	2837	bool printHeader = (printer->option("app-khtml-printheader") == "true");
2838		2838
2839	int headerHeight = 0;	2839	int headerHeight = 0;
2840	TQFont headerFont("Sans Serif", 8);	2840	TQFont headerFont("Sans Serif", 8);