cottongin/crosspoint-reader
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

comments

Browse Source
This commit is contained in:
Arthur Tazhitdinov 2025-12-19 10:43:15 +05:00
parent 63668708bc
commit b768c4ba89
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Epub/Epub/ParsedText.cpp
View File

@ -25,6 +25,7 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
return; return;
} }
// horizontalMargin accounts for both left and right gutters, leaving the drawable width.
const int pageWidth = renderer.getScreenWidth() - horizontalMargin; const int pageWidth = renderer.getScreenWidth() - horizontalMargin;
if (pageWidth <= 0) { if (pageWidth <= 0) {
words.clear(); words.clear();
@ -50,6 +51,7 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
std::vector<uint16_t> lineWordWidths; std::vector<uint16_t> lineWordWidths;
lineWordWidths.reserve(16); lineWordWidths.reserve(16);
// Guard against malicious/invalid content generating unbounded line counts.
size_t producedLines = 0; size_t producedLines = 0;
constexpr size_t MAX_LINES = 1000; constexpr size_t MAX_LINES = 1000;
@ -186,6 +188,7 @@ void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fo
continue; continue;
} }
// No more tricks available; flush the collected words and move on.
commitLine(false); commitLine(false);
} }

4
lib/Epub/Epub/hyphenation/Hyphenator.cpp
View File

@ -110,16 +110,19 @@ bool Hyphenator::splitWord(const GfxRenderer& renderer, const int fontId, const
return false; return false;
} }
// Skip mixed tokens (e.g., "v2.0") unless the caller forces a split due to overflow.
if (!force && !hasOnlyAlphabetic(cps)) { if (!force && !hasOnlyAlphabetic(cps)) {
return false; return false;
} }
const auto breakIndexes = collectBreakIndexes(cps); const auto breakIndexes = collectBreakIndexes(cps);
// Budget for a trailing hyphen so rendered width matches the layout test.
const int hyphenWidth = renderer.getTextWidth(fontId, "-", style); const int hyphenWidth = renderer.getTextWidth(fontId, "-", style);
const int adjustedWidth = availableWidth - hyphenWidth; const int adjustedWidth = availableWidth - hyphenWidth;
size_t chosenIndex = std::numeric_limits<size_t>::max(); size_t chosenIndex = std::numeric_limits<size_t>::max();
// Prefer dictionary-style break points emitted by language hyphenators.
if (adjustedWidth > 0) { if (adjustedWidth > 0) {
for (const size_t idx : breakIndexes) { for (const size_t idx : breakIndexes) {
const size_t byteOffset = byteOffsetForIndex(cps, idx); const size_t byteOffset = byteOffsetForIndex(cps, idx);
@ -160,6 +163,7 @@ bool Hyphenator::splitWord(const GfxRenderer& renderer, const int fontId, const
return false; return false;
} }
// Append the printed hyphen to the prefix while leaving the tail untouched.
result->head = head + "-"; result->head = head + "-";
result->tail = tail; result->tail = tail;
return true; return true;