Commit be02abb2 authored by hyatt's avatar hyatt

The new table code from Lars. Also includes bug fixes for

	percentage height children in table cells, for positioning
	of tables, and for width distribution of percentage width
	cells.

        Reviewed by darin

        * ForwardingHeaders/rendering/table_layout.h: Added.
        * WebCore.pbproj/project.pbxproj:
        * khtml/css/cssparser.cpp:
        (StyleBaseImpl::parseValue):
        * khtml/css/cssstyleselector.cpp:
        * khtml/css/cssvalues.c:
        (findValue):
        * khtml/css/cssvalues.h:
        * khtml/css/cssvalues.in:
        * khtml/css/html4.css:
        * khtml/dom/html_table.cpp:
        (HTMLTableElement::insertRow):
        (HTMLTableElement::deleteRow):
        (HTMLTableRowElement::insertCell):
        (HTMLTableRowElement::deleteCell):
        (HTMLTableSectionElement::insertRow):
        (HTMLTableSectionElement::deleteRow):
        * khtml/html/html_tableimpl.cpp:
        (HTMLTableElementImpl::HTMLTableElementImpl):
        (HTMLTableElementImpl::setTFoot):
        (HTMLTableElementImpl::setTBody):
        (HTMLTableElementImpl::createTHead):
        (HTMLTableElementImpl::createTFoot):
        (HTMLTableElementImpl::insertRow):
        (HTMLTableElementImpl::deleteRow):
        (HTMLTableElementImpl::addChild):
        (HTMLTableElementImpl::parseAttribute):
        (HTMLTableElementImpl::attach):
        (HTMLTablePartElementImpl::parseAttribute):
        (HTMLTableSectionElementImpl::HTMLTableSectionElementImpl):
        (HTMLTableSectionElementImpl::~HTMLTableSectionElementImpl):
        (HTMLTableSectionElementImpl::insertRow):
        (HTMLTableSectionElementImpl::deleteRow):
        (HTMLTableSectionElementImpl::numRows):
        (HTMLTableRowElementImpl::rowIndex):
        (HTMLTableRowElementImpl::insertCell):
        (HTMLTableRowElementImpl::deleteCell):
        (HTMLTableCellElementImpl::HTMLTableCellElementImpl):
        (HTMLTableCellElementImpl::parseAttribute):
        (HTMLTableCellElementImpl::attach):
        (HTMLTableColElementImpl::HTMLTableColElementImpl):
        (HTMLTableColElementImpl::parseAttribute):
        * khtml/html/html_tableimpl.h:
        * khtml/html/htmlparser.cpp:
        (KHTMLParser::insertNode):
        (KHTMLParser::getElement):
        * khtml/rendering/bidi.cpp:
        (RenderFlow::layoutInlineChildren):
        * khtml/rendering/render_body.cpp:
        (RenderBody::availableHeight):
        * khtml/rendering/render_body.h:
        * khtml/rendering/render_box.cpp:
        (RenderBox::contentWidth):
        (RenderBox::contentHeight):
        (RenderBox::calcReplacedWidth):
        (RenderBox::calcReplacedHeight):
        (RenderBox::availableHeight):
        (RenderBox::calcAbsoluteVertical):
        * khtml/rendering/render_box.h:
        * khtml/rendering/render_flow.cpp:
        (RenderFlow::layoutBlockChildren):
        (RenderFlow::leftOffset):
        (RenderFlow::rightOffset):
        (RenderFlow::addOverHangingFloats):
        (RenderFlow::calcBlockMinMaxWidth):
        (RenderFlow::calcMinMaxWidth):
        * khtml/rendering/render_form.cpp:
        * khtml/rendering/render_form.h:
        * khtml/rendering/render_frames.cpp:
        * khtml/rendering/render_frames.h:
        * khtml/rendering/render_object.cpp:
        (RenderObject::createObject):
        (RenderObject::paddingTop):
        (RenderObject::paddingBottom):
        (RenderObject::paddingLeft):
        (RenderObject::paddingRight):
        * khtml/rendering/render_object.h:
        * khtml/rendering/render_replaced.cpp:
        (RenderReplaced::calcMinMaxWidth):
        * khtml/rendering/render_root.cpp:
        (RenderRoot::RenderRoot):
        (RenderRoot::layout):
        (RenderRoot::paintObject):
        * khtml/rendering/render_root.h:
        * khtml/rendering/render_style.cpp:
        (StyleSurroundData::StyleSurroundData):
        * khtml/rendering/render_style.h:
        * khtml/rendering/render_table.cpp:
        (RenderTable::RenderTable):
        (RenderTable::~RenderTable):
        (RenderTable::setStyle):
        (RenderTable::position):
        (RenderTable::addChild):
        (RenderTable::calcWidth):
        (RenderTable::layout):
        (RenderTable::setCellWidths):
        (RenderTable::paint):
        (RenderTable::calcMinMaxWidth):
        (RenderTable::splitColumn):
        (RenderTable::appendColumn):
        (RenderTable::colElement):
        (RenderTable::recalcSections):
        (RenderTable::removeChildNode):
        (RenderTable::dump):
        (RenderTableSection::RenderTableSection):
        (RenderTableSection::~RenderTableSection):
        (RenderTableSection::detach):
        (RenderTableSection::setStyle):
        (RenderTableSection::addChild):
        (RenderTableSection::ensureRows):
        (RenderTableSection::addCell):
        (RenderTableSection::setCellWidths):
        (RenderTableSection::calcRowHeight):
        (RenderTableSection::layoutRows):
        (RenderTableSection::paint):
        (RenderTableSection::recalcCells):
        (RenderTableSection::clearGrid):
        (RenderTableSection::removeChildNode):
        (RenderTableSection::dump):
        (RenderTableRow::RenderTableRow):
        (RenderTableRow::detach):
        (RenderTableRow::setStyle):
        (RenderTableRow::addChild):
        (RenderTableRow::removeChildNode):
        (RenderTableRow::dump):
        (RenderTableRow::layout):
        (RenderTableCell::RenderTableCell):
        (RenderTableCell::detach):
        (RenderTableCell::updateFromElement):
        (RenderTableCell::getCellPercentageHeight):
        (RenderTableCell::setCellPercentageHeight):
        (RenderTableCell::calcMinMaxWidth):
        (RenderTableCell::baselinePosition):
        (RenderTableCell::setStyle):
        (RenderTableCell::paint):
        (RenderTableCell::paintBoxDecorations):
        (RenderTableCell::dump):
        (RenderTableCol::RenderTableCol):
        (RenderTableCol::updateFromElement):
        (RenderTableCol::addChild):
        (RenderTableCol::dump):
        * khtml/rendering/render_table.h:
        * khtml/rendering/table_layout.cpp: Added.
        (FixedTableLayout::FixedTableLayout):
        (FixedTableLayout::~FixedTableLayout):
        (FixedTableLayout::calcWidthArray):
        (FixedTableLayout::calcMinMaxWidth):
        (FixedTableLayout::layout):
        (AutoTableLayout::AutoTableLayout):
        (AutoTableLayout::~AutoTableLayout):
        (AutoTableLayout::recalcColumn):
        (AutoTableLayout::fullRecalc):
        (AutoTableLayout::calcMinMaxWidth):
        (AutoTableLayout::calcEffectiveWidth):
        (AutoTableLayout::insertSpanCell):
        (AutoTableLayout::layout):
        (AutoTableLayout::calcPercentages):
        * khtml/rendering/table_layout.h: Added.
        * khtml/xml/dom_docimpl.cpp:
        (DocumentImpl::createHTMLElement):
        * khtml/xml/dom_nodeimpl.cpp:
        (NodeImpl::NodeImpl):
        (NodeImpl::dump):
        * khtml/xml/dom_nodeimpl.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3351 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1bb17f28
2003-01-17 David Hyatt <hyatt@apple.com>
The new table code from Lars. Also includes bug fixes for
percentage height children in table cells, for positioning
of tables, and for width distribution of percentage width
cells.
Reviewed by darin
* ForwardingHeaders/rendering/table_layout.h: Added.
* WebCore.pbproj/project.pbxproj:
* khtml/css/cssparser.cpp:
(StyleBaseImpl::parseValue):
* khtml/css/cssstyleselector.cpp:
* khtml/css/cssvalues.c:
(findValue):
* khtml/css/cssvalues.h:
* khtml/css/cssvalues.in:
* khtml/css/html4.css:
* khtml/dom/html_table.cpp:
(HTMLTableElement::insertRow):
(HTMLTableElement::deleteRow):
(HTMLTableRowElement::insertCell):
(HTMLTableRowElement::deleteCell):
(HTMLTableSectionElement::insertRow):
(HTMLTableSectionElement::deleteRow):
* khtml/html/html_tableimpl.cpp:
(HTMLTableElementImpl::HTMLTableElementImpl):
(HTMLTableElementImpl::setTFoot):
(HTMLTableElementImpl::setTBody):
(HTMLTableElementImpl::createTHead):
(HTMLTableElementImpl::createTFoot):
(HTMLTableElementImpl::insertRow):
(HTMLTableElementImpl::deleteRow):
(HTMLTableElementImpl::addChild):
(HTMLTableElementImpl::parseAttribute):
(HTMLTableElementImpl::attach):
(HTMLTablePartElementImpl::parseAttribute):
(HTMLTableSectionElementImpl::HTMLTableSectionElementImpl):
(HTMLTableSectionElementImpl::~HTMLTableSectionElementImpl):
(HTMLTableSectionElementImpl::insertRow):
(HTMLTableSectionElementImpl::deleteRow):
(HTMLTableSectionElementImpl::numRows):
(HTMLTableRowElementImpl::rowIndex):
(HTMLTableRowElementImpl::insertCell):
(HTMLTableRowElementImpl::deleteCell):
(HTMLTableCellElementImpl::HTMLTableCellElementImpl):
(HTMLTableCellElementImpl::parseAttribute):
(HTMLTableCellElementImpl::attach):
(HTMLTableColElementImpl::HTMLTableColElementImpl):
(HTMLTableColElementImpl::parseAttribute):
* khtml/html/html_tableimpl.h:
* khtml/html/htmlparser.cpp:
(KHTMLParser::insertNode):
(KHTMLParser::getElement):
* khtml/rendering/bidi.cpp:
(RenderFlow::layoutInlineChildren):
* khtml/rendering/render_body.cpp:
(RenderBody::availableHeight):
* khtml/rendering/render_body.h:
* khtml/rendering/render_box.cpp:
(RenderBox::contentWidth):
(RenderBox::contentHeight):
(RenderBox::calcReplacedWidth):
(RenderBox::calcReplacedHeight):
(RenderBox::availableHeight):
(RenderBox::calcAbsoluteVertical):
* khtml/rendering/render_box.h:
* khtml/rendering/render_flow.cpp:
(RenderFlow::layoutBlockChildren):
(RenderFlow::leftOffset):
(RenderFlow::rightOffset):
(RenderFlow::addOverHangingFloats):
(RenderFlow::calcBlockMinMaxWidth):
(RenderFlow::calcMinMaxWidth):
* khtml/rendering/render_form.cpp:
* khtml/rendering/render_form.h:
* khtml/rendering/render_frames.cpp:
* khtml/rendering/render_frames.h:
* khtml/rendering/render_object.cpp:
(RenderObject::createObject):
(RenderObject::paddingTop):
(RenderObject::paddingBottom):
(RenderObject::paddingLeft):
(RenderObject::paddingRight):
* khtml/rendering/render_object.h:
* khtml/rendering/render_replaced.cpp:
(RenderReplaced::calcMinMaxWidth):
* khtml/rendering/render_root.cpp:
(RenderRoot::RenderRoot):
(RenderRoot::layout):
(RenderRoot::paintObject):
* khtml/rendering/render_root.h:
* khtml/rendering/render_style.cpp:
(StyleSurroundData::StyleSurroundData):
* khtml/rendering/render_style.h:
* khtml/rendering/render_table.cpp:
(RenderTable::RenderTable):
(RenderTable::~RenderTable):
(RenderTable::setStyle):
(RenderTable::position):
(RenderTable::addChild):
(RenderTable::calcWidth):
(RenderTable::layout):
(RenderTable::setCellWidths):
(RenderTable::paint):
(RenderTable::calcMinMaxWidth):
(RenderTable::splitColumn):
(RenderTable::appendColumn):
(RenderTable::colElement):
(RenderTable::recalcSections):
(RenderTable::removeChildNode):
(RenderTable::dump):
(RenderTableSection::RenderTableSection):
(RenderTableSection::~RenderTableSection):
(RenderTableSection::detach):
(RenderTableSection::setStyle):
(RenderTableSection::addChild):
(RenderTableSection::ensureRows):
(RenderTableSection::addCell):
(RenderTableSection::setCellWidths):
(RenderTableSection::calcRowHeight):
(RenderTableSection::layoutRows):
(RenderTableSection::paint):
(RenderTableSection::recalcCells):
(RenderTableSection::clearGrid):
(RenderTableSection::removeChildNode):
(RenderTableSection::dump):
(RenderTableRow::RenderTableRow):
(RenderTableRow::detach):
(RenderTableRow::setStyle):
(RenderTableRow::addChild):
(RenderTableRow::removeChildNode):
(RenderTableRow::dump):
(RenderTableRow::layout):
(RenderTableCell::RenderTableCell):
(RenderTableCell::detach):
(RenderTableCell::updateFromElement):
(RenderTableCell::getCellPercentageHeight):
(RenderTableCell::setCellPercentageHeight):
(RenderTableCell::calcMinMaxWidth):
(RenderTableCell::baselinePosition):
(RenderTableCell::setStyle):
(RenderTableCell::paint):
(RenderTableCell::paintBoxDecorations):
(RenderTableCell::dump):
(RenderTableCol::RenderTableCol):
(RenderTableCol::updateFromElement):
(RenderTableCol::addChild):
(RenderTableCol::dump):
* khtml/rendering/render_table.h:
* khtml/rendering/table_layout.cpp: Added.
(FixedTableLayout::FixedTableLayout):
(FixedTableLayout::~FixedTableLayout):
(FixedTableLayout::calcWidthArray):
(FixedTableLayout::calcMinMaxWidth):
(FixedTableLayout::layout):
(AutoTableLayout::AutoTableLayout):
(AutoTableLayout::~AutoTableLayout):
(AutoTableLayout::recalcColumn):
(AutoTableLayout::fullRecalc):
(AutoTableLayout::calcMinMaxWidth):
(AutoTableLayout::calcEffectiveWidth):
(AutoTableLayout::insertSpanCell):
(AutoTableLayout::layout):
(AutoTableLayout::calcPercentages):
* khtml/rendering/table_layout.h: Added.
* khtml/xml/dom_docimpl.cpp:
(DocumentImpl::createHTMLElement):
* khtml/xml/dom_nodeimpl.cpp:
(NodeImpl::NodeImpl):
(NodeImpl::dump):
* khtml/xml/dom_nodeimpl.h:
2003-01-17 Darin Adler <darin@apple.com>
Reviewed by Dave.
......
2003-01-17 David Hyatt <hyatt@apple.com>
The new table code from Lars. Also includes bug fixes for
percentage height children in table cells, for positioning
of tables, and for width distribution of percentage width
cells.
Reviewed by darin
* ForwardingHeaders/rendering/table_layout.h: Added.
* WebCore.pbproj/project.pbxproj:
* khtml/css/cssparser.cpp:
(StyleBaseImpl::parseValue):
* khtml/css/cssstyleselector.cpp:
* khtml/css/cssvalues.c:
(findValue):
* khtml/css/cssvalues.h:
* khtml/css/cssvalues.in:
* khtml/css/html4.css:
* khtml/dom/html_table.cpp:
(HTMLTableElement::insertRow):
(HTMLTableElement::deleteRow):
(HTMLTableRowElement::insertCell):
(HTMLTableRowElement::deleteCell):
(HTMLTableSectionElement::insertRow):
(HTMLTableSectionElement::deleteRow):
* khtml/html/html_tableimpl.cpp:
(HTMLTableElementImpl::HTMLTableElementImpl):
(HTMLTableElementImpl::setTFoot):
(HTMLTableElementImpl::setTBody):
(HTMLTableElementImpl::createTHead):
(HTMLTableElementImpl::createTFoot):
(HTMLTableElementImpl::insertRow):
(HTMLTableElementImpl::deleteRow):
(HTMLTableElementImpl::addChild):
(HTMLTableElementImpl::parseAttribute):
(HTMLTableElementImpl::attach):
(HTMLTablePartElementImpl::parseAttribute):
(HTMLTableSectionElementImpl::HTMLTableSectionElementImpl):
(HTMLTableSectionElementImpl::~HTMLTableSectionElementImpl):
(HTMLTableSectionElementImpl::insertRow):
(HTMLTableSectionElementImpl::deleteRow):
(HTMLTableSectionElementImpl::numRows):
(HTMLTableRowElementImpl::rowIndex):
(HTMLTableRowElementImpl::insertCell):
(HTMLTableRowElementImpl::deleteCell):
(HTMLTableCellElementImpl::HTMLTableCellElementImpl):
(HTMLTableCellElementImpl::parseAttribute):
(HTMLTableCellElementImpl::attach):
(HTMLTableColElementImpl::HTMLTableColElementImpl):
(HTMLTableColElementImpl::parseAttribute):
* khtml/html/html_tableimpl.h:
* khtml/html/htmlparser.cpp:
(KHTMLParser::insertNode):
(KHTMLParser::getElement):
* khtml/rendering/bidi.cpp:
(RenderFlow::layoutInlineChildren):
* khtml/rendering/render_body.cpp:
(RenderBody::availableHeight):
* khtml/rendering/render_body.h:
* khtml/rendering/render_box.cpp:
(RenderBox::contentWidth):
(RenderBox::contentHeight):
(RenderBox::calcReplacedWidth):
(RenderBox::calcReplacedHeight):
(RenderBox::availableHeight):
(RenderBox::calcAbsoluteVertical):
* khtml/rendering/render_box.h:
* khtml/rendering/render_flow.cpp:
(RenderFlow::layoutBlockChildren):
(RenderFlow::leftOffset):
(RenderFlow::rightOffset):
(RenderFlow::addOverHangingFloats):
(RenderFlow::calcBlockMinMaxWidth):
(RenderFlow::calcMinMaxWidth):
* khtml/rendering/render_form.cpp:
* khtml/rendering/render_form.h:
* khtml/rendering/render_frames.cpp:
* khtml/rendering/render_frames.h:
* khtml/rendering/render_object.cpp:
(RenderObject::createObject):
(RenderObject::paddingTop):
(RenderObject::paddingBottom):
(RenderObject::paddingLeft):
(RenderObject::paddingRight):
* khtml/rendering/render_object.h:
* khtml/rendering/render_replaced.cpp:
(RenderReplaced::calcMinMaxWidth):
* khtml/rendering/render_root.cpp:
(RenderRoot::RenderRoot):
(RenderRoot::layout):
(RenderRoot::paintObject):
* khtml/rendering/render_root.h:
* khtml/rendering/render_style.cpp:
(StyleSurroundData::StyleSurroundData):
* khtml/rendering/render_style.h:
* khtml/rendering/render_table.cpp:
(RenderTable::RenderTable):
(RenderTable::~RenderTable):
(RenderTable::setStyle):
(RenderTable::position):
(RenderTable::addChild):
(RenderTable::calcWidth):
(RenderTable::layout):
(RenderTable::setCellWidths):
(RenderTable::paint):
(RenderTable::calcMinMaxWidth):
(RenderTable::splitColumn):
(RenderTable::appendColumn):
(RenderTable::colElement):
(RenderTable::recalcSections):
(RenderTable::removeChildNode):
(RenderTable::dump):
(RenderTableSection::RenderTableSection):
(RenderTableSection::~RenderTableSection):
(RenderTableSection::detach):
(RenderTableSection::setStyle):
(RenderTableSection::addChild):
(RenderTableSection::ensureRows):
(RenderTableSection::addCell):
(RenderTableSection::setCellWidths):
(RenderTableSection::calcRowHeight):
(RenderTableSection::layoutRows):
(RenderTableSection::paint):
(RenderTableSection::recalcCells):
(RenderTableSection::clearGrid):
(RenderTableSection::removeChildNode):
(RenderTableSection::dump):
(RenderTableRow::RenderTableRow):
(RenderTableRow::detach):
(RenderTableRow::setStyle):
(RenderTableRow::addChild):
(RenderTableRow::removeChildNode):
(RenderTableRow::dump):
(RenderTableRow::layout):
(RenderTableCell::RenderTableCell):
(RenderTableCell::detach):
(RenderTableCell::updateFromElement):
(RenderTableCell::getCellPercentageHeight):
(RenderTableCell::setCellPercentageHeight):
(RenderTableCell::calcMinMaxWidth):
(RenderTableCell::baselinePosition):
(RenderTableCell::setStyle):
(RenderTableCell::paint):
(RenderTableCell::paintBoxDecorations):
(RenderTableCell::dump):
(RenderTableCol::RenderTableCol):
(RenderTableCol::updateFromElement):
(RenderTableCol::addChild):
(RenderTableCol::dump):
* khtml/rendering/render_table.h:
* khtml/rendering/table_layout.cpp: Added.
(FixedTableLayout::FixedTableLayout):
(FixedTableLayout::~FixedTableLayout):
(FixedTableLayout::calcWidthArray):
(FixedTableLayout::calcMinMaxWidth):
(FixedTableLayout::layout):
(AutoTableLayout::AutoTableLayout):
(AutoTableLayout::~AutoTableLayout):
(AutoTableLayout::recalcColumn):
(AutoTableLayout::fullRecalc):
(AutoTableLayout::calcMinMaxWidth):
(AutoTableLayout::calcEffectiveWidth):
(AutoTableLayout::insertSpanCell):
(AutoTableLayout::layout):
(AutoTableLayout::calcPercentages):
* khtml/rendering/table_layout.h: Added.
* khtml/xml/dom_docimpl.cpp:
(DocumentImpl::createHTMLElement):
* khtml/xml/dom_nodeimpl.cpp:
(NodeImpl::NodeImpl):
(NodeImpl::dump):
* khtml/xml/dom_nodeimpl.h:
2003-01-17 Darin Adler <darin@apple.com>
Reviewed by Dave.
......
......@@ -175,6 +175,7 @@
</dict>
</plist>
";
shouldUseHeadermap = 0;
};
0867D69DFE84028FC02AAC07 = {
buildActionMask = 2147483647;
......@@ -478,6 +479,7 @@
93F12CB103CCFD570000011C,
93F12CB303CCFD570000011C,
93F12CC803CD0AE60000011C,
BCF0192703D3802200B2D04D,
931BFCD003D4AEDA008635CE,
931BFCD403D4AEE5008635CE,
931BFCD803D4AEFD008635CE,
......@@ -718,6 +720,7 @@
93F12CAD03CCFD570000011C,
93F12CAE03CCFD570000011C,
93F12CB003CCFD570000011C,
BCF0192603D3802200B2D04D,
931BFCD103D4AEDA008635CE,
931BFCD503D4AEE5008635CE,
931BFCD903D4AEFD008635CE,
......@@ -1456,6 +1459,30 @@
settings = {
};
};
BCF0192403D3802200B2D04D = {
fileEncoding = 30;
isa = PBXFileReference;
path = table_layout.cpp;
refType = 4;
};
BCF0192503D3802200B2D04D = {
fileEncoding = 30;
isa = PBXFileReference;
path = table_layout.h;
refType = 4;
};
BCF0192603D3802200B2D04D = {
fileRef = BCF0192403D3802200B2D04D;
isa = PBXBuildFile;
settings = {
};
};
BCF0192703D3802200B2D04D = {
fileRef = BCF0192503D3802200B2D04D;
isa = PBXBuildFile;
settings = {
};
};
//BC0
//BC1
//BC2
......@@ -4168,6 +4195,10 @@
F523D2C402DE4438018635CA,
F523D2C702DE4438018635CA,
F523D2C602DE4438018635CA,
BC7294FB03804B5600A80166,
BC7294FC03804B5600A80166,
BCF0192403D3802200B2D04D,
BCF0192503D3802200B2D04D,
);
isa = PBXGroup;
path = rendering;
......
......@@ -1198,7 +1198,7 @@ bool StyleBaseImpl::parseValue( const QChar *curP, const QChar *endP, int propId
// [<color> || <length> <length> <length>?] | inherit
case CSS_PROP_UNICODE_BIDI: // normal | embed | bidi-override | inherit
case CSS_PROP_WHITE_SPACE: // normal | pre | nowrap | inherit
case CSS_PROP_WHITE_SPACE: // normal | pre | nowrap | -konq-nowrap | inherit
case CSS_PROP_FONT_STRETCH:
// normal | wider | narrower | ultra-condensed | extra-condensed | condensed |
// semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded |
......
......@@ -1743,6 +1743,9 @@ void CSSStyleSelector::applyRule( DOM::CSSProperty *prop )
EWhiteSpace s;
switch(primitiveValue->getIdent()) {
case CSS_VAL__KONQ_NOWRAP:
s = KONQ_NOWRAP;
break;
case CSS_VAL_NOWRAP:
s = NOWRAP;
break;
......
......@@ -108,7 +108,7 @@ findValue (register const char *str, register unsigned int len)
{
enum
{
TOTAL_KEYWORDS = 180,
TOTAL_KEYWORDS = 181,
MIN_WORD_LENGTH = 3,
MAX_WORD_LENGTH = 21,
MIN_HASH_VALUE = 0,
......@@ -280,6 +280,7 @@ findValue (register const char *str, register unsigned int len)
{"medium", CSS_VAL_MEDIUM},
{"higher", CSS_VAL_HIGHER},
{"table-column", CSS_VAL_TABLE_COLUMN},
{"-konq-nowrap", CSS_VAL__KONQ_NOWRAP},
{"message-box", CSS_VAL_MESSAGE_BOX},
{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
{"-konq-normal", CSS_VAL__KONQ_NORMAL},
......@@ -316,7 +317,7 @@ findValue (register const char *str, register unsigned int len)
-1, -1, 17, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 18, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 19,
-302, -160, -2, 22, -1, -1, -1, -1,
-303, -161, -2, 22, -1, -1, -1, -1,
-1, -1, 23, -1, -1, 24, -1, -1,
-1, -1, -1, -1, 25, -1, -1, 26,
27, -1, -1, -1, -1, -1, 28, -1,
......@@ -392,32 +393,33 @@ findValue (register const char *str, register unsigned int len)
-1, 161, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 162, -1, -1, -1, -1, -1,
-1, 163, -1, -1, -1, -1, -1, -1,
-1, -1, 164, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 163, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 165, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 164, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 166, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 165, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 167, -1, -1,
-1, -1, -1, -1, 168, -1, -1, -1,
-1, 169, -1, -1, -1, -1, -1, 170,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 166, -1, -1,
-1, -1, -1, -1, 167, -1, -1, -1,
-1, 168, -1, -1, -1, -1, -1, 169,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 171, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 170, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 172,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 171,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
......@@ -425,22 +427,21 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 172, -1, -1, -1,
-1, -1, -1, -1, 173, -1, -1, -1,
-1, -1, -1, -1, 174, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 174, -1,
-1, -1, -1, -1, -1, -1, 175, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 175, -1, -1, -1, -1, -1,
-1, -1, 176, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 176, -1, -1, -1, -1, -1,
177, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 177, -1, -1, -1, -1, -1,
178, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
......@@ -457,7 +458,7 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 178, -1, -1, -1, -1,
-1, -1, -1, 179, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
......@@ -473,7 +474,7 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 179
-1, -1, -1, -1, -1, 180
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
......@@ -690,6 +691,7 @@ static const char * const valueList[] = {
"thick",
"thin",
"underline",
"-konq-nowrap",
"-konq-normal",
"-konq-around-floats",
0
......
......@@ -187,9 +187,10 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_THICK 176
#define CSS_VAL_THIN 177
#define CSS_VAL_UNDERLINE 178
#define CSS_VAL__KONQ_NORMAL 179
#define CSS_VAL__KONQ_AROUND_FLOATS 180
#define CSS_VAL__KONQ_NOWRAP 179
#define CSS_VAL__KONQ_NORMAL 180
#define CSS_VAL__KONQ_AROUND_FLOATS 181
#define CSS_VAL_TOTAL 181
#define CSS_VAL_TOTAL 182
#endif
......@@ -258,6 +258,7 @@ static-position
thick
thin
underline
-konq-nowrap
# CSS_PROP__KONQ_FLOW_MODE
-konq-normal
-konq-around-floats
......
......@@ -187,8 +187,7 @@ TABLE {
text-align: -konq-auto;
border-spacing: 2px;
border-color: gray;
padding: 1px;
-konq-flow-mode: -konq-around-floats;
-konq-flow-mode: -konq-around-floats;
}
TD[align=left] > TABLE {
......@@ -207,19 +206,19 @@ TABLE[align="center"] {
THEAD {
display: table-header-group;
vertical-align: middle;
border: inherit;
border-color: inherit;
}
TBODY {
display: table-row-group;
vertical-align: middle;
border: inherit;
border-color: inherit;
}
TFOOT {
display: table-footer-group;
vertical-align: middle;
border: inherit;
border-color: inherit;