修改分页问题

Sources/RDReaderView/EPUBUI/RDEPUBPageLayoutSnapshot.swift

@@ -139,9 +139,10 @@ struct RDEPUBPageLayoutSnapshot {
         var lines: [RDEPUBPageLine] = []
         var runs: [RDEPUBPageRun] = []
         var attachments: [RDEPUBPageAttachment] = []
+        let pageOffset = page.pageStartOffset
 
         for dtLine in dtLines {
-            let lineRange = dtLine.stringRange()
+            let lineRange = offset(dtLine.stringRange(), by: pageOffset)
             let line = RDEPUBPageLine(
                 stringRange: lineRange,
                 frame: dtLine.frame,
@@ -154,7 +155,7 @@ struct RDEPUBPageLayoutSnapshot {
 
             if let glyphRuns = dtLine.glyphRuns as? [DTCoreTextGlyphRun] {
                 for run in glyphRuns {
-                    let runRange = run.stringRange()
+                    let runRange = offset(run.stringRange(), by: pageOffset)
                     let isAttachment = run.attachment != nil
                     runs.append(
                         RDEPUBPageRun(
@@ -182,7 +183,7 @@ struct RDEPUBPageLayoutSnapshot {
             }
         }
 
-        let visibleRange = layoutFrame.visibleStringRange()
+        let visibleRange = offset(layoutFrame.visibleStringRange(), by: pageOffset)
 
         return RDEPUBPageLayoutSnapshot(
             page: page,
@@ -210,5 +211,12 @@ struct RDEPUBPageLayoutSnapshot {
             : nil
         return (placement, kind)
     }
+
+    private static func offset(_ range: NSRange, by offset: Int) -> NSRange {
+        guard range.location != NSNotFound else {
+            return range
+        }
+        return NSRange(location: range.location + offset, length: range.length)
+    }
 #endif
 }

Sources/RDReaderView/EPUBUI/RDEPUBReaderController.swift

@@ -165,6 +165,8 @@ public final class RDEPUBReaderController: UIViewController {
     private var currentBrightness: CGFloat
     private var didStartInitialLoad = false
     private var isRepaginating = false
+    private var lastTextPaginationPageSize: CGSize?
+    private var isReconcilingTextPaginationSize = false
     private var paginationToken = UUID()
     private var paginator: RDEPUBPaginator?
     private var searchState: RDEPUBSearchState?
@@ -695,6 +697,7 @@ public final class RDEPUBReaderController: UIViewController {
         if publication.readingProfile == .textReflowable {
             let renderer = resolvedTextRenderer()
             let pageSize = currentTextPageSize()
+            lastTextPaginationPageSize = pageSize
             let layoutConfig = currentTextLayoutConfig(pageSize: pageSize)
             let builder = RDEPUBTextBookBuilder(renderer: renderer, cache: textBookCache, layoutConfig: layoutConfig)
             let renderStyle = currentTextRenderStyle()
@@ -1258,12 +1261,12 @@ public final class RDEPUBReaderController: UIViewController {
     }
 
     private func currentTextPageSize() -> CGSize {
-        let viewportSize = currentLayoutContext().viewportSize
-        let insets = configuration.reflowableContentInsets
-        return CGSize(
-            width: max(viewportSize.width - insets.left - insets.right, 1),
-            height: max(viewportSize.height - insets.top - insets.bottom, 1)
-        )
+        let pageNum = readerView.currentPage >= 0 ? readerView.currentPage : nil
+        let resolvedSize = readerView.resolvedSinglePageSize(pageNum: pageNum)
+        if resolvedSize.width > 0, resolvedSize.height > 0 {
+            return resolvedSize
+        }
+        return currentLayoutContext().viewportSize
     }
 
     private func currentTextRenderStyle() -> RDEPUBTextRenderStyle {
@@ -1278,15 +1281,10 @@ public final class RDEPUBReaderController: UIViewController {
     }
 
     private func currentTextLayoutConfig(pageSize: CGSize) -> RDEPUBTextLayoutConfig {
-        let viewportSize = currentLayoutContext().viewportSize
-        let derivedFrameSize = CGSize(
-            width: max(viewportSize.width, pageSize.width),
-            height: max(viewportSize.height, pageSize.height)
-        )
         return RDEPUBTextLayoutConfig(
-            frameWidth: derivedFrameSize.width,
-            frameHeight: derivedFrameSize.height,
-            edgeInsets: .zero,
+            frameWidth: max(pageSize.width, 1),
+            frameHeight: max(pageSize.height, 1),
+            edgeInsets: configuration.reflowableContentInsets,
             numberOfColumns: configuration.numberOfColumns,
             columnGap: configuration.columnGap,
             avoidOrphans: true,
@@ -1834,6 +1832,7 @@ extension RDEPUBReaderController: RDReaderDataSource, RDReaderDelegate {
 
     public func pageNum(readerView: RDReaderView, pageNum: Int) {
         updateCurrentSelection(nil)
+        reconcileTextPaginationSizeIfNeeded(for: pageNum)
 
         let totalPages = pageCountOfReaderView(readerView: readerView)
         if totalPages > 0, pageNum == totalPages - 1 {
@@ -1859,6 +1858,36 @@ extension RDEPUBReaderController: RDReaderDataSource, RDReaderDelegate {
         _ = isLandscape
         pendingPresentationRestoreLocation = currentVisibleLocation() ?? persistenceLocation()
     }
+
+    private func reconcileTextPaginationSizeIfNeeded(for pageNum: Int) {
+        guard textBook != nil,
+              !isRepaginating,
+              !isReconcilingTextPaginationSize,
+              pageNum >= 0,
+              let lastTextPaginationPageSize else {
+            return
+        }
+
+        let resolvedSize = readerView.resolvedSinglePageSize(pageNum: pageNum)
+        guard resolvedSize.width > 0,
+              resolvedSize.height > 0 else {
+            return
+        }
+
+        let sizeChanged = abs(resolvedSize.width - lastTextPaginationPageSize.width) > 0.5
+            || abs(resolvedSize.height - lastTextPaginationPageSize.height) > 0.5
+        guard sizeChanged else {
+            return
+        }
+
+        isReconcilingTextPaginationSize = true
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            self.isReconcilingTextPaginationSize = false
+            guard self.textBook != nil, !self.isRepaginating else { return }
+            self.repaginatePreservingCurrentLocation()
+        }
+    }
 }
 
 // MARK: - Web 内容视图代理（EPUB 固定布局/Web 渲染路径）

Sources/RDReaderView/EPUBUI/RDEPUBTextContentView.swift

@@ -265,7 +265,7 @@ final class RDEPUBTextContentView: UIView {
         )
 
 #if canImport(DTCoreText)
-        let displayContent = NSMutableAttributedString(attributedString: page.chapterContent)
+        let displayContent = NSMutableAttributedString(attributedString: page.content)
         let fullRange = NSRange(location: 0, length: displayContent.length)
         displayContent.addAttribute(
             .foregroundColor,
@@ -275,7 +275,7 @@ final class RDEPUBTextContentView: UIView {
         coreTextContentView.isHidden = false
         coreTextContentView.backgroundColor = .clear
         coreTextDisplayContent = displayContent
-        coreTextDisplayRange = page.contentRange
+        coreTextDisplayRange = NSRange(location: 0, length: displayContent.length)
         textView.isHidden = true
         textView.isUserInteractionEnabled = false
         textView.attributedText = nil

Sources/RDReaderView/EPUBUI/RDURLReaderController.swift

@@ -123,7 +123,7 @@ public final class RDURLReaderController: UIViewController {
                 layoutConfig: RDEPUBTextLayoutConfig(
                     frameWidth: pageSize.width,
                     frameHeight: pageSize.height,
-                    edgeInsets: .zero,
+                    edgeInsets: epubConfiguration.reflowableContentInsets,
                     numberOfColumns: 1,
                     columnGap: 20,
                     avoidOrphans: true,
@@ -179,15 +179,11 @@ public final class RDURLReaderController: UIViewController {
         print("[ReadViewDemo] automation \(prefix) -> page \(page) href \(href) progression \(progression)")
     }
 
-    /// 计算文本分页的页面尺寸
-    /// 基于屏幕尺寸和配置的内边距
+    /// 计算文本分页的页面尺寸。
+    /// 分页器使用完整 viewport，真实可绘制区域由 layoutConfig.edgeInsets 控制，
+    /// 以保持与页面展示时的内容几何一致。
     private func currentTextPageSize() -> CGSize {
-        let viewportSize = UIScreen.main.bounds.size
-        let insets = epubConfiguration.reflowableContentInsets
-        return CGSize(
-            width: max(viewportSize.width - insets.left - insets.right, 1),
-            height: max(viewportSize.height - insets.top - insets.bottom, 1)
-        )
+        UIScreen.main.bounds.size
     }
 
     /// 根据当前配置生成文本渲染样式