diff options
| -rw-r--r-- | dw/textblock.cc | 3 | ||||
| -rw-r--r-- | dw/textblock.hh | 2 | ||||
| -rw-r--r-- | src/html.cc | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc index e390a0b0..e5369bfb 100644 --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -2672,7 +2672,8 @@ void Textblock::handOverBreak (core::style::Style *style) Line *lastLine = lines->getRef (lines->size () - 1); if (lastLine->breakSpace != 0 && (parent = getParent()) && - parent->instanceOf (Textblock::CLASS_ID)) { + parent->instanceOf (Textblock::CLASS_ID) && + parent->getStyle()->display != core::style::DISPLAY_BLOCK) { Textblock *textblock2 = (Textblock*) parent; textblock2->addParbreak(lastLine->breakSpace, style); } diff --git a/dw/textblock.hh b/dw/textblock.hh index 11875c22..7b62dd3b 100644 --- a/dw/textblock.hh +++ b/dw/textblock.hh @@ -866,7 +866,7 @@ public: words->getRef(n)->content.widget); \ break; \ case ::dw::core::Content::BREAK: \ - DBG_OBJ_ARRATTRSET_SYM ("words", n, "type", "TEXT"); \ + DBG_OBJ_ARRATTRSET_SYM ("words", n, "type", "BREAK"); \ DBG_OBJ_ARRATTRSET_NUM ("words", n, "text/widget/breakSpace", \ words->getRef(n)->content.breakSpace); \ break; \ diff --git a/src/html.cc b/src/html.cc index fde972c2..e6d13aab 100644 --- a/src/html.cc +++ b/src/html.cc @@ -363,14 +363,11 @@ static void Html_add_textblock(DilloHtml *html, bool addBreaks, int breakSpace) if (addBreaks) HT2TB(html)->addParbreak (breakSpace, html->wordStyle ()); - HT2TB(html)->addWidget (textblock, html->style ()); /* Works also for floats etc. */ - if (addBreaks) HT2TB(html)->addParbreak (breakSpace, html->wordStyle ()); S_TOP(html)->textblock = html->dw = textblock; - if (addBreaks) S_TOP(html)->hand_over_break = true; } |