X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbe77ceae546bdc9fc219ae01f6f0d12f37f1038..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/html/m_tables.cpp diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index b9fcc38bb2..07f7b61658 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -1,34 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_tables.cpp +// Name: src/html/m_tables.cpp // Purpose: wxHtml module for tables // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - #include "wx/wxprec.h" -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ -#pragma hdrstop +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#ifndef WXPRECOMP -#endif - - -/* -REMARKS: - 1. This version of m_tables doesn't support auto-layout algorithm. - This means that all columns are of same width unless explicitly specified. -*/ +#if wxUSE_HTML && wxUSE_STREAMS +#ifndef WX_PRECOMP + #include "wx/wxcrtvararg.h" + #include "wx/brush.h" +#endif #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" @@ -54,7 +44,7 @@ struct colStruct // ('width' is the number, 'units' determines its meaning) int minWidth, maxWidth; // minimal/maximal column width. This is needed by HTML 4.0 - // layouting algorithm and can be determined by trying to + // layout algorithm and can be determined by trying to // layout table cells with width=1 and width=infinity int leftpos, pixwidth, maxrealwidth; // temporary (depends on actual width of table) @@ -73,6 +63,7 @@ struct cellStruct int colspan, rowspan; int minheight, valign; cellState flag; + bool nowrap; }; @@ -81,8 +72,6 @@ class wxHtmlTableCell : public wxHtmlContainerCell protected: /* These are real attributes: */ - // should we draw borders or not? - bool m_HasBorders; // number of columns; rows int m_NumCols, m_NumRows; // array of column information @@ -109,12 +98,17 @@ private: public: wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& tag, double pixel_scale = 1.0); - ~wxHtmlTableCell(); + virtual ~wxHtmlTableCell(); + + virtual void RemoveExtraSpacing(bool top, bool bottom); + virtual void Layout(int w); void AddRow(const wxHtmlTag& tag); void AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag); + const wxColour& GetRowDefaultBackgroundColour() const { return m_rBkg; } + private: // Reallocates memory to given number of cols/rows // and changes m_NumCols/m_NumRows value to reflect this change @@ -123,8 +117,10 @@ private: void ReallocRows(int rows); // Computes minimal and maximal widths of columns. Needs to be called - // only once, before first Layout(). + // only once, before first Layout(). void ComputeMinMaxWidths(); + + wxDECLARE_NO_COPY_CLASS(wxHtmlTableCell); }; @@ -133,8 +129,6 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t : wxHtmlContainerCell(parent) { m_PixelScale = pixel_scale; - m_HasBorders = - (tag.HasParam(wxT("BORDER")) && tag.GetParam(wxT("BORDER")) != wxT("0")); m_ColsInfo = NULL; m_NumCols = m_NumRows = 0; m_CellInfo = NULL; @@ -142,7 +136,11 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t /* scan params: */ if (tag.HasParam(wxT("BGCOLOR"))) + { tag.GetParamAsColour(wxT("BGCOLOR"), &m_tBkg); + if (m_tBkg.IsOk()) + SetBackgroundColour(m_tBkg); + } if (tag.HasParam(wxT("VALIGN"))) m_tValign = tag.GetParam(wxT("VALIGN")); else @@ -154,8 +152,20 @@ wxHtmlTableCell::wxHtmlTableCell(wxHtmlContainerCell *parent, const wxHtmlTag& t m_Spacing = (int)(m_PixelScale * (double)m_Spacing); m_Padding = (int)(m_PixelScale * (double)m_Padding); - if (m_HasBorders) - SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2); + if(tag.HasParam(wxT("BORDER"))) + { + if(tag.GetParam("BORDER").IsEmpty()) + m_Border = 1; + else + tag.GetParamAsInt(wxT("BORDER"), &m_Border); + } + if (m_Border == 1) + SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2, m_Border); // special case see wxHtmlContainerCell::Draw + else if (m_Border> 0) + SetBorder(TABLE_BORDER_CLR_1, TABLE_BORDER_CLR_2, (int)(m_PixelScale * (double)m_Border)); + else + m_Border = 0; + } @@ -172,6 +182,15 @@ wxHtmlTableCell::~wxHtmlTableCell() } +void wxHtmlTableCell::RemoveExtraSpacing(bool WXUNUSED(top), + bool WXUNUSED(bottom)) +{ + // Don't remove any spacing in the table -- it's always desirable, + // because it's part of table's definition. + // (If wxHtmlContainerCell::RemoveExtraSpacing() was applied to tables, + // then upper left cell of a table would be positioned above other cells + // if the table was the first element on the page.) +} void wxHtmlTableCell::ReallocCols(int cols) { @@ -272,16 +291,21 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) { wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == wxT('%')) + if (!wd.empty() && wd[wd.length()-1] == wxT('%')) { - wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width); - m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; + if ( wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width) == 1 ) + { + m_ColsInfo[c].units = wxHTML_UNITS_PERCENT; + } } else { - wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width); - m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width); - m_ColsInfo[c].units = wxHTML_UNITS_PIXELS; + long width; + if ( wd.ToLong(&width) ) + { + m_ColsInfo[c].width = (int)(m_PixelScale * (double)width); + m_ColsInfo[c].units = wxHTML_UNITS_PIXELS; + } } } } @@ -293,14 +317,14 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) tag.GetParamAsInt(wxT("ROWSPAN"), &m_CellInfo[r][c].rowspan); // VS: the standard says this about col/rowspan: - // "This attribute specifies the number of rows spanned by the - // current cell. The default value of this attribute is one ("1"). - // The value zero ("0") means that the cell spans all rows from the - // current row to the last row of the table." All mainstream + // "This attribute specifies the number of rows spanned by the + // current cell. The default value of this attribute is one ("1"). + // The value zero ("0") means that the cell spans all rows from the + // current row to the last row of the table." All mainstream // browsers act as if 0==1, though, and so does wxHTML. - if (m_CellInfo[r][c].colspan < 1) + if (m_CellInfo[r][c].colspan < 1) m_CellInfo[r][c].colspan = 1; - if (m_CellInfo[r][c].rowspan < 1) + if (m_CellInfo[r][c].rowspan < 1) m_CellInfo[r][c].rowspan = 1; if ((m_CellInfo[r][c].colspan > 1) || (m_CellInfo[r][c].rowspan > 1)) @@ -323,10 +347,10 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) wxColour bk = m_rBkg; if (tag.HasParam(wxT("BGCOLOR"))) tag.GetParamAsColour(wxT("BGCOLOR"), &bk); - if (bk.Ok()) + if (bk.IsOk()) cell->SetBackgroundColour(bk); } - if (m_HasBorders) + if (m_Border > 0) cell->SetBorder(TABLE_BORDER_CLR_2, TABLE_BORDER_CLR_1); // vertical alignment: @@ -344,15 +368,21 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) else m_CellInfo[r][c].valign = wxHTML_ALIGN_CENTER; } + // nowrap + if (tag.HasParam(wxT("NOWRAP"))) + m_CellInfo[r][c].nowrap = true; + else + m_CellInfo[r][c].nowrap = false; + cell->SetIndent(m_Padding, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); } void wxHtmlTableCell::ComputeMinMaxWidths() { - if (m_NumCols == 0 || m_ColsInfo[0].minWidth != -1) return; - - int left, right, width; + if (m_NumCols == 0 || m_ColsInfo[0].minWidth != wxDefaultCoord) return; + m_MaxTotalWidth = 0; + int percentage = 0; for (int c = 0; c < m_NumCols; c++) { for (int r = 0; r < m_NumRows; r++) @@ -361,28 +391,46 @@ void wxHtmlTableCell::ComputeMinMaxWidths() if (cell.flag == cellUsed) { cell.cont->Layout(2*m_Padding + 1); - cell.cont->GetHorizontalConstraints(&left, &right); - width = right - left; + int maxWidth = cell.cont->GetMaxTotalWidth(); + int width = cell.nowrap?maxWidth:cell.cont->GetWidth(); width -= (cell.colspan-1) * m_Spacing; + maxWidth -= (cell.colspan-1) * m_Spacing; // HTML 4.0 says it is acceptable to distribute min/max - // width of spanning cells evently width /= cell.colspan; - for (int j = 0; j < cell.colspan; j++) + maxWidth /= cell.colspan; + for (int j = 0; j < cell.colspan; j++) { if (width > m_ColsInfo[c+j].minWidth) m_ColsInfo[c+j].minWidth = width; + if (maxWidth > m_ColsInfo[c+j].maxWidth) + m_ColsInfo[c+j].maxWidth = maxWidth; + } } } + // Calculate maximum table width, required for nested tables + if (m_ColsInfo[c].units == wxHTML_UNITS_PIXELS) + m_MaxTotalWidth += wxMax(m_ColsInfo[c].width, m_ColsInfo[c].minWidth); + else if ((m_ColsInfo[c].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[c].width != 0)) + percentage += m_ColsInfo[c].width; + else + m_MaxTotalWidth += m_ColsInfo[c].maxWidth; } - - // FIXME -- compute maxWidth as well. Not needed yet, so there's no - // point in computing it. -} + if (percentage >= 100) + { + // Table would have infinite length + // Make it ridiculous large + m_MaxTotalWidth = 0xFFFFFF; + } + else + m_MaxTotalWidth = m_MaxTotalWidth * 100 / (100 - percentage); + + m_MaxTotalWidth += (m_NumCols + 1) * m_Spacing + 2 * m_Border; +} void wxHtmlTableCell::Layout(int w) { ComputeMinMaxWidths(); - + wxHtmlCell::Layout(w); /* @@ -393,8 +441,18 @@ void wxHtmlTableCell::Layout(int w) if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT) { - if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100; - else m_Width = m_WidthFloat * w / 100; + if (m_WidthFloat < 0) + { + if (m_WidthFloat < -100) + m_WidthFloat = -100; + m_Width = (100 + m_WidthFloat) * w / 100; + } + else + { + if (m_WidthFloat > 100) + m_WidthFloat = 100; + m_Width = m_WidthFloat * w / 100; + } } else { @@ -405,53 +463,139 @@ void wxHtmlTableCell::Layout(int w) /* - LAYOUTING : + LAYOUT : */ - /* 1. setup columns widths: */ + /* 1. setup columns widths: + + The algorithm tries to keep the table size less than w if possible. + */ { - int wpix = m_Width - (m_NumCols + 1) * m_Spacing; + int wpix = m_Width - (m_NumCols + 1) * m_Spacing - 2 * m_Border; // Available space for cell content int i, j; // 1a. setup fixed-width columns: for (i = 0; i < m_NumCols; i++) if (m_ColsInfo[i].units == wxHTML_UNITS_PIXELS) { - m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width, + m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width, m_ColsInfo[i].minWidth); wpix -= m_ColsInfo[i].pixwidth; } - // 1b. setup floating-width columns: - int wtemp = 0; + // 1b. Calculate maximum possible width if line wrapping would be disabled + // Recalculate total width if m_WidthFloat is zero to keep tables as small + // as possible. + int maxWidth = 0; + for (i = 0; i < m_NumCols; i++) + if (m_ColsInfo[i].width == 0) + { + maxWidth += m_ColsInfo[i].maxWidth; + } + + if (!m_WidthFloat) + { + // Recalculate table width since no table width was initially given + int newWidth = m_Width - wpix + maxWidth; + + // Make sure that floating-width columns will have the right size. + // Calculate sum of all floating-width columns + int percentage = 0; + for (i = 0; i < m_NumCols; i++) + if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) + percentage += m_ColsInfo[i].width; + + if (percentage >= 100) + newWidth = w; + else + newWidth = newWidth * 100 / (100 - percentage); + + newWidth = wxMin(newWidth, w - (m_NumCols + 1) * m_Spacing - 2 * m_Border); + wpix -= m_Width - newWidth; + m_Width = newWidth; + } + + + // 1c. setup floating-width columns: + int wtemp = wpix; for (i = 0; i < m_NumCols; i++) if ((m_ColsInfo[i].units == wxHTML_UNITS_PERCENT) && (m_ColsInfo[i].width != 0)) { - m_ColsInfo[i].pixwidth = wxMax(m_ColsInfo[i].width * wpix / 100, - m_ColsInfo[i].minWidth); - wtemp += m_ColsInfo[i].pixwidth; + m_ColsInfo[i].pixwidth = wxMin(m_ColsInfo[i].width, 100) * wpix / 100; + + // Make sure to leave enough space for the other columns + int minRequired = m_Border; + for (j = 0; j < m_NumCols; j++) + { + if ((m_ColsInfo[j].units == wxHTML_UNITS_PERCENT && j > i) || + !m_ColsInfo[j].width) + minRequired += m_ColsInfo[j].minWidth; + } + m_ColsInfo[i].pixwidth = wxMax(wxMin(wtemp - minRequired, m_ColsInfo[i].pixwidth), m_ColsInfo[i].minWidth); + + wtemp -= m_ColsInfo[i].pixwidth; } - wpix -= wtemp; + wpix = wtemp; // minimum cells width + + // 1d. setup default columns (no width specification supplied): + // The algorithm assigns calculates the maximum possible width if line + // wrapping would be disabled and assigns column width as a fraction + // based upon the maximum width of a column + // FIXME: I'm not sure if this algorithm is conform to HTML standard, + // though it seems to be much better than the old one - // 1c. setup defalut columns (no width specification supplied): - // NOTE! This algorithm doesn't conform to HTML standard : it assigns equal widths - // instead of optimal for (i = j = 0; i < m_NumCols; i++) if (m_ColsInfo[i].width == 0) j++; + if (wpix < m_Border) + wpix = m_Border; + + // Assign widths for (i = 0; i < m_NumCols; i++) if (m_ColsInfo[i].width == 0) - m_ColsInfo[i].pixwidth = wpix / j; + { + // Assign with, make sure not to drop below minWidth + if (maxWidth) + m_ColsInfo[i].pixwidth = (int)(wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5); + else + m_ColsInfo[i].pixwidth = wpix / j; + + // Make sure to leave enough space for the other columns + int minRequired = 0; + int r; + for (r = i + 1; r < m_NumCols; r++) + { + if (!m_ColsInfo[r].width) + minRequired += m_ColsInfo[r].minWidth; + } + m_ColsInfo[i].pixwidth = wxMax(wxMin(wpix - minRequired, m_ColsInfo[i].pixwidth), m_ColsInfo[i].minWidth); + + if (maxWidth) + { + if (m_ColsInfo[i].pixwidth > (wpix * (m_ColsInfo[i].maxWidth / (float)maxWidth) + 0.5)) + { + int diff = (int)(m_ColsInfo[i].pixwidth - (wpix * m_ColsInfo[i].maxWidth / (float)maxWidth + 0.5)); + maxWidth += diff - m_ColsInfo[i].maxWidth; + } + else + maxWidth -= m_ColsInfo[i].maxWidth; + } + wpix -= m_ColsInfo[i].pixwidth; + } } /* 2. compute positions of columns: */ { - int wpos = m_Spacing; + int wpos = m_Spacing + m_Border; for (int i = 0; i < m_NumCols; i++) { m_ColsInfo[i].leftpos = wpos; wpos += m_ColsInfo[i].pixwidth + m_Spacing; } + + // add the remaining space to the last column + if (m_NumCols > 0 && wpos < m_Width - m_Border) + m_ColsInfo[m_NumCols-1].pixwidth += m_Width - wpos - m_Border; } /* 3. sub-layout all cells: */ @@ -462,7 +606,7 @@ void wxHtmlTableCell::Layout(int w) int fullwid; wxHtmlContainerCell *actcell; - ypos[0] = m_Spacing; + ypos[0] = m_Spacing + m_Border; for (actrow = 1; actrow <= m_NumRows; actrow++) ypos[actrow] = -1; for (actrow = 0; actrow < m_NumRows; actrow++) { @@ -504,9 +648,18 @@ void wxHtmlTableCell::Layout(int w) actcell->SetPos(m_ColsInfo[actcol].leftpos, ypos[actrow]); } } - m_Height = ypos[m_NumRows]; + m_Height = ypos[m_NumRows] + m_Border; delete[] ypos; } + + /* 4. adjust table's width if it was too small: */ + if (m_NumCols > 0) + { + int twidth = m_ColsInfo[m_NumCols-1].leftpos + + m_ColsInfo[m_NumCols-1].pixwidth + m_Spacing + m_Border; + if (twidth > m_Width) + m_Width = twidth; + } } @@ -524,13 +677,44 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") TAG_HANDLER_VARS wxHtmlTableCell* m_Table; wxString m_tAlign, m_rAlign; - int m_OldAlign; + wxHtmlContainerCell *m_enclosingContainer; + + // Call ParseInner() preserving background colour and mode after any + // changes done by it. + void CallParseInnerWithBg(const wxHtmlTag& tag, const wxColour& colBg) + { + const wxColour oldbackclr = m_WParser->GetActualBackgroundColor(); + const int oldbackmode = m_WParser->GetActualBackgroundMode(); + if ( colBg.IsOk() ) + { + m_WParser->SetActualBackgroundColor(colBg); + m_WParser->SetActualBackgroundMode(wxBRUSHSTYLE_SOLID); + m_WParser->GetContainer()->InsertCell( + new wxHtmlColourCell(colBg, wxHTML_CLR_BACKGROUND) + ); + } + + ParseInner(tag); + + if ( oldbackmode != m_WParser->GetActualBackgroundMode() || + oldbackclr != m_WParser->GetActualBackgroundColor() ) + { + m_WParser->SetActualBackgroundMode(oldbackmode); + m_WParser->SetActualBackgroundColor(oldbackclr); + m_WParser->GetContainer()->InsertCell( + new wxHtmlColourCell(oldbackclr, + oldbackmode == wxBRUSHSTYLE_TRANSPARENT + ? wxHTML_CLR_TRANSPARENT_BACKGROUND + : wxHTML_CLR_BACKGROUND) + ); + } + } TAG_HANDLER_CONSTR(TABLE) { m_Table = NULL; + m_enclosingContainer = NULL; m_tAlign = m_rAlign = wxEmptyString; - m_OldAlign = wxHTML_ALIGN_LEFT; } @@ -542,26 +726,48 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") if (tag.GetName() == wxT("TABLE")) { wxHtmlTableCell *oldt = m_Table; - wxHtmlContainerCell *oldcont; - int m_OldAlign; - oldcont = c = m_WParser->OpenContainer(); + wxHtmlContainerCell *oldEnclosing = m_enclosingContainer; + m_enclosingContainer = c = m_WParser->OpenContainer(); - c->SetWidthFloat(tag, m_WParser->GetPixelScale()); m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale()); - m_OldAlign = m_WParser->GetAlign(); + + // width: + { + if (tag.HasParam(wxT("WIDTH"))) + { + int width = 0; + bool wpercent = false; + if (tag.GetParamAsIntOrPercent(wxT("WIDTH"), &width, wpercent)) + { + if (wpercent) + { + m_Table->SetWidthFloat(width, wxHTML_UNITS_PERCENT); + } + else + { + m_Table->SetWidthFloat((int)(m_WParser->GetPixelScale() * width), wxHTML_UNITS_PIXELS); + } + } + } + else + m_Table->SetWidthFloat(0, wxHTML_UNITS_PIXELS); + } + int oldAlign = m_WParser->GetAlign(); m_tAlign = wxEmptyString; if (tag.HasParam(wxT("ALIGN"))) m_tAlign = tag.GetParam(wxT("ALIGN")); - ParseInner(tag); + CallParseInnerWithBg(tag, m_Table->GetBackgroundColour()); - m_WParser->SetAlign(m_OldAlign); - m_WParser->SetContainer(oldcont); + m_WParser->SetAlign(oldAlign); + m_WParser->SetContainer(m_enclosingContainer); m_WParser->CloseContainer(); - + m_Table = oldt; - return TRUE; + m_enclosingContainer = oldEnclosing; + + return true; // ParseInner() called } @@ -579,33 +785,66 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") // new cell else { - m_WParser->SetAlign(m_OldAlign); c = m_WParser->SetContainer(new wxHtmlContainerCell(m_Table)); m_Table->AddCell(c, tag); m_WParser->OpenContainer(); - if (tag.GetName() == wxT("TH")) /*header style*/ - { + const bool isHeader = tag.GetName() == wxT("TH"); + + wxString als; + if (tag.HasParam(wxT("ALIGN"))) + als = tag.GetParam(wxT("ALIGN")); + else + als = m_rAlign; + als.MakeUpper(); + + if (als == wxT("RIGHT")) + m_WParser->SetAlign(wxHTML_ALIGN_RIGHT); + else if (als == wxT("LEFT")) + m_WParser->SetAlign(wxHTML_ALIGN_LEFT); + else if (als == wxT("CENTER")) m_WParser->SetAlign(wxHTML_ALIGN_CENTER); - } + else // use default alignment + m_WParser->SetAlign(isHeader ? wxHTML_ALIGN_CENTER + : wxHTML_ALIGN_LEFT); + + m_WParser->OpenContainer(); + // the header should be rendered in bold by default + int boldOld = 0; + if ( isHeader ) { - wxString als; + boldOld = m_WParser->GetFontBold(); + m_WParser->SetFontBold(true); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + } - als = m_rAlign; - if (tag.HasParam(wxT("ALIGN"))) - als = tag.GetParam(wxT("ALIGN")); - als.MakeUpper(); - if (als == wxT("RIGHT")) - m_WParser->SetAlign(wxHTML_ALIGN_RIGHT); - else if (als == wxT("CENTER")) - m_WParser->SetAlign(wxHTML_ALIGN_CENTER); + wxColour bgCol; + if ( !tag.GetParamAsColour(wxT("BGCOLOR"), &bgCol) ) + bgCol = m_Table->GetRowDefaultBackgroundColour(); + + CallParseInnerWithBg(tag, bgCol); + + if ( isHeader ) + { + m_WParser->SetFontBold(boldOld); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); } - m_WParser->OpenContainer(); + + // set the current container back to the enclosing one so that + // text outside of