eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix br count carry over regression

Browse Source
This commit is contained in:
jpirnay
2026-03-30 13:26:41 +02:00
parent d7c4471864
commit 53f93b2857
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Epub/Epub/parsers/ChapterHtmlSlimParser.cpp
+15 -3
View File
@@ -137,7 +137,8 @@ void ChapterHtmlSlimParser::startNewTextBlock(const BlockStyle& blockStyle) {
// div's margin should be preserved, even though it has no direct text content. // div's margin should be preserved, even though it has no direct text content.
BlockStyle incoming = blockStyle; BlockStyle incoming = blockStyle;
if (currentTextBlock->getBlockStyle().fromBrElement) { const bool brGapPending = currentTextBlock->getBlockStyle().fromBrElement;
if (brGapPending) {
// The empty block was created by a <br> section separator. Inject a full line of // The empty block was created by a <br> section separator. Inject a full line of
// blank space before the following paragraph so the scene/section break is visible. // blank space before the following paragraph so the scene/section break is visible.
// This only fires when the <br> block stayed empty (i.e. no inline text was added). // This only fires when the <br> block stayed empty (i.e. no inline text was added).
@@ -145,7 +146,11 @@ void ChapterHtmlSlimParser::startNewTextBlock(const BlockStyle& blockStyle) {
incoming.marginTop = static_cast<int16_t>(incoming.marginTop + lineHeight); incoming.marginTop = static_cast<int16_t>(incoming.marginTop + lineHeight);
} }
currentTextBlock->setBlockStyle(currentTextBlock->getBlockStyle().getCombinedBlockStyle(incoming)); BlockStyle merged = currentTextBlock->getBlockStyle().getCombinedBlockStyle(incoming);
// Preserve only whether the current empty block still represents <br> separators.
// This lets consecutive <br> accumulate one line each without leaking the flag to real content blocks.
merged.fromBrElement = blockStyle.fromBrElement;
currentTextBlock->setBlockStyle(merged);
if (!pendingAnchorId.empty()) { if (!pendingAnchorId.empty()) {
if (std::find(tocAnchors.begin(), tocAnchors.end(), pendingAnchorId) != tocAnchors.end()) { if (std::find(tocAnchors.begin(), tocAnchors.end(), pendingAnchorId) != tocAnchors.end()) {
@@ -657,7 +662,14 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
// the block remains empty (i.e. <br> is a section separator between paragraphs). // the block remains empty (i.e. <br> is a section separator between paragraphs).
// If the block gets text added before the next block opens it becomes non-empty, // If the block gets text added before the next block opens it becomes non-empty,
// goes through makePages() normally, and the flag has no effect (inline <br> case). // goes through makePages() normally, and the flag has no effect (inline <br> case).
BlockStyle brStyle = self->currentTextBlock->getBlockStyle(); // Build a neutral <br> style that keeps inline alignment/indent context but avoids
// carrying cumulative margins from previous empty blocks (which can force spurious page breaks).
const BlockStyle& currentStyle = self->currentTextBlock->getBlockStyle();
BlockStyle brStyle;
brStyle.alignment = currentStyle.alignment;
brStyle.textAlignDefined = currentStyle.textAlignDefined;
brStyle.textIndent = currentStyle.textIndent;
brStyle.textIndentDefined = currentStyle.textIndentDefined;
brStyle.fromBrElement = true; brStyle.fromBrElement = true;
self->startNewTextBlock(brStyle); self->startNewTextBlock(brStyle);
} else { } else {