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

Fix parent-element “exact” preemption

Browse Source
This commit is contained in:
jpirnay
2026-04-01 13:32:55 +02:00
parent cb7c019367
commit fea600dd7e
2 changed files with 96 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/KOReaderSync/ChapterXPathReverseMapper.cpp
+19 -3
View File
@@ -148,8 +148,17 @@ struct ReverseState : StackState {
const std::string xpath = normalizeXPath(currentXPath(spineIndex));
const int depth = pathDepth(xpath);
const bool targetIsTextSelector = targetTextNodeIndex > 0;
if (xpath == targetNorm) {
tryUpdate(MatchTier::EXACT, depth, "exact", true);
// For /text()[N].M targets, the normalized parent element path is equal to
// targetNorm. Treat that as an ancestor-level anchor so text-node exact
// matching can still determine the real intra-node offset.
if (targetIsTextSelector) {
tryUpdate(MatchTier::ANCESTOR, depth, "text-parent", false);
} else {
tryUpdate(MatchTier::EXACT, depth, "exact", true);
}
return;
}
if (isAncestorPath(xpath, targetNorm)) {
@@ -225,8 +234,15 @@ bool findProgressForXPathInternal(const std::shared_ptr<Epub>& epub, const int s
outIntraSpineProgress = std::max(0.0f, std::min(1.0f, outIntraSpineProgress));
}
LOG_DBG("KOX", "Reverse: spine=%d %s match offset=%zu/%zu -> progress=%.3f for '%s'", spineIndex, state.bestTierName,
state.bestOffset, state.totalTextBytes, outIntraSpineProgress, xpath.c_str());
if (state.targetTextNodeIndex > 0) {
LOG_DBG("KOX",
"Reverse: spine=%d %s match textNode=%d char=%d offset=%zu/%zu -> progress=%.3f for '%s'",
spineIndex, state.bestTierName, state.targetTextNodeIndex, state.targetCharOffset, state.bestOffset,
state.totalTextBytes, outIntraSpineProgress, xpath.c_str());
} else {
LOG_DBG("KOX", "Reverse: spine=%d %s match offset=%zu/%zu -> progress=%.3f for '%s'", spineIndex,
state.bestTierName, state.bestOffset, state.totalTextBytes, outIntraSpineProgress, xpath.c_str());
}
return true;
}