|
|
@ -1783,11 +1783,21 @@ namespace NLGUI
|
|
|
|
_TR.push_back(false);
|
|
|
|
_TR.push_back(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_TH:
|
|
|
|
|
|
|
|
// TH is similar to TD, just different font style
|
|
|
|
case HTML_TD:
|
|
|
|
case HTML_TD:
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Get cells parameters
|
|
|
|
// Get cells parameters
|
|
|
|
getCellsParameters (MY_HTML_TD, true);
|
|
|
|
getCellsParameters (MY_HTML_TD, true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (element_number == HTML_TH)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
_FontWeight.push_back(FONT_WEIGHT_BOLD);
|
|
|
|
|
|
|
|
// center if not specified otherwise. TD/TH present/value arrays have same indices
|
|
|
|
|
|
|
|
if (!(present[MY_HTML_TD_ALIGN] && value[MY_HTML_TD_ALIGN]))
|
|
|
|
|
|
|
|
_CellParams.back().Align = CGroupCell::Center;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CGroupTable *table = getTable();
|
|
|
|
CGroupTable *table = getTable();
|
|
|
|
if (table)
|
|
|
|
if (table)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -2124,6 +2134,9 @@ namespace NLGUI
|
|
|
|
endParagraph();
|
|
|
|
endParagraph();
|
|
|
|
// Add a cell
|
|
|
|
// Add a cell
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_TH:
|
|
|
|
|
|
|
|
popIfNotEmpty (_FontWeight);
|
|
|
|
|
|
|
|
// no break;
|
|
|
|
case HTML_TD:
|
|
|
|
case HTML_TD:
|
|
|
|
popIfNotEmpty (_CellParams);
|
|
|
|
popIfNotEmpty (_CellParams);
|
|
|
|
if (!_Cells.empty())
|
|
|
|
if (!_Cells.empty())
|
|
|
|