diff options
author | Sebastian Geerken <devnull@localhost> | 2014-12-08 17:35:18 +0100 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2014-12-08 17:35:18 +0100 |
commit | 3d521d286174264448cbd1b2315ff89f9d8e8edf (patch) | |
tree | 37515aa58dc935014b677c7212ada0fdfab7b2bd /src/html.cc | |
parent | de2139f76ee1fa4f14970914bb6c87fe46feed17 (diff) | |
parent | 2bb03c759cb44241d42e3385336a1c6b9a8d7d9f (diff) |
Merged with main repo (part 1/2).
Diffstat (limited to 'src/html.cc')
-rw-r--r-- | src/html.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/html.cc b/src/html.cc index 843b69ff..56af12a9 100644 --- a/src/html.cc +++ b/src/html.cc @@ -374,6 +374,11 @@ static void Html_add_textblock(DilloHtml *html, bool addBreaks, int breakSpace) S_TOP(html)->hand_over_break = true; } +static bool Html_will_textblock_be_out_of_flow(DilloHtml *html) +{ + return HT2TB(html)->testStyleOutOfFlow (html->style ()); +} + /* * Create and initialize a new DilloHtml class */ @@ -3859,8 +3864,7 @@ static void Html_check_html5_obsolete(DilloHtml *html, int ni) static void Html_display_block(DilloHtml *html) { - //HT2TB(html)->addParbreak (5, html->styleEngine->wordStyle ()); - Html_add_textblock(html, true, 0); + Html_add_textblock(html, !Html_will_textblock_be_out_of_flow (html), 0); } static void Html_display_inline_block(DilloHtml *html) |