|
|
@ -1145,6 +1145,7 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
case HTML_DIV:
|
|
|
|
case HTML_DIV:
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
_BlockLevelElement.push_back(true);
|
|
|
|
registerAnchorName(MY_HTML_DIV);
|
|
|
|
registerAnchorName(MY_HTML_DIV);
|
|
|
|
|
|
|
|
|
|
|
|
if (present[MY_HTML_DIV_NAME] && value[MY_HTML_DIV_NAME])
|
|
|
|
if (present[MY_HTML_DIV_NAME] && value[MY_HTML_DIV_NAME])
|
|
|
@ -1204,6 +1205,8 @@ namespace NLGUI
|
|
|
|
inst->setPosRef(Hotspot_TL);
|
|
|
|
inst->setPosRef(Hotspot_TL);
|
|
|
|
inst->setParentPosRef(Hotspot_TL);
|
|
|
|
inst->setParentPosRef(Hotspot_TL);
|
|
|
|
getDiv()->addGroup(inst);
|
|
|
|
getDiv()->addGroup(inst);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_BlockLevelElement.back() = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1220,6 +1223,11 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (isBlockLevelElement())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
newParagraph(0);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
@ -2118,12 +2126,20 @@ namespace NLGUI
|
|
|
|
popIfNotEmpty (_GlobalColor);
|
|
|
|
popIfNotEmpty (_GlobalColor);
|
|
|
|
endParagraph();
|
|
|
|
endParagraph();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_P:
|
|
|
|
|
|
|
|
endParagraph();
|
|
|
|
|
|
|
|
break;
|
|
|
|
case HTML_PRE:
|
|
|
|
case HTML_PRE:
|
|
|
|
popIfNotEmpty (_PRE);
|
|
|
|
popIfNotEmpty (_PRE);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case HTML_DIV:
|
|
|
|
case HTML_DIV:
|
|
|
|
|
|
|
|
if (isBlockLevelElement())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
endParagraph();
|
|
|
|
|
|
|
|
}
|
|
|
|
_DivName = "";
|
|
|
|
_DivName = "";
|
|
|
|
popIfNotEmpty (_Divs);
|
|
|
|
popIfNotEmpty (_Divs);
|
|
|
|
|
|
|
|
popIfNotEmpty (_BlockLevelElement);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case HTML_TABLE:
|
|
|
|
case HTML_TABLE:
|
|
|
|