This commit is contained in:
M66B 2020-11-06 14:40:43 +01:00
parent 73a902858e
commit fb03a1da12
1 changed files with 8 additions and 3 deletions

View File

@ -746,13 +746,16 @@ public class HtmlHelper {
} }
// Remove trailing br from div // Remove trailing br from div
for (Element div : document.select("div")) for (Element div : document.select("div")) {
if (div.children().select("div").size() == 0 && boolean inline = Boolean.parseBoolean(div.attr("x-inline"));
if (!inline &&
div.children().select("div").size() == 0 &&
hasVisibleContent(div)) { hasVisibleContent(div)) {
Element last = div.lastElementSibling(); Element last = div.lastElementSibling();
if (last != null && "br".equals(last.tagName())) if (last != null && "br".equals(last.tagName()))
last.remove(); last.remove();
} }
}
// Replace headings // Replace headings
if (!text_size) if (!text_size)
@ -1013,7 +1016,9 @@ public class HtmlHelper {
// Selective new lines // Selective new lines
for (Element div : document.select("div")) { for (Element div : document.select("div")) {
boolean inline = Boolean.parseBoolean(div.attr("x-inline")); boolean inline = Boolean.parseBoolean(div.attr("x-inline"));
if (!inline && hasVisibleContent(div)) if (!inline &&
div.children().select("div").size() == 0 &&
hasVisibleContent(div))
div.attr("x-line-after", "true"); div.attr("x-line-after", "true");
div.tagName("span"); div.tagName("span");
} }