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

Clamp indent to page dimensions

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
jpirnay
2026-04-25 11:19:04 +02:00
co-authored by Copilot
parent 17ea700538
commit 12372aaafc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Epub/Epub/ParsedText.cpp
+4 -4
View File
@@ -295,7 +295,7 @@ std::vector<size_t> ParsedText::computeLineBreaks(const GfxRenderer& renderer, c
// toggle. Only the implicit EmSpace fallback in applyParagraphIndent() is gated on it. // toggle. Only the implicit EmSpace fallback in applyParagraphIndent() is gated on it.
const int firstLineIndent = blockStyle.textIndentDefined && (blockStyle.alignment == CssTextAlign::Justify || const int firstLineIndent = blockStyle.textIndentDefined && (blockStyle.alignment == CssTextAlign::Justify ||
blockStyle.alignment == CssTextAlign::Left) blockStyle.alignment == CssTextAlign::Left)
? blockStyle.textIndent ? std::min(std::max<int>(static_cast<int>(blockStyle.textIndent), -(pageWidth - 1)), pageWidth - 1)
: 0; : 0;
// Ensure any word that would overflow even as the first entry on a line is split using fallback hyphenation. // Ensure any word that would overflow even as the first entry on a line is split using fallback hyphenation.
@@ -428,7 +428,7 @@ size_t ParsedText::computeSingleLineBreakNoHyphen(const GfxRenderer& renderer, c
const int firstLineIndent = const int firstLineIndent =
lineStartIndex == 0 && blockStyle.textIndentDefined && lineStartIndex == 0 && blockStyle.textIndentDefined &&
(blockStyle.alignment == CssTextAlign::Justify || blockStyle.alignment == CssTextAlign::Left) (blockStyle.alignment == CssTextAlign::Justify || blockStyle.alignment == CssTextAlign::Left)
? blockStyle.textIndent ? std::min(std::max<int>(static_cast<int>(blockStyle.textIndent), -(pageWidth - 1)), pageWidth - 1)
: 0; : 0;
const int effectivePageWidth = pageWidth - firstLineIndent; const int effectivePageWidth = pageWidth - firstLineIndent;
@@ -496,7 +496,7 @@ std::vector<size_t> ParsedText::computeHyphenatedLineBreaks(const GfxRenderer& r
// toggle. Only the implicit EmSpace fallback in applyParagraphIndent() is gated on it. // toggle. Only the implicit EmSpace fallback in applyParagraphIndent() is gated on it.
const int firstLineIndent = blockStyle.textIndentDefined && (blockStyle.alignment == CssTextAlign::Justify || const int firstLineIndent = blockStyle.textIndentDefined && (blockStyle.alignment == CssTextAlign::Justify ||
blockStyle.alignment == CssTextAlign::Left) blockStyle.alignment == CssTextAlign::Left)
? blockStyle.textIndent ? std::min(std::max<int>(static_cast<int>(blockStyle.textIndent), -(pageWidth - 1)), pageWidth - 1)
: 0; : 0;
// Pre-compute inter-word gaps to avoid repeated codepoint scanning and renderer // Pre-compute inter-word gaps to avoid repeated codepoint scanning and renderer
@@ -789,7 +789,7 @@ ParsedText::LineProcessResult ParsedText::extractLine(
const int firstLineIndent = const int firstLineIndent =
isFirstLine && blockStyle.textIndentDefined && isFirstLine && blockStyle.textIndentDefined &&
(blockStyle.alignment == CssTextAlign::Justify || blockStyle.alignment == CssTextAlign::Left) (blockStyle.alignment == CssTextAlign::Justify || blockStyle.alignment == CssTextAlign::Left)
? blockStyle.textIndent ? std::min(std::max<int>(static_cast<int>(blockStyle.textIndent), -(pageWidth - 1)), pageWidth - 1)
: 0; : 0;
// Calculate total word width for this line, count actual word gaps, // Calculate total word width for this line, count actual word gaps,