修改分页问题

2026-05-26 21:08:27 +08:00
parent 0e7d952fe5
commit 83b705b9ae
14 changed files with 227 additions and 50 deletions
@@ -155,27 +155,31 @@ struct RDEPUBTextLayouter {
                totalLength: attributedString.length,
                lineRanges: lineRanges
            )
+            let verifiedRange = verifiedDisplayRange(for: adjusted.range)
            let trailingFragmentID = nearestTrailingFragmentID(
-                endingAt: adjusted.range.location + adjusted.range.length,
+                endingAt: verifiedRange.location + verifiedRange.length,
                fragmentOffsets: fragmentOffsets
            )
+            let diagnostics = verifiedRange == adjusted.range
+                ? adjusted.diagnostics
+                : adjusted.diagnostics + ["verified-display-range \(NSStringFromRange(adjusted.range)) -> \(NSStringFromRange(verifiedRange))"]

            frames.append(
                RDEPUBTextLayoutFrame(
-                    contentRange: adjusted.range,
+                    contentRange: verifiedRange,
                    breakReason: adjusted.breakReason,
-                    blockRange: adjusted.blockRange,
-                    attachmentRanges: adjusted.attachmentRanges,
-                    attachmentKinds: adjusted.attachmentKinds,
-                    blockKinds: adjusted.blockKinds,
-                    semanticHints: adjusted.semanticHints,
-                    attachmentPlacements: adjusted.attachmentPlacements,
+                    blockRange: blockRange(at: max(verifiedRange.location, verifiedRange.location + verifiedRange.length - 1)),
+                    attachmentRanges: attachmentRanges(in: verifiedRange),
+                    attachmentKinds: attachmentKinds(in: verifiedRange),
+                    blockKinds: blockKinds(in: verifiedRange),
+                    semanticHints: semanticHints(in: verifiedRange),
+                    attachmentPlacements: attachmentPlacements(in: verifiedRange),
                    trailingFragmentID: trailingFragmentID,
-                    diagnostics: adjusted.diagnostics
+                    diagnostics: diagnostics
                )
            )

-            let nextLocation = adjusted.range.location + adjusted.range.length
+            let nextLocation = verifiedRange.location + verifiedRange.length
            guard nextLocation > location else {
                location += max(visibleRange.length, 1)
                continue
@@ -185,6 +189,30 @@ struct RDEPUBTextLayouter {

        return frames
    }
+
+    private func verifiedDisplayRange(for range: NSRange) -> NSRange {
+        guard range.length > 0,
+              !attachmentRanges(in: range).isEmpty else {
+            return range
+        }
+
+        let pageContent = attributedString.attributedSubstring(from: range)
+        guard let layouter = DTCoreTextLayouter(attributedString: pageContent) else {
+            return range
+        }
+
+        layouter.shouldCacheLayoutFrames = false
+        guard let layoutFrame = layouter.layoutFrame(with: dtLayoutRect, range: NSRange(location: 0, length: 0)) else {
+            return range
+        }
+
+        let visibleRange = layoutFrame.visibleStringRange()
+        guard visibleRange.length > 0, visibleRange.length < range.length else {
+            return range
+        }
+
+        return NSRange(location: range.location, length: visibleRange.length)
+    }
 #endif

    private static func makeLayoutPath(pageSize: CGSize, config: RDEPUBTextLayoutConfig) -> CGPath {