diff --git a/Doc/ARCHITECTURE-CONTEXT.md b/Doc/ARCHITECTURE-CONTEXT.md
deleted file mode 100644
index 291d1ef..0000000
--- a/Doc/ARCHITECTURE-CONTEXT.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# 架构分析：WXRead 参考 vs ReadViewSDK 当前
-
-**分析日期：** 2026-05-23
-**分析基础：** `Doc/WXRead/decompiled-doc.md`、`Doc/WXRead/resources-doc.md`、`Doc/WXRead/读书EPUB阅读器实现架构.md`
-**状态：** Decisions captured
-
----
-
-<domain>
-## 分析范围
-
-对比读书 (WeRead v10.0.3) 逆向架构与当前 ReadViewSDK 项目的结构性差距，聚焦四大方向：分页引擎集成、CSS 处理、渲染架构、字体系统。
-
-读书 EPUB 渲染的核心架构特征：
-- Path A (EPUB): 纯 CoreText 渲染 — `WRPageView.drawRect:` → `CTFrameDraw`，不用 UITextView/UILabel
-- 4 级语义断页：`WRCoreTextLayouter` + `WRCoreTextLayoutFrame` (语义边界 > 附件边界 > 块边界 > 帧限制)
-- 5 层 CSS 级联：`default.css < replace.css < dark.css < EPUB 内嵌 < 用户设置`
-- 字符级位置精度：`WREpubPositionConverter` (fileIndex, row, column) ↔ 全局字符偏移
-- 标注直接在 CTFrame 层叠加绘制，搜索高亮同理
-
-</domain>
-
-<decisions>
-## 已决事项
-
-### Area 1: 分页引擎集成（P0）
-
-| 决策 | 说明 |
-|------|------|
-| 将 `RDEPUBTextLayouter` 集成到 `RDEPUBTextBookBuilder` | 内部调用 `rd_paginatedFrames(size:)` 替代旧的 `ss_pageRanges(size:)`，外部 API 不变 |
-| 分页元数据暴露到 `RDEPUBTextPage` | 新增 `metadata: RDEPUBTextPageMetadata` 字段（含 breakReason/blockKinds/semanticHints），对外暴露分页质量数据 |
-| `RDEPUBTextChapterPaginationDiagnostic` 增强 | 透传 RDEPUBTextLayoutFrame 的诊断信息 |
-| 分页缓存 | 按 `bookID + fontSize + lineHeightMultiple + contentInsets` 生成缓存 key，缓存完整 `RDEPUBTextBook` 到磁盘 |
-
-### Area 2: CSS `<link>` 外部样式表处理（P0）
-
-| 决策 | 说明 |
-|------|------|
-| 预处理内联 CSS | 渲染前扫描 HTML 中 `<link>` 标签，从 EPUB 解压目录读取 CSS 内容，注入 `<style>` 替换 `<link>` |
-| 实现 5 层 CSS 级联 | `RDEPUBTextStyleSheetBuilder` 实现 `default < replace < dark < epub-embedded < user` 五层合并，使用已定义的 `RDEPUBTextStyleSheetPackage`/`RDEPUBTextStyleSheetLayer` |
-
-### Area 3: CoreText 直接绘制迁移（P1 — 大架构变更）
-
-| 决策 | 说明 |
-|------|------|
-| 直接替换 UITextView | 新实现完全替代 `RDEPUBTextContentView`，不保留 UITextView 渐进迁移路径 |
-| CoreText 原生选区 | `CTLineGetStringIndexForPosition` 坐标 hit test + 自定义选区绘制，不依赖 UITextView 选区 |
-| 标注渲染：CGContext 装饰层 | drawRect 中 CTFrameDraw 绘制文本后，遍历当前页 RDEPUBHighlight，CGContext 绘制背景矩形（highlight）/ 下划线（underline） |
-| 搜索高亮：CGContext 叠加绘制 | 不修改底层 attributedString，在 drawRect 中根据匹配范围直接绘制高亮背景 |
-
-### Area 4: 字体系统（P1 — 延迟到后续版本）
-
-| 决策 | 说明 |
-|------|------|
-| 方案：内嵌固定字体集 | SDK bundle 内嵌常用中文字体，Settings 面板新增字体选择。不做 CDN 动态下载 |
-| 本版本范围：暂不做 | 字体切换功能延迟到后续迭代 |
-
-</decisions>
-
-<canonical_refs>
-## 关键参考文档
-
-**WXRead 逆向参考（必须阅读）：**
-- `Doc/WXRead/decompiled-doc.md` — 44 个逆向文件的职责说明
-- `Doc/WXRead/resources-doc.md` — CSS/JS 资源文件清单与职责
-- `Doc/WXRead/读书EPUB阅读器实现架构.md` — 双渲染引擎架构总览
-- `Doc/WXRead/decompiled/WRCoreTextLayoutFrame.m` — 跨页避让、装饰元素、搜索高亮实现
-- `Doc/WXRead/decompiled/WRCoreTextLayouter.m` — 4 级语义断页配置
-- `Doc/WXRead/decompiled/WRPageView.m` — CoreText 直接绘制参考
-- `Doc/WXRead/decompiled/WREpubTypesetter.m` — CSS 级联合并参考
-- `Doc/WXRead/resources/css/replace.css` — 5 层 CSS 参考
-
-**当前项目代码（已有的基础设施）：**
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextLayouter.swift` — 已实现 4 级语义断页，待集成
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextLayoutFrame.swift` — 帧模型，含 breakReason/semanticHints
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextRenderer.swift` — 已定义 `RDEPUBTextStyleSheetPackage`/`RDEPUBTextStyleSheetLayer`，未完全使用
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextBookBuilder.swift` — 当前可能仍在用旧的 `ss_pageRanges`
-- `Sources/RDReaderView/EPUBUI/RDEPUBTextContentView.swift` — UITextView 实现，待替换为 CoreText
-
-</canonical_refs>
-
-<roadmap_mapping>
-## 与现有 Roadmap 的映射
-
-| 决策 | 对应 Phase | 说明 |
-|------|-----------|------|
-| RDEPUBTextLayouter 集成 | Phase 8 (08-02) | 分页质量改善的核心 |
-| 分页元数据暴露 | Phase 8 (08-03) | 分页诊断输出的一部分 |
-| 分页缓存 | Phase 8 (08-01) | 缓存键与失效策略 |
-| CSS `<link>` 内联 | Phase 7 范畴外 | 当前 Roadmap 未覆盖，需新增 phase 或合并到 Phase 8 |
-| 5 层 CSS 级联 | Phase 7 + Phase 8 | Phase 7 已完成属性闭环，级联是后续增强 |
-| **CoreText 直接绘制** | **v1.2 或 v2.0** | **超出 v1.1 Roadmap，需要独立 milestone** |
-| CoreText 原生选区 | 随 CoreText 迁移 | 同上 |
-| 标注 CGContext 绘制 | 随 CoreText 迁移 | 同上 |
-| 字体系统 | 未来版本 | 延迟 |
-
-**关键发现：** CoreText 直接绘制迁移是最大的架构变更，超出 v1.1 的增量改进范围。建议作为 v1.2 独立 milestone 规划。
-
-</roadmap_mapping>
-
-<deferred>
-## 延迟事项
-
-- **字体系统**：内嵌固定字体集方案已决，延迟到后续版本
-- **位置精度提升**（字符级锚点）：P2，与 CoreText 迁移关联
-- **章节数据模型内聚**（WRChapterData 模式）：P2，架构清晰度改进
-- **TTS / DRM / Pencil / 多栏排版**：P3，独立功能模块
-- **翻页控制器健壮性**（UIPageViewController crash patch）：P2，当前未遇到相关崩溃
-
-</deferred>
-
----
-
-*分析范围：WXRead 逆向文档 → ReadViewSDK 架构差距*
-*产出：4 个 Area、14 项决策、1 项延迟*
diff --git a/Doc/ARCHITECTURE.md b/Doc/ARCHITECTURE.md
index 12bf92f..4f15be4 100644
--- a/Doc/ARCHITECTURE.md
+++ b/Doc/ARCHITECTURE.md
@@ -105,7 +105,7 @@ paginateTextPublication()
     │   ├─ makePartialPageMap()                // 构建局部 BookPageMap
     │   └─ applyBookPageMap()                  // 应用到 UI，用户可立即阅读
     │
-    └─ paginateMetadataOnly()                 // 后台元数据解析
+    └─ RDEPUBMetadataParseWorker.start()      // 后台元数据解析
         │
         ├─ 预计算 contentHash（串行）          // 读取所有章节 HTML + SHA-256
         ├─ readAll(keys:) 恢复已有缓存
@@ -245,7 +245,7 @@ RDEPUBReaderController
     │
     ├─ RDEPUBReaderPaginationCoordinator     // 分页入口与后台元数据解析
     │   ├─ paginatePublication()
-    │   ├─ paginateMetadataOnly()
+    │   ├─ RDEPUBMetadataParseWorker.start()
     │   └─ restoreBookPageMapIfPossible()
     │
     ├─ RDEPUBPresentationRuntime             // 分页状态与窗口替换
diff --git a/Doc/Android EPUB 阅读器实施方案.md b/Doc/Android EPUB 阅读器实施方案.md
deleted file mode 100644
index 3d7fb65..0000000
--- a/Doc/Android EPUB 阅读器实施方案.md	
+++ /dev/null
@@ -1,606 +0,0 @@
-# Android EPUB 阅读器实施方案
-
-## Context
-
-当前 ReadViewSDK 是一个功能完整的 iOS EPUB 阅读器框架（Swift + UIKit），支持 EPUB 2/3 解析、三种渲染模式（重排/固定布局/网页交互）、全文搜索、高亮/书签/批注、分页管理等。目标是基于现有 iOS 版本的架构和 JS 桥接协议，实现一套 Android 版本的 EPUB 阅读器。
-
-**核心策略**：JS 桥接层（epub-bridge.js、WeReadApi.js 等）直接复用，Swift 逻辑层用 Kotlin 重写，UIKit UI 层用 Android 原生 View 重写。
-
----
-
-## 第一阶段：项目基础设施（预计 1 周）
-
-### 1.1 创建 Android 项目
-
-```
-ReadViewSDK-Android/
-├── app/                          # Demo 应用
-├── reader-core/                  # Kotlin 核心库（解析、模型、搜索）
-├── reader-jsbridge/              # WebView JS 桥接层
-├── reader-ui/                    # Android UI 组件（工具栏、搜索面板、设置等）
-├── reader-view/                  # 翻页容器（ViewPager2 封装）
-└── build-logic/                  # Gradle convention plugins
-```
-
-- 语言：Kotlin
-- 最低 API：24（Android 7.0）
-- 目标 API：34
-- 构建工具：Gradle + Kotlin DSL
-- 依赖注入：手动（与 iOS 的 `RDEPUBReaderDependencies` 模式一致）
-
-### 1.2 Gradle 模块划分
-
-| 模块 | 对应 iOS 层 | 职责 |
-|------|------------|------|
-| `reader-core` | EPUBCore/ + EPUBTextRendering/ | 解析、模型、搜索引擎、CSS 生成、分页算法 |
-| `reader-jsbridge` | RDEPUBJavaScriptBridge + JS Resources | JS 文件管理、消息收发、脚本生成 |
-| `reader-ui` | EPUBUI/ | 工具栏、搜索面板、设置面板、目录列表、高亮管理 |
-| `reader-view` | ReaderView/ | 翻页容器（ViewPager2 + PagerSnapHelper） |
-
-### 1.3 公共依赖
-
-```kotlin
-// reader-core
-implementation("net.lingala.zip4j:zip4j:2.11.5")          // 替代 ZIPFoundation
-implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
-implementation("com.google.code.gson:gson:2.11.0")         // 替代 Codable
-implementation("androidx.webkit:webkit:1.10.0")
-
-// reader-ui
-implementation("androidx.recyclerview:recyclerview:1.3.2")
-implementation("com.google.android.material:material:1.12.0")
-implementation("androidx.viewpager2:viewpager2:1.0.0")
-
-// reader-view
-implementation("androidx.viewpager2:viewpager2:1.0.0")
-implementation("androidx.recyclerview:recyclerview:1.3.2")
-```
-
----
-
-## 第二阶段：Core 层 — EPUB 解析与模型（预计 2 周）
-
-### 2.1 数据模型迁移
-
-将 iOS 的 Codable struct 迁移为 Kotlin data class：
-
-| iOS 文件 | Android 文件 | 关键类型 |
-|----------|-------------|---------|
-| `RDEPUBModels.swift` | `EpubModels.kt` | `EpubLayout`, `EpubMetadata`, `ManifestItem`, `SpineItem`, `TableOfContentsItem` |
-| `RDEPUBReadingLocationModels.swift` | `ReadingLocationModels.kt` | `ReadingLocation`, `Viewport`, `ReadingContext` |
-| `RDEPUBAnnotationModels.swift` | `AnnotationModels.kt` | `Selection`, `Highlight`, `Bookmark`, `Annotation` |
-| `RDEPUBPaginationModels.swift` | `PaginationModels.kt` | `EpubPage`, `ChapterInfo`, `FixedSpread` |
-| `RDEPUBSearchModels.swift` | `SearchModels.kt` | `SearchMatch`, `SearchResult`, `SearchState`, `SearchPresentation` |
-| `RDEPUBPreferences.swift` | `ReaderPreferences.kt` | `ReadingPreferences`（字体、行高、颜色、分栏） |
-| `RDEPUBRenderRequest.swift` | `RenderRequest.kt` | `ReflowableRenderRequest`, `FixedRenderRequest` |
-| `RDEPUBReaderConfiguration.swift` | `ReaderConfiguration.kt` | 完整阅读器配置 |
-| `RDEPUBReaderTheme.swift` | `ReaderTheme.kt` | 6 种预设主题 |
-
-### 2.2 EPUB 解析器迁移
-
-| iOS 文件 | Android 文件 | 说明 |
-|----------|-------------|------|
-| `RDEPUBParser.swift` | `EpubParser.kt` | 主解析入口 |
-| `RDEPUBParser+Archive.swift` | `EpubParser+Archive.kt` | zip4j 解压（替代 ZIPFoundation） |
-| `RDEPUBParser+Package.swift` | `EpubParser+Package.kt` | OPF XML SAX 解析 |
-| `RDEPUBParser+TOC.swift` | `EpubParser+TOC.kt` | NCX/Nav Document 解析 |
-| `RDEPUBParser+Resources.swift` | `EpubParser+Resources.kt` | HTML/资源文件读取 |
-| `RDEPUBParser+ReadingProfile.swift` | `EpubParser+ReadingProfile.kt` | 阅读模式判断 |
-| `RDEPUBPublication.swift` | `EpubPublication.kt` | Facade 门面 |
-| `RDEPUBResourceResolver.swift` | `ResourceResolver.kt` | URL 规范化 |
-
-**XML 解析方案**：iOS 使用 `XMLParser`（SAX），Android 使用 `org.xml.sax.XMLReader`（同为 SAX），解析逻辑可逐行对照翻译。
-
-### 2.3 搜索引擎迁移
-
-| iOS 文件 | Android 文件 |
-|----------|-------------|
-| `RDEPUBSearchEngine.swift` | `EpubSearchEngine.kt` |
-| `RDEPUBTextSearchEngine.swift` | `TextSearchEngine.kt` |
-
-搜索引擎核心逻辑（遍历 spine → 读取 HTML → 解析为纯文本 → NSString.range 搜索 → 生成 match）可直接翻译为 Kotlin `String.indexOf` 循环。
-
-### 2.4 CSS 生成与样式
-
-| iOS 文件 | Android 文件 |
-|----------|-------------|
-| `RDEPUBStyleSheetBuilder.swift` | `StyleSheetBuilder.kt` |
-| `RDEPUBFixedLayoutTemplate.swift` | `FixedLayoutTemplate.kt` |
-
-CSS 生成逻辑完全平台无关，直接翻译即可。
-
-### 2.5 分页算法
-
-| iOS 文件 | Android 文件 | 说明 |
-|----------|-------------|------|
-| `RDEPUBPaginator.swift` | `EpubPaginator.kt` | 离屏 WebView 分页计算 |
-| `RDEPUBReadingSession.swift` | `ReadingSession.kt` | 状态机 + 页面管理 |
-
-**关键决策**：Android 版统一使用 WebView 渲染，不实现 `EPUBTextRendering` 层（DTCoreText 的 Android 等价物过于复杂且收益低）。这意味着：
-
-- **不迁移** `EPUBTextRendering/` 整个目录（18 个文件）
-- **不迁移** `EPUBUI/TextPage/` 目录（7 个文件）
-- Android 版的所有内容（包括重排模式）都通过 WebView + CSS column 分页实现
-- 这与 iOS 的 `webInteractive` 路径一致，已验证可行
-
----
-
-## 第三阶段：JS 桥接层（预计 1 周）
-
-### 3.1 JS 文件直接复用
-
-将以下文件直接复制到 Android `assets/` 目录：
-
-```
-reader-jsbridge/src/main/assets/js/
-├── epub-bridge.js        # 直接复用
-├── WeReadApi.js          # 直接复用
-├── cssInjector.js        # 直接复用
-├── rangy-core.js         # 直接复用
-└── rangy-serializer.js   # 直接复用
-```
-
-### 3.2 WKWebView → Android WebView 桥接映射
-
-| iOS 机制 | Android 等价物 |
-|----------|--------------|
-| `WKScriptMessageHandler.userContentController(_:didReceive:)` | `@JavascriptInterface` 方法 |
-| `window.webkit.messageHandlers.{name}.postMessage()` | 修改 JS 端调用 `AndroidBridge.{method}()` |
-| `WKWebView.evaluateJavaScript()` | `WebView.evaluateJavascript()` |
-| `WKURLSchemeHandler` | `WebViewClient.shouldInterceptRequest()` |
-| `WKUserScript`（页面加载前注入） | `WebView.addJavascriptInterface()` + `WebViewClient.onPageStarted()` |
-
-### 3.3 Android Bridge 实现
-
-```kotlin
-// EpubBridge.kt — 对应 iOS RDEPUBJavaScriptBridge
-class EpubBridge(private val callback: BridgeCallback) {
-
-    @JavascriptInterface
-    fun onProgressionChanged(json: String) { callback.onProgressionChanged(json) }
-
-    @JavascriptInterface
-    fun onSelectionChanged(json: String) { callback.onSelectionChanged(json) }
-
-    @JavascriptInterface
-    fun onInternalLink(href: String) { callback.onInternalLink(href) }
-
-    @JavascriptInterface
-    fun onExternalLink(url: String) { callback.onExternalLink(url) }
-
-    @JavascriptInterface
-    fun onJSError(message: String) { callback.onJSError(message) }
-
-    @JavascriptInterface
-    fun onFixedLayoutReady() { callback.onFixedLayoutReady() }
-}
-```
-
-**JS 端修改**：需要将 `window.webkit.messageHandlers.xxx.postMessage(data)` 替换为 `window.AndroidBridge.xxx(JSON.stringify(data))`。可以通过在注入时做字符串替换，或维护一个 Android 版本的 bridge JS 文件。
-
-### 3.4 WebView 资源拦截
-
-对应 iOS 的 `ss-reader://book/` 自定义协议：
-
-```kotlin
-// EpubSchemeHandler.kt
-class EpubSchemeHandler(private val publication: EpubPublication) : WebViewClient() {
-
-    override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? {
-        val url = request.url.toString()
-        if (url.startsWith("ss-reader://book/")) {
-            val path = url.removePrefix("ss-reader://book/")
-            val data = publication.readResource(path)
-            val mimeType = getMimeType(path)
-            return WebResourceResponse(mimeType, "UTF-8", data.byteInputStream())
-        }
-        return null
-    }
-}
-```
-
-### 3.5 JavaScriptBridge 脚本生成
-
-对应 iOS 的 `RDEPUBJavaScriptBridge` 中各种 `*Script()` 方法，生成 `evaluateJavascript()` 调用的 JS 代码字符串。这些方法的核心是拼接 JSON 参数 + 调用 `WeReadApi.*` 方法，逻辑完全相同。
-
----
-
-## 第四阶段：翻页容器（预计 1.5 周）
-
-### 4.1 PagerView 实现
-
-对应 iOS `RDReaderView`（UICollectionView + UIPageViewController）：
-
-```kotlin
-// PagerView.kt — 对应 iOS RDReaderView
-class PagerView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : FrameLayout(context, attrs) {
-
-    private val viewPager: ViewPager2
-    private val adapter: PageAdapter
-
-    enum class DisplayMode { HORIZONTAL, VERTICAL }
-    var displayMode = DisplayMode.HORIZONTAL
-        set(value) { /* 切换 orientation */ }
-
-    fun reloadData() { adapter.notifyDataSetChanged() }
-    fun scrollToPage(index: Int, animated: Boolean) { /* ... */ }
-}
-```
-
-**PageAdapter**：使用 `RecyclerView.Adapter`，每个 item 是一个 `FrameLayout`，内部放 `WebView`。
-
-### 4.2 点击区域检测
-
-对应 iOS `RDReaderTapRegionHandler`：
-
-```kotlin
-// TapRegionHandler.kt
-class TapRegionHandler {
-    enum class Region { LEFT, CENTER, RIGHT }
-
-    fun resolve(x: Float, viewWidth: Float): Region {
-        return when {
-            x < viewWidth / 3 -> Region.LEFT
-            x > viewWidth * 2 / 3 -> Region.RIGHT
-            else -> Region.CENTER
-        }
-    }
-}
-```
-
-### 4.3 预加载控制
-
-对应 iOS `RDReaderPreloadController`：
-
-使用 `ViewPager2.offscreenPageLimit` 控制预加载页面数量（默认 1-2 页）。
-
----
-
-## 第五阶段：UI 组件（预计 2 周）
-
-### 5.1 阅读器主控制器
-
-对应 iOS `RDEPUBReaderController`：
-
-```kotlin
-// EpubReaderFragment.kt — Fragment 优于 Activity，方便宿主嵌入
-class EpubReaderFragment : Fragment() {
-
-    // 对应 iOS 的各 Coordinator
-    private lateinit var runtime: ReaderRuntime
-    private lateinit var pagerView: PagerView
-    private lateinit var topBar: TopToolBar
-    private lateinit var bottomBar: BottomToolBar
-    private lateinit var searchPanel: SearchPanelView
-
-    // Public API
-    fun openBook(epubUrl: Uri, configuration: ReaderConfiguration = ReaderConfiguration.default)
-    fun goTo(location: ReadingLocation)
-    fun goToPageNumber(pageNumber: Int)
-    fun search(keyword: String)
-    fun addHighlight(selection: Selection, color: Int, note: String?)
-    fun addBookmark(note: String?)
-    // ... 其余 public API
-}
-```
-
-### 5.2 Coordinator 架构迁移
-
-保持 iOS 的 Coordinator 模式，每个 Coordinator 作为独立的 Kotlin 类：
-
-| iOS Coordinator | Android 类 | 职责 |
-|----------------|-----------|------|
-| `RDEPUBReaderRuntime` | `ReaderRuntime` | Facade，协调所有子 Coordinator |
-| `RDEPUBReaderLoadCoordinator` | `LoadCoordinator` | EPUB 文件解析 + Publication 初始化 |
-| `RDEPUBReaderPaginationCoordinator` | `PaginationCoordinator` | 分页计算 |
-| `RDEPUBReaderLocationCoordinator` | `LocationCoordinator` | 阅读位置管理 + 持久化 |
-| `RDEPUBReaderChromeCoordinator` | `ChromeCoordinator` | 工具栏状态同步 |
-| `RDEPUBReaderAnnotationCoordinator` | `AnnotationCoordinator` | 高亮/书签/批注 CRUD |
-| `RDEPUBReaderSearchCoordinator` | `SearchCoordinator` | 全文搜索协调 |
-| `RDEPUBReaderViewportMonitor` | `ViewportMonitor` | 屏幕旋转/尺寸变化检测 |
-
-### 5.3 WebView 内容视图
-
-对应 iOS `RDEPUBWebView` + `RDEPUBWebContentView`：
-
-```kotlin
-// EpubWebView.kt — 封装 Android WebView
-class EpubWebView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : WebView(context, attrs) {
-
-    private val bridge = EpubBridge(/* ... */)
-
-    fun setup() {
-        settings.javaScriptEnabled = true
-        settings.domStorageEnabled = true
-        addJavascriptInterface(bridge, "AndroidBridge")
-        webViewClient = EpubSchemeHandler(publication)
-        webChromeClient = WebChromeClient()
-    }
-
-    fun loadChapter(spineIndex: Int, preferences: ReadingPreferences) {
-        // 生成 HTML 模板 + 注入 CSS + 加载资源
-    }
-
-    fun evaluateScript(script: String, callback: ((String?) -> Unit)? = null) {
-        evaluateJavascript(script) { result -> callback?.invoke(result) }
-    }
-}
-```
-
-### 5.4 顶部工具栏
-
-对应 iOS `RDEPUBReaderTopToolView`：
-
-```xml
-<!-- top_tool_bar.xml -->
-<LinearLayout>
-    <ImageButton android:id="@+id/btnBack" />
-    <TextView android:id="@+id/tvTitle" weight="1" />
-    <ImageButton android:id="@+id/btnSearch" />
-    <ImageButton android:id="@+id/btnBookmark" />
-</LinearLayout>
-```
-
-### 5.5 底部工具栏
-
-对应 iOS `RDEPUBReaderBottomToolView`：
-
-```xml
-<!-- bottom_tool_bar.xml -->
-<LinearLayout>
-    <ImageButton android:id="@+id/btnTOC" />        <!-- 目录 -->
-    <ImageButton android:id="@+id/btnBookmarks" />   <!-- 书签列表 -->
-    <ImageButton android:id="@+id/btnHighlights" />  <!-- 高亮列表 -->
-    <ImageButton android:id="@+id/btnAddHighlight" /> <!-- 添加高亮 -->
-    <ImageButton android:id="@+id/btnSettings" />    <!-- 设置 -->
-</LinearLayout>
-```
-
-### 5.6 搜索面板
-
-对应 iOS `RDEPUBReaderSearchBarView`：
-
-```kotlin
-// SearchPanelView.kt
-class SearchPanelView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : LinearLayout(context, attrs, defStyleAttr) {
-
-    private val searchField: EditText
-    private val cancelButton: Button
-    private val resultsList: RecyclerView  // 分组结果列表
-    private val emptyStateLabel: TextView
-
-    fun updateResults(sections: List<SearchSection>, keyword: String, currentMatchIndex: Int?)
-    fun showNoResults()
-    fun showSearching()
-}
-```
-
-### 5.7 设置面板
-
-对应 iOS `RDEPUBReaderSettingsViewController`：
-
-使用 `BottomSheetDialogFragment` 实现底部弹出设置面板：
-- 亮度调节（SeekBar）
-- 字体大小（+/- 按钮）
-- 字体选择
-- 行间距
-- 主题切换（6 种预设）
-- 翻页模式切换
-
-### 5.8 目录列表
-
-对应 iOS `RDEPUBReaderChapterListController`：
-
-使用 `BottomSheetDialogFragment` + `RecyclerView` 实现目录列表，支持章节标题显示和点击跳转。
-
----
-
-## 第六阶段：持久化与状态管理（预计 0.5 周）
-
-### 6.1 持久化实现
-
-对应 iOS `RDEPUBReaderPersistence`：
-
-```kotlin
-// ReaderPersistence.kt
-interface ReaderPersistence {
-    fun loadLocation(bookId: String): ReadingLocation?
-    fun saveLocation(bookId: String, location: ReadingLocation)
-    fun loadBookmarks(bookId: String): List<Bookmark>
-    fun saveBookmarks(bookId: String, bookmarks: List<Bookmark>)
-    fun loadHighlights(bookId: String): List<Highlight>
-    fun saveHighlights(bookId: String, highlights: List<Highlight>)
-    fun loadSettings(): ReaderSettings
-    fun saveSettings(settings: ReaderSettings)
-}
-
-// SharedPreferences 实现
-class SharedPrefsPersistence(context: Context) : ReaderPersistence {
-    // 使用 Gson 序列化/反序列化
-}
-```
-
-### 6.2 状态管理
-
-使用 Kotlin `StateFlow` 替代 iOS 的手动状态同步：
-
-```kotlin
-// ReaderState.kt
-data class ReaderUiState(
-    val isLoading: Boolean = true,
-    val currentPage: Int = 0,
-    val totalPages: Int = 0,
-    val title: String = "",
-    val isToolbarVisible: Boolean = false,
-    val isSearchVisible: Boolean = false,
-    val bookmarks: List<Bookmark> = emptyList(),
-    val highlights: List<Highlight> = emptyList(),
-    val searchState: SearchState? = null,
-)
-
-class ReaderStateManager {
-    private val _uiState = MutableStateFlow(ReaderUiState())
-    val uiState: StateFlow<ReaderUiState> = _uiState.asStateFlow()
-}
-```
-
----
-
-## 第七阶段：主题与外观（预计 0.5 周）
-
-### 7.1 主题系统
-
-对应 iOS `RDEPUBReaderTheme`：
-
-```kotlin
-// ReaderTheme.kt
-data class ReaderTheme(
-    val name: String,
-    val contentBackgroundColor: Int,  // Color int
-    val textColor: Int,
-    val toolbarBackgroundColor: Int,
-    val toolbarForegroundColor: Int,
-    val isDark: Boolean
-) {
-    companion object {
-        val LIGHT = ReaderTheme("浅色", Color.WHITE, Color.BLACK, ...)
-        val DARK = ReaderTheme("深色", Color.rgb(0x1A, 0x1A, 0x1A), Color.WHITE, ...)
-        val YELLOW = ReaderTheme("纸质", Color.rgb(0xF5, 0xF0, 0xE0), Color.BLACK, ...)
-        // ... 共 6 种
-    }
-}
-```
-
-### 7.2 状态栏适配
-
-根据主题动态设置状态栏颜色（`Window.statusBarColor`）和图标颜色（`WindowInsetsController.isAppearanceLightStatusBars`）。
-
----
-
-## 第八阶段：测试与 Demo（预计 1 周）
-
-### 8.1 单元测试
-
-- `EpubParserTest` — EPUB 解析（container.xml、OPF、TOC）
-- `SearchEngineTest` — 搜索引擎
-- `StyleSheetBuilderTest` — CSS 生成
-- `ResourceResolverTest` — URL 解析
-- `LocationCoordinatorTest` — 位置管理
-
-### 8.2 集成测试
-
-- `EpubReaderIntegrationTest` — 完整阅读流程（打开 → 分页 → 翻页 → 搜索 → 高亮）
-
-### 8.3 Demo App
-
-对应 iOS `ReadViewDemo`：
-
-```kotlin
-// MainActivity.kt
-class MainActivity : AppCompatActivity() {
-    private fun openBook() {
-        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-            addCategory(Intent.CATEGORY_OPENABLE)
-            type = "application/epub+zip"
-        }
-        startActivityForResult(intent, REQUEST_OPEN_BOOK)
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == REQUEST_OPEN_BOOK && resultCode == RESULT_OK) {
-            val uri = data?.data ?: return
-            val fragment = EpubReaderFragment.newInstance(uri)
-            // 嵌入 Fragment
-        }
-    }
-}
-```
-
-### 8.4 UI 自动化测试
-
-对应 iOS 的 XCUIApplication 测试（24 个测试文件）：
-- 使用 Espresso + UiAutomator
-- 覆盖：目录交互、页码导航、书签管理、高亮管理、搜索、设置效果、工具栏状态等
-
----
-
-## 实施时间估算
-
-| 阶段 | 内容 | 预计工时 |
-|------|------|---------|
-| 1 | 项目基础设施 | 1 周 |
-| 2 | Core 层（解析、模型、搜索、CSS） | 2 周 |
-| 3 | JS 桥接层 | 1 周 |
-| 4 | 翻页容器 | 1.5 周 |
-| 5 | UI 组件 | 2 周 |
-| 6 | 持久化与状态管理 | 0.5 周 |
-| 7 | 主题与外观 | 0.5 周 |
-| 8 | 测试与 Demo | 1 周 |
-| **合计** | | **约 9.5 周** |
-
----
-
-## 关键技术决策
-
-1. **统一 WebView 渲染**：不实现 DTCoreText 等效层，所有内容通过 WebView + CSS column 分页。简化实现，与 iOS 的 webInteractive 路径一致。
-
-2. **Coordinator 模式保留**：与 iOS 架构保持一致，便于两端逻辑对照和维护。
-
-3. **JS Bridge 微调**：Android 的 `@JavascriptInterface` 与 iOS 的 `WKScriptMessageHandler` 机制不同，JS 端需要适配（用 `AndroidBridge.*` 替代 `window.webkit.messageHandlers.*`）。
-
-4. **不使用 Kotlin Multiplatform**：当前阶段直接用 Kotlin 重写，避免 KMP 的额外复杂度。未来如果需要共享逻辑层，可以逐步迁移。
-
-5. **ViewPager2 替代 PageViewController**：Android 无 page curl 效果，使用 ViewPager2 + 自定义 PageTransformer 实现翻页动画（可选深度效果或滑动效果）。
-
----
-
-## 文件映射索引（iOS → Android）
-
-### 核心映射
-
-| iOS Swift 文件 | Android Kotlin 文件 | 行数参考 |
-|---------------|-------------------|---------|
-| `RDEPUBParser.swift` + extensions | `EpubParser.kt` + extensions | ~600 |
-| `RDEPUBModels.swift` | `EpubModels.kt` | ~200 |
-| `RDEPUBPublication.swift` | `EpubPublication.kt` | ~150 |
-| `RDEPUBJavaScriptBridge.swift` | `EpubJavaScriptBridge.kt` | ~400 |
-| `RDEPUBStyleSheetBuilder.swift` | `StyleSheetBuilder.kt` | ~300 |
-| `RDEPUBSearchEngine.swift` | `EpubSearchEngine.kt` | ~150 |
-| `RDEPUBPaginator.swift` | `EpubPaginator.kt` | ~200 |
-| `RDEPUBReadingSession.swift` | `ReadingSession.kt` | ~250 |
-| `RDEPUBReaderController.swift` + extensions | `EpubReaderFragment.kt` + extensions | ~800 |
-| `RDEPUBReaderContext.swift` | `ReaderContext.kt` | ~150 |
-| `RDEPUBReaderRuntime.swift` | `ReaderRuntime.kt` | ~200 |
-| 各 Coordinator 文件 | 对应 `*Coordinator.kt` | 各 ~100-200 |
-| `RDEPUBWebView.swift` + extensions | `EpubWebView.kt` + extensions | ~500 |
-| `RDReaderView.swift` + extensions | `PagerView.kt` + extensions | ~400 |
-| `RDEPUBReaderSearchBarView.swift` | `SearchPanelView.kt` | ~500 |
-| `RDEPUBReaderTopToolView.swift` | `TopToolBar.kt` | ~150 |
-| `RDEPUBReaderBottomToolView.swift` | `BottomToolBar.kt` | ~200 |
-| `RDEPUBReaderSettingsViewController.swift` | `SettingsSheetFragment.kt` | ~300 |
-
-### 直接复用（不需翻译）
-
-| 文件 | 说明 |
-|------|------|
-| `epub-bridge.js` | JS 核心桥接 |
-| `WeReadApi.js` | JS API 门面 |
-| `cssInjector.js` | CSS 注入工具 |
-| `rangy-core.js` | Range 操作库 |
-| `rangy-serializer.js` | Range 序列化 |
-
-### 不迁移（Android 不需要）
-
-| iOS 文件/目录 | 原因 |
-|-------------|------|
-| `EPUBTextRendering/`（18 个文件） | DTCoreText/CoreText 无 Android 等价物，统一用 WebView |
-| `EPUBUI/TextPage/`（7 个文件） | 原生文字渲染层，Android 不需要 |
-| `RDEPUBTextContentView.swift` | 同上 |
-| `RDEPUBTextPageRenderView.swift` | 同上 |
-| `RDEPUBWebDecorationOverlayView.swift` | Android WebView 的高亮由 JS 直接处理，不需要原生 overlay |
diff --git a/Doc/BUSINESS_LOGIC.md b/Doc/BUSINESS_LOGIC.md
index f7b8b59..63f98fd 100644
--- a/Doc/BUSINESS_LOGIC.md
+++ b/Doc/BUSINESS_LOGIC.md
@@ -177,7 +177,7 @@ while location < totalLength:
     │   ├─ 加载窗口内相邻章节
     │   └─ 应用局部 BookPageMap → 用户可立即阅读
     │
-    └─ 后台解析（paginateMetadataOnly）
+    └─ 后台解析（RDEPUBMetadataParseWorker.start()）
         ├─ 预计算所有章节 contentHash（串行，~1-3s）
         ├─ 恢复已有磁盘缓存
         ├─ 等待用户操作冷却 0.8s
@@ -196,7 +196,7 @@ while location < totalLength:
 var contentHashBySpineIndex: [Int: String] = [:]
 for spineIndex in allBuildableIndices {
     let html = parser.htmlString(forRelativePath: href)
-    contentHashBySpineIndex[spineIndex] = html?.sha256Hex ?? ""
+    contentHashBySpineIndex[spineIndex] = html?.rd_sha256Hex ?? ""
 }
 ```
 
@@ -206,7 +206,7 @@ for spineIndex in allBuildableIndices {
 
 **问题：** 如果用户在后台解析进行中更改字号/行距，`context.currentRenderSignature()` 会返回新值，导致部分章节用旧签名、部分用新签名写入磁盘缓存，造成缓存不一致。
 
-**解决：** 在 `paginateMetadataOnly` 开始时冻结签名：
+**解决：** 在 `RDEPUBMetadataParseWorker` 初始化时冻结签名：
 
 ```swift
 let renderSignature = context.currentRenderSignature()
diff --git a/Doc/CHAPTER_RUNTIME.md b/Doc/CHAPTER_RUNTIME.md
index 2b216f0..7720a4b 100644
--- a/Doc/CHAPTER_RUNTIME.md
+++ b/Doc/CHAPTER_RUNTIME.md
@@ -328,7 +328,7 @@ func resolvePage(absolutePageIndex: Int) -> RDEPUBResolvedPage?
 ### 7.1 整体流程
 
 ```
-paginateMetadataOnly(token)
+RDEPUBMetadataParseWorker.start(token)
     │
     ├─ 预计算所有章节 contentHash（串行）
     ├─ readAll(keys:) 批量读取磁盘缓存
@@ -354,7 +354,7 @@ paginateMetadataOnly(token)
 var contentHashBySpineIndex: [Int: String] = [:]
 for spineIndex in allBuildableIndices {
     let html = parser.htmlString(forRelativePath: href)
-    contentHashBySpineIndex[spineIndex] = html?.sha256Hex ?? ""
+    contentHashBySpineIndex[spineIndex] = html?.rd_sha256Hex ?? ""
 }
 ```
 
@@ -364,7 +364,7 @@ for spineIndex in allBuildableIndices {
 
 **问题**：用户在后台解析进行中更改字号/行距，会导致部分章节用旧签名、部分用新签名写入缓存。
 
-**解决**：在 `paginateMetadataOnly` 开始时冻结签名：
+**解决**：在 `RDEPUBMetadataParseWorker` 初始化时冻结签名：
 
 ```swift
 let renderSignature = context.currentRenderSignature()
diff --git a/Doc/EPUBUI_CODE_REFERENCE.md b/Doc/EPUBUI_CODE_REFERENCE.md
index 71d5548..c337c5e 100644
--- a/Doc/EPUBUI_CODE_REFERENCE.md
+++ b/Doc/EPUBUI_CODE_REFERENCE.md
@@ -58,7 +58,10 @@ public final class RDEPUBReaderController: UIViewController {
 |------|------|
 | `RDEPUBReaderController+PublicAPI.swift` | 公开 API（跳转、搜索、标注、书签） |
 | `RDEPUBReaderController+DataSource.swift` | `RDReaderPageProvider` 实现 |
-| `RDEPUBReaderController+ContentDelegates.swift` | WebView/TextContentView 代理 |
+| `RDEPUBReaderController+ContentDelegates.swift` | WebView/TextContentView 代理路由 |
+| `RDEPUBReaderController+LocationResolution.swift` | 页码/位置解析、阅读状态同步 |
+| `RDEPUBReaderController+ExternalLinks.swift` | 外部链接处理（白名单、确认弹窗） |
+| `RDEPUBReaderController+AttachmentTooltip.swift` | 附件 alt 文本 tooltip 展示 |
 | `RDEPUBReaderController+RenderSupport.swift` | 渲染辅助（WebView/TextContent 创建） |
 | `RDEPUBReaderController+RuntimeBridge.swift` | Runtime 桥接 |
 | `RDEPUBReaderController+TableOfContents.swift` | 目录处理 |
@@ -410,7 +413,8 @@ struct RDEPUBResolvedPage {
 | `RDEPUBChapterLocation.swift` | 章节位置模型 |
 | `RDEPUBChapterOffsetMap.swift` | 章节偏移映射 |
 | `RDEPUBBackgroundTrace.swift` | 后台任务追踪日志 |
-| `String+SHA256.swift` | SHA256 哈希扩展 |
+| `RDEPUBMetadataParseWorker.swift` | 后台元数据解析 worker |
+| `RDEPUBMetadataParseCancellationController.swift` | 解析取消控制器 |
 
 ---
 
diff --git a/Doc/FeatureSolution/ReflowableEPUB_WXReadRenderer_Design.md b/Doc/FeatureSolution/ReflowableEPUB_WXReadRenderer_Design.md
deleted file mode 100644
index 2bfba33..0000000
--- a/Doc/FeatureSolution/ReflowableEPUB_WXReadRenderer_Design.md
+++ /dev/null
@@ -1,265 +0,0 @@
-# Reflowable EPUB 使用 WXRead 风格原生渲染：详细设计
-
-> 文档目的：讨论并固化“将 ReadViewSDK 的 reflowable EPUB 渲染/排版/分页改为参考 Doc/WXRead 的读书（WXRead）原生渲染方式”的可落地设计，供后续开发与回归使用。  
-> 版本：v0（设计草案）  
-> 日期：2026-05-21
-
-## 0. 背景与结论（先说人话）
-
-ReadViewSDK 当前对 EPUB 有三类渲染路径：
-
-- `RDEPUBReadingProfile.webFixedLayout`：Fixed Layout EPUB → `WKWebView`（保持不变）
-- `RDEPUBReadingProfile.webInteractive`：交互式 EPUB（JS/音视频/表单/iframe/外链/bridge）→ `WKWebView`（保持不变）
-- `RDEPUBReadingProfile.textReflowable`：普通 reflowable EPUB → **当前走 DTCoreText → NSAttributedString → CoreText 分页 → 原生文本视图**（这是我们要“升级成 WXRead 风格”的主战场）
-
-本次改造的最小可落地方向是：**保留三分流策略不变**，只增强 `.textReflowable` 分支，使其在“CSS 分层、样式一致性、资源解析、分页稳定性”等方面更接近 `Doc/WXRead/analysis/EPUB渲染管线详解.md` 所描述的 WXRead 管线，而不是引入新的 WebView 渲染。
-
-## 1. 目标 / 非目标
-
-### 1.1 目标（In Scope）
-
-- G1：reflowable EPUB 的正文渲染/排版/分页改为“WXRead 风格原生渲染管线”：
-  - XHTML/HTML →（CSS 分层 + 解析 + 后处理）→ `NSAttributedString`
-  - `NSAttributedString` →（CoreText 分页）→ 单页内容
-  - 单页内容 → 原生绘制/展示
-- G2：保持 Fixed Layout 与交互式 EPUB 的 `WKWebView` 路径不回归。
-- G3：不破坏 `RDURLReaderController` 打开 `.epub` / `.txt` 的主流程。
-- G4：Demo 可用于验证：至少 2-3 本典型 reflowable EPUB 在段落/标题/图片/链接等常见内容下可稳定阅读。
-
-### 1.2 非目标（Out of Scope）
-
-- N1：Fixed Layout EPUB 切换为原生渲染（明确不做）。
-- N2：交互式 EPUB 切换为原生渲染（明确不做）。
-- N3：一次性复刻 WXRead 对 DTCoreText 的所有深度魔改（例如自定义 CSS 属性体系、复杂后处理、分页避断规则等）——本次先按“问题驱动”逐步对齐。
-
-## 2. 关键事实核验（当前代码真实路径）
-
-> 纠偏说明：项目初始化时曾把”reflowable EPUB 当前路径”概括为偏 `WKWebView` 的历史性表述。经本次代码核验，当前真实主路径是 `.textReflowable` → `RDEPUBTextBookBuilder` → `RDEPUBDTCoreTextRenderer` → CoreText 分页 → `RDEPUBTextContentView`。本设计以代码事实为准，并默认后续实现都按此理解推进。
-
-### 2.1 渲染路径分流（已存在）
-
-- 判定在 `Sources/RDReaderView/EPUBCore/RDEPUBParser+ReadingProfile.swift`：
-  - `metadata.layout == .fixed` → `.webFixedLayout`
-  - `hasInteractiveContent() == true` → `.webInteractive`
-  - 否则 → `.textReflowable`
-
-### 2.2 `.textReflowable` 当前实现（已存在，且是正确切入点）
-
-`Sources/RDReaderView/EPUBUI/RDEPUBReaderController.swift`：
-
-- `publication.readingProfile == .textReflowable` 时：
-  - 使用 `RDEPUBTextBookBuilder(renderer: resolvedTextRenderer())`
-  - 默认 renderer 是 `RDEPUBDTCoreTextRenderer`（`#if canImport(DTCoreText)`）
-  - 分页使用 `NSAttributedString.ss_pageRanges(size:)`（`CTFramesetterCreateFrame` + `CTFrameGetVisibleStringRange`）
-  - UI 展示使用 `RDEPUBTextContentView`
-
-结论：我们不需要“新起一个阅读器”，只要把 `.textReflowable` 的 **渲染（typesetter）层**与部分 **分页策略**升级即可。
-
-## 3. WXRead 参考模型（我们要对齐的最小子集）
-
-来自 `Doc/WXRead/analysis/EPUB渲染管线详解.md` 的管线：
-
-1) `WREpubParser`：解析 EPUB 结构（spine、manifest、resourceMap）  
-2) `WREpubTypesetter`：XHTML → `NSAttributedString`（CSS 级联 + HTML 解析 + 后处理）  
-3) `WRCoreTextLayouter`：`NSAttributedString` → 分页布局（`CTTypesetter` + 分页算法）  
-4) `WRCoreTextLayoutFrame`：单页 layout frame  
-5) `WRPageView`：绘制到屏幕  
-
-本次设计对齐重点（最小集合）：
-
-- A：**CSS 分层与合成**（default/replace/dark/epub/user）并注入到渲染输入  
-- B：**资源解析**（图片/CSS 的相对路径 baseURL）与稳定性保障  
-- C：在现有分页基础上逐步迭代（先可用，后对齐“避免断页”等高级策略）
-
-### 3.1 第一阶段实施假设（必须遵守）
-
-- H1：**第一期只对齐“管线形态”和“CSS 分层策略”**，即把现有 `.textReflowable` renderer 增强为更接近 WXRead 的 typesetter 输入与样式组织方式。
-- H2：**第一期不实现 WXRead 对 DTCoreText 的深度魔改**，包括但不限于自定义 CSS 属性体系、复杂附件布局规则、完整的 `WRCoreTextLayouter` / `WRCoreTextLayoutFrame` 等价分页器。
-- H3：当开发过程中遇到图片断页、复杂样式缺失、附件布局异常等问题时，默认先作为“第二阶段问题清单”记录；只有在它阻塞 `REND-01` / `STAB-02` 的最小验收时，才允许做局部补丁，而不是扩展为全面重写分页引擎。
-
-## 4. 是否能直接使用 Doc/WXRead 中的 JS/CSS？
-
-结论：**不建议、也不应该直接把“来自读书 App bundle 的私有 JS/CSS”拷贝进 SDK 作为产品代码**；但可以按以下原则“选择性使用”：
-
-### 4.1 可以使用的情况（需满足其一）
-
-- 文件本身带有明确开源许可证声明，且我们按许可证要求引入（保留 license、署名、NOTICE 等），并建议从官方 upstream 获取：
-  - 例如 `Doc/WXRead/resources/js/rangy-core.js` 明确标注 MIT
-  - 例如 `Doc/WXRead/resources/js/Readability.js` 明确标注 Apache-2.0
-
-> 建议：即便文件里有 license 头，也优先从其原始开源仓库拉取对应版本，而不是从逆向提取的副本直接入库，以降低合规风险。
-
-### 4.2 不建议/不能直接使用的情况
-
-- 无明确许可证头、看起来是读书私有逻辑/样式（例如 `weread-highlighter.js`、`MediaPlatform.js`、`replace.css` 等）：默认视为私有作品，不应直接拷贝使用。
-- 即便是“Safari 默认样式”类文件（例如 `default.css` 的注释提到 Safari），也不建议直接照搬；我们可以根据需求写一份“SDK 自己的 default.css / replace.css”，只实现必要规则。
-
-### 4.3 对本次需求的实际影响
-
-本次 reflowable EPUB 走原生渲染，不依赖 WebView，因此 **JS 不是本次必需**。  
-CSS 方面我们需要的是“分层策略”和一小部分通用排版规则，可在 SDK 内重写为“WXRead 风格的默认样式集合”。
-
-## 5. 详细设计（核心）
-
-### 5.1 总体架构：在现有 `.textReflowable` 上增量替换 renderer
-
-新增一个 renderer（实现 `RDEPUBTextRenderer`）：
-
-- `RDEPUBWXReadTextRenderer`（新）
-  - 输入：`html: String`, `baseURL: URL?`, `style: RDEPUBTextRenderStyle`
-  - 输出：`RDEPUBRenderedChapterContent`（`NSAttributedString` + `fragmentOffsets`）
-  - 内部职责：
-    1) 读取/生成 CSS 各层（default/replace/dark/user）
-    2) 与 EPUB 自带 CSS 共同作用（通过 HTML 注入 + baseURL）
-    3) 调用 DTCoreText builder 生成 attributedString
-    4) 做最小后处理（段落间距/字体/颜色标准化、fragment marker 提取等）
-
-切换点：
-
-- 在 `RDEPUBReaderController.resolvedTextRenderer()`（或其配置位置）增加策略：当开关启用时选择 `RDEPUBWXReadTextRenderer()`，否则沿用 `RDEPUBDTCoreTextRenderer()`。
-  - 建议默认先提供“实验开关”（仅 Demo / debug 可见），降低回归风险。
-
-### 5.2 CSS 分层策略（WXRead 风格）
-
-我们在 SDK 内实现与 `Doc/WXRead/analysis/EPUB渲染管线详解.md` 一致的分层概念，但不直接照搬其私有样式文件：
-
-- Layer 1：`default.css`（SDK 自己维护的基础排版规则）
-- Layer 2：`replace.css`（SDK 自己维护的替换/增强规则：标题、代码块、图片最大宽度等）
-- Layer 3：`dark.css`（暗色主题覆盖，仅在暗色主题启用）
-- Layer 4：EPUB 嵌入 CSS（书籍自带，DTCoreText 解析 HTML 时自然生效；相对路径靠 baseURL）
-- Layer 5：用户设置 CSS（由 `RDEPUBTextRenderStyle` 动态生成：字体、字号、行高、背景色、文字色等）
-
-实现方式（建议）：
-
-1) 新增 `RDEPUBWXReadStyleSheetBuilder`：
-   - `func makeDefaultCSS() -> String`
-   - `func makeReplaceCSS() -> String`
-   - `func makeDarkCSS(theme: RDEPUBTheme) -> String?`
-   - `func makeUserCSS(style: RDEPUBTextRenderStyle, theme: RDEPUBTheme) -> String`
-   - `func composeCSS(...) -> String`（按层拼接，后层覆盖前层）
-
-2) 在 renderer 中将合成后的 CSS 注入到 HTML：
-   - 若存在 `<head>`：插入 `<style id="rd-wxread-layered-style">...`
-   - 若不存在：在 `<html>` 后插入 `<head>...`
-   - 保持原 HTML 内容尽量不改动（外部脚本/交互内容已被 readingProfile 判定剔除到 web 分支）
-
-### 5.3 baseURL 与资源解析
-
-目前 `RDEPUBTextBookBuilder` 传入：
-
-- `baseURL: parser.fileURL(forRelativePath: item.href)?.deletingLastPathComponent()`
-
-原则：
-
-- baseURL 必须是“章节文件所在目录”，以确保：
-  - `<img src="...">` 相对路径可解析
-  - `<link href="...">` CSS 相对路径可解析（如果 DTCoreText 支持）
-
-待核验点（实现时做小实验）：
-
-- DTCoreText 对 `<link rel="stylesheet">` 的解析策略是否完整；若不完整：
-  - 兜底策略：在渲染前解析 HTML 中的 `<link rel="stylesheet">`，读取 CSS 内容并内联到 `<style>`（仅限 `file://` 且位于 EPUB 解压目录内）。
-
-### 5.4 分页策略（阶段性）
-
-现状：
-
-- `NSAttributedString.ss_pageRanges(size:)` 使用 `CTFramesetterCreateFrame` + `CTFrameGetVisibleStringRange`，属于“最小可用分页”。
-
-WXRead 的更高阶策略（参考 `Doc/WXRead/analysis/DTCoreText自定义修改分析.md`）可能包含：
-
-- 避免孤行/断页
-- 图片/附件的分页边界处理
-- 特定块元素的分页规则
-
-本次建议：
-
-- Phase 2：先保持现有分页算法，只要渲染输入（CSS 分层 + 后处理）到位，就能显著改善一致性。
-- Phase 3：针对真实书籍出现的问题，逐条补齐分页规则（问题驱动），避免一开始就引入复杂分页器导致风险扩大。
-
-> 范围约束：如果某个分页问题需要引入“新的复杂分页器”或大规模模拟 `WRCoreTextLayouter` / `WRCoreTextLayoutFrame`，应先暂停并回到方案讨论，不默认并入第一期实现。
-
-### 5.5 与现有高亮/搜索/位置映射的兼容
-
-当前 `.textReflowable` 路径：
-
-- 高亮/搜索依赖 `RDEPUBTextBook` 的 `fragmentOffsets` 与 `location/progression` 映射（见 `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextBookBuilder.swift` 与 `RDEPUBTextBook` 的 `pageNumber(for:)` / `location(forPageNumber:)`）。
-
-兼容策略：
-
-- 继续使用现有的 fragment marker 注入与提取：
-  - `RDEPUBTextRendererSupport.injectFragmentMarkers(...)`
-  - `RDEPUBTextRendererSupport.extractFragmentOffsets(...)`
-- renderer 只改变“CSS 注入与 DTCoreText options/后处理”，不改变 marker 体系与 `RDEPUBTextBook` 数据结构，以降低 UI 层回归。
-
-## 6. 开发落点（文件 / 类型 / 目录）
-
-### 6.1 新增文件（建议位置）
-
-放在 `Sources/RDReaderView/EPUBTextRendering/`（因为它是 textReflowable 的渲染与分页域）：
-
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBWXReadTextRenderer.swift`（新）
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBWXReadStyleSheetBuilder.swift`（新）
-- （可选）`Sources/RDReaderView/EPUBTextRendering/RDEPUBWXReadHTMLPreprocessor.swift`（新：仅当需要内联 `<link>` CSS 时）
-
-资源文件（建议）：
-
-- `Sources/RDReaderView/Resources/WXRead/default.css`（新，SDK 自己写）
-- `Sources/RDReaderView/Resources/WXRead/replace.css`（新，SDK 自己写）
-- `Sources/RDReaderView/Resources/WXRead/dark.css`（新，SDK 自己写）
-
-> 注意：这些资源需被 `RDReaderView.podspec` 的 resource bundle 覆盖到（当前资源 bundle 为 `RDReaderViewAssets`，来源 `Sources/RDReaderView/Resources/**`）。
-
-### 6.2 改动文件（建议最小改动）
-
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderController.swift`
-  - 在 `resolvedTextRenderer()` 或相邻配置处增加选择逻辑（开关 / 版本策略）
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextBookBuilder.swift`
-  - 如需内联 link CSS：在获取 `rawHTML` 后做预处理（保持接口不变）
-
-## 7. 验收标准与验证方式（对应 REQUIREMENTS）
-
-### 对应 REND-01 / REND-03
-
-- 在 Demo 中打开 reflowable EPUB：
-  - 正文渲染不依赖 `WKWebView`（可通过日志/断点确认不走 `RDEPUBWebContentView`）
-  - CSS 分层生效：默认样式可控、主题/字号/行高变化可控
-  - 图片/链接至少可正确显示/响应（链接行为按现有 text 内容策略）
-
-### 对应 REND-02
-
-- Fixed Layout EPUB：仍走 `.webFixedLayout` → `WKWebView` 路径
-- 交互式 EPUB：仍走 `.webInteractive` → `WKWebView` 路径（桥接与外链不回归）
-
-### 对应 STAB-01 / STAB-02
-
-- `RDURLReaderController` 打开 `.epub` / `.txt` 主流程不回归
-- 至少使用以下 3 类 reflowable EPUB 样本进行回归：
-  - 样本 A：纯文本/小说类章节为主，验证基础段落、标题、分页与阅读位置恢复
-  - 样本 B：包含内嵌图片与多段样式的章节，验证图片显示、图片前后分页、基础 CSS 生效
-  - 样本 C：包含外链与多个 CSS 文件引用的章节，验证 baseURL、样式解析与链接呈现稳定性
-- 对以上样本的共同要求：不崩溃、不白屏、不无限加载；分页/翻页可用
-
-## 8. 风险清单与降级策略
-
-### 8.1 主要风险
-
-- R1：DTCoreText 对 EPUB 内嵌 CSS / `<link>` CSS 支持不足，导致样式缺失
-- R2：分页质量不足（断页不美观、图片分页异常）
-- R3：`hasInteractiveContent()` 判定过宽，导致大量书被误判为 `.webInteractive`，覆盖率不足
-
-### 8.2 降级/灰度（建议）
-
-- D1：增加一个“渲染引擎开关”（仅 debug 或 demo 可配置），可在出现严重问题时快速回退到现有 `RDEPUBDTCoreTextRenderer`
-- D2：对 `hasInteractiveContent()` 的判定提供可配置白名单/黑名单（例如按 manifest properties、按 tag 命中级别）
-
-## 9. 下一步（交接到开发）
-
-建议按 `Doc/ARCHITECTURE-CONTEXT.md` 中的架构决策逐步推进：
-
-- 先基于 `Doc/WXRead/analysis/*` 提炼“我们要实现的 CSS 分层最小集合”
-- 再在 `.textReflowable` renderer 里实现“分层 CSS 注入 + baseURL/资源解析兜底”
-- 最后用 Demo 书籍做回归，按问题驱动补齐分页/样式细节
-
----
-*Last updated: 2026-05-21 after discuss-feature-solution*
diff --git a/Doc/FeatureSolution/高亮选区复刻WXRead实现方案.md b/Doc/FeatureSolution/高亮选区复刻WXRead实现方案.md
deleted file mode 100644
index 0b448bb..0000000
--- a/Doc/FeatureSolution/高亮选区复刻WXRead实现方案.md
+++ /dev/null
@@ -1,365 +0,0 @@
-# 将高亮选区实现 1:1 复刻为 WXRead 架构
-
-## Context
-
-当前 ReadViewSDK 的高亮选区实现与 WXRead 存在根本性架构差异。需要将选区系统从"UITextView 透明代理 + 独立 overlay 层"迁移到 WXRead 的"自定义手势 + CoreText 直接命中测试 + 统一 drawRect 绘制"架构。
-
-## 核心差异对比
-
-| 维度 | 当前 ReadViewSDK | WXRead |
-|------|-----------------|--------|
-| 选择触发 | UITextView 原生长按（透明文本） | 自定义 long-press(0.5s) + pan 手势 |
-| 命中测试 | DTCoreText `stringIndex(forPosition:)` | `CTLineGetStringIndexForPosition` + 坐标翻转 |
-| 选区绘制 | 独立 `RDEPUBSelectionOverlayView` overlay 层 | 同一 `drawRect:` 内绘制（文字+高亮+选区） |
-| 高亮绘制 | overlay 层计算 rect 后 CG 填充 | `com.weread.highlight` 自定义属性注入 NSAttributedString，在 `drawInContext:` 中读取绘制 |
-| 菜单系统 | 自定义 `selectionActionBar` UIStackView | `UIMenuController` + 自定义 items |
-| 手势模型 | 无 pan 手势（UITextView 自带拖拽） | long-press 启动 + pan 扩展，`isSelecting` 控制 pan 启停 |
-| 视图层级 | 3 层 overlay（background + text + foreground） | 单一 WRPageView 统一绘制 |
-
----
-
-## Phase 1: 移除 UITextView，改用自定义手势 + CoreText 命中测试
-
-### 1.1 修改 `RDEPUBPageInteractionController.swift`
-
-当前已正确封装 DTCoreText 的 `stringIndex(forPosition:)` 和 `offset(forStringIndex:)`，算法与 WXRead 一致。
-
-**新增方法：**
-- `characterIndexForViewPoint(at viewPoint: CGPoint, in view: UIView)` — 将 UIKit 坐标转为相对于 content view 的坐标后调用 `characterIndex(at:)`，对应 WXRead 的 `stringIndexForPoint:` + `WRSFlipPointForCoreText`
-
-> 注意：DTCoreText 已在内部处理了 UIKit↔CoreText 坐标翻转（`line.baselineOrigin` 是 UIKit 坐标），所以不需要手动翻转 Y 轴。但 WXRead 的自定义 DTCoreText 需要手动翻转。当前项目用的是原版 DTCoreText pod，行为已正确。
-
-### 1.2 重构 `RDEPUBTextSelectionController.swift`
-
-**当前状态：** 遵循 `UITextViewDelegate`，通过 `textViewDidChangeSelection` 接收选区变化。`handleLongPress` 方法存在但未被任何手势调用。
-
-**改为：**
-- 移除 `UITextViewDelegate` 遵循
-- 移除 `textViewDidChangeSelection(_:)` 和 `textViewDidChangeSelection(_:, page:)`
-- 新增状态属性：`selectionStartIndex: Int = NSNotFound`、`selectionEndIndex: Int = NSNotFound`、`isSelecting: Bool = false`
-- 重构 `handleLongPress`：
-  - `.began`：调用 `characterIndex(at:)` 设置 `selectionStartIndex = selectionEndIndex = index`，设 `isSelecting = true`
-  - `.ended`：设 `isSelectionFromInteraction = false`（保留，供后续扩展）
-- 新增 `handlePan(_ gesture:, page:, renderView:, interactionController:)`：
-  - `.changed`：计算字符索引，更新 `selectionEndIndex`，计算 range = `(min, max - min)`，计算 rects，更新 renderView
-- 移除 `clearSelection` 的 `textView:` 参数
-- `makeSelection(from:, page:)` 保持不变（已正确基于绝对偏移构建 `RDEPUBSelection`）
-
-### 1.3 重构 `RDEPUBTextContentView.swift` — 移除 UITextView
-
-**删除：**
-- `textView: RDEPUBSelectableTextView` 属性及其初始化
-- `selectionProxyContent(from:)` 方法
-- `textView.delegate = selectionController` 等 textView 配置代码
-- `textView.frame = ...` 在 `layoutSubviews` 中的设置
-- `configure(page:...)` 中所有 `textView.attributedText = ...`、`textView.selectedRange = ...`、`textView.isHidden = ...` 赋值
-
-**新增手势识别器（对齐 WXRead 的 WRPageView）：**
-```swift
-private let longPressGR = UILongPressGestureRecognizer(target: ..., action: #selector(handleLongPress))
-private let panGR = UIPanGestureRecognizer(target: ..., action: #selector(handlePan))
-private let tapGR = UITapGestureRecognizer(target: ..., action: #selector(handleTap))
-```
-- `longPressGR.minimumPressDuration = 0.5`（与 WXRead 一致）
-- `panGR.isEnabled = false`（初始禁用，long-press began 时启用）
-- `tapGR.require(toFail: longPressGR)`（与 WXRead 一致）
-- 三个手势都添加到 contentView 自身
-
-**手势响应：**
-- `handleLongPress`：转发给 `selectionController.handleLongPress`，启用 `panGR`
-- `handlePan`：转发给 `selectionController.handlePan`
-- `handleTap`：如果 `selectionController.isSelecting` 则 `clearSelection()`，否则转发给 delegate 做工具栏切换
-
-**菜单改为 UIMenuController（对齐 WXRead）：**
-- 删除 `selectionActionBar: UIStackView` 及相关方法（`showSelectionActionBarIfNeeded`、`hideSelectionActionBar`、`updateSelectionActionBarFrame`、`selectionMenuButton`）
-- 在 `selectionController.onSelectionChanged` 回调中，当 selection 非 nil 时调用 `showSelectionMenu(in:anchorRect:)`
-- `RDEPUBTextContentView` 设为 `canBecomeFirstResponder = true`，override `canPerformAction` 仅允许三个自定义 selector
-- 使用 `UIMenuController.shared` 配置 "拷贝"/"高亮"/"批注" 三个 `UIMenuItem`
-
-**调整 `clearSelection()`：**
-```swift
-func clearSelection() {
-    currentSelection = nil
-    menuSelection = nil
-    panGR.isEnabled = false
-    selectionController.clearSelection(overlayView: overlayView, backgroundOverlayView: backgroundOverlayView)
-    UIMenuController.shared.setMenuVisible(false, animated: true)
-}
-```
-
-### 1.4 删除 `RDEPUBSelectableTextView.swift`
-
-该文件的功能（屏蔽系统菜单、暴露自定义 action）已被 UIMenuController 方案替代，直接删除。
-
-### 1.5 更新 `RDEPUBReaderController+ContentDelegates.swift`
-
-`textContentView(_:, didRequestSelectionAction:, selection:)` 中的 `contentView.clearSelection()` 调用无需改动，新的 `clearSelection()` 签名兼容。
-
-### Phase 1 验证
-- UI 测试 `ReaderAnnotationTests.testSelectionMenuCreatesHighlight` 必须通过
-- 手动验证：长按选词 → 弹出 UIMenuController → 点击"高亮" → 高亮创建成功
-- 手动验证：拖拽扩展选区 → 蓝色选区矩形正确绘制
-- 手动验证：单击空白处 → 选区清除
-
----
-
-## Phase 2: 统一绘制循环 — 高亮/选区在 draw(_:) 中绘制
-
-### 2.1 扩展 `RDEPUBTextPageRenderView.swift`
-
-**当前状态：** 仅调用 `layoutFrame.draw(in: context, options:)` 绘制文字。
-
-**新增属性：**
-```swift
-var highlightRanges: [(range: NSRange, color: UIColor)] = [] { didSet { setNeedsDisplay() } }
-var underlineRanges: [(range: NSRange, color: UIColor, style: Int)] = [] { didSet { setNeedsDisplay() } }
-var selectionRects: [CGRect] = [] { didSet { setNeedsDisplay() } }
-var selectionColor: UIColor = UIColor(red: 70/255, green: 140/255, blue: 1, alpha: 0.24)
-```
-
-**扩展 `draw(_:)`：**
-```swift
-override func draw(_ rect: CGRect) {
-    guard let context = UIGraphicsGetCurrentContext(), let layoutFrame else { return }
-    context.saveGState()
-
-    // 1. 绘制高亮背景（在文字下方，匹配 WXRead 的 drawHighlightsInContext:）
-    drawHighlights(in: context, layoutFrame: layoutFrame)
-
-    // 2. 绘制文字
-    layoutFrame.draw(in: context, options: drawOptions)
-
-    // 3. 绘制选区（在文字上方，匹配 WXRead 的 _drawSelectionInContext:）
-    drawSelection(in: context)
-
-    context.restoreGState()
-}
-```
-
-**`drawHighlights` 算法（对齐 WXRead `WRCoreTextLayoutFrame.drawHighlightsInContext:`）：**
-```swift
-private func drawHighlights(in context: CGContext, layoutFrame: DTCoreTextLayoutFrame) {
-    for (range, color) in highlightRanges {
-        let lines = layoutFrame.lines as! [DTCoreTextLayoutLine]
-        for line in lines {
-            let overlap = NSIntersectionRange(range, line.stringRange)
-            guard overlap.length > 0 else { continue }
-            let startX = line.offset(forStringIndex: overlap.location)
-            let endX = line.offset(forStringIndex: overlap.location + overlap.length)
-            let rect = CGRect(
-                x: line.baselineOrigin.x + startX,
-                y: line.baselineOrigin.y - line.ascent,
-                width: endX - startX,
-                height: line.ascent + line.descent
-            )
-            color.withAlphaComponent(0.35).setFill()  // WXRead 使用 35% alpha
-            context.fill(rect)
-        }
-    }
-}
-```
-
-> 说明：WXRead 使用 `[color colorWithAlphaComponent:0.3]`，WRPageHighlight 的预设色本身已是 35% alpha，最终效果等同。当前项目使用 0.45 alpha，需调整为 0.35 以完全对齐。
-
-**`drawSelection` 算法（对齐 WXRead `_drawSelectionInContext:`）：**
-```swift
-private func drawSelection(in context: CGContext) {
-    guard !selectionRects.isEmpty else { return }
-    selectionColor.setFill()
-    for rect in selectionRects {
-        context.fill(rect)
-    }
-}
-```
-
-### 2.2 简化 `RDEPUBTextContentView.swift` 视图层级
-
-**删除/保留：**
-- 删除 `backgroundOverlayView` 属性（高亮背景现在由 renderView 在文字下方绘制）
-- 保留 `overlayView`（用于非 DTCoreText 回退路径和搜索高亮）
-- `configure(page:...)` 中，将 highlight 数据传给 `coreTextContentView` 而非 overlayView：
-
-```swift
-// DTCoreText 路径
-coreTextContentView.highlightRanges = highlights.compactMap { highlight -> (NSRange, UIColor)? in
-    guard let rangeInfo = highlight.rangeInfo,
-          let info = RDEPUBTextOffsetRangeInfo.decode(from: rangeInfo) else { return nil }
-    let absoluteRange = info.nsRange
-    let overlap = NSIntersectionRange(absoluteRange, pageAbsoluteRange)
-    guard overlap.length > 0 else { return nil }
-    let relativeRange = NSRange(location: overlap.location - page.pageStartOffset, length: overlap.length)
-    return (relativeRange, highlight.uiColor)
-}
-```
-
-### 2.3 更新 `RDEPUBTextSelectionController.swift` — 直接更新 renderView
-
-- `handleLongPress` 和 `handlePan` 现在直接更新 `renderView.selectionRects` 并调用 `renderView.setNeedsDisplay()`
-- 移除 `overlayView.updateSelection(absoluteRange:, rects:)` 调用
-
-### Phase 2 验证
-- 视觉对比：高亮矩形与文字像素对齐
-- 性能测试：单次 `draw(_:)` 耗时应与之前持平或更快
-- 回归测试：搜索高亮仍正常显示
-
----
-
-## Phase 3: 高亮属性注入 NSAttributedString（对齐 WXRead `com.weread.highlight`）
-
-### 3.1 定义自定义属性常量
-
-```swift
-// 对齐 WXRead 的 kWRHighlightAttributeName / kWRUnderlineAttributeName
-let kRDEPUBHighlightAttributeName = NSAttributedString.Key("com.rdreader.highlight")
-let kRDEPUBUnderlineAttributeName = NSAttributedString.Key("com.rdreader.underline")
-```
-
-### 3.2 新增 `RDEPUBChapterData.applyHighlights(to:page:highlights:)`
-
-对齐 WXRead 的 `WRChapterData.addHighlightInRange:key:itemId:color:`：
-
-```swift
-func applyHighlights(
-    to content: NSMutableAttributedString,
-    page: RDEPUBTextPage,
-    highlights: [RDEPUBHighlight]
-) {
-    for highlight in highlights {
-        guard let rangeInfo = highlight.rangeInfo,
-              let info = RDEPUBTextOffsetRangeInfo.decode(from: rangeInfo) else { continue }
-        let absoluteRange = info.nsRange
-        let pageRange = NSRange(location: page.pageStartOffset, length: page.pageEndOffset - page.pageStartOffset)
-        let overlap = NSIntersectionRange(absoluteRange, pageRange)
-        guard overlap.length > 0 else { continue }
-        let relativeRange = NSRange(location: overlap.location - page.pageStartOffset, length: overlap.length)
-
-        switch highlight.style {
-        case .highlight:
-            content.addAttribute(kRDEPUBHighlightAttributeName, value: highlight.uiColor, range: relativeRange)
-        case .underline:
-            content.addAttribute(kRDEPUBUnderlineAttributeName, value: highlight.uiColor, range: relativeRange)
-        }
-    }
-}
-```
-
-### 3.3 `RDEPUBTextPageRenderView.draw(_:)` 从属性读取高亮
-
-替代 Phase 2 的 `highlightRanges` 属性方案，改为在 `draw(_:)` 中枚举 attributed string 的自定义属性：
-
-```swift
-private func drawHighlightsFromAttributes(in context: CGContext, attributedString: NSAttributedString) {
-    let fullRange = NSRange(location: 0, length: attributedString.length)
-    attributedString.enumerateAttribute(kRDEPUBHighlightAttributeName, in: fullRange) { value, range, _ in
-        guard let color = value as? UIColor else { return }
-        let rects = computeRects(for: range)  // 复用 line 迭代 + CTLineGetOffsetForStringIndex
-        color.withAlphaComponent(0.35).setFill()
-        for rect in rects { context.fill(rect) }
-    }
-}
-```
-
-### 3.4 更新 `RDEPUBTextContentView.configure(page:...)`
-
-```swift
-// 在传给 renderView 之前注入高亮属性
-let displayContent = darkImageAdjustedContentIfNeeded(...)
-chapterData.applyHighlights(to: displayContent, page: page, highlights: highlights)
-coreTextContentView.attributedDisplayContent = displayContent  // 新增属性
-```
-
-### Phase 3 验证
-- 高亮在翻页后仍正确显示（属性嵌入 attributed string，不依赖外部状态）
-- 高亮颜色、alpha、rect 与 WXRead 截图一致
-
----
-
-## Phase 4: 手势模型对齐 — long-press + pan + isSelecting
-
-### 4.1 手势冲突处理
-
-**风险：** pan 手势（选区扩展）可能与 RDReaderView 的翻页手势冲突。
-
-**解决方案（对齐 WXRead）：**
-- `panGR` 初始 `isEnabled = false`，仅在 `isSelecting = true` 时启用
-- `clearSelection()` 时禁用 `panGR`
-- 新增 delegate 方法通知父视图：
-  ```swift
-  func textContentViewDidBeginSelection(_ contentView: RDEPUBTextContentView)
-  func textContentViewDidEndSelection(_ contentView: RDEPUBTextContentView)
-  ```
-- `RDReaderView` 在 `didBeginSelection` 时禁用翻页手势，在 `didEndSelection` 时恢复
-
-### 4.2 WXRead 手势时序对齐
-
-WXRead 的手势流程：
-1. long-press `.began` → 设置 `selectionStartIndex = selectionEndIndex = index`，`isSelecting = true`，启用 panGR，`setNeedsDisplay`
-2. long-press `.ended` → 无额外操作（保留选区）
-3. pan `.changed` → 更新 `selectionEndIndex`，计算 rects，`setNeedsDisplay`
-4. single tap → `clearSelection()`，禁用 panGR
-
-### Phase 4 验证
-- 长按选词 → 拖拽扩展 → 单击取消，全流程流畅
-- 无选区时翻页手势正常
-- 有选区时翻页手势被禁用
-
----
-
-## Phase 5: 菜单系统对齐 + 清理
-
-### 5.1 UIMenuController 替换 selectionActionBar
-
-已在 Phase 1 中完成。此阶段仅做清理：
-- 删除 `RDEPUBSelectableTextView.swift`
-- 标记 `RDEPUBSelectionOverlayView.swift` 和 `RDEPUBTextPageDecorationView.swift` 为 deprecated（保留给非 DTCoreText 回退路径）
-
-### 5.2 更新 UI 测试
-
-`ReaderAnnotationTests` 中查找菜单项的方式需更新：
-- 当前：`app.buttons["高亮"]`（UIStackView 中的按钮）
-- 改为：`app.menuItems["高亮"]`（UIMenuController 的菜单项）
-- 或者：保留 `accessibilityIdentifier` 在 RDEPUBTextContentView 上以便测试定位
-
-### 5.3 高亮颜色对齐
-
-WXRead 的 5 种预设色（35% alpha）：
-- Yellow: `(1.0, 0.92, 0.23, 0.35)`
-- Blue: `(0.26, 0.65, 0.96, 0.35)`
-- Red: `(0.96, 0.26, 0.26, 0.35)`
-- Green: `(0.30, 0.85, 0.39, 0.35)`
-- Purple: `(0.67, 0.33, 0.97, 0.35)`
-
-当前项目使用 CSS hex 颜色 + 0.45 alpha，需对齐为 WXRead 的 RGBA 值。
-
----
-
-## 文件变更清单
-
-| 文件 | 操作 | Phase |
-|------|------|-------|
-| `RDEPUBPageInteractionController.swift` | 修改：新增 `characterIndexForViewPoint` | 1 |
-| `RDEPUBTextSelectionController.swift` | 重构：移除 UITextViewDelegate，新增 pan 处理、状态机 | 1 |
-| `RDEPUBTextContentView.swift` | 重构：移除 textView，新增手势，替换菜单，简化层级 | 1,2,4 |
-| `RDEPUBSelectableTextView.swift` | **删除** | 1 |
-| `RDEPUBTextPageRenderView.swift` | 扩展：新增高亮/选区/下划线绘制逻辑 | 2,3 |
-| `RDEPUBChapterData.swift` | 新增：`applyHighlights(to:page:highlights:)` | 3 |
-| `RDEPUBReaderController+ContentDelegates.swift` | 小改：适配新 clearSelection 签名 | 1 |
-| `RDReaderView.swift` | 新增：选区期间禁用翻页手势 | 4 |
-| `RDEPUBSelectionOverlayView.swift` | 保留（deprecated for DTCoreText path） | 5 |
-| `RDEPUBTextPageDecorationView.swift` | 保留（deprecated for DTCoreText path） | 5 |
-| `RDEPUBTextAnnotationOverlay.swift` | 保留（deprecated for DTCoreText path） | 5 |
-| `ReaderAnnotationTests.swift` | 更新：菜单项查找方式 | 5 |
-
-## 验证方案
-
-1. **UI 测试**：`ReaderAnnotationTests` 全部通过
-2. **手动测试**：
-   - 长按选词 → 蓝色选区高亮显示
-   - 拖拽扩展选区 → 选区跟随手指
-   - 点击"高亮" → 黄色高亮创建成功
-   - 翻页后返回 → 高亮仍存在
-   - 点击"拷贝" → 文本已复制
-   - 点击"批注" → 弹出笔记输入框
-   - 单击空白处 → 选区清除
-3. **性能测试**：`draw(_:)` 耗时 ≤ 之前（单次绘制 vs 三次绘制）
-4. **对比验证**：与 WXRead 截图对比高亮颜色、alpha、rect 位置
diff --git a/Doc/SDK架构整改路线图.md b/Doc/SDK架构整改路线图.md
deleted file mode 100644
index 3458a44..0000000
--- a/Doc/SDK架构整改路线图.md
+++ /dev/null
@@ -1,740 +0,0 @@
-# ReadViewSDK 架构整改路线图
-
-> 最后更新：2026-06-22
-> 适用范围：`Sources/RDReaderView/` 下的 EPUB 阅读器 SDK 主体代码
-> 目标性质：可执行整改方案，而不是纯讨论文档
-
----
-
-## 1. 文档目标
-
-本文将当前 SDK 的架构问题整理为一份可逐阶段推进的整改路线图，目标是解决以下五类核心问题：
-
-1. 共享状态与 UI 环境混杂，导致隐藏依赖过多。
-2. 运行时协调中心过大，新增需求持续回流到单一大类。
-3. 章节加载、分页、定位、选区等关键链路存在同步边界与模型重复。
-4. 阅读容器层、业务控制层、渲染能力层之间的职责边界还不够稳定。
-5. 用户感知最强的性能问题缺少独立的优先修复阶段。
-
-本文不追求一次性重写，而强调：
-
-- 先收口依赖方向
-- 再拆核心状态与服务
-- 最后统一抽象与模块边界
-
----
-
-## 2. 当前架构问题摘要
-
-基于当前代码，主要问题集中在以下对象与层次：
-
-### 2.1 `RDEPUBReaderContext` 过重
-
-涉及文件：
-
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderContext.swift`
-
-当前同时承担：
-
-- 共享状态容器
-- UI 环境查询入口
-- service locator
-- render/layout 参数推导
-- controller/runtime 反向跳转
-
-这会让下层对象表面上只依赖 `context`，实际上隐式依赖整棵 UI 树与运行时生命周期。
-
-### 2.2 `RDEPUBReaderRuntime` 过大
-
-涉及文件：
-
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderRuntime.swift`
-
-当前问题：
-
-- 持有大量 coordinator
-- 继续承接大量 facade API
-- 同时编排分页、章节窗口、选区、书签、高亮、设置预览、page map 替换等多领域逻辑
-
-结果是 runtime 已经成为事实上的架构中心点。
-
-### 2.3 存在危险同步边界
-
-涉及文件：
-
-- `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift`
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderContext.swift`
-
-当前风险：
-
-- 同步章节加载仍保留在系统内部
-- 后台线程获取分页尺寸时可能回主线程同步查询
-- 长链路上仍可能形成“主线程等后台，后台等主线程”的死锁型结构
-
-### 2.4 分页状态模型重复
-
-涉及对象：
-
-- `bookPageMap`
-- `pendingFullPageMap`
-- `chapter window snapshot`
-- `readingSession.activePages/activeChapters`
-
-当前问题：
-
-- 多套近似模型并存
-- takeover/reconciliation 规则分散
-- 维护“当前阅读窗口”的逻辑被多个对象共同持有
-
-### 2.5 `RDReaderView` 既是容器又是兼容层
-
-涉及文件：
-
-- `Sources/RDReaderView/ReaderView/RDReaderView.swift`
-- `Sources/RDReaderView/ReaderView/RDReaderViewProtocols.swift`
-
-当前问题：
-
-- 同时承载 page curl / scroll / dual-page / preload / tool chrome
-- 同时兼容 `RDReaderDataSource` 与 `RDReaderPageProvider`
-- 既做分页容器，又承担历史 API 适配职责
-
----
-
-## 3. 整改原则
-
-整改过程中遵循以下原则：
-
-1. 不做一次性全量重写，采用分阶段替换。
-2. 优先解决依赖方向错误，再解决类过大问题。
-3. 所有阶段都必须保持 Demo 可运行、SDK 公共 API 尽量兼容。
-4. 先抽象内部接口，再清理外部旧接口。
-5. 每个阶段结束时必须有可验证的稳定输出。
-
----
-
-## 4. 总体阶段划分
-
-建议分为 6 个阶段推进：
-
-1. Phase 0：建立基线与护栏
-2. Phase 0.5：优先消除主线程同步加载与跨章节翻页卡顿
-3. Phase 1：收缩 `Context`，切开环境与状态
-4. Phase 2：拆分 `Runtime` 与章节加载编排
-5. Phase 3：统一分页状态模型与导航状态机
-6. Phase 4：收敛 `ReaderView` 抽象与模块边界
-
-建议执行顺序不可颠倒。
-
-原因：
-
-- 如果不先建立基线，后续性能与结构整改缺少可验证参照。
-- 如果不先把最强用户痛点独立处理，后续阶段虽然架构更干净，但用户体感改善会滞后。
-- `Context` 拆分是中期结构整改前置条件，但不是修复同步加载卡顿的前置条件。
-- 如果不先拆 `Runtime`，分页模型和容器抽象重构会继续回流到 runtime。
-- 如果不先统一分页状态模型，后续 UI/容器抽象无法稳定。
-
----
-
-## 5. Phase 0：建立基线与护栏
-
-### 5.1 目标
-
-在重构前建立可回归的技术基线，避免“结构越改越好，但行为逐渐漂移”。
-
-### 5.2 主要工作
-
-1. 建立架构整改分支与阶段文档索引。
-2. 为以下关键链路补 smoke 验证清单：
-   - 打开一本大书
-   - 跨章节连续翻页
-   - 恢复上次阅读位置
-   - 搜索关键字并跳转
-   - 长按选区并添加高亮
-   - 打开目录远跳
-3. 补充日志观察点：
-   - 章节首次构建耗时
-   - `bookPageMap` 扩展/替换次数
-   - CFI 延迟构建完成次数
-   - 页面静态底图缓存命中率
-4. 把“禁止 UI 主路径同步章节加载”加成断言或日志告警。
-5. 补充用户感知最直接的观测指标：
-   - 翻页路径主线程阻塞时长
-   - 跨章节翻页帧稳定性
-   - 预加载命中率
-
-### 5.3 建议修改文件
-
-- `Doc/TESTING.md`
-- `Doc/ARCHITECTURE.md`
-- `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBBackgroundTrace.swift`
-- 必要时新增轻量调试开关文件
-
-### 5.4 验收标准
-
-- 有一份明确的人工回归 checklist
-- 核心链路能通过现有 Demo 手工验证
-- 关键性能/状态切换点有结构化日志
-
-### 5.5 关键观测指标
-
-Phase 0 结束前，建议至少具备以下指标：
-
-1. `prepareOnDemandChapter` 主线程 wall clock
-   - 目标：识别是否仍有 UI 主路径同步等待章节构建
-2. 跨章节翻页时的帧稳定性
-   - 可使用 `os_signpost`、`CADisplayLink` 或简化采样方案
-   - 目标：量化“动画有没有明显掉帧”
-3. `RDReaderPreloadController.takePreloadedView(for:)` 命中率
-   - 目标：评估预加载是否真的在帮助翻页，而不是名义存在
-4. `bookPageMap` 扩展/替换频次
-   - 目标：评估分页窗口切换是否过于频繁
-5. CFI 延迟构建次数与完成耗时
-   - 目标：评估交互增强能力是否被延迟过度
-
----
-
-## 6. Phase 0.5：优先消除主线程同步加载与跨章节翻页卡顿
-
-### 6.1 目标
-
-在不等待大规模结构拆分的前提下，优先解决用户感知最强的问题：
-
-- 跨章节翻页时主线程阻塞
-- 章节边界预加载命中不足
-- 页面进入时重复重绘开销过高
-
-这是最高优先级阶段，目标是尽快让用户在大书场景下获得可感知的流畅度提升。
-
-### 6.2 主要问题链路
-
-当前高风险链路集中在：
-
-- `RDEPUBReaderController+DataSource.pageContentView`
-- `RDEPUBReaderController+DataSource.pageNum`
-- `RDEPUBReaderRuntime.prepareOnDemandChapter`
-- `RDEPUBReaderRuntime.extendPartialBookPageMapIfNeeded`
-- `RDEPUBChapterLoader.loadChapterSynchronouslyForMigration`
-- `RDReaderPreloadController`
-- `RDEPUBTextPageRenderView`
-
-### 6.3 具体工作
-
-1. 将普通翻页路径上的章节准备改为异步
-   - `prepareOnDemandChapter` 不再在 UI 主路径同步等待章节构建
-   - 允许返回占位页，章节就绪后刷新当前可见内容
-2. 将 `extendPartialBookPageMapIfNeeded` 改为后台批量加载
-   - 不在 `pageNum` 回调中同步循环加载多个章节
-   - 加载完成后回主线程合并 `bookPageMap`
-3. 前移跨章节预热
-   - 用户接近章节尾页时提前 lookahead 下一章或下两章
-   - 不等 `pageContentView` 被请求后才开始准备
-4. 调整预加载半径与策略
-   - `RDReaderPreloadController.radius` 不再固定为章节内相邻 1 页思维
-   - 预加载应感知章节边界，而不只是页号连续性
-5. 为 `RDEPUBTextPageRenderView` 引入静态内容缓存
-   - 避免页面进入或选区变化时重复完整 CoreText 绘制
-   - 将“静态底图”和“动态选区/交互覆盖”尽量分离
-6. 明确 `contentMode = .redraw` 的优化策略
-   - 不建议简单把 `contentMode` 改成缩放模式来规避重绘
-   - 建议对静态文本层使用手动位图缓存，必要时再评估 `CATiledLayer`
-   - 动态选区、高亮交互层应保持独立 overlay，避免拖拽选区时重绘整页文本
-7. 为主线程阻塞建立监控
-   - 重点观察跨章节翻页与恢复定位路径
-
-### 6.4 建议修改文件
-
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderController+DataSource.swift`
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderRuntime.swift`
-- `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift`
-- `Sources/RDReaderView/ReaderView/Paging/RDReaderPreloadController.swift`
-- `Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextPageRenderView.swift`
-- `Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentView.swift`
-
-### 6.5 阶段边界
-
-本阶段只解决“同步改异步”和“预热/缓存前移”的问题，不强行做大规模类拆分。
-
-也就是说：
-
-- 可以调整方法签名
-- 可以新增轻量状态与回调
-- 但不以“四服务化拆分 `RDEPUBChapterLoader`”为本阶段目标
-
-### 6.6 风险点
-
-- 占位页策略若处理不当，可能从“卡顿”变成“短暂空白”
-- 异步章节准备如果重复触发，可能导致重复刷新和抖动
-- `bookPageMap` 合并时若定位恢复策略不稳定，可能引起页码闪跳
-
-### 6.7 阶段验收
-
-- 普通翻页主路径不再依赖 UI 主线程同步章节加载
-- 跨章节翻页体感明显改善
-- 主线程阻塞监控下降到可接受水平
-- 预加载命中率比整改前提高
-- 选区拖拽时不再频繁整页重绘
-
----
-
-## 7. Phase 1：收缩 Context，切开环境与状态
-
-### 7.1 目标
-
-把当前 `RDEPUBReaderContext` 从“全能对象”收缩为组合式对象，降低隐藏依赖。
-
-### 7.2 改造结果
-
-整改后至少形成三个对象：
-
-#### `RDEPUBReaderState`
-
-负责纯运行状态：
-
-- `parser`
-- `publication`
-- `readingSession`
-- `textBook`
-- `bookPageMap`
-- `pendingFullPageMap`
-- `activeBookmarks`
-- `activeHighlights`
-- `searchState`
-- `currentSelection`
-
-#### `RDEPUBReaderEnvironment`
-
-负责 UI 与设备环境：
-
-- viewport size
-- safeAreaInsets
-- traitCollection 抽象
-- brightness
-- fallbackViewportSize
-
-#### `RDEPUBReaderServices`
-
-负责工厂与外部依赖：
-
-- parser factory
-- paginator factory
-- text renderer factory
-- text builder factory
-- persistence
-- cache repository factory
-
-### 7.3 具体步骤
-
-1. 新增文件：
-   - `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderState.swift`
-   - `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderEnvironment.swift`
-   - `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderServices.swift`
-2. 让 `RDEPUBReaderController` 初始化并持有这三个对象。
-3. `RDEPUBReaderContext` 第一阶段暂时保留，但只作为过渡门面。
-4. 逐步把这些方法迁出 `Context`：
-   - `currentLayoutContext()`
-   - `currentTextPageSize()`
-   - `currentTextRenderStyle()`
-   - `currentTextLayoutConfig(pageSize:)`
-   - `makeParser()`
-   - `makePaginator()`
-   - `makeTextBookBuilder(...)`
-5. 移除 `context.runtime` 这种反向访问。
-6. 下层对象改成显式注入自己真正需要的 state/environment/services。
-
-### 7.4 优先改造对象
-
-1. `RDEPUBReaderPaginationCoordinator`
-2. `RDEPUBReaderLocationCoordinator`
-3. `RDEPUBChapterLoader`
-4. `RDEPUBReaderRuntime`
-
-### 7.5 风险点
-
-- 迁移过程中容易出现旧 `context` 和新 `state/environment/services` 双写。
-- 必须在阶段末关闭旧入口，否则后续会继续新增对 `context` 的依赖。
-
-### 7.6 阶段验收
-
-- `RDEPUBReaderContext` 不再直接访问 `controller.view`
-- `RDEPUBReaderContext` 不再暴露 `runtime`
-- 后台线程不再通过 `context` 回主线程同步取分页尺寸
-
----
-
-## 8. Phase 2：拆分 Runtime 与章节加载编排
-
-### 8.1 目标
-
-把当前大而全的 runtime 拆成稳定的领域 facade，并把章节加载逻辑从“对象内联编排”改成“服务化编排”。
-
-### 8.2 拆分方向
-
-建议把 `RDEPUBReaderRuntime` 拆为以下 3 类 facade：
-
-#### `RDEPUBNavigationRuntime`
-
-负责：
-
-- 恢复阅读位置
-- 跳转到页码/目录/高亮/书签
-- 章节窗口维护
-- jump session
-
-#### `RDEPUBPresentationRuntime`
-
-负责：
-
-- 分页
-- `bookPageMap` / `pendingFullPageMap`
-- viewport monitor
-- settings preview
-- 当前快照替换
-
-#### `RDEPUBAnnotationRuntime`
-
-负责：
-
-- 高亮
-- 批注
-- 书签
-- 当前选区
-- 搜索结果定位联动
-
-### 8.3 章节加载服务化
-
-当前 `RDEPUBChapterLoader` 既做缓存命中、章节构建、磁盘写回、延迟 CFI、主线程回调。Phase 2 不建议一开始就强制拆成 4 个服务，而是建议在 Phase 0.5 完成异步化后，根据残余复杂度做渐进式收口。
-
-优先建议的落地方式是：
-
-- 保留 `RDEPUBChapterLoader` 作为过渡门面
-- 先抽出稳定边界最清晰的构建与缓存职责
-- 把预热、lookahead、延迟 CFI、优先级调度收口到一个协调对象，而不是立即拆成多个小服务
-
-第一轮更合适的职责拆分可以是：
-
-#### `RDEPUBChapterBuildService`
-
-- 输入：spineIndex + render/layout context
-- 输出：`RDEPUBRuntimeChapter`
-- 不关心 UI、不关心回调、不关心磁盘缓存
-
-#### `RDEPUBChapterCacheRepository`
-
-- 管理内存缓存与磁盘摘要缓存
-- 提供统一读写接口
-
-#### `RDEPUBChapterWarmupOrchestrator`
-
-- 负责预热章节
-- 负责延迟 CFI 构建
-- 负责边界 lookahead 预取
-- 负责导航优先级、预取优先级、取消与串行化策略
-
-如果后续复杂度继续上升，再考虑把 `WarmupOrchestrator` 继续拆成更细的 service；但这不应作为当前阶段的先决交付物。
-
-### 8.4 具体步骤
-
-1. 新增 facade 文件与必要的 service 文件。
-2. 把 `RDEPUBReaderRuntime` 中的公共 API 先转发到新 facade。
-3. 再把具体逻辑迁走。
-4. `RDEPUBChapterLoader` 先收缩为过渡门面，内部优先委派到 build/cache/warmup orchestration。
-5. `RDEPUBReaderRuntime` 最终只保留一个薄门面，负责兼容旧调用。
-
-### 8.5 风险点
-
-- facade 与旧 runtime 并存期较长，容易出现调用路径重复。
-- 如果服务拆分粒度过细，可能先增加调用跳转和维护成本，收益却不明显。
-- 章节加载优先级与取消策略若迁移不完整，可能引入新的页面空白或重复构建。
-
-### 8.6 阶段验收
-
-- `RDEPUBReaderRuntime.swift` 行数明显下降
-- 章节加载主逻辑不再集中在单文件
-- `RDEPUBReaderRuntime` 不再直接操作章节缓存细节
-
----
-
-## 9. Phase 3：统一分页状态模型与导航状态机
-
-### 9.1 目标
-
-统一分页窗口模型，并把关键导航链路从“多个 bool/pending 值”升级为显式状态机。
-
-### 9.2 要解决的问题
-
-当前并存：
-
-- `bookPageMap`
-- `pendingFullPageMap`
-- `chapter window snapshot`
-- `readingSession.activePages`
-
-这些对象都在表达“用户当前能看到什么”，只是层次不同，导致 takeover 和刷新规则分散。
-
-### 9.3 目标模型
-
-建议建立统一的分页状态对象，例如：
-
-```swift
-struct RDEPUBPaginationState {
-    var activeWindow: RDEPUBPageWindow
-    var candidateFullMap: RDEPUBBookPageMap?
-    var chapterWindowSnapshot: RDEPUBChapterWindowSnapshot?
-    var source: Source
-}
-```
-
-配套引入状态机：
-
-```swift
-enum RDEPUBNavigationState {
-    case idle
-    case initialLoading
-    case restoringLocation
-    case preparingChapter(spineIndex: Int)
-    case presentingWindow
-    case reconcilingFullMap
-    case repaginating
-}
-```
-
-### 9.4 具体步骤
-
-1. 新增 `RDEPUBPaginationState.swift`
-2. 新增 `RDEPUBNavigationStateMachine.swift`
-3. 把以下逻辑统一收口：
-   - `applyBookPageMap`
-   - `refreshBookPageMapInPlace`
-   - `applyPendingFullPageMapIfNeeded`
-   - `extendPartialBookPageMapIfNeeded`
-   - jump session 覆盖判断
-4. 所有页码替换、窗口扩展、完整 map takeover 都必须经过统一 evaluator。
-5. 把当前 scattered bool 收敛：
-   - `isRepaginating`
-   - `didStartInitialLoad`
-   - `isSettingsPanelOpen`
-   - `needsFullRepaginationAfterSettingsClose`
-
-### 9.5 风险点
-
-- 这是最容易影响“当前页恢复”和“目录跳转”的阶段。
-- 必须先保留旧日志与旧行为兜底，再切换状态机入口。
-
-### 9.6 阶段验收
-
-- 翻页、远跳、恢复位置、设置变更后 repagination 都走统一状态流
-- 不再出现多个对象各自判断“是否该替换当前窗口”
-- `bookPageMap` 与 snapshot 的来源关系更清晰
-
----
-
-## 10. Phase 4：收敛 ReaderView 抽象与模块边界
-
-### 10.1 目标
-
-让 `RDReaderView` 重新成为“通用阅读分页容器”，而不是业务与兼容逻辑混合层。
-
-### 10.2 具体方向
-
-#### 统一 Provider 协议
-
-对外保留：
-
-- `RDReaderPageProvider`
-
-逐步废弃：
-
-- `RDReaderDataSource`
-- `RDReaderLegacyDataSourceAdapter`
-
-#### 拆分 ReaderView 角色
-
-建议拆成以下内部组件：
-
-- `RDReaderPagingSurface`
-- `RDReaderChromeHost`
-- `RDReaderInteractionRouter`
-- `RDReaderPreloadManager`
-
-#### 收紧模块依赖
-
-需要形成明确约束：
-
-- `EPUBCore` 不依赖 `EPUBUI`
-- `EPUBTextRendering` 不依赖 `UIViewController`
-- `ReaderView` 不依赖 `RDEPUBReaderController`
-- `TextPage` 只依赖页面模型与交互协议，不直接访问 controller/runtime
-
-### 10.3 具体步骤
-
-1. 先把 `RDEPUBReaderController` 改成只通过 `RDReaderPageProvider` 对接容器。
-2. 给旧 `RDReaderDataSource` 增加 deprecate 注释。
-3. 把 tool view、tap routing、单双页布局决策进一步下沉到 ReaderView 内部组件。
-4. 整理 `ReaderView` 对业务对象的隐式假设。
-
-### 10.4 风险点
-
-- 这是 API 层整改，最容易影响 SDK 使用方。
-- 如果已有外部方直接实现 `RDReaderDataSource`，需要提供过渡期。
-
-### 10.5 阶段验收
-
-- `RDEPUBReaderController` 与 `RDReaderView` 之间只通过 page provider 交互
-- `RDReaderLegacyDataSourceAdapter` 不再是主路径依赖
-- ReaderView 层可以被描述为“业务无关的分页容器”
-
----
-
-## 11. 配套横向任务
-
-这些任务建议穿插在各阶段中进行：
-
-### 11.1 建立缓存协议层
-
-建议新增：
-
-- `RDEPUBPageRenderCacheKey`
-- `RDEPUBPageRenderCacheStore`
-- `RDEPUBRenderInvalidationPolicy`
-
-目标：
-
-- 统一字体/主题/尺寸/highlight/search 的缓存失效规则
-- 让底图缓存不再散落在 view 内部
-
-### 11.2 建立定位能力层
-
-建议新增：
-
-- `RDEPUBTextAnchorService`
-- `RDEPUBSelectionLocationService`
-- `RDEPUBSearchAnchorService`
-
-目标：
-
-- 把 CFI、rangeAnchor、fragmentOffset 相关逻辑从 UI 与 text rendering 之间抽离
-
-### 11.3 建立仓储接口
-
-建议新增协议：
-
-- `RDEPUBChapterSummaryRepository`
-- `RDEPUBPageCountRepository`
-- `RDEPUBAnnotationRepository`
-
-目标：
-
-- 解耦 loader 与具体缓存实现
-- 便于做测试与未来存储替换
-
----
-
-## 12. 建议执行顺序
-
-建议按以下顺序创建实施任务：
-
-1. `phase-0-baseline-and-guardrails`
-2. `phase-0-5-remove-main-thread-sync-loading`
-3. `phase-1-context-split`
-4. `phase-2-runtime-and-chapter-orchestration-split`
-5. `phase-3-pagination-state-unification`
-6. `phase-4-reader-view-abstraction-cleanup`
-7. `horizontal-cache-and-anchor-services`
-
-原因：
-
-- Phase 0.5 解决最强用户痛点，且不依赖 `Context` 拆分。
-- Phase 1 是中期结构整改前置条件，但不是性能解阻塞前置条件。
-- Phase 2 如果先做，会继续依赖旧 context。
-- Phase 3 必须建立在 runtime 拆分之后，否则状态机会继续长进 runtime。
-- Phase 4 应该最后做，避免 UI 容器抽象在业务状态还不稳定时反复返工。
-
----
-
-## 13. 每阶段交付物清单
-
-### Phase 0
-
-- 基线文档
-- smoke checklist
-- 日志观测点
-
-### Phase 0.5
-
-- 异步化的 `prepareOnDemandChapter`
-- 异步化的 `extendPartialBookPageMapIfNeeded`
-- 跨章节预热逻辑
-- 预加载半径与章节边界感知策略调整
-- `RDEPUBTextPageRenderView` 静态内容缓存
-- 主线程阻塞监控数据与整改前后对比
-
-### Phase 1
-
-- `RDEPUBReaderState`
-- `RDEPUBReaderEnvironment`
-- `RDEPUBReaderServices`
-- 过渡版 `RDEPUBReaderContext`
-
-### Phase 2
-
-- runtime facade 拆分
-- 渐进式的 chapter build/cache/warmup orchestration 收口
-- 过渡版 `RDEPUBChapterLoader` 门面
-- 旧 runtime 兼容门面
-
-### Phase 3
-
-- `RDEPUBPaginationState`
-- `RDEPUBNavigationStateMachine`
-- 统一 takeover/reconciliation 入口
-
-### Phase 4
-
-- `RDReaderPageProvider` 成为唯一主协议
-- ReaderView 组件化
-- 模块依赖约束文档
-
----
-
-## 14. 验收口径
-
-整改完成后，至少满足以下口径：
-
-1. 普通翻页、跨章节翻页、目录远跳、恢复位置不再依赖 UI 主线程同步加载章节。
-2. 下层服务不再通过 `context` 反向访问 `controller` 或 `runtime`。
-3. `RDEPUBReaderRuntime` 不再是主要业务实现载体，而是兼容门面。
-4. 分页状态替换与窗口扩展有单一入口。
-5. `RDReaderView` 可以独立描述为容器层，不持有明显业务规则。
-
----
-
-## 15. 不建议立即做的事
-
-以下事项不建议在第一轮整改中做：
-
-1. 全量改名或移动全部文件目录。
-2. 直接重写分页系统。
-3. 直接废弃现有 `readingSession`。
-4. 一次性删除所有旧 API。
-5. 在没有回归基线前同时推进多阶段大改。
-
-这些操作返工风险过高，不适合当前代码体量。
-
----
-
-## 16. 建议下一步
-
-建议立即启动的实际工作是：
-
-1. 将本路线图拆成 6 个 phase 文档或 issue。
-2. 先执行 Phase 0。
-3. 紧接着执行 Phase 0.5，优先交付用户可感知的翻页流畅度改进。
-4. Phase 1 只做 `Context` 拆分，不夹带 ReaderView 或分页状态重构。
-5. 每完成一个 phase，就更新 `Doc/ARCHITECTURE.md`。
-
-如果需要继续推进，下一份建议产物是：
-
-- `Doc/PhasePlan/phase-0-5-remove-main-thread-sync-loading.md`
-
-它将把 Phase 0.5 再拆成更细的文件级改动清单、迁移顺序和验收步骤。
diff --git a/Doc/UML_CLASS_DIAGRAMS.md b/Doc/UML_CLASS_DIAGRAMS.md
index 1035a09..b26113c 100644
--- a/Doc/UML_CLASS_DIAGRAMS.md
+++ b/Doc/UML_CLASS_DIAGRAMS.md
@@ -441,10 +441,20 @@ classDiagram
     class RDEPUBReaderPaginationCoordinator {
         -context: RDEPUBReaderContext
         +paginatePublication(restoreLocation:)
-        +paginateMetadataOnly(token:restoreLocation:)
         +repaginatePreservingCurrentLocation()
-        -restoreBookPageMapIfPossible(publication:) RDEPUBBookPageMap?
-        -buildPageMap(from:summaries:) RDEPUBBookPageMap
+    }
+
+    class RDEPUBMetadataParseWorker {
+        -context: RDEPUBReaderContext
+        -cancellationController: RDEPUBMetadataParseCancellationController
+        +start(token:restoreLocation:)
+    }
+
+    class RDEPUBMetadataParseCancellationController {
+        +token: UUID
+        +attach(queue:)
+        +cancel()
+        +isCancelled: Bool
     }
 
     class RDEPUBReaderLoadCoordinator {
@@ -660,7 +670,7 @@ sequenceDiagram
     participant OQ as OperationQueue (N workers)
     participant Disk as Disk Cache
 
-    Main->>BG: paginateMetadataOnly(token)
+    Main->>BG: RDEPUBMetadataParseWorker.start(token)
     BG->>BG: 预计算 contentHash (串行)
     BG->>Disk: readAll(catalog) 批量读取缓存
     BG->>Main: refreshBookPageMapInPlace (缓存部分)
diff --git a/Doc/index.md b/Doc/index.md
index e58548f..3c8db04 100644
--- a/Doc/index.md
+++ b/Doc/index.md
@@ -28,7 +28,6 @@
 | [CONCERNS.md](CONCERNS.md) | 代码库风险与关注点：12 项安全/性能/可维护性风险 |
 | [TESTING.md](TESTING.md) | 测试基础设施：UI 测试文件清单、运行方式、覆盖率 |
 | [CONVENTIONS.md](CONVENTIONS.md) | 编码规范：命名约定、代码风格、导入规范、错误处理 |
-| [ARCHITECTURE-CONTEXT.md](ARCHITECTURE-CONTEXT.md) | WXRead vs ReadViewSDK 架构差距分析：4 个领域、14 项决策 |
 
 ## 专题文档
 
@@ -47,7 +46,7 @@
 ## 项目信息
 
 - **模块总数：** 4 个（EPUBCore、EPUBTextRendering、RDReaderView、EPUBUI）
-- **Swift 文件数：** 166 个（SDK Sources）
+- **Swift 文件数：** 142 个（SDK Sources）
 - **测试用例数：** 23 个测试类，约 99 个测试方法（UI 测试）
 - **最低 iOS 版本：** 15.6
 - **构建方式：** CocoaPods（本地 pod）
diff --git a/Doc/readoor-vs-readview-feature-gap.md b/Doc/readoor-vs-readview-feature-gap.md
deleted file mode 100644
index 4a5ed0a..0000000
--- a/Doc/readoor-vs-readview-feature-gap.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# readoor vs ReadViewSDK 功能差距分析
-
-> 最后更新：2026-06-18
-
----
-
-## 概述
-
-本文档对比 readoor（`BookView/EPUB/`）EPUB 阅读器与 ReadViewSDK 的功能差异，列出 readoor 已实现但 ReadViewSDK **尚未实现**的功能，以及实现方式存在差异的功能。
-
----
-
-## 未实现的功能
-
-### 1. 字体下载
-
-**readoor 状态：** 已实现。`RBCoreEpubFontDownloadViewController` + `RBCoreEpubFontDownloadHandler` 提供字体下载管理，支持用户从服务端下载自定义字体并通过 `@font-face` 注入阅读器。
-
-**ReadViewSDK 状态：** 未实现。`RDEPUBFontNormalizer` 仅负责注册 EPUB 内嵌字体（`CTFontManagerRegisterFontsForURL`）和系统字体回退，无字体下载/商店功能。
-
-**影响：** 用户只能使用系统字体和 EPUB 自带字体，无法扩展字体选择。
-
----
-
-### 2. 服务器同步笔记/书签
-
-**readoor 状态：** 已实现。`pullEpubNoteInfo`/`pushEpubNoteInfo` 通过 API 同步笔记到云端，支持多设备数据一致性。
-
-**ReadViewSDK 状态：** 未实现。`RDEPUBReaderDelegate` 提供 `didUpdateHighlights`、`didUpdateBookmarks` 等回调，但仅为本地通知，无网络请求或远程同步逻辑。笔记/书签数据完全在本地管理。
-
-**影响：** 用户换设备后阅读数据（书签、高亮、笔记）会丢失。
-
----
-
-### 3. 加密 EPUB 解密
-
-**readoor 状态：** 已实现。`STSRDFileManagerStorage readToFileDeCrypt:password:` 基于 bookID 拼接密码，对所有 EPUB 资源（HTML、CSS、图片）进行解密加载。
-
-**ReadViewSDK 状态：** 未实现。`RDEPUBParser` 直接解析标准 EPUB 归档，无加解密层。
-
-**影响：** 无法打开加密的 EPUB 文件。
-
----
-
-### 4. 试读/购买权限控制
-
-**readoor 状态：** 已实现。支持三种权限模式：免费试读、登录后免费、购买后阅读。通过 API 返回的权限字段控制章节可读性。
-
-**ReadViewSDK 状态：** 未实现。无试读限制、付费墙或章节权限控制逻辑。
-
-**影响：** SDK 无商业化能力，无法限制用户只阅读已购买的章节。
-
----
-
-### 5. 阅读统计上报
-
-**readoor 状态：** 已实现。`RDStatisticsManager` 上报阅读进度（sectionNo + 页面内进度），集成埋点系统。
-
-**ReadViewSDK 状态：** 未实现。JS 端 `reportProgression()` 仅将进度通过 `webkit.messageHandlers` 传递给原生端，属于本地 bridge 通信，无远程上报。
-
-**影响：** 无法收集用户阅读行为数据用于运营分析。
-
----
-
-### 6. 图片点击放大
-
-**readoor 状态：** 已实现。点击 EPUB 内图片发送通知，弹出全屏图片查看（`showImageView`）。
-
-**ReadViewSDK 状态：** 未实现。JS 端 `handleDocumentClick`（`epub-bridge.js:388-400`）仅处理链接点击，不处理图片点击事件。
-
-**影响：** 用户无法放大查看 EPUB 中的小图片或细节图。
-
----
-
-## 实现方式存在差异的功能
-
-### 7. 亮度调节
-
-**readoor 方式：** 通过黑色半透明 CALayer overlay 暗化屏幕，不改变系统亮度。
-
-**ReadViewSDK 方式：** 直接设置 `UIScreen.main.brightness`（系统屏幕亮度 API）。已实现，但会影响系统全局亮度。
-
----
-
-### 8. 搜索结果上下文
-
-**readoor 方式：** 搜索结果显示匹配文本前后各 30 字符上下文。
-
-**ReadViewSDK 方式：** `previewRadius` 为 12 字符（`RDEPUBReaderController+DataSource.swift:196-201`），上下文较短。
-
----
-
-### 9. CSS 主题切换机制
-
-**readoor 方式：** 通过 JS `classList.toggle("mycss")` 切换 CSS class 实现主题切换。
-
-**ReadViewSDK 方式：** 通过 `cssInjector.js` 的 `window.RDInjectedCSS.setStyle(identifier, cssText, options)` 直接操作 style 标签内容。功能等价，但机制不同。
-
----
-
-## 总结
-
-| # | 功能 | 优先级 | 复杂度 |
-|---|------|--------|--------|
-| 1 | 字体下载 | 中 | 中（需后端接口 + 下载管理） |
-| 2 | 服务器同步 | 高 | 高（需 API 设计 + 冲突解决） |
-| 3 | 加密 EPUB | 高 | 中（需对接加密方案） |
-| 4 | 试读/购买权限 | 高 | 低（SDK 层暴露权限接口即可） |
-| 5 | 阅读统计上报 | 中 | 低（delegate 暴露事件即可） |
-| 6 | 图片点击放大 | 中 | 低（JS 端监听图片点击 + 原生展示） |
diff --git a/Doc/当前阅读器问题修复开发清单.md b/Doc/当前阅读器问题修复开发清单.md
deleted file mode 100644
index 452d6a2..0000000
--- a/Doc/当前阅读器问题修复开发清单.md
+++ /dev/null
@@ -1,757 +0,0 @@
-# 当前阅读器问题修复开发清单
-
-> 最后更新：2026-06-13
-> 依据说明：本清单仅基于当前仓库代码实现整理，不以现有说明文档是否准确为前提。
-
----
-
-## 1. 文档目标
-
-本文将“当前阅读器还存在的问题”展开为可执行的逐任务开发清单，目标是把工作从“方向建议”落到“具体改哪里、怎么改、如何验收”。
-
-本文聚焦以下四类问题：
-
-1. 核心交互链路不稳定：选区、高亮、书签、工具栏状态分散。
-2. 默认安全策略偏弱：外链、解压、日志、持久化默认行为需要收口。
-3. 资源与分页稳定性不足：大资源内存峰值、离屏分页 WebView 边界控制不足。
-4. SDK 契约与回归手段不足：默认 no-op 容易误用，自动化观测点不够结构化。
-
----
-
-## 2. 总体实施顺序
-
-建议按以下顺序执行，减少返工：
-
-1. `bookmark-chrome-state-unification`
-2. `selection-state-refactor`
-3. `external-link-policy-hardening`
-4. `epub-archive-path-validation`
-5. `webview-debug-sanitization`
-6. `persistence-defaults-hardening`
-7. `resource-scheme-streaming-and-limits`
-8. `pagination-webview-hardening`
-9. `cache-hardening`
-10. `sdk-contract-and-test-hardening`
-
-原因：
-
-- 任务 2 是已确认的重复 UI 状态写入问题，收益最高、风险相对低，应优先处理。
-- 任务 1 更偏“状态模型收口优化”，问题真实存在，但严重度低于任务 2。
-- 第 3-6 项收口默认安全行为，改动局部、收益高。
-- 第 7-9 项涉及资源与分页底层，副作用更大，放在前面稳定后更容易验证。
-- 最后一项负责把前面改动固化为稳定契约和测试基线。
-
----
-
-## 3. 任务清单
-
-## 任务 1：`selection-state-refactor`
-
-### 3.1 目标
-
-在不破坏当前清晰分层的前提下，收口选区相关状态的冗余表达，降低 view 层与 controller 层各持有一份选区状态所带来的维护成本和时序问题。
-
-### 3.2 主要问题代码
-
-- `Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextSelectionController.swift`
-- `Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentView.swift`
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderAnnotationCoordinator.swift`
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderController.swift`
-
-### 3.3 修改方案
-
-当前代码并不是“混乱散写”，而是相对清晰的分层流：
-
-- gesture
-- view
-- coordinator
-- context/controller
-
-其中真正值得优化的点主要有两个：
-
-1. view 层和 controller 层各自持有一份 `currentSelection`
-2. `menuSelection` 是为 `UIMenuController` 时序保底引入的 workaround，属于合理存在，但可以尝试被更明确的状态模型替代
-
-新增一个统一的选区状态模型仍然是可行方案，例如：
-
-```swift
-enum RDEPUBSelectionState: Equatable {
-    case idle
-    case selecting(anchor: Int)
-    case selected(RDEPUBSelection)
-    case committingAction(RDEPUBSelection, action: RDEPUBAnnotationMenuAction)
-}
-```
-
-建议新增文件：
-
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBSelectionState.swift`
-
-建议在 `RDEPUBReaderAnnotationCoordinator` 内新增或抽出一个单一入口：
-
-- `applySelectionState(_ state: RDEPUBSelectionState)`
-- `currentSelectionState`
-
-具体修改：
-
-1. `RDEPUBTextSelectionController`
-   - 移除“自己就是最终状态源”的职责。
-   - 保留字符范围计算与 `RDEPUBSelection?` 构建。
-   - `isSelecting` 可保留为手势内部临时状态，但不再作为 UI 的最终依据。
-
-2. `RDEPUBTextContentView`
-   - 不再直接通过 `currentSelection != nil` 作为所有 UI 行为的唯一判断条件。
-   - 长按、拖拽、结束只上报“开始选择 / 更新选择 / 结束选择 / 取消选择”事件。
-   - `menuSelection` 不建议直接删除。
-   - 第一版应先保留 `menuSelection`，并把它明确标注为菜单时序缓冲状态。
-   - 待状态模型稳定后，再评估是否能安全移除。
-
-3. `RDEPUBReaderAnnotationCoordinator.updateCurrentSelection(_:)`
-   - 改造成 `applySelectionState(_:)`。
-   - 在 `.selected` 时统一：
-     - 更新 `controller.currentSelection`
-     - 决定是否展示工具栏
-     - 更新底部高亮按钮可用性
-     - 通知 delegate
-   - 在 `.idle` 时统一清理：
-     - 清空 `controller.currentSelection`
-     - 关闭菜单
-     - 刷新按钮状态
-
-4. `RDEPUBReaderController`
-   - `currentSelection` 继续保留为公开只读语义，但底层来源改为 `selectionState` 推导，而不是多处直接赋值。
-
-### 3.4 实施步骤
-
-1. 新增 `RDEPUBSelectionState.swift`
-2. 在 `RDEPUBReaderAnnotationCoordinator` 中接管选区状态
-3. 重写 `RDEPUBTextContentView` 中选区相关回调
-4. 先收口零散的 `currentSelection != nil` 控制逻辑
-5. 保留 `menuSelection`，待验证不再需要后再移除
-6. 统一 delegate 通知路径
-
-### 3.5 风险点
-
-- 选区菜单弹出时机可能变化。
-- `menuSelection` 是现有时序补丁，若贸然删除，菜单动作可能拿不到正确 selection。
-- Web 路径和 Native Text 路径都要走统一状态流，避免只修一条。
-
-### 3.6 验收标准
-
-- 长按后必然进入“选区中”状态。
-- 松手后有有效文本时必然进入“已选中”状态。
-- 复制/高亮/批注后必然回到空闲状态。
-- `selection=1` 的 Demo 状态与按钮启用状态始终一致。
-
-### 3.7 优先级修正
-
-本任务应视为“结构优化 + 降低后续维护成本”，不是当前代码库里最严重的缺陷。建议优先级下调到与任务 2 同级，排在任务 2 之后实施。
-
----
-
-## 任务 2：`bookmark-chrome-state-unification`
-
-### 3.8 目标
-
-统一顶部书签按钮、底部书签按钮、高亮按钮、添加高亮按钮的可用状态计算，避免不同协调器各自改一部分 UI。
-
-### 3.9 主要问题代码
-
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderChromeCoordinator.swift`
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderAnnotationCoordinator.swift`
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderTopToolView.swift`
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderBottomToolView.swift`
-
-### 3.10 修改方案
-
-新增统一 UI 状态模型：
-
-```swift
-struct RDEPUBReaderUIState {
-    let canToggleBookmark: Bool
-    let hasBookmarkAtCurrentLocation: Bool
-    let canShowBookmarks: Bool
-    let canAddHighlight: Bool
-    let canShowHighlights: Bool
-}
-```
-
-建议新增文件：
-
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderUIState.swift`
-
-具体修改：
-
-1. `RDEPUBReaderChromeCoordinator`
-   - 新增 `makeUIState()` 和 `applyUIState(_:)`
-   - `updateReaderChrome()` 内不再直接散写多个 `setXxxEnabled`
-
-2. `RDEPUBReaderAnnotationCoordinator`
-   - `updateBookmarkChrome()` 不再直接写 view，改为触发 `context.updateReaderChrome()`
-
-3. `RDEPUBReaderTopToolView` / `RDEPUBReaderBottomToolView`
-   - 保持 dumb view，只接收状态，不参与规则判断
-
-### 3.11 实施步骤
-
-1. 新增 `RDEPUBReaderUIState.swift`
-2. 改造 `updateReaderChrome()`
-3. 不要简单删除 `AnnotationCoordinator` 内的按钮状态刷新
-4. 区分两类触发时机：
-   - `ChromeCoordinator` 负责整页/整轮 chrome 同步
-   - `AnnotationCoordinator` 负责用户操作后的即时反馈触发
-5. 将二者统一收口到同一个状态计算入口，例如 `context.updateReaderChrome()`
-6. 调整书签新增/删除/跳转后的刷新入口为统一 `updateReaderChrome()`
-
-### 3.12 风险点
-
-- 如果简单删除 `AnnotationCoordinator` 内的调用，可能丢失“用户操作后立即反馈”的刷新时机。
-- 如果某些按钮当前依赖副作用显示，需要顺便梳理显示时机。
-
-### 3.13 验收标准
-
-- 添加第一个书签后，底部书签列表按钮立即可用。
-- 删除最后一个书签后，底部书签列表按钮立即禁用。
-- 当前位置已加书签时，顶部书签按钮始终是选中态。
-
----
-
-## 任务 3：`external-link-policy-hardening`
-
-### 3.14 目标
-
-把“外链点击后直接打开系统应用”改成受控策略，避免 SDK 默认行为过于激进。
-
-### 3.15 主要问题代码
-
-- `Sources/RDReaderView/EPUBCore/RDEPUBWebView+JavaScriptBridge.swift`
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift`
-- `Sources/RDReaderView/EPUBUI/Settings/RDEPUBReaderConfiguration.swift`
-
-### 3.16 修改方案
-
-在 `RDEPUBReaderConfiguration` 新增：
-
-- `allowedExternalURLSchemes: Set<String>`
-- `requiresExternalLinkConfirmation: Bool`
-- 可选：`allowedExternalURLHosts: Set<String>?`
-
-默认值建议：
-
-- scheme 仅允许 `https`
-- 需要确认框
-
-具体修改：
-
-1. `RDEPUBWebView+JavaScriptBridge.swift`
-   - 继续识别外链，但不再表示“允许直接打开”。
-   - 只负责把外链事件上抛。
-
-2. `RDEPUBReaderController+ContentDelegates.swift`
-   - 新增私有方法：
-     - `shouldAllowExternalURL(_:)`
-     - `presentExternalLinkConfirmation(for:)`
-     - `openExternalURLIfAllowed(_:)`
-   - `didActivateExternalLink` 改为：
-     - 先 delegate 回调
-     - 再走配置校验
-     - 再弹确认框
-     - 最后调用 `UIApplication.shared.open`
-
-3. 可选扩展 `RDEPUBReaderDelegate`
-   - 增加可选拦截钩子：
-     - `epubReader(_:shouldOpenExternalURL:) -> Bool`
-
-### 3.17 实施步骤
-
-1. 改配置模型与默认值
-2. 改控制器外链处理逻辑
-3. 增加确认对话框
-4. 增加测试用 mock URL 覆盖 `https`、`mailto`、未知 scheme`
-
-### 3.18 风险点
-
-- 某些 Demo 书可能依赖 `mailto` 或 `tel`，要明确它们现在默认不再直接打开。
-
-### 3.19 验收标准
-
-- `https` 外链在确认后打开。
-- 默认配置下 `mailto` 和 `tel` 不直接打开。
-- 未知 scheme 一律拒绝。
-
----
-
-## 任务 4：`epub-archive-path-validation`
-
-### 3.20 目标
-
-为 EPUB 解压路径增加显式安全校验，防止恶意压缩包通过相对路径写出解压根目录。
-
-### 3.21 主要问题代码
-
-- `Sources/RDReaderView/EPUBCore/RDEPUBParser+Archive.swift`
-
-### 3.22 修改方案
-
-新增私有方法：
-
-- `validatedExtractionDestination(for:extractionRoot:) -> URL?`
-
-校验规则：
-
-1. 拒绝绝对路径。
-2. 拒绝包含 `..` 的路径段。
-3. `standardizedFileURL.path` 必须位于 `extractionRoot.standardizedFileURL.path` 下。
-
-具体修改：
-
-1. `extractArchiveIfNeeded(epubURL:)`
-   - 在循环内先调用 `validatedExtractionDestination`
-   - 无效 entry 可：
-     - 直接抛错终止解析，或
-     - 记日志并跳过
-   - 建议优先抛错，行为更清晰
-
-2. 增加自定义错误：
-   - 若当前 `RDEPUBParserError` 里没有合适 case，可新增 `invalidArchiveEntryPath(String)`
-
-### 3.23 实施步骤
-
-1. 增加路径校验方法
-2. 替换原始 `destinationURL` 生成逻辑
-3. 增加针对恶意 entry path 的单元测试
-
-### 3.24 风险点
-
-- 少数历史 EPUB 可能带奇怪路径分隔符，需要兼容性验证。
-
-### 3.25 验收标准
-
-- 正常 EPUB 仍可正常解压。
-- 带 `../` 的恶意 entry 会被拒绝。
-
----
-
-## 任务 5：`webview-debug-sanitization`
-
-### 3.26 目标
-
-减少默认调试日志泄露阅读内容的风险，并关闭不必要的 inspectable 默认值。
-
-### 3.27 主要问题代码
-
-- `Sources/RDReaderView/EPUBCore/RDEPUBWebViewDebug.swift`
-- `Sources/RDReaderView/EPUBCore/RDEPUBPaginator.swift`
-- `Sources/RDReaderView/EPUBCore/RDEPUBWebView+Configuration.swift`
-
-### 3.28 修改方案
-
-1. `RDEPUBWebViewDebug`
-   - `logMessage` 改为只打印：
-     - message name
-     - 字段名列表
-     - 文本长度
-     - URL 摘要
-   - 不再打印完整 message body
-
-2. 新增更细粒度配置
-   - `RDEPUBWebViewDebugEnabled`
-   - `RDEPUBVerboseWebViewDebugEnabled`
-
-3. `RDEPUBPaginator` 与正常阅读 WebView
-   - `isInspectable` 改为受配置控制
-   - 默认关闭
-
-4. `RDEPUBReaderConfiguration`
-   - 增加：
-     - `allowsInspectableWebViews`
-     - `enablesVerboseWebViewLogging`
-
-### 3.29 实施步骤
-
-1. 改日志输出格式
-2. 改 inspectable 的默认逻辑
-3. 为 verbose 模式保留调试后门
-
-### 3.30 风险点
-
-- 调试某些 JS 问题时信息会变少，因此要保留显式 verbose 开关。
-
-### 3.31 验收标准
-
-- 默认 DEBUG 包不输出完整选中文本。
-- 默认分页 WebView 不可 inspect。
-- 打开 verbose 开关后仍能深度调试。
-
----
-
-## 任务 6：`persistence-defaults-hardening`
-
-### 3.32 目标
-
-降低默认 `UserDefaults` 持久化的误用风险和数据膨胀风险，同时不破坏当前 API 可用性。
-
-### 3.33 主要问题代码
-
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderPersistence.swift`
-- `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderAnnotationCoordinator.swift`
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderController.swift`
-
-### 3.34 修改方案
-
-短期目标：
-
-1. 明确 `RDEPUBUserDefaultsPersistence` 是轻量实现。
-2. 高亮持久化优先依赖：
-   - `location`
-   - `rangeInfo`
-   - `style`
-   - `note`
-3. `text` 字段作为冗余缓存，而不是唯一恢复依据。
-
-中期可选目标：
-
-新增文件持久化实现：
-
-- `Sources/RDReaderView/EPUBUI/RDEPUBFilePersistence.swift`
-
-### 3.35 具体修改
-
-1. `RDEPUBReaderPersistence.swift`
-   - 为默认实现增加 DEBUG 警告，提示 bookmarks/settings 默认实现是 no-op
-
-2. `RDEPUBUserDefaultsPersistence`
-   - 增加大小保护，例如当高亮集合序列化后超阈值时打印告警
-   - 可选增加版本字段，便于后续迁移
-
-3. `RDEPUBReaderController`
-   - 初始化默认 persistence 时，在注释与命名上明确这是默认轻量实现
-
-### 3.36 实施步骤
-
-1. 增加 warning/assert 机制
-2. 优化高亮持久化字段策略
-3. 视时间增加 `RDEPUBFilePersistence`
-
-### 3.37 风险点
-
-- 如果外部代码依赖 `text` 永远存在，需要做好兼容。
-
-### 3.38 验收标准
-
-- 未实现书签持久化时，DEBUG 下能看到明确提示。
-- 高亮即使 `text` 丢失，也可基于范围信息恢复定位。
-
----
-
-## 任务 7：`resource-scheme-streaming-and-limits`
-
-### 3.39 目标
-
-降低 `WKURLSchemeHandler` 对大资源的内存冲击，避免每次都整块 `Data(contentsOf:)` 读入。
-
-### 3.40 主要问题代码
-
-- `Sources/RDReaderView/EPUBCore/RDEPUBResourceURLSchemeHandler.swift`
-
-### 3.41 修改方案
-
-分两步做：
-
-第一步，先加大小阈值和告警：
-
-- 读取文件属性获取大小
-- 超过阈值时走分块发送
-
-第二步，再补流式发送：
-
-- 使用 `FileHandle` 或 `InputStream`
-- 按固定 chunk size 反复 `didReceive(data)`
-
-建议新增私有方法：
-
-- `resourceMetadata(for:)`
-- `respondWithStreaming(fileURL:requestURL:taskID:urlSchemeTask:)`
-- `respondWithInMemoryData(...)`
-
-### 3.42 实施步骤
-
-1. 先加文件大小检测
-2. 小文件保留内存直读
-3. 大文件切换到分块发送
-4. 增加取消任务时的中断判断
-
-### 3.43 风险点
-
-- `WKURLSchemeHandler` 分块发送要注意 stop 之后不继续回调。
-
-### 3.44 验收标准
-
-- 大图片/字体加载时内存峰值下降。
-- 取消任务不会继续发送数据。
-
----
-
-## 任务 8：`pagination-webview-hardening`
-
-### 3.45 目标
-
-加强离屏分页 WebView 的边界控制，减少外部资源波动和调试副作用。
-
-### 3.46 主要问题代码
-
-- `Sources/RDReaderView/EPUBCore/RDEPUBPaginator.swift`
-
-### 3.47 修改方案
-
-1. 为分页 WebView 增加严格导航限制
-   - 仅允许 `file://`
-   - 仅允许 `ss-reader://`
-   - 拒绝 `http/https`
-
-2. 将 `isInspectable` 受配置控制
-
-3. 增加测量稳定性日志
-   - 记录三轮测量结果
-   - 当三轮差异过大时告警
-
-建议新增私有方法：
-
-- `shouldAllowPaginatorNavigation(url:)`
-- `recordMeasurement(pass:value:)`
-
-### 3.48 实施步骤
-
-1. 扩展 `WKNavigationDelegate`
-2. 加入导航 allowlist
-3. 记录多轮测量差异
-
-### 3.49 风险点
-
-- 某些 EPUB 样式若依赖外链资源，分页结果可能与当前行为不同，但这本身就是更安全的策略。
-
-### 3.50 验收标准
-
-- 分页 WebView 不发起外部导航。
-- 三轮测量波动可观测。
-
----
-
-## 任务 9：`cache-hardening`
-
-### 3.51 目标
-
-提升章节摘要磁盘缓存的健壮性、可观测性和可清理能力。
-
-### 3.52 主要问题代码
-
-- `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterSummaryDiskCache.swift`
-
-### 3.53 修改方案
-
-1. 原子写入
-   - 先写 `.tmp`
-   - 再 replace 到正式文件
-
-2. 读失败分类
-   - 文件不存在
-   - 读取失败
-   - 解码失败
-
-3. 精细化清理
-   - `removeAll()`
-   - `removeAll(forBookID:)`
-   - `removeAll(forRenderSignature:)`
-
-4. 增加统计接口
-   - 缓存文件数
-   - 总大小
-
-### 3.54 实施步骤
-
-1. 改写入策略
-2. 增加读失败日志
-3. 增加清理接口
-4. 补测试覆盖损坏文件、半写文件
-
-### 3.55 风险点
-
-- 清理策略接口若公开，需要评估是否作为 public API。
-
-### 3.56 验收标准
-
-- 缓存文件损坏不会影响整本书重新打开。
-- 能按需清理缓存，而不是只能全删。
-
----
-
-## 任务 10：`sdk-contract-and-test-hardening`
-
-### 3.57 目标
-
-把前面所有修复固化为更清晰的 SDK 契约和更稳定的测试观测点。
-
-### 3.58 主要问题代码
-
-- `Sources/RDReaderView/EPUBUI/RDEPUBReaderPersistence.swift`
-- `Sources/RDReaderView/EPUBUI/RDURLReaderController.swift`
-- `ReadViewDemo/ReadViewDemoUITests/`
-
-### 3.59 修改方案
-
-1. 强化 persistence 契约
-   - 继续保留默认实现，但在 DEBUG 下对 no-op 行为给出明确信号
-
-2. Demo 状态能力修正
-   - 当前仓库并非完全没有结构化状态。
-   - `ReadViewDemo/ReadViewDemoUITests/Helpers/DemoReaderState.swift` 已经提供了状态解析器和 `waitForDemoReaderState(...)` 结构化等待能力。
-   - 真正需要推进的不是再造一个 `DemoReaderSnapshot`，而是把仍然大量存在的 `waitForReaderState(containing:)` 迁移到结构化断言。
-
-建议方向：
-
-- 继续保留隐藏 label 输出
-- 保持 `key=value` 格式
-- 统一测试侧只通过 `DemoReaderState` 解析和断言
-- 逐步淘汰 `containing:` 子串匹配，避免 `highlights=1` 命中 `highlights=10` 之类误判
-
-3. 补测试
-   - 单元测试：
-     - `RDEPUBParserArchiveSafetyTests`
-     - `RDEPUBExternalLinkPolicyTests`
-     - `RDEPUBChapterSummaryDiskCacheTests`
-   - UI 测试：
-     - 选区状态流
-     - 书签启用/禁用
-     - 外链确认框
-
-### 3.60 实施步骤
-
-1. 改 Demo 状态串生成逻辑
-2. 优先将 `waitForReaderState(containing:)` 迁移为 `waitForDemoReaderState(...)`
-3. 调整 UI 测试断言
-4. 增加单元测试 target 或现有测试目录内的新文件
-
-### 3.61 风险点
-
-- 现有 UI 测试如果强依赖旧状态串，需要同步迁移。
-
-### 3.62 验收标准
-
-- UI 测试失败时能明确知道是选区状态、书签状态还是导航状态失配。
-- persistence 的默认 no-op 行为在开发期不再“静默”。
-
----
-
-## 4. 补充清理项
-
-以下问题已在代码中可见，但未纳入前 10 个主任务，建议作为补充任务或穿插清理项处理。
-
-### 4.1 `pageBreakBefore/pageBreakAfter` 相关死代码审计
-
-涉及代码：
-
-- `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextRenderer.swift`
-- `Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBSemanticMarkerInjector.swift`
-- `Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBPageBreakPolicy.swift`
-- `Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBChapterPageCounter.swift`
-
-建议动作：
-
-- 审计 `pageBreakBefore/pageBreakAfter` 从注入到消费的完整链路
-- 判断是否有“已定义、已注入、但实际无有效触发”的死路径
-- 若确认无效，删除或补测试锁定其真实行为
-
-### 4.2 `PAGINATION-DEBUG` 输出清理
-
-涉及代码：
-
-- `Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBCoreTextPageFrameFactory.swift`
-- `Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBChapterPageCounter.swift`
-
-建议动作：
-
-- 将裸 `print` 改为受控调试开关
-- 默认关闭
-- 避免分页细节和正文片段直接进入控制台
-
-### 4.3 `ChapterRuntime` 旧代码与遗留路径清理
-
-建议动作：
-
-- 梳理 `ChapterRuntime` 下是否存在已不再被主流程使用的辅助类型或过渡实现
-- 对“仍被引用但语义已经过时”的代码先补注释标记
-- 对“完全无调用”的代码建立删除候选清单
-
----
-
-## 5. 推荐里程碑切分
-
-### 里程碑 A：核心交互稳定
-
-包含任务：
-
-- `selection-state-refactor`
-- `bookmark-chrome-state-unification`
-
-完成标准：
-
-- 选区、高亮、书签相关 UI 测试恢复稳定
-
-### 里程碑 B：默认安全行为收口
-
-包含任务：
-
-- `external-link-policy-hardening`
-- `epub-archive-path-validation`
-- `webview-debug-sanitization`
-- `persistence-defaults-hardening`
-
-完成标准：
-
-- 默认配置下不再直接打开高风险外链
-- 解压路径具备显式校验
-- 默认调试日志不泄露完整阅读内容
-
-### 里程碑 C：底层稳定性优化
-
-包含任务：
-
-- `resource-scheme-streaming-and-limits`
-- `pagination-webview-hardening`
-- `cache-hardening`
-
-完成标准：
-
-- 大资源加载和分页更稳定
-- 缓存更健壮、可清理
-
-### 里程碑 D：契约与测试固化
-
-包含任务：
-
-- `sdk-contract-and-test-hardening`
-
-完成标准：
-
-- SDK 默认行为更清晰
-- 回归测试对关键状态具备稳定观测能力
-
----
-
-## 6. 建议的开发节奏
-
-若按 2 周一个小迭代，可参考：
-
-1. 第 1 周：`bookmark-chrome-state-unification` + `selection-state-refactor`
-2. 第 2 周：`external-link-policy-hardening` + `epub-archive-path-validation` + `webview-debug-sanitization`
-3. 第 3 周：`persistence-defaults-hardening` + `resource-scheme-streaming-and-limits` + `pagination-webview-hardening`
-4. 第 4 周：`cache-hardening` + `sdk-contract-and-test-hardening` 与回归收口
-
-如果只想先做最值的部分，建议最小交付集合为：
-
-1. `bookmark-chrome-state-unification`
-2. `selection-state-refactor`
-3. `external-link-policy-hardening`
-4. `epub-archive-path-validation`
-
-这四项完成后，阅读器的“主观可用性”和“默认安全性”会先提升一个台阶。
diff --git a/Doc/标准级EPUB定位与兼容能力开发蓝图.md b/Doc/标准级EPUB定位与兼容能力开发蓝图.md
deleted file mode 100644
index 55f320d..0000000
--- a/Doc/标准级EPUB定位与兼容能力开发蓝图.md
+++ /dev/null
@@ -1,744 +0,0 @@
-# 标准级 EPUB 定位与兼容能力开发蓝图
-
-> 最后更新：2026-06-18
-> 适用范围：`EPUBCore/CFI`、`EPUBCore/Notes`、`EPUBTextRendering`、`EPUBUI`
-> 目标：把当前阅读器从“主流文本书可用”推进到“商业级 EPUB 阅读器必须具备的定位与兼容能力”。
-
----
-
-## 1. 文档目标
-
-本文不是概念方案，而是可直接拆任务、排期、开发和回归的实施蓝图，覆盖三项“必须做”的能力：
-
-1. `EPUB CFI` 标准级定位与持久化
-2. 脚注 / 尾注弹层阅读
-3. 嵌入字体回退 + CSS 兼容层
-
-其中 `EPUB CFI` 按完整版路线执行，核心要求是：
-
-1. 不依赖 `id` 也能做章节内精确 DOM 定位
-2. 支持“阅读位置 -> CFI”和“CFI -> 阅读位置”的双向恢复
-3. 在换字号、换字体、换行距、重新分页后仍能稳定恢复
-4. 为高亮、书签、搜索命中、脚注锚点、未来跨设备同步提供统一锚点
-
----
-
-## 2. 当前基线
-
-当前仓库已经有一部分基础设施，不是从零开始：
-
-### 2.1 已有能力
-
-1. 已有 `RDEPUBLocation.cfi / lastCFI / rangeCFI`
-2. 已有 `RDEPUBCFIParser / Serializer / Resolver / Generator`
-3. 已有 `RDEPUBCFIMap` 和章节级 `marker`
-4. 已有基于文本节点路径的初版 `cfiMap` 构建
-5. 已有脚注检测、解析和弹层 UI 的第一版入口
-6. 已有 CSS 兼容层与字体 fallback resolver 的第一版模型
-
-### 2.2 当前仍然不够的地方
-
-当前实现更像“标准级路线的 Phase 0.5”，还差以下闭环：
-
-1. 无 `id` 节点的 DOM 路径恢复还只是“文本对齐驱动”，未达到标准级双向校准
-2. `CFI -> 章内偏移` 仍主要依赖单个 marker 命中，缺少区间级、断言级回退链
-3. 还没有持久化“DOM 恢复所需的结构指纹”，章节缓存命中后无法做更强恢复
-4. 脚注弹层还没有完整纳入 CFI 锚点、回跳和高亮链路
-5. CSS 兼容层仍偏“样式修正函数”，还不是完整的兼容策略包
-6. 缺少样书库、诊断报告和标准级回归基线
-
----
-
-## 3. 为什么要做“标准级无 id 节点双向恢复”
-
-### 3.1 要解决的真实问题
-
-如果只用 `href + progression` 或 `href + chapterOffset`：
-
-1. 用户改字号、字体、行距、分栏后，位置会漂
-2. 高亮恢复会落到错误字词
-3. 搜索命中重开书后会跳偏
-4. 脚注回跳在长章节里不稳定
-5. 将来做跨设备同步时，同步点不可复用
-
-### 3.2 做到标准级后的收益
-
-1. 阅读位置恢复从“章节大致位置”升级到“字符级稳定锚点”
-2. 高亮、批注、书签、搜索、脚注全部共用同一套定位协议
-3. 章节重排后仍能尽可能落到同一语义位置
-4. 对不规范 EPUB 的容错能力显著提升
-5. 后续可以继续扩展到 WebView 路径、CFI 导出、跨端同步
-
----
-
-## 4. 目标能力定义
-
-## 4.1 CFI 能力分级
-
-### L1 基础可用
-
-1. 能解析 / 序列化单点 CFI 与 Range CFI
-2. 能持久化阅读位置和高亮范围
-3. 对带 `id` 的节点定位稳定
-
-### L2 当前已接近
-
-1. 能为文本节点生成路径
-2. 能在章节内做初步文本节点映射
-3. 能在部分重排场景下恢复位置
-
-### L3 本文目标：标准级
-
-1. 无 `id` 节点可精确恢复
-2. 位置恢复有多级回退链
-3. 断言、结构指纹、上下文窗口共同参与校准
-4. 章节缓存可直接携带恢复元数据
-5. 所有消费方统一走 `CFI` 主链路
-
----
-
-## 5. 总体架构
-
-建议把定位系统拆成四层：
-
-1. `CFI Syntax Layer`
-2. `DOM Anchor Extraction Layer`
-3. `Recovery & Calibration Layer`
-4. `Consumer Integration Layer`
-
-### 5.1 CFI Syntax Layer
-
-职责：
-
-1. 负责解析、序列化、生成、Range 拼装
-2. 不关心具体渲染结果
-
-对应目录：
-
-- `Sources/RDReaderView/EPUBCore/CFI/`
-
-### 5.2 DOM Anchor Extraction Layer
-
-职责：
-
-1. 从原始 HTML 建立 DOM 路径
-2. 为文本节点、fragment、note anchor 建立索引
-3. 产出章节级恢复元数据
-
-对应目录：
-
-- `Sources/RDReaderView/EPUBCore/CFI/`
-- `Sources/RDReaderView/EPUBTextRendering/BuildPipeline/`
-
-### 5.3 Recovery & Calibration Layer
-
-职责：
-
-1. 输入 `CFI`，输出稳定的章节字符偏移
-2. 输入字符偏移，输出稳定 `CFI`
-3. 在 DOM、文本、分页变动时完成校准与回退
-
-对应目录：
-
-- `Sources/RDReaderView/EPUBTextRendering/`
-- `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/`
-
-### 5.4 Consumer Integration Layer
-
-职责：
-
-1. 阅读位置恢复
-2. 高亮 / 批注 / 书签
-3. 搜索命中
-4. 脚注弹层与回跳
-
-对应目录：
-
-- `Sources/RDReaderView/EPUBUI/`
-
----
-
-## 6. 核心数据结构
-
-## 6.1 在现有模型上补强，不推翻
-
-### `RDEPUBCFIMap`
-
-现有结构：
-
-```swift
-public struct RDEPUBCFIMap: Codable, Equatable {
-    public var href: String
-    public var markers: [RDEPUBCFIMarker]
-    public var textAssertions: [String: RDEPUBCFITextAssertion]
-}
-```
-
-建议扩展为：
-
-```swift
-public struct RDEPUBCFIMap: Codable, Equatable {
-    public var href: String
-    public var renderVersion: Int
-    public var domVersion: Int
-    public var markers: [RDEPUBCFIMarker]
-    public var textAssertions: [String: RDEPUBCFITextAssertion]
-    public var pathRanges: [RDEPUBCFIPathRange]
-    public var recoveryMetadata: RDEPUBCFIRecoveryMetadata
-}
-```
-
-新增原因：
-
-1. `markers` 适合单点命中，但不足以做标准级回退
-2. 需要显式记录“某个 DOM 路径覆盖哪段文本”
-3. 需要缓存 DOM 恢复辅助信息，避免每次重扫 HTML
-
-### `RDEPUBCFIMarker`
-
-建议扩展字段：
-
-```swift
-public struct RDEPUBCFIMarker: Codable, Equatable {
-    public var cfiPath: RDEPUBCFIPath
-    public var chapterOffset: Int?
-    public var fragmentID: String?
-    public var textNodeLength: Int?
-    public var textNodeChecksum: UInt64?
-    public var normalizedTextPreview: String?
-    public var domSiblingSignature: String?
-}
-```
-
-用途：
-
-1. `textNodeChecksum` 用于节点文本快速比对
-2. `normalizedTextPreview` 用于短窗口断言
-3. `domSiblingSignature` 用于路径偏移时的邻接恢复
-
-### 新增 `RDEPUBCFIPathRange`
-
-```swift
-public struct RDEPUBCFIPathRange: Codable, Equatable {
-    public var cfiPath: RDEPUBCFIPath
-    public var startOffset: Int
-    public var endOffset: Int
-    public var textNodeLength: Int
-}
-```
-
-用途：
-
-1. 表示某个文本节点在章节纯文本中的覆盖区间
-2. 支撑“按区间查找最近路径”
-3. 支撑 `chapterOffset -> nearest CFI path`
-
-### 新增 `RDEPUBCFIRecoveryMetadata`
-
-```swift
-public struct RDEPUBCFIRecoveryMetadata: Codable, Equatable {
-    public var domFingerprint: String
-    public var normalizedTextChecksum: String
-    public var tokenIndex: [RDEPUBCFITokenAnchor]
-    public var fragmentPathMap: [String: RDEPUBCFIPath]
-}
-```
-
-用途：
-
-1. `domFingerprint` 判断原始 HTML 是否变化
-2. `normalizedTextChecksum` 判断章节标准化文本是否变化
-3. `tokenIndex` 为无 `id` 恢复提供次级定位锚
-4. `fragmentPathMap` 保留锚点和脚注入口
-
-### 新增 `RDEPUBCFITokenAnchor`
-
-```swift
-public struct RDEPUBCFITokenAnchor: Codable, Equatable {
-    public var token: String
-    public var occurrence: Int
-    public var chapterOffset: Int
-    public var cfiPath: RDEPUBCFIPath
-}
-```
-
-用途：
-
-1. 当文本节点路径不再精确命中时，用稀疏 token 锚做恢复
-2. 对长章节做局部二次定位
-
----
-
-## 7. 标准级无 id 节点双向恢复算法
-
-## 7.1 正向：阅读位置 -> CFI
-
-输入：
-
-1. `fileIndex`
-2. `chapterOffset`
-3. `RDEPUBCFIMap`
-
-输出：
-
-1. 标准 `CFI`
-2. 如有需要，附带 text assertion
-
-算法顺序：
-
-1. 在 `pathRanges` 中查找覆盖 `chapterOffset` 的文本节点
-2. 计算该节点内的 `localOffset`
-3. 生成 `contentPath + characterOffset`
-4. 从前后文提取 assertion
-5. 若该节点不存在，则回退到最近 `fragment`
-6. 若 `fragment` 也缺失，则退化为 offset-backed CFI
-
-### 关键要求
-
-1. `chapterOffset` 不能直接依赖页码
-2. assertion 必须来自标准化文本，而不是原始 HTML 片段
-3. 对选区范围，`startCFI / endCFI` 必须分别独立生成，不能只存一个起点
-
-## 7.2 逆向：CFI -> 阅读位置
-
-输入：
-
-1. `RDEPUBCFI`
-2. `RDEPUBCFIMap`
-3. `chapterText`
-
-输出：
-
-1. `chapterOffset`
-2. 必要时输出 `confidence`
-
-建议新增恢复结果：
-
-```swift
-public struct RDEPUBCFIRecoveryResult: Equatable {
-    public enum Confidence: Int {
-        case exactPath
-        case assertionCalibrated
-        case siblingRecovered
-        case tokenRecovered
-        case fragmentFallback
-        case offsetFallback
-    }
-
-    public var chapterOffset: Int
-    public var confidence: Confidence
-}
-```
-
-恢复链路必须固定为：
-
-1. `exact-path`
-   - `cfiPath` 直接命中 marker 或 pathRange
-2. `assertion-calibrated`
-   - 路径命中后，用 text assertion 微调偏移
-3. `sibling-recovered`
-   - 路径不命中时，用父路径 + 兄弟签名查找邻近文本节点
-4. `token-recovered`
-   - 使用 token anchor 在局部窗口重定位
-5. `fragment-fallback`
-   - 回退到最近 fragment 起点
-6. `offset-fallback`
-   - 使用旧式 chapterOffset 或 progression 兜底
-
-这里的关键不是“某一步一定成功”，而是恢复链必须稳定、可解释、可诊断。
-
----
-
-## 8. 为什么要加“结构指纹 + token 锚”
-
-只做文本节点路径有两个问题：
-
-1. 某些 EPUB 会在无 `id` 场景下插入大量包装标签，导致路径整体漂移
-2. 某些章节文本重复度高，单靠短 assertion 可能落到错误位置
-
-所以标准级方案需要两层辅助：
-
-### 8.1 结构指纹
-
-针对每个文本节点记录：
-
-1. 父路径
-2. 左右兄弟摘要
-3. 标签名序列
-4. 局部文本 checksum
-
-这样即便 `cfiPath` 因中间插入一个 wrapper 节点失效，也能在兄弟集合里恢复出最可能目标。
-
-### 8.2 token 锚
-
-在章节标准化文本中抽样稀疏 token，例如：
-
-1. 每 `N` 个词或每 `M` 个中文字符窗口抽一个 token
-2. 每个 token 记录其 occurrence、offset 和所属 `cfiPath`
-
-当路径和断言都不稳时：
-
-1. 先用 token 锁定大致位置
-2. 再在局部窗口里做文本节点回溯
-
-这就是“无 id 节点也能做标准级恢复”的核心。
-
----
-
-## 9. 分阶段实施
-
-## Phase 1：结构补强与缓存升级
-
-### 目标
-
-让章节缓存携带足够的 DOM 恢复元数据，为后续标准级恢复打底。
-
-### 需要改的模块
-
-1. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIMap.swift`
-2. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIDOMPathBuilder.swift`
-3. `Sources/RDReaderView/EPUBTextRendering/BuildPipeline/RDEPUBTextBookModels.swift`
-4. `Sources/RDReaderView/EPUBTextRendering/BuildPipeline/RDEPUBTextBookBuilder.swift`
-5. `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterSummaryDiskCache.swift`
-6. `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift`
-
-### 具体任务
-
-1. 扩展 `RDEPUBCFIMap`、`RDEPUBCFIMarker`
-2. 新增 `RDEPUBCFIPathRange`
-3. 新增 `RDEPUBCFIRecoveryMetadata`
-4. 在章节构建阶段产出 `pathRanges / tokenIndex / domFingerprint`
-5. 升级 chapter summary schema version
-6. 为缓存加版本兼容分支，旧缓存 miss 后自动重建
-
-### 验收
-
-1. 新章节缓存可落盘完整 `cfiMap`
-2. 旧缓存不会引发崩溃
-3. 二次打开时不需要重新扫描整章 HTML 才能恢复定位
-
-## Phase 2：标准级 `CFI -> offset` 恢复链
-
-### 目标
-
-把当前“marker 命中 + chapterOffset 回退”的恢复方式升级为多级恢复链。
-
-### 需要改的模块
-
-1. `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextIndexTable.swift`
-2. `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterOffsetMap.swift`
-3. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIResolver.swift`
-4. 建议新增：
-   - `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIRecoveryEngine.swift`
-
-### 具体任务
-
-1. 抽出 `RDEPUBCFIRecoveryEngine`
-2. 输出 `RDEPUBCFIRecoveryResult`
-3. 实现六级恢复链
-4. 为每次恢复产出 `confidence`
-5. 为 diagnostics 埋点：
-   - exact-path 命中率
-   - assertion 校准命中率
-   - token 恢复命中率
-   - offset 回退比例
-
-### 验收
-
-1. 无 `id` 文本节点可稳定恢复
-2. 换字号 / 字体 / 行距后，阅读位置恢复成功率显著提升
-3. 高亮与搜索命中恢复不再大面积偏移
-
-## Phase 3：标准级 `offset -> CFI` 生成链
-
-### 目标
-
-让所有阅读位置、选区、高亮和搜索结果都优先生成标准文本节点 CFI。
-
-### 需要改的模块
-
-1. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIGenerator.swift`
-2. `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextIndexTable.swift`
-3. `Sources/RDReaderView/EPUBTextRendering/RDEPUBChapterData.swift`
-4. `Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextSelectionController.swift`
-5. `Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift`
-6. `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextSearchEngine.swift`
-
-### 具体任务
-
-1. `chapterOffset -> pathRange` 精确映射
-2. 统一单点 CFI 与范围 CFI 生成
-3. 所有消费方优先写入 `cfi/rangeCFI`
-4. 保留 `fragment/progression` 作为兜底兼容字段
-
-### 验收
-
-1. 书签、新建高亮、搜索命中都能生成标准 CFI
-2. 相同文本范围在重新分页后仍能正确恢复
-
-## Phase 4：脚注 / 尾注弹层闭环
-
-### 目标
-
-把脚注从“跳出当前阅读流”改为“就地预览 + 可回跳”。
-
-### 需要改的模块
-
-1. `Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteDetector.swift`
-2. `Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteResolver.swift`
-3. `Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteModels.swift`
-4. `Sources/RDReaderView/EPUBUI/Notes/RDEPUBNotePopupCoordinator.swift`
-5. `Sources/RDReaderView/EPUBUI/Notes/RDEPUBNotePopupViewController.swift`
-6. `Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift`
-
-### 具体任务
-
-1. 完善脚注链接识别：
-   - `epub:type=noteref`
-   - `role=doc-noteref`
-   - `href=#footnote-*`
-   - 章节内 / 跨章节 note link
-2. note target 解析后落为 `CFI`
-3. 弹层展示注释正文，而不是强制整章跳转
-4. 弹层内支持：
-   - 查看上下文
-   - 跳到原文
-   - 跳到注释原位置
-5. 建立“入口位置 CFI -> 弹层 -> 回跳位置 CFI”的闭环
-
-### 验收
-
-1. 点击脚注不打断当前阅读主流程
-2. 长注释可滚动
-3. 关闭弹层后能回到点击时的位置
-4. 跨章节尾注也能稳定打开
-
-## Phase 5：样式兼容层与字体回退闭环
-
-### 目标
-
-减少“某些 EPUB 打开排版异常”的商业级缺陷。
-
-### 需要改的模块
-
-1. `Sources/RDReaderView/EPUBTextRendering/Typesetter/Compatibility/RDEPUBStyleCompatibilityModels.swift`
-2. `Sources/RDReaderView/EPUBTextRendering/Typesetter/Compatibility/RDEPUBCSSCompatibilityLayer.swift`
-3. `Sources/RDReaderView/EPUBTextRendering/Typesetter/Compatibility/RDEPUBFontFallbackResolver.swift`
-4. `Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBStyleSheetComposer.swift`
-5. `Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBHTMLNormalizer.swift`
-6. `Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBRenderDiagnosticsCollector.swift`
-
-### 具体任务
-
-1. 建立 CSS 兼容策略包：
-   - 非法 `font-family` 归一化
-   - 极端 `line-height` 修正
-   - 过大 `margin/padding` 收口
-   - 表格 / 图片 / SVG 溢出保护
-   - 嵌套 `white-space` 异常归一化
-2. 建立字体 fallback 链：
-   - 书内嵌入字体
-   - 用户选中字體
-   - 语言 fallback
-   - 系统兜底字体
-3. diagnostics 输出：
-   - 缺失字体
-   - 被修正的 CSS 规则
-   - 可能导致排版异常的资源
-
-### 验收
-
-1. 缺字库 EPUB 不崩溃、不出现大面积 tofu
-2. 非法 CSS 不导致正文不可读
-3. diagnostics 可定位问题书源
-
----
-
-## 10. 关键实现细节
-
-## 10.1 DOM 路径构建规则
-
-1. 元素节点使用偶数 step
-2. 文本节点使用奇数 step
-3. 忽略注释节点、doctype、处理指令
-4. `script/style` 默认不参与文本定位
-5. `ruby`、`rt`、`rp` 需要单独定义标准化策略，避免正文偏移
-
-## 10.2 标准化文本规则必须固定
-
-以下规则必须全链路共用同一份实现，否则 CFI 会漂：
-
-1. HTML entity 解码
-2. 连续空白压缩
-3. 换行归一化
-4. 零宽字符处理
-5. `nbsp` 处理
-6. 附件占位字符策略
-7. 中文全角 / 半角是否归一
-
-建议把规则集中到一个入口，避免 `Builder`、`Search`、`Selection` 各写一套。
-
-## 10.3 `renderSignature` 与 `domFingerprint` 分工
-
-1. `renderSignature`
-   - 描述“分页语义”
-   - 用于判定页图、chapter summary、layout cache 是否可复用
-2. `domFingerprint`
-   - 描述“章节 DOM 结构”
-   - 用于判定 `cfiMap` 是否可复用
-
-这两个概念不能混用。
-
-## 10.4 本地缓存策略
-
-建议缓存分三层：
-
-1. `raw parse cache`
-   - OPF、manifest、spine、resource bytes
-2. `chapter summary cache`
-   - 章节文本、fragmentOffsets、cfiMap、pathRanges、tokenIndex
-3. `page map / runtime cache`
-   - 与具体排版参数绑定
-
-原则：
-
-1. 字号、字体、行距变化时，第三层必须失效
-2. 第二层尽量复用
-3. `cfiMap` 属于第二层，不应因单纯重排被清空
-
----
-
-## 11. 文件改动清单
-
-## 11.1 必改文件
-
-### CFI 核心
-
-1. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIMap.swift`
-2. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIDOMPathBuilder.swift`
-3. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIGenerator.swift`
-4. `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIResolver.swift`
-5. 新增 `Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIRecoveryEngine.swift`
-
-### 构建与缓存
-
-1. `Sources/RDReaderView/EPUBTextRendering/BuildPipeline/RDEPUBTextBookModels.swift`
-2. `Sources/RDReaderView/EPUBTextRendering/BuildPipeline/RDEPUBTextBookBuilder.swift`
-3. `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift`
-4. `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterSummaryDiskCache.swift`
-
-### 定位消费方
-
-1. `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextIndexTable.swift`
-2. `Sources/RDReaderView/EPUBTextRendering/RDEPUBChapterData.swift`
-3. `Sources/RDReaderView/EPUBTextRendering/RDEPUBTextSearchEngine.swift`
-4. `Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextSelectionController.swift`
-5. `Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentView.swift`
-6. `Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift`
-7. `Sources/RDReaderView/EPUBUI/RDEPUBReaderController+DataSource.swift`
-8. `Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterOffsetMap.swift`
-9. `Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderLocationCoordinator.swift`
-
-### 脚注
-
-1. `Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteDetector.swift`
-2. `Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteResolver.swift`
-3. `Sources/RDReaderView/EPUBUI/Notes/RDEPUBNotePopupCoordinator.swift`
-4. `Sources/RDReaderView/EPUBUI/Notes/RDEPUBNotePopupViewController.swift`
-
-### 样式兼容
-
-1. `Sources/RDReaderView/EPUBTextRendering/Typesetter/Compatibility/RDEPUBStyleCompatibilityModels.swift`
-2. `Sources/RDReaderView/EPUBTextRendering/Typesetter/Compatibility/RDEPUBCSSCompatibilityLayer.swift`
-3. `Sources/RDReaderView/EPUBTextRendering/Typesetter/Compatibility/RDEPUBFontFallbackResolver.swift`
-4. `Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBStyleSheetComposer.swift`
-
-## 11.2 建议新增测试
-
-1. `ReadViewDemo/ReadViewDemoTests/CFI/RDEPUBCFIRecoveryEngineTests.swift`
-2. `ReadViewDemo/ReadViewDemoTests/CFI/RDEPUBCFITextNodeMapBuilderTests.swift`
-3. `ReadViewDemo/ReadViewDemoTests/Notes/RDEPUBNoteResolverTests.swift`
-4. `ReadViewDemo/ReadViewDemoTests/Compatibility/RDEPUBCSSCompatibilityLayerTests.swift`
-5. `ReadViewDemo/ReadViewDemoUITests/ReaderUITests/LocationPersistenceTests.swift`
-6. `ReadViewDemo/ReadViewDemoUITests/ReaderUITests/FootnotePopupTests.swift`
-
----
-
-## 12. 回归样书与验收用例
-
-至少准备以下样书：
-
-1. 标准文本 EPUB，节点 `id` 完整
-2. 无 `id` 文本 EPUB
-3. 重复文本很多的长章节 EPUB
-4. 脚注密集型 EPUB
-5. 嵌入字体缺失或损坏 EPUB
-6. CSS 激进覆盖型 EPUB
-7. 跨章节尾注 EPUB
-
-关键验收：
-
-1. 阅读到某章第 5 页，改字号后仍落在同一阅读语义位置
-2. 高亮一段正文，改字体后还能精确回到同一段
-3. 搜索命中结果重开书后可稳定定位
-4. 点击脚注弹层展示，不强制整章跳转
-5. 关闭脚注后回到点击前位置
-6. 不规范 CSS 的书籍仍可阅读
-7. 缺失嵌入字体时能稳定 fallback
-
----
-
-## 13. 性能与风险要求
-
-### 性能目标
-
-1. 单章节 `cfiMap` 构建增量耗时 P50 `< 12ms`，P95 `< 35ms`
-2. `CFI -> offset` 恢复耗时 P50 `< 2ms`，P95 `< 8ms`
-3. 二次打开时不因 CFI 恢复而重新解析整本书
-
-### 主要风险
-
-1. 章节标准化文本规则不统一，导致生成和恢复不一致
-2. token 锚过密，导致缓存膨胀
-3. 断言窗口过短，在重复文本章节误命中
-4. 兼容层修正规则过激，伤及正常书籍排版
-
-对应策略：
-
-1. 文本标准化统一收口
-2. token 锚做稀疏抽样并设章节上限
-3. diagnostics 输出恢复置信度
-4. CSS 修正规则全部可开关并支持样书回归
-
----
-
-## 14. 推荐排期
-
-建议按 4 个迭代执行：
-
-1. 第 1 迭代
-   - Phase 1
-   - Phase 2
-2. 第 2 迭代
-   - Phase 3
-   - 核心位置恢复 UI 回归
-3. 第 3 迭代
-   - Phase 4
-   - 脚注体验打磨
-4. 第 4 迭代
-   - Phase 5
-   - 样书库、diagnostics、稳定性回归
-
----
-
-## 15. 最终交付定义
-
-完成本蓝图后，阅读器至少应达到以下标准：
-
-1. 阅读位置、高亮、书签、搜索命中全部优先基于标准 CFI
-2. 无 `id` 节点的 EPUB 仍能做精确字符级恢复
-3. 脚注 / 尾注不再破坏主阅读流
-4. 字体缺失和异常 CSS 不再轻易把正文排坏
-5. 章节缓存、页图缓存、定位缓存职责清晰，二次打开可复用
-
-这时阅读器才算从“功能可用”进入“商业级可发布”的基线。
diff --git a/ReadViewDemo/Pods/Pods.xcodeproj/project.pbxproj b/ReadViewDemo/Pods/Pods.xcodeproj/project.pbxproj
index f964ea2..74a02b2 100644
--- a/ReadViewDemo/Pods/Pods.xcodeproj/project.pbxproj
+++ b/ReadViewDemo/Pods/Pods.xcodeproj/project.pbxproj
@@ -8,964 +8,998 @@
 
 /* Begin PBXBuildFile section */
 		002685407B9C4D548571DA24AFD6E8F1 /* NSString+Paragraphs.m in Sources */ = {isa = PBXBuildFile; fileRef = F53CCB60DE5D06A43E4A52EDB274E7D2 /* NSString+Paragraphs.m */; };
-		004A896E9268C5C8310A2C546B18A54A /* ConstraintDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CF362F88AB69253F1898E53D7A286A /* ConstraintDSL.swift */; };
-		00A2A1FA31C654A3F77457EB74C3A413 /* SSAlertAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97995C73297871C353364E685939DED9 /* SSAlertAnimationController.swift */; };
+		00E8757FB94E0A8100BE11635D545831 /* ConstraintMakerPrioritizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E138EC76D0DF24544D29D1A4D7429E3 /* ConstraintMakerPrioritizable.swift */; };
+		00EC20B980D829A07C2F25D0E317DBAA /* NSData+DTCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 17F750F38183302BF345F40F5A4CDD43 /* NSData+DTCrypto.m */; };
 		014449AE560FFF3C628FAE639D043004 /* DTAnchorHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D63AE1801C7AB149219317BE7529B26 /* DTAnchorHTMLElement.m */; };
-		014DF767E7F65A77A6B37D043CED5BAA /* RDEPUBWebView+FixedLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AD3643718CB1E5CC5DF85EBB82F2022 /* RDEPUBWebView+FixedLayout.swift */; };
-		02794ACD3F42F5491DEF84BA009B0F5A /* RDEPUBTextBookBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = EABC0A5DC75E27092EE4743115BA90E2 /* RDEPUBTextBookBuilder.swift */; };
-		02D5DD3053995A6414F5E74AA62A9D86 /* RDEPUBBackgroundCoverageStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5678FF32DD584BB87D6B278E74263B9 /* RDEPUBBackgroundCoverageStore.swift */; };
-		02E41306F02C87A79CC3902900607CBC /* RDEPUBReaderDependencies.swift in Sources */ = {isa = PBXBuildFile; fileRef = E856F4F78DEE5AE91066FCE2371A797D /* RDEPUBReaderDependencies.swift */; };
-		031DCDCD6003C70308E7A4B45790F95C /* RDEPUBParser+TOC.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA95AEDCF40D954F678FD80D14334F22 /* RDEPUBParser+TOC.swift */; };
+		017C8BDE742F347FB3D4D7E5A365B757 /* DTLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B007AEEACE9EA271DD73AFD80A74D83 /* DTLog.m */; };
+		01B1B8AF1056EF71658BE02D0850C34F /* ConstraintConstantTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F090A0289338B14050FAF16C22605B0 /* ConstraintConstantTarget.swift */; };
+		020F2DBF2B0D499C7D5FDB014AA03CF5 /* NSURL+DTUnshorten.h in Headers */ = {isa = PBXBuildFile; fileRef = 054674EB90C625BB4BEA9368ED92592B /* NSURL+DTUnshorten.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		02CBB350FE8E8C48D48347519605408E /* RDEPUBModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DCD2E4F44A79B62DF96C3ABAE2B8592 /* RDEPUBModels.swift */; };
+		034CDAD58DD721808C23222EE79E2FB6 /* RDEPUBReaderController+LocationResolution.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCEB096B8A5CC40D05995D4C8BCE6996 /* RDEPUBReaderController+LocationResolution.swift */; };
+		03BC4A9B24919C76E85CB50869D47858 /* ConstraintMakerFinalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0B32EA4B7A492EEF26CE260E9AEFA0B /* ConstraintMakerFinalizable.swift */; };
 		03D90C831397E8636A33CE557024A136 /* NSMutableAttributedString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = A2C299CFB47AA6ECF86F7348E1EB751F /* NSMutableAttributedString+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		03D91639D7EF7C7380ED101A9521967F /* SnapKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B10D3EC1701BBA4D69926915F942558 /* SnapKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		04CC1B53A7996C3112B381C0841422F6 /* cssInjector.js in Resources */ = {isa = PBXBuildFile; fileRef = 1E0D6AF2997BAD28F37F9D771B59F7E9 /* cssInjector.js */; };
-		0557AE0592F9E47318DE2506BEE0C38A /* SnapKit-SnapKit_Privacy in Resources */ = {isa = PBXBuildFile; fileRef = B9DCB5EC0B1CDADD221717CADDF62359 /* SnapKit-SnapKit_Privacy */; };
+		040559B03C1A5E027594EAF859293F6C /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = B5FCE04EBB553439D1C2BA1001936293 /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		04CF747CD2BE5158C1B372F1CC7B5009 /* RDReaderContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1689173E78766BA24FA271006949DD2 /* RDReaderContentCell.swift */; };
 		0561DF6793C8516F469D9813F5CE3211 /* DTCoreTextLayouter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D6DA580F40DF113709E15CF6542A35C /* DTCoreTextLayouter.m */; };
-		06045B0044D4688219C0A02186A69E8B /* Archive+WritingDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98C7359A7C3FC7675FED220200A43A17 /* Archive+WritingDeprecated.swift */; };
-		0699E23859E051B40C29FAEE703AAE3B /* Entry+Serialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F991240340FA026C71B68EB25B9F9C8 /* Entry+Serialization.swift */; };
-		06F07DCF356C7F3C8924701B45FB9317 /* default.css in Resources */ = {isa = PBXBuildFile; fileRef = 05D57D16346FAF830F1F82067307EA9F /* default.css */; };
-		07FDD48A01F5971181FBF1E103EA8CDE /* RDEPUBReaderTopToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DF306A281A8DA5FDD3314734FA5AFB /* RDEPUBReaderTopToolView.swift */; };
-		08EBB80B87F5589594B1EA582F688465 /* RDEPUBHTMLNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70CCDD71A0D77BA8E1C8D0FF8E739473 /* RDEPUBHTMLNormalizer.swift */; };
-		09479E3AAA909AA4F39578B7EF7C12A2 /* NSURL+DTUnshorten.m in Sources */ = {isa = PBXBuildFile; fileRef = C80065DBA5634DAA71129404975D7349 /* NSURL+DTUnshorten.m */; };
-		098C86F512F5D27BE51A986EE53F04D7 /* epub-fixed-layout.html in Resources */ = {isa = PBXBuildFile; fileRef = 7CB475F3E2D12FD5ED7CA4CD01DC3323 /* epub-fixed-layout.html */; };
-		0A79F0C5247E793991BCCC3C4C8FBCEA /* RDReaderView+PageCurl.swift in Sources */ = {isa = PBXBuildFile; fileRef = F43A220C0D3B9E71DCEA79B58CC78F8F /* RDReaderView+PageCurl.swift */; };
+		062898C7FA5797A1327D7CDDEB000DAA /* RDEPUBReaderController+PublicAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38CC6A6BEE99B6DD8A2CB0C3D94D3C2D /* RDEPUBReaderController+PublicAPI.swift */; };
+		069C5149522B38C8AB7C735FF83EE099 /* DTFoundation-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FAB3C7F19A511C2B1B7DFBA3CA308C4 /* DTFoundation-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		06DF025C3F6A6A0BAE23D1AA2ACB9BB7 /* ConstraintView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A02EA0374C693F881AB36202FB276DCD /* ConstraintView.swift */; };
+		074DAE005137E6E89D69DC0E8765EAB0 /* NSFileWrapper+DTCopying.m in Sources */ = {isa = PBXBuildFile; fileRef = 1756C6FFCA695290BA62DA4E7B6DD20B /* NSFileWrapper+DTCopying.m */; };
+		08742D7AA435FD9CA20294F408FC44AC /* RDEPUBCFIDOMPathBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D53FC89DDB339BF2C7F6BEAFEE0097F4 /* RDEPUBCFIDOMPathBuilder.swift */; };
+		08AF1E234EC84C5B105AD119DD68C7C7 /* UILayoutSupport+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C647A2EB2720BCBF88B160D124B57BF /* UILayoutSupport+Extensions.swift */; };
+		08D7E5A0D65FAEA0FFE71946A00FFF1E /* RDEPUBChapterWindowSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = F13DE2B771ECF4C1C6DDAC4FCD18CD0A /* RDEPUBChapterWindowSnapshot.swift */; };
+		08F54A15BE50EA69DC223672EC21DC36 /* Archive+ZIP64.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED5693BD171B879406EA14C97F4AD8D8 /* Archive+ZIP64.swift */; };
+		093B7188B6717318AD5CD0CBBB6BB1B6 /* RDEPUBRuntimePageCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E8A22827641532F651809A316008577 /* RDEPUBRuntimePageCount.swift */; };
+		099FEDF9807830FA98B165701170023D /* RDEPUBAttachmentTooltipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34649E5DA563878B374E0488CF7B450A /* RDEPUBAttachmentTooltipView.swift */; };
 		0AAA5BB1DBF584102B15CF8738F1815E /* NSScanner+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = CA538A48DD3691701EC6B5021D7B7381 /* NSScanner+HTML.m */; };
 		0ABC4D62588EABAA636441FD9A82C940 /* CTLineUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = DD58A1908F3C532210EA65ACE410A44D /* CTLineUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0B32362B15FCBE685C9515F89022F858 /* UIImage+DTFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 15941683D394FB8D7EAE91CD2CF03FF1 /* UIImage+DTFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		0B6FA1F22150D7F8B1865F41FF70C922 /* DTImage+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AB9016408894675D11069CDAACEDE94 /* DTImage+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0BEBA9C63C306195F2D4AE398C69716D /* DTVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD9F2023FF826F67E69E3407A70A8A6 /* DTVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0C73CB58FBC9B43ED47146B319B25478 /* RDEPUBSelectionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B5F9162A2C23B3AFD078A809D60876F /* RDEPUBSelectionState.swift */; };
-		0D77BD996001EE46C8F5CEDDA68988A5 /* NSFileWrapper+DTCopying.h in Headers */ = {isa = PBXBuildFile; fileRef = 09C957F3199C596781EFA1DEA1DDCEC8 /* NSFileWrapper+DTCopying.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		0DD457CB67E0BA8ECD06B62C25ED5761 /* RDEPUBSemanticMarkerInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23C08F0993EC3E8BAECD557D0E6FEAE3 /* RDEPUBSemanticMarkerInjector.swift */; };
-		0E847D1383A858DE31A259F51A5DEAC6 /* RDEPUBReaderController+RenderSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF166FC19259E17C130DF5E825B8A442 /* RDEPUBReaderController+RenderSupport.swift */; };
-		0E8C12C184757856BAC8A177F0E54E63 /* RDEPUBSearchEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12B251B6FA033114DCF46872DA273A54 /* RDEPUBSearchEngine.swift */; };
+		0CB5057B141757B491EA31E8D6DB33EB /* DTPieProgressIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA1E8494B86FFD79C639DCB8C21E1BB /* DTPieProgressIndicator.m */; };
+		0D92A7F76F994F8709CACA82062165CC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 53D473C6F07982D3D25781A343EC5A99 /* PrivacyInfo.xcprivacy */; };
+		0E5A4BBE6AEFFCC15F458099FAAA65E7 /* ConstraintLayoutSupportDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5B34EE2160C27947D1EEFD42184CF5D /* ConstraintLayoutSupportDSL.swift */; };
+		0E7D32BFD4B09BEB911DB10CCD874648 /* UIColor+RDEPUB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB4A1F095257F5F9410518DCB1053FB /* UIColor+RDEPUB.swift */; };
+		0EC42ADE0B83491854E458B0D00EE49A /* DTBase64Coding.m in Sources */ = {isa = PBXBuildFile; fileRef = 061BD3911E4E530C792E65CED7868C33 /* DTBase64Coding.m */; };
 		0FCBC8C64D8862F2A0E8794EDADDECBD /* UIFont+DTCoreText.h in Headers */ = {isa = PBXBuildFile; fileRef = 647FB0C5AAF84C71A7784DD277E48910 /* UIFont+DTCoreText.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		100BFFBD24F234C095EDB001B8088DB1 /* DTCoreTextLayoutFrameAccessibilityElementGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = D1599698B5A62671C488F13E07272B09 /* DTCoreTextLayoutFrameAccessibilityElementGenerator.m */; };
+		108BB5B3F866558C1DA53A5A684A2C9D /* RDEPUBMetadataParseWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBECF99D05CF4651818FB884017A0C69 /* RDEPUBMetadataParseWorker.swift */; };
 		109458F9D48FD4F381F0E40E2DB3D91C /* DTLazyImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = E5F69A1E1260BAD7737BEB533F643A15 /* DTLazyImageView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1121E539EAEFEB583A86DEA256B1DF16 /* DTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF6156128A1A0CA24D9D06E346B9445 /* DTVersion.m */; };
-		11A0AF34C098CABA6F95B2BFBEB8C33C /* RDEPUBPublication.swift in Sources */ = {isa = PBXBuildFile; fileRef = B058AAABBC8349D197F8931C2FFDF7D7 /* RDEPUBPublication.swift */; };
+		10E2206844CFF1FFD5815CDD1EA2CB5D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
+		11154670AA2AB4CC361FB7A3E5D47B2C /* ConstraintView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB34ACB132E465CDF8191F7DB71EF6 /* ConstraintView+Extensions.swift */; };
 		11AB1902A68385851FB81E870991F9A0 /* DTImageTextAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = FEEB15F87BA6575BBFE1C5FD19B17CD7 /* DTImageTextAttachment.m */; };
 		12B4A35B8E40C112E18A7C5511F023E9 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4472755F83C121DE5E1E505D145F6DBE /* CoreText.framework */; };
 		130C3A85D9F9F445222C2E31EC245B0A /* NSScanner+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = A0927A875CA1F11DBCE60DFC6F0CA0B6 /* NSScanner+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		13389E3AE0A86063B6E3A5BD45B8202C /* RDPlainTextBookBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53A09D0189C0A8418BF8851BFCA4B857 /* RDPlainTextBookBuilder.swift */; };
-		139994D6DAE38BD8EE102EB342C8E61D /* RDEPUBTextIndexTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4B7177D696E76F752265DA9978505A /* RDEPUBTextIndexTable.swift */; };
-		148E8A59B31A7BCB2C1175ADAF5B1021 /* RDEPUBReaderController+TableOfContents.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5C0A5C8BB9EAEE1C547D2FC03D475AE /* RDEPUBReaderController+TableOfContents.swift */; };
+		13CCBD97D8AF4C50A6888B78325A192B /* RDEPUBTextPageRenderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 839B80DCB8EBDB9BFDEE18C4B160FE81 /* RDEPUBTextPageRenderView.swift */; };
+		146CE7A97D2DAC1A9CB084C0E2ADD67A /* RDEPUBNotePopupCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA7C5D50017972C1AF6905C1B3733B08 /* RDEPUBNotePopupCoordinator.swift */; };
 		14BDD9FB7A7AC5C8ABFF8D24C381F3DA /* NSAttributedString+DTCoreText.m in Sources */ = {isa = PBXBuildFile; fileRef = DBC9280BA00935565E9658775DD7404D /* NSAttributedString+DTCoreText.m */; };
-		14CE63869011AB39B35A85672A9C5160 /* Entry+ZIP64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7345CE45F696634CEA692A86D16F684C /* Entry+ZIP64.swift */; };
 		15A7ED15DA03DD3B9F26A017D270D1C2 /* DTCSSListStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = FDD333B409D528E5006FA48F4D70A6F5 /* DTCSSListStyle.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		163366AF0E3A9C2D35D4B214AE517BFE /* RDEPUBNavigatorState.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51FACDEC04EA0E6A25312107613752B /* RDEPUBNavigatorState.swift */; };
-		1821DCCE34F09CFAFC840B8056261A3B /* epub-bridge.js in Resources */ = {isa = PBXBuildFile; fileRef = 185B84B524EAE491C132A0D5767A47A1 /* epub-bridge.js */; };
-		18BBD23FB90837351F558436FC08FF06 /* RDEPUBPageResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = A07475B86BDC87B5618833917A8D6846 /* RDEPUBPageResolver.swift */; };
-		18DC401EAF2806E997C291DA99117777 /* RDEPUBNoteModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0970981DC5A3462A9E0B9FD7CF88E66 /* RDEPUBNoteModels.swift */; };
+		15E9894983D8DC1E17BDAF2DAA245360 /* RDEPUBWebView+JavaScriptBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = F661AA03BC0EBFBDBBC00AC38E62EF34 /* RDEPUBWebView+JavaScriptBridge.swift */; };
+		162118890D7B65D3C4E7D257A1C10913 /* RDEPUBReaderHighlightsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98E0E994653153A8BF5451529E78BD86 /* RDEPUBReaderHighlightsViewController.swift */; };
+		16C0E9481964DFB28C80DB847403036A /* RDReaderGestureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 172DDB09A6DD0C1A92FCD7AF5060B657 /* RDReaderGestureController.swift */; };
+		171DCD68BA95D701F1FBA8F02A865BCE /* RDReaderPreloadController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC2313F8B75FDFEFD0DBDD842F76D012 /* RDReaderPreloadController.swift */; };
+		17254666C151CD8FED29CD9ED51556D8 /* RDEPUBCFIMarkerInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963DB0508456E313DFDD8A01BD92C4AD /* RDEPUBCFIMarkerInjector.swift */; };
+		175182AF75968DA8966AFC28250C3E0F /* NSString+DTURLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7F3535507F56824BA21509302CF8B3 /* NSString+DTURLEncoding.m */; };
+		1763403B89A04B154B404C19CEBA335F /* DTFoundationConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = FD03567681A79FFB6E81B3105503065D /* DTFoundationConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		17B3296FE8254C2D47DFE4FD19949503 /* RDEPUBCFIUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3C14E09958710059E09B6816BC50FF1 /* RDEPUBCFIUtilities.swift */; };
+		187488196599FAE35DE1E51925A0DF6A /* RDEPUBTextBookBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80CBF12B91CD7E30B52521195ACD8066 /* RDEPUBTextBookBuilder.swift */; };
+		1908212D1BAB262381AEE80002D1C7FC /* RDEPUBReaderServices.swift in Sources */ = {isa = PBXBuildFile; fileRef = B83D2091A24AC3D4A98E99AD499C381A /* RDEPUBReaderServices.swift */; };
 		191824B2B1E1B0A7DD3B6298100B4B8A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE4821B98DDE6C71411EC139EC6D2762 /* CoreGraphics.framework */; };
+		194A976E63A09667F53C9FE293F5B8C6 /* RDEPUBChapterCacheKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2205C761CC6E3BD03E29D00247B8017 /* RDEPUBChapterCacheKey.swift */; };
 		19649ED312D92A6F5D2D6AF4E540CE75 /* DTHorizontalRuleHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = E28CA95D89DBAB2FE56BC8513D5838D7 /* DTHorizontalRuleHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		198B592D09442217CE19FCB164656801 /* SSAlertViewExtention.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2280F2302F54E90122747821FE681543 /* SSAlertViewExtention.swift */; };
-		199F1C8881CDBEAE57DFB65506C7DEF4 /* ConstraintInsetTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32A5ABB8F3656A110B955B0306E9A8C3 /* ConstraintInsetTarget.swift */; };
-		19B463842FAB4F381F5029633C3A4BBA /* RDEPUBTextRendererSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C53B14CB594A5D925B516A21278616E /* RDEPUBTextRendererSupport.swift */; };
-		19F0D582B0D7ACF55B5DED2F3C574D7F /* RDEPUBTextSelectionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2BD4E767D37F40AB6BF4221B97BA1D1 /* RDEPUBTextSelectionController.swift */; };
-		1CA3B649A1C37BF66FA7A3C7759169D5 /* ConstraintAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9593E7B37569219F8D9A504B47707DC /* ConstraintAttributes.swift */; };
+		1982F649017D511A11E32DEAC7236CE4 /* RDEPUBNavigationStateMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = A4AC6CA9870D7941FA2F27711C6038E4 /* RDEPUBNavigationStateMachine.swift */; };
+		1B0EA0C22B5B0469D49C4E19BB68D7DE /* ConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28D62D3200AC3D4E42C81CDFF7E884E8 /* ConstraintItem.swift */; };
+		1B274610DB6E2AABA67FFC50BF1B5BDE /* RDEPUBCFIGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97F7B41CF52C44365ABC89D0081C7DDF /* RDEPUBCFIGenerator.swift */; };
+		1B3D933930FC50612BEEADBB84204EA6 /* RDEPUBChapterSummaryDiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 385AC715B035543F28D98F44262302E3 /* RDEPUBChapterSummaryDiskCache.swift */; };
+		1D236F47AD10304D7E61547C956BDD9B /* RDEPUBChapterWindowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA25825AB5D083AD35744145AF10E718 /* RDEPUBChapterWindowCoordinator.swift */; };
+		1D397699D725D0B63980271F92D9672F /* RDEPUBReaderController+AttachmentTooltip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90D060B1A624B2699F408C993E8C418B /* RDEPUBReaderController+AttachmentTooltip.swift */; };
 		1D460603DCA4A4E5ECFE8FF1F1CACC10 /* DTColorFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = AFC4C9F69BF2D0CAEBAA83896C139D2C /* DTColorFunctions.m */; };
-		1E9D894DBECB080883E51F02663B39F3 /* RDEPUBNotePopupCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E372A80D548A620EDE72D9EF7CF565CC /* RDEPUBNotePopupCoordinator.swift */; };
-		1F2667B7B6FC86EB64C1AAB7FF52B6BC /* LayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 932FD688DE493323BA6B691BC2CB5094 /* LayoutConstraint.swift */; };
-		2007C62F53DDCBE211EB0B023BBB7CE9 /* DTCoreGraphicsUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = A8DFDCAB69B471EB5667C964865C26CF /* DTCoreGraphicsUtils.m */; };
-		201C85ECDAAC33554D4F6F42BC88E98F /* ConstraintDirectionalInsetTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = A651CEE8062C84A597DBC44ECA3DBCC1 /* ConstraintDirectionalInsetTarget.swift */; };
-		20CD6C8384E3F61636633BEDFC351B83 /* DTFolderMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2101691D5743105B2E3E40376584B91C /* DTFolderMonitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		212137325B8B7FA304F53A2A9FA1D207 /* RDEPUBTextBookModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DCEB3A6D3DF3CC1DBE0AE0B947B9ABD /* RDEPUBTextBookModels.swift */; };
-		2188FC782E46E8511439AEAFD9D714C8 /* RDReaderPageChildViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 131CFFE1A72EF99B7007E8D814659B67 /* RDReaderPageChildViewController.swift */; };
+		1D4D78DA0BD6B1928CD54AC5DC82353B /* RDEPUBPageMapReconciliationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D15EBEFE87571B56DE884F4C60118CE5 /* RDEPUBPageMapReconciliationCoordinator.swift */; };
+		1D5093C35F8EF012FF48FCB91F312F0C /* RDEPUBReaderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACBDBAB2D4A07BA86ABF3F196E275CD2 /* RDEPUBReaderController.swift */; };
+		1EA6B0C9801AAFE8C4A27717B91E7A7A /* Date+ZIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76A97683FB5E8E8B86EA4AD71F6F4B4 /* Date+ZIP.swift */; };
+		1EB37E83C162AEBF22EFA71AECE18298 /* Entry.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD081272B47A3B73CE693D21DC26827 /* Entry.swift */; };
+		1F89F883CC03311F2801F0B80B3A1CF3 /* RDEPUBParser+TOC.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4E65CBFE33A55487727CE851F95C96 /* RDEPUBParser+TOC.swift */; };
+		1FEEAE25C66FA8EA607876915ADC1830 /* Archive+WritingDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98C7359A7C3FC7675FED220200A43A17 /* Archive+WritingDeprecated.swift */; };
+		207D9BDB05964DA9EA4418E83C1530FE /* RDEPUBPageBreakPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABBF727ED6EB3FA3EA88597AD35642B /* RDEPUBPageBreakPolicy.swift */; };
+		20EBD9A7748D5BB4D24ACCF08EAEBC17 /* ConstraintDirectionalInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91144FC099DD458E61625CD939577DAA /* ConstraintDirectionalInsets.swift */; };
 		2203356EEA94A9172BC7902923E43CBE /* DTCoreTextFontCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B7771FDE9AB1688166584C0AA03F12A /* DTCoreTextFontCollection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		23AC535B4DC5D8475ED2B1273C501F95 /* RDEPUBChapterData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EF7020C5BFFD68865D54D1B940E73C /* RDEPUBChapterData.swift */; };
+		23F8E9928335EB706B9D340097111305 /* NSURL+DTComparing.h in Headers */ = {isa = PBXBuildFile; fileRef = 731C0C61E3AD227D691FBA1C2C17BF7B /* NSURL+DTComparing.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		24395BEB3C360D9DA5180BFB955B04A0 /* DTAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 21BAA93E67D8CBC5297302D798FB4F7A /* DTAttributedLabel.m */; };
 		2445709667CB3820E51CD4AA915E6943 /* DTHTMLParserTextNode.h in Headers */ = {isa = PBXBuildFile; fileRef = C30D143134EEC5D4BA99459104B76A2E /* DTHTMLParserTextNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		24C5B52FD2AA9C49731DC6859ABA7CDE /* NSDictionary+DTCoreText.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C50CAB4241C141EF6EC9ED22AB3A7E8 /* NSDictionary+DTCoreText.m */; };
-		250AC11D6AA2C09A43005F7396750BA1 /* LayoutConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E8C0D83EB6EDE71B264B6B0DD4644F5 /* LayoutConstraintItem.swift */; };
-		2607587B5FDA75B26AA6752D53807F08 /* UIColor+RDEPUBHex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FA15767EC291461F99B4542D3B36765 /* UIColor+RDEPUBHex.swift */; };
+		256B83F8FFBB3009C30A49DC549A6EC3 /* RDEPUBTextAnnotationOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E8DDA0C0AF445B5BC5E2B60508BE58 /* RDEPUBTextAnnotationOverlay.swift */; };
+		25D59C50A9C2B60F797B1BFDB50A8AE0 /* ConstraintDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6578DFAB51436E8DF266FD087700E26B /* ConstraintDescription.swift */; };
+		25FDC87B68FFF9003A4DDA8C20C9B8D2 /* RDReaderView-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = F29D75FFF877587EAEA07BBE58C097FB /* RDReaderView-dummy.m */; };
+		26EA72F11D12D8B2990F0EAC76459EA3 /* RDEPUBDarkImageAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAA57C95D8912B8505C8DA1AD4B6AC6 /* RDEPUBDarkImageAdjuster.swift */; };
 		270C5C10028F0BC5A62548326CCB379B /* DTColor+Compatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = E196F56E68578181D5BDE787DE5C0F3A /* DTColor+Compatibility.m */; };
-		2739C4856206A85B576605B1678F0976 /* DTBase64Coding.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E40E302B85493BDE0FE91F829EC01E /* DTBase64Coding.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		27CA932D638248B5B6E6461F2141ECAA /* RDEPUBRuntimePageCount.swift in Sources */ = {isa = PBXBuildFile; fileRef = C55CB28CF41D832FD4871111E37FEAB8 /* RDEPUBRuntimePageCount.swift */; };
-		27E3B09CFC53A752CE3AAD42C2AA1534 /* RDEPUBChapterDataCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6CD922C6490932E56AE12DC05A0323D /* RDEPUBChapterDataCache.swift */; };
-		280F95B9F931FA58FB5BF0AD31364517 /* NSURL+DTAppLinks.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D36F7CDCD7D5788CDCB3A1421DB242B /* NSURL+DTAppLinks.m */; };
-		28ACCBC0A505F96A4133B5C78DCF71EA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
-		2980081BE00EA77C2AF67C725958E14E /* RDReaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB7C9B1AA97A421E72968B30CE09C515 /* RDReaderView.swift */; };
+		2744CEF2A6D29AD6AD3B262FE5A17395 /* RDEPUBAnnotationModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B888CEDF0E6ECE3807EF95D1BB7D400 /* RDEPUBAnnotationModels.swift */; };
+		2787D611BA02BB3CF87E83D0D576BD1E /* RDEPUBReaderSearchBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F0670803E8267332E1891D6AB6E5A3F /* RDEPUBReaderSearchBarView.swift */; };
+		27A49CAF4369774F8BAFA4829F4DC303 /* Archive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C8F0DCEAA5A3DF38C503CA30DC94C1C /* Archive.swift */; };
+		27CB714678010A30099E9B7A6A945451 /* RDURLReaderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEDA10329B118CA762890DD7D8B64C6C /* RDURLReaderController.swift */; };
+		2869C86624156F94B05ABC01C47DA085 /* RDEPUBPublication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34AAF33D5968FF88E52BE323BE82F631 /* RDEPUBPublication.swift */; };
 		29D9B32DFFC59A157EDEF005DB92A5AC /* DTCoreTextLayoutLine.m in Sources */ = {isa = PBXBuildFile; fileRef = C71D83D6AEF198FA680B8A80BF2D9605 /* DTCoreTextLayoutLine.m */; };
 		2AAF9361720FC2D8FFCA93B5FAE42019 /* NSMutableString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 31F3F91D5624C451E5D44D85B1DDE7C5 /* NSMutableString+HTML.m */; };
-		2B06CE855FB063A11BB658BE6E5AEE47 /* ConstraintRelatableTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 885653999BD237A574B67DB279DE7E87 /* ConstraintRelatableTarget.swift */; };
-		2B5D066B1A3182465F3BC487E09E75A7 /* RDEPUBTextRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62857539DB0215B98E04F70642B6FEF /* RDEPUBTextRenderer.swift */; };
-		2F08C642151D4365F5311B1E4BEB9DF5 /* NSURL+DTComparing.h in Headers */ = {isa = PBXBuildFile; fileRef = 731C0C61E3AD227D691FBA1C2C17BF7B /* NSURL+DTComparing.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2ACF19FB7F905D8831BF3779A1D2E0DC /* NSString+DTFormatNumbers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACA5E519F100582F0D772FCD76125C0 /* NSString+DTFormatNumbers.m */; };
+		2B636C6C8FFECF2614162FD48ED07017 /* DTHTMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FB2B1B0498DCBE7B79BDF49E963E3D /* DTHTMLParser.m */; };
+		2BBF15A41205114D992E57839B93A738 /* RDEPUBViewportTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6886C52EAE45B38A526CD917C8CBFED8 /* RDEPUBViewportTypes.swift */; };
+		2CD768D642EF8DE4EBD5F9D5836FAFD2 /* RDEPUBWebView+Reflowable.swift in Sources */ = {isa = PBXBuildFile; fileRef = E474E1489E80ABDF6B665BEA40856E40 /* RDEPUBWebView+Reflowable.swift */; };
+		2D9711ECF31F92B6344A4B4769E7D18F /* RDReaderView-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BF8C1B2C40980FB07D49180D7285667 /* RDReaderView-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		2DC30426D54A9ACE171812C9B71CAC68 /* ConstraintConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7176B677A350927FC670368313DC2CA1 /* ConstraintConfig.swift */; };
+		2E2F479275A0D936C2A1E87C6765A47D /* RDEPUBStyleCompatibilityModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEEE722A6CEB62B173B8C71F0E7336C7 /* RDEPUBStyleCompatibilityModels.swift */; };
+		2F24F22928E575299BF137619DE2C018 /* LayoutConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E8C0D83EB6EDE71B264B6B0DD4644F5 /* LayoutConstraintItem.swift */; };
+		2F4CB2CA3F00A4AAA725F3C17D95D991 /* RDEPUBResourceURLSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4245A0DA8D1ED324142168C60B775253 /* RDEPUBResourceURLSchemeHandler.swift */; };
 		2FD7360250C2255A80583D4CF518FBFA /* DTTextAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = F35039A8D0AA1F7BAFC4E5E016057E15 /* DTTextAttachment.m */; };
-		2FEF9BD3D2DCF9984F302B0B342E2FDE /* RDEPUBReaderAssemblyCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA69FA9C9BC5DF26BCD177FD42113865 /* RDEPUBReaderAssemblyCoordinator.swift */; };
-		30152FAF375CFF872A8224FDCA86F1C6 /* RDEPUBBuildDiagnosticsReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F240829B62338026772A632D8857F072 /* RDEPUBBuildDiagnosticsReporter.swift */; };
-		30918A2B4503249D8335CEA4211F7F3D /* DTActivityTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EEFAE80193E1F0DA53400C9AD641410 /* DTActivityTitleView.m */; };
+		2FE5650E3D74E35D130BD0BAC8C37E5B /* ConstraintLayoutGuide+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A82CB094636AFB53D6D130D6219BA /* ConstraintLayoutGuide+Extensions.swift */; };
+		301B3D81C6A28B5777E01246CD33D13F /* DTSmartPagingScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D2BA6D5DBD4C6A9285C4592721790A26 /* DTSmartPagingScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		3044AAD1DE4C39601994F84CEE57223D /* DTCoreGraphicsUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = A8DFDCAB69B471EB5667C964865C26CF /* DTCoreGraphicsUtils.m */; };
+		307AA99D0BF12F418BB9CA6275F5EFA0 /* DTVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 8BD9F2023FF826F67E69E3407A70A8A6 /* DTVersion.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		30C01FE491C26314F776AD8B2AF136FA /* NSAttributedStringRunDelegates.m in Sources */ = {isa = PBXBuildFile; fileRef = E6F2E79CC33E0823C4E719ECDDFBBE08 /* NSAttributedStringRunDelegates.m */; };
-		3135BC3DE6BF95DD048166D4009250F2 /* ConstraintLayoutGuide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6BA0ECCB0ACF8580C3B5192CA9F11B /* ConstraintLayoutGuide.swift */; };
-		3168249FF21A14A541C5B33CA9F100BF /* DTTiledLayerWithoutFade.h in Headers */ = {isa = PBXBuildFile; fileRef = DF5EDCA3B21964D0462BE0982E2F0BF8 /* DTTiledLayerWithoutFade.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		31936037BAEE5E4BEE51079EBCBE7979 /* DTActivityTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EEFAE80193E1F0DA53400C9AD641410 /* DTActivityTitleView.m */; };
 		31B805C50E0E187E6242B0C878C4D30D /* DTCoreTextMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5D34047BAA894BEF1DFA23E6A9DAB1 /* DTCoreTextMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		31CD9BFD4FC3440B65D2BAECF5498C67 /* UIScreen+DTFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = A3765B289CB7E6C5DF6160D8EBC83C3C /* UIScreen+DTFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		321B7492C392FD926990F3C22046D36C /* RDEPUBCoreTextPageFrameFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 894685F6BF9DF2124012989C5A853657 /* RDEPUBCoreTextPageFrameFactory.swift */; };
-		32E7466AFBD2A21BE166BC60E3FBC6A1 /* RDEPUBTextSearchEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 353F8BB9AB59FF88C959A7878D4CA687 /* RDEPUBTextSearchEngine.swift */; };
-		341495A2CAABE7DB0220CA8E52685FEC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
+		31D1715DF1621964DCA8D10501899FF8 /* DTBlockFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 375179DD3A4576CEF947E1760BBDC69B /* DTBlockFunctions.m */; };
+		31E3EDECC6470B4E92C97F58E80965E8 /* RDEPUBChapterTailNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0348219C5299B3BE84133818923C2495 /* RDEPUBChapterTailNormalizer.swift */; };
+		32ACD94F1F25F38FB0D6073734C3436C /* RDEPUBDTCoreTextRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 902C1572982F594CBCFA71AF8CB6749A /* RDEPUBDTCoreTextRenderer.swift */; };
+		32DC4D93DFCF2924AAF7EF4AD7447DB7 /* ConstraintLayoutSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50297AAB8278F2BB6FCFE82B20C7A049 /* ConstraintLayoutSupport.swift */; };
+		332B3EE547B4ECCFD2179D50888BDF6A /* RDEPUBReaderSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B19C4570618CC1C8B9E8488EBCD9B0F5 /* RDEPUBReaderSettingsViewController.swift */; };
 		343E794F88AA503F5139C2244DC1A2B1 /* DTTextAttachmentHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = C298199F5DC5390E8B6666F638B34C10 /* DTTextAttachmentHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		34B9FF3A8CF941CD7CD9672B32B035E1 /* RDReaderContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93972052546ECA81648EFF429E5957E7 /* RDReaderContentCell.swift */; };
-		34E5F03407D6D33E77BC9F05BB743636 /* UIScreen+DTFoundation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F051D813D50D20D53205D5FDCAA877C /* UIScreen+DTFoundation.m */; };
+		34F6005B80DA064C0B099A3288AD95D5 /* RDEPUBSelectionOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5E488026478CA9CD4FAF23BF378F77 /* RDEPUBSelectionOverlayView.swift */; };
+		35C3A7AAA0BC0F615EF7159D64EB4372 /* DTFolderMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 2101691D5743105B2E3E40376584B91C /* DTFolderMonitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		35C5BE59CA712CCDF93D6E7010D93883 /* DTAttributedTextContentView.h in Headers */ = {isa = PBXBuildFile; fileRef = C123C127CC539ACCB510F665DB774899 /* DTAttributedTextContentView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		36EA1AECCD44BFCB0B0F5D813C498BA5 /* NSMutableArray+DTMoving.m in Sources */ = {isa = PBXBuildFile; fileRef = 53499F40E1790A6CBE8AFEB3AC5BEFC8 /* NSMutableArray+DTMoving.m */; };
-		372C0740C5EED5C26DC875692045C5D0 /* RDEPUBCFIMarkerInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22E148D0D8C1F600CA1943413EF56747 /* RDEPUBCFIMarkerInjector.swift */; };
+		361AAB8943E201F1BF3256580CA4ACDE /* RDEPUBPresentationRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 033DD9B982E8F1F948C5787EBF92FF84 /* RDEPUBPresentationRuntime.swift */; };
 		372E907DF08263D0E1AF904F1FCD66EB /* DTTextAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = D36ED8209C907E3E9B074DDB399F54FF /* DTTextAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		375C7EC87B5FB3F6680B1F0E91141FB0 /* RDEPUBReaderTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB9386EB6459AF8A05BC94E5005D8BAE /* RDEPUBReaderTheme.swift */; };
-		37B64EB1C9E1459F5AC2B2BBBAF99DC5 /* ConstraintViewDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E5637603691B9B35C2A886B686D3CE7 /* ConstraintViewDSL.swift */; };
+		375E640C8EA1A38D61C1566EE7691017 /* RDEPUBBuildDiagnosticsReporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B62D239E65A52677A36BA68DB820FEA /* RDEPUBBuildDiagnosticsReporter.swift */; };
 		389F7C8400F9223C019F2D7825CD2369 /* NSCharacterSet+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 713C9FD0354D16AFCCFA630A97F2DA68 /* NSCharacterSet+HTML.m */; };
-		38C261F16337E9B69ED2742E534A74DA /* RDEPUBReaderRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 359F75D2BB7409EFBC61AD7E6DE918CB /* RDEPUBReaderRuntime.swift */; };
-		38D4A2C8E463ABD4D15994EFD7BAE2FA /* DTHTMLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FB2B1B0498DCBE7B79BDF49E963E3D /* DTHTMLParser.m */; };
-		3A19DC1CCF05E3E0E03E1D2F649E9B25 /* RDEPUBPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C505B31D0CDD88D76E0DF9050060A3B /* RDEPUBPreferences.swift */; };
-		3B49766F799BF9C74FBC713811681F70 /* UIView+DTFoundation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4219E7C32019899890CAB66E5FBDF524 /* UIView+DTFoundation.m */; };
-		3C140FC052F8A1D7EF246A1029FD4C69 /* RDEPUBPageCountCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FB9FC4847266E4F97CB262C4207B9D4 /* RDEPUBPageCountCache.swift */; };
-		3DA0E91F1BA8F67C49BE76D012A51C24 /* RDEPUBFragmentMarkerInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7D8A417E2638BDB5390CD236CA05970 /* RDEPUBFragmentMarkerInjector.swift */; };
+		38B74778B7E961F82ED9083E7BC612DF /* NSString+DTURLEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 31BD7533867336DEA9B835F471767178 /* NSString+DTURLEncoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		38CE5AE7F08F51BCA49E57210C73DD8A /* RDEPUBReaderRuntime.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC010729FF0DC7965F4E61FE4B7DAED8 /* RDEPUBReaderRuntime.swift */; };
+		38DA59D7FEE7CE3915421A2AB5AC24A0 /* RDEPUBRenderRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44A3A2C05CEC2C66E821919A93A14590 /* RDEPUBRenderRequest.swift */; };
+		3970919FD97D377196BA9EC376C18679 /* RDEPUBCoreTextPageFrameFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 620F6EB9BD2515CCF9666EBD79D1E206 /* RDEPUBCoreTextPageFrameFactory.swift */; };
+		3A3A1DC5BEAF852DDD4816158D34F2C8 /* RDEPUBPageLayoutSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16945B1BA7C2D8D318AA4A97FB53A619 /* RDEPUBPageLayoutSnapshot.swift */; };
+		3C976145343B9E986CF8D88E0D0EF51F /* RDEPUBChapterRuntimeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B72D18F1336296178742C907A3956E45 /* RDEPUBChapterRuntimeStore.swift */; };
 		3DC8F9474FC6A0BB7E81A703CE958966 /* NSAttributedString+DTDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E2D85A099C99CD82FD1842EE7C52D2 /* NSAttributedString+DTDebug.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3EBAA73012237F0806BAC1EE895E43CF /* NSArray+DTError.h in Headers */ = {isa = PBXBuildFile; fileRef = CEA93EDA6ED54D374265AA5D6B9EBBA9 /* NSArray+DTError.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3EE5432AB09356A3B677F4EB66257001 /* NSString+DTURLEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = CB7F3535507F56824BA21509302CF8B3 /* NSString+DTURLEncoding.m */; };
-		3FCE06668A09A4C516EF313BE8353CD8 /* ConstraintRelation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3593ADF561D422F73C8EABAD4A4F440 /* ConstraintRelation.swift */; };
-		41C76F526D6730D50F949F441B3A5622 /* RDEPUBTextLayouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB81992F504A7D5880AADAEC0D3CA063 /* RDEPUBTextLayouter.swift */; };
-		4220674496D5B5AE5B59CE4B3CB78E09 /* SSAlertPresentAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = E481007A8174943868EBC81CF3B04B9F /* SSAlertPresentAnimation.swift */; };
-		42A88BC5E0C5515E4B19A41507D8F08E /* RDEPUBPageBreakPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11FD2C3FDE35580B59901C23E905647A /* RDEPUBPageBreakPolicy.swift */; };
-		430B7F50CA10F44CEA21D1ADC7AAD7F7 /* RDEPUBTextLayoutFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FDEFB6939DB3DF5D5226B932821BA /* RDEPUBTextLayoutFrame.swift */; };
+		3DDC7432B3FE5E5A9B1A42256329F234 /* RDEPUBParser+Resources.swift in Sources */ = {isa = PBXBuildFile; fileRef = F53F2F0463AC1292BFE9AFE159F8016F /* RDEPUBParser+Resources.swift */; };
+		3FB97DCC2725FEDD8D19633B8C363F4B /* Archive+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A2659DB0685E16ABAE0382F726DA8C8 /* Archive+Helpers.swift */; };
+		40221D5B7717ED1BE8F6AC59EC9F3CEC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
+		40BFADA4560F1139652A89FA86489ABE /* SSAlertSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DE4FA5133891593CB45AF36B8EBF60C /* SSAlertSwift-dummy.m */; };
+		418D49534E919DB3A6D1285C6550DF52 /* RDEPUBReaderDependencies.swift in Sources */ = {isa = PBXBuildFile; fileRef = 744C73D1186E82ACC4BDB4FBB30CFACE /* RDEPUBReaderDependencies.swift */; };
+		4287D10B8D0884C63F409C49114962DC /* RDEPUBPageCountCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = E05401D6B263F054E8B15A3B594BC5A5 /* RDEPUBPageCountCache.swift */; };
+		42CC3E0AE7FD1C91407FA62F312257D0 /* RDEPUBWebDecorationOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CF30C46F1B4F469D06B27690215880A /* RDEPUBWebDecorationOverlayView.swift */; };
 		44B1FBF893C06F314F8C9BD1405897D8 /* DTCoreTextGlyphRun.m in Sources */ = {isa = PBXBuildFile; fileRef = 36FCB869246FE45FD1C9609A34EB4E74 /* DTCoreTextGlyphRun.m */; };
-		44DF1D504693C82463D12814053B3129 /* RDEPUBWebView+JavaScriptBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5BC57D6984ABDAFFD87B95AFA6410F7 /* RDEPUBWebView+JavaScriptBridge.swift */; };
-		44FD96B04359F05543DD91BF291C3396 /* RDEPUBTextBookCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6DD0AAE60C26C35ADA0C19CE0FD97F /* RDEPUBTextBookCache.swift */; };
 		45133E47CC5FBCF78BFCD38981BA027F /* DTDictationPlaceholderView.h in Headers */ = {isa = PBXBuildFile; fileRef = 982391EC8620A617B8788C8A6101C96A /* DTDictationPlaceholderView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		455B57E7D4F7025BCAA9686237ECE4D6 /* RDEPUBAttachmentTooltipOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83FE23C4421208A77C790E396C2391EC /* RDEPUBAttachmentTooltipOverlayView.swift */; };
+		4586631E0F11BDF2C667A8DAB6E33D7C /* Archive+ReadingDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 934F9BB2B3A313294F121484C3A97A14 /* Archive+ReadingDeprecated.swift */; };
 		45F90B98546FDBA03AB112DFE859A185 /* DTCSSStylesheet.m in Sources */ = {isa = PBXBuildFile; fileRef = E0D90EB06FC37D534934542F9CAB1D74 /* DTCSSStylesheet.m */; };
-		45FE3D80303BBDE2949908CCE024A12A /* Entry.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDD081272B47A3B73CE693D21DC26827 /* Entry.swift */; };
-		463D329012D5C787425D1345B1633E57 /* SSAlertCommonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4EE750340347ED584C5A2C1164331A /* SSAlertCommonView.swift */; };
-		466E26F6E7B4C5857B1C2C6693AAE07D /* DTLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B007AEEACE9EA271DD73AFD80A74D83 /* DTLog.m */; };
+		463882F4C6BCD5B6329CEC1CAADADD0A /* RDEPUBParser+Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEA0316D9580EFCF73105A138F13E33 /* RDEPUBParser+Package.swift */; };
+		46489255286B880DBCB326C15E0058BF /* RDReaderView-RDReaderViewAssets in Resources */ = {isa = PBXBuildFile; fileRef = 83410CC9CF2ABE63B90A92F2F988BF65 /* RDReaderView-RDReaderViewAssets */; };
 		46EF32D586FF590CE2C60C66364B9357 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEB14A8F8170777DB7CCC3F27C8EA57A /* ImageIO.framework */; };
-		48410E1D5D8A303BFE707BF9D06A9210 /* NSString+DTUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCECDBD73595CA88A2208000B4B68352 /* NSString+DTUtilities.m */; };
-		4871F893C7D297F99210CB66E4DB7FEB /* UIApplication+DTNetworkActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = 957DB4675D5CCBD3CB1762F08619F3F7 /* UIApplication+DTNetworkActivity.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4973DD76014C7D52D49336FB09FF40B2 /* RDEPUBTextPaginationInterfaces.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3344122296561C5CBCF4E54ABF146A05 /* RDEPUBTextPaginationInterfaces.swift */; };
+		4722E3071B57E0DF9CB521EC230360E3 /* RDEPUBWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC162013E2626B2489739C731077B43C /* RDEPUBWebView.swift */; };
+		475B19074137EFDA4106EBCCCF36FC6F /* RDEPUBParser+ReadingProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76610C58FDE0133C7B8E5E15CD84C663 /* RDEPUBParser+ReadingProfile.swift */; };
+		47DC0686898DE2FE0A1603ED796362B7 /* RDReaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F20C5D28C46992997B5F00839C906E95 /* RDReaderView.swift */; };
+		48B88876F05C31838B1F49392467CD64 /* ConstraintLayoutGuide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6BA0ECCB0ACF8580C3B5192CA9F11B /* ConstraintLayoutGuide.swift */; };
 		4A13B4E5EA8616A8F09D90BC6EAEEA64 /* CTLineUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = D24FE8634A7AD2562DB8ADB9D4BBB36A /* CTLineUtils.m */; };
-		4A2DFBC6BC78F69E2E1271B172961573 /* RDEPUBCSSCompatibilityLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57FEB4E33E705DD0A1EEBDB548856FEE /* RDEPUBCSSCompatibilityLayer.swift */; };
-		4A3A26648CAB8160C7F75594F2A84ABB /* DTWeakSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = C422BCADBB48E28B549495663705A0FB /* DTWeakSupport.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4A4D88B930A08AB452F0F005AD56092C /* ConstraintMakerPrioritizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E138EC76D0DF24544D29D1A4D7429E3 /* ConstraintMakerPrioritizable.swift */; };
-		4C1E7C46DA5071BD121AF6FF7B07D26A /* Archive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C8F0DCEAA5A3DF38C503CA30DC94C1C /* Archive.swift */; };
-		4C33C6784F628AF36EABA082613B7F50 /* RDReaderViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A867717C525A9DC522388125DC5DB70 /* RDReaderViewProtocols.swift */; };
+		4AFFC3A7A62BC90E2BBD7529AE89CD36 /* RDEPUBHTMLNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B833FD47EDD18F132A4F3DABFD3E55 /* RDEPUBHTMLNormalizer.swift */; };
+		4B640F3B02D43DE8B78B644E0A95449A /* RDEPUBParser+Archive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ABD098B435C30F2039019D7646E87ED /* RDEPUBParser+Archive.swift */; };
 		4DA6EC46F8968265B96C6D7B2260C4E5 /* DTTextBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC5AC8FD4EC45E9BA5654A38715BB93 /* DTTextBlock.m */; };
 		4E4939F6592B06D2CA764DCACFB47871 /* NSString+Paragraphs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E37DC74BB53F90A5AD54842858A62F /* NSString+Paragraphs.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		4F1F69CAEDB394394069F0D48FB63D3C /* RDEPUBPaginator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFE2EF5C5FBC43651748B45835D2341C /* RDEPUBPaginator.swift */; };
 		4F50C703427747B88405080B221349A1 /* DTLinkButton.h in Headers */ = {isa = PBXBuildFile; fileRef = D7B5E61166782ED8D585D4FCEE2074DB /* DTLinkButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		500F1BD399C196CDACC137DCD7D53541 /* RDReaderView+PageCurl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77E36CB709B0609F38B9C5F40B7A18C0 /* RDReaderView+PageCurl.swift */; };
 		5065D99E1588E8CC60677E74916A5C03 /* DTAttributedTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E1F63A854BBF28E93AC1D3F71CD48CBE /* DTAttributedTextCell.m */; };
-		50A66D5CD5F84EDB743A777CCA3B7DAA /* RDReaderView-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F829B34569967604450F61013CCC9618 /* RDReaderView-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		50E6F4B858B375E9AA9C0307C166513F /* RDEPUBCFIPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = F25A8801661F7DE4DEAC12BE1F80C332 /* RDEPUBCFIPath.swift */; };
+		5130C9666BA0D9DACF1D4017B6E94D96 /* RDEPUBReaderController+ContentDelegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EFA16D97F8CC8E61C22F3CEF546EAA3 /* RDEPUBReaderController+ContentDelegates.swift */; };
 		51A1B5800D23C355B1712E8D1103780C /* DTTextBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = D497C3CA364E37DAAFF2C3B90CC7DBE8 /* DTTextBlock.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		51FC51399196DA502C5A7087A976BAA9 /* NSData+DTCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 17F750F38183302BF345F40F5A4CDD43 /* NSData+DTCrypto.m */; };
-		52175713D0946A41E8B3456962C66497 /* RDEPUBChapterSummaryDiskCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE9A97D0E8929D0099B94184E082884D /* RDEPUBChapterSummaryDiskCache.swift */; };
-		5245E48FEB0384830479DC0E5C87C7E0 /* RDURLReaderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5753416D2D985EAF1FF9D9062157847F /* RDURLReaderController.swift */; };
-		52899BA81CC02CA4AD6FED39E1950CE8 /* ConstraintPriorityTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 882FA707ED3513D263A1E0656AAD2D33 /* ConstraintPriorityTarget.swift */; };
+		51BE76461ABF61F23EF33C7806706720 /* NSURL+DTAppLinks.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D36F7CDCD7D5788CDCB3A1421DB242B /* NSURL+DTAppLinks.m */; };
 		528DBAC7FCEFC7D6575C1F6CB4399AEA /* DTStylesheetHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 96FA99AA7D4AD0D4246C8DAC1CC0C24E /* DTStylesheetHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		53D40D48ED1D448218140D554BDA8D72 /* RDEPUBChapterLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAEE3906C167B40C116FA472D9C78D0 /* RDEPUBChapterLocation.swift */; };
-		540822933C75A6D634E642A6D47C3891 /* DTExtendedFileAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 538572A5C098252D629F2185F1B1C9E8 /* DTExtendedFileAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		539FF993AAAE6D3C0F5D0038DB1E0673 /* Archive+MemoryFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 174FC0CA05D20BB995E211DE5A0857DB /* Archive+MemoryFile.swift */; };
+		53AA94D0D8A26ADEA82DF5FF5A984948 /* RDEPUBStyleSheetComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A0A410374DBCE1B5533846F0BCBC36C /* RDEPUBStyleSheetComposer.swift */; };
+		54E64A136D38FA0FD478BD00E3783754 /* RDEPUBReaderViewportMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C18CB52F788E649EF3C7AA2AC11100A4 /* RDEPUBReaderViewportMonitor.swift */; };
 		5582735073EBB9F5078E6E8AEEFB646A /* DTCoreTextLayoutLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 64AB89EAB10148C39B726B26BE04F4F8 /* DTCoreTextLayoutLine.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		566BAF8F3A4F7CDC18257CDC85026824 /* RDEPUBChapterPageCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3057D9BAC5FEF58836805FA2BF615391 /* RDEPUBChapterPageCounter.swift */; };
-		56C59D6D236063909A0518D75B67C300 /* RDEPUBBackgroundPriorityPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CBBC6BFE9C0EC921FE326274C97A36A /* RDEPUBBackgroundPriorityPolicy.swift */; };
+		55A24FCD955BEC5081C3AB397905B17C /* ConstraintOffsetTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F950CEF31AC0065C0BEAB26BA2CEFA1 /* ConstraintOffsetTarget.swift */; };
 		57D5228C8A85628772D4D78E7FBEAF3C /* DTDictationPlaceholderTextAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 477A0FC2A1F0B7F7CCF72D201ECEBAB0 /* DTDictationPlaceholderTextAttachment.m */; };
-		591BB5793CEEFE57788C1B4A60032EE5 /* ConstraintView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6DB34ACB132E465CDF8191F7DB71EF6 /* ConstraintView+Extensions.swift */; };
-		5945DD8DDFF95E316EBEDF4AC65A7DFB /* Archive+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A2659DB0685E16ABAE0382F726DA8C8 /* Archive+Helpers.swift */; };
+		57F03CA9FCCEFDCB22586C14B9D81E35 /* RDEPUBWebView+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5687CEB04DF925FAE0FC801EFA943FD8 /* RDEPUBWebView+Configuration.swift */; };
+		587C85989F02ACED1B59047E57DD68A7 /* RDReaderSpreadResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F439346FABB45D193709E61E908A616 /* RDReaderSpreadResolver.swift */; };
 		597DE4CDF5C674E269F03F6AA0AFFCC1 /* NSAttributedString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 92460D196C5300656C9649784EBD3C58 /* NSAttributedString+HTML.m */; };
-		59973A202457D00093195534132A5C7E /* RDEPUBTextPerformanceSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 564DFD9C0E67DFB3283FA05DD23C8F58 /* RDEPUBTextPerformanceSampler.swift */; };
-		5A1875EEE50E68B95B134392785F33AD /* RDEPUBTypesettingPipeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 672C726EE465BA99AAB74EA89472AC6E /* RDEPUBTypesettingPipeline.swift */; };
-		5B7D36E8DAB6192ECC0EBCEFA2A8F4A4 /* RDEPUBCFIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11846D2AA4295A15016D569CC747275E /* RDEPUBCFIError.swift */; };
-		5B9AF3B2FA07F664822E2C84C68DA81F /* RDEPUBReaderViewportMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FF725A363EE065F1A82DFDE5121520 /* RDEPUBReaderViewportMonitor.swift */; };
-		5BC39453A3690A2A210EB9E5E0E0650F /* DTAnimatedGIF.h in Headers */ = {isa = PBXBuildFile; fileRef = A9FBC69C7DA29A7283920FDA9EBBCE8A /* DTAnimatedGIF.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5C08EE3D59E015F70D7DA1B6FFFFD5F5 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1E89FE5F2996336E862E82C1E14E0EE7 /* PrivacyInfo.xcprivacy */; };
-		5CDFEE586150D99255A6F6318B3A5199 /* RDEPUBReaderUIState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4717049EE2F365C2ECA2B29A5F0CDC44 /* RDEPUBReaderUIState.swift */; };
+		59BFBA6A99843138AE3FAD9B61093B4C /* DTBase64Coding.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E40E302B85493BDE0FE91F829EC01E /* DTBase64Coding.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5A4C8D7A61A831DFE6191CE9EE8FC0FF /* RDEPUBCFIMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84432C44761FA9535E1C1C00A97581F8 /* RDEPUBCFIMap.swift */; };
+		5B2118C44FFE62D2001AFA9857425C8F /* RDEPUBTextRendererSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523B2C383DBC263294C404FA85A5DE82 /* RDEPUBTextRendererSupport.swift */; };
+		5BDB7BAE4BE48E109F955C3497E31026 /* RDEPUBReadingLocationModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13DBC142B0461E436AACC85794DA80D0 /* RDEPUBReadingLocationModels.swift */; };
+		5C6705569165F0E5D806396692FD8953 /* RDEPUBWebViewDebug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 269D68D156A9D97C9C623160D509981D /* RDEPUBWebViewDebug.swift */; };
+		5C6C440EBBA7062516303A3D7AF1001A /* RDEPUBChapterLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 167AF6E907DF607CF1D5F5B0FA05B565 /* RDEPUBChapterLocation.swift */; };
+		5CA39C9A333268929BA1DDE1254ADD9A /* ConstraintMakerRelatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD768C27E392C934C06DFB4AC401037C /* ConstraintMakerRelatable.swift */; };
 		5D03A5B9DC067875CFEC9D4EA7B059E8 /* DTCoreTextLayoutFrameAccessibilityElementGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = D863AE4F659A0F71B22DC9FF334DDF4E /* DTCoreTextLayoutFrameAccessibilityElementGenerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5D52B44C0898B6A4860C9EE59DA59ED4 /* RDEPUBReaderSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 010BA37F9FCB8C9AF363CC966A76A455 /* RDEPUBReaderSettings.swift */; };
+		5D5FDFA60EDACF69E7CE113BB41859E9 /* UIApplication+DTNetworkActivity.h in Headers */ = {isa = PBXBuildFile; fileRef = 957DB4675D5CCBD3CB1762F08619F3F7 /* UIApplication+DTNetworkActivity.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5D8D65121E87E419D8D2F23F8AF43673 /* DTColor+Compatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 80B3D15ED0D19D020663EF055386291A /* DTColor+Compatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5DC3DEE7A8C6824615C9A743FC27F993 /* RDEPUBParser+Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77584175DBE9233D48B49D24156EC5A5 /* RDEPUBParser+Package.swift */; };
-		5DD8AA7E9E05A8BC5A963DED5BD87440 /* RDEPUBReadingSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74B74728A7753AF3421EBAAC5CBD6A11 /* RDEPUBReadingSession.swift */; };
 		5E90EBD876ED4E50AB890FB56C4BFA57 /* DTHTMLParserNode.h in Headers */ = {isa = PBXBuildFile; fileRef = C8343CDCF82729A8EBCCA37A6650E34F /* DTHTMLParserNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		5F6F3D933CE5D01482234305856739AF /* RDEPUBFontNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59DF20BA6C3F0FF52936AFFA6EDBC4FF /* RDEPUBFontNormalizer.swift */; };
-		5F788EB474B6ACAA7BF1378543E68C21 /* wxread-default.css in Resources */ = {isa = PBXBuildFile; fileRef = 303D3169E20C9432C90A387A621055B7 /* wxread-default.css */; };
-		6010BB9D0F5416E28349CA1DB2110CD5 /* RDEPUBReaderPaginationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7023A986F364F329C85DD8CB36828860 /* RDEPUBReaderPaginationCoordinator.swift */; };
-		6021C418957959D68D53C7E1FB3C4B0B /* RDEPUBReaderController+RuntimeBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA169C9DF7B86076B3A4F1E4FCDB7197 /* RDEPUBReaderController+RuntimeBridge.swift */; };
+		5EBCD616AF7BB46CB2CC43B5736F94A1 /* RDEPUBResourceResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D24D7F3F52B5BE585E06538DBA3CD6F7 /* RDEPUBResourceResolver.swift */; };
+		5EC18CDFDFBA1F4F0E3357D8079F68D4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
+		5EC723A8387A3F88A30A25863FFBA52F /* DTFolderMonitor.m in Sources */ = {isa = PBXBuildFile; fileRef = B245F7E143F3091652C64F6593E33F7A /* DTFolderMonitor.m */; };
+		60290057447E24C8AE5CAE49B2B628F8 /* RDEPUBNoteResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1A5E5B0F978E87E788096796E498EE1 /* RDEPUBNoteResolver.swift */; };
 		60532A2E06CCFF814933D2FAE6793AE9 /* DTCoreTextLayouter.h in Headers */ = {isa = PBXBuildFile; fileRef = C26DBE1150BC9A30B69839783E000358 /* DTCoreTextLayouter.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		60F04C8C1CFCDC5E38F8663859412A03 /* Constraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0EBAC7714A5F73B75AAB47D24B08B71 /* Constraint.swift */; };
-		61959A29CBBD6A210737E5F55071189E /* ConstraintConstantTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F090A0289338B14050FAF16C22605B0 /* ConstraintConstantTarget.swift */; };
+		6143B5040E1B4A7149C35447B8DE2CD0 /* RDEPUBReaderState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FDBB942C7F43B24B5A42E6837AE5A80 /* RDEPUBReaderState.swift */; };
+		614F13CF514CEAEAE30F07B22E58DDA5 /* RDEPUBTextSearchEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DF49DAD850A270AF8E92ED70F66184 /* RDEPUBTextSearchEngine.swift */; };
 		61BE3607EABD2657BC71AF8ACB1C25D4 /* DTHTMLAttributedStringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B59C9A1B265393E4BA8383B308A5917 /* DTHTMLAttributedStringBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		62F47F2402C4E4EB1CA3D37E59F8F426 /* Archive+Progress.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD987C2FA7C8FBC96FD024E421DA0E68 /* Archive+Progress.swift */; };
-		63D821BF32D922084839CAC146A92CD9 /* RDEPUBCFI.swift in Sources */ = {isa = PBXBuildFile; fileRef = E56F29EB0999064677A050AC08F04C84 /* RDEPUBCFI.swift */; };
-		644114C901096954AA267E5D3A85A182 /* NSURL+DTComparing.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFCAC7C2AEA867E67C63A852576774F /* NSURL+DTComparing.m */; };
-		6470C19989C547D12A434E2A53717224 /* RDEPUBCFIPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7393C161B75A0E039B5BFF99E5C7B042 /* RDEPUBCFIPath.swift */; };
-		64B956A1D635977726C4EA16569355DD /* Archive+Writing.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF988440049800DB7824A94B81D20254 /* Archive+Writing.swift */; };
-		650AA0BA1DAEA3F329B56E95AB1D42CF /* RDEPUBChapterWindowSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2717E26568D6A20D8F557BDF5A379E85 /* RDEPUBChapterWindowSnapshot.swift */; };
-		65B3BF819494AA7520FA388ED60951DF /* NSURL+DTAppLinks.h in Headers */ = {isa = PBXBuildFile; fileRef = 557DA029E15EC99631B647AE8922007F /* NSURL+DTAppLinks.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		65F0FB3107C4EB7C89DFDC4DD5567154 /* RDEPUBPageLayoutSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 631001401579A0D4E3E45FBE1C6638B4 /* RDEPUBPageLayoutSnapshot.swift */; };
-		66322F6BE870B4070610CD0606084C18 /* RDEPUBTextPositionConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F0F6D6A2794703282450C5841C6D2C /* RDEPUBTextPositionConverter.swift */; };
+		61D7D7C7063E2E3F3EFBEA67343D5BC1 /* RDEPUBReaderTopToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD88D55D7F7F1667E4466071F740A3C9 /* RDEPUBReaderTopToolView.swift */; };
+		622B1B472DED191F34262A04CE05DD83 /* DTCustomColoredAccessory.h in Headers */ = {isa = PBXBuildFile; fileRef = 33DB57DF8C5AE334B1BBE9F989352F1D /* DTCustomColoredAccessory.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		622E2F71BD252D844AC6838D3B58CB84 /* cssInjector.js in Resources */ = {isa = PBXBuildFile; fileRef = DAB14DCFE26C506AB370FDEE79883AE8 /* cssInjector.js */; };
+		62D144BF0E62D22C5C0C8C4F2F80342F /* RDEPUBBackgroundPriorityPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B092BF12D8045E3C72C39C19010E067F /* RDEPUBBackgroundPriorityPolicy.swift */; };
+		651E573C03B07E8930AE7A3E61A5C5A3 /* RDReaderPagingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C24BD0148D661DA92DCD300C67D590D /* RDReaderPagingController.swift */; };
+		653FF238952AF22C828EFD68EA3A2BBE /* NSURL+DTComparing.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BFCAC7C2AEA867E67C63A852576774F /* NSURL+DTComparing.m */; };
+		6576F9624F055FF3E27A20613FBF8EAF /* UIApplication+DTNetworkActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 77213203802F44012346181FED2856F9 /* UIApplication+DTNetworkActivity.m */; };
 		6634D568E49F5610242E1454680E5885 /* NSAttributedString+SmallCaps.h in Headers */ = {isa = PBXBuildFile; fileRef = DD189DA6054AAE2242F6644A2623B50E /* NSAttributedString+SmallCaps.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6737262A5610AAE852865AED829531FF /* DTSmartPagingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 96EEB6B022E22A4ABC86D87469D4815B /* DTSmartPagingScrollView.m */; };
+		663A22A63DF740DE2DDD9F94FBCDED1B /* SSAlertDefaultAnmation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81B8F42440B802E6EC2B1FF7E3022F3A /* SSAlertDefaultAnmation.swift */; };
+		665EE2D835C5DF71A6A4FFA82994C388 /* DTFoundation-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = FCC718115E5C31C88A680522AE36B089 /* DTFoundation-dummy.m */; };
+		66CA591CC2C5DDEB9F10DF6201AC73E2 /* RDEPUBReadingSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 236E0B22C7FAE0F5E5BC44A2D1C4726B /* RDEPUBReadingSession.swift */; };
 		67AE2AC8D9B961D45871077774E11FD3 /* DTObjectTextAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 073A7F9DF1A554BD1B324EA9E0090E91 /* DTObjectTextAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		68435959192A7323E065BD7FACCA1BF6 /* RDEPUBChapterRuntimeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D303A1D4012C1CBA18C229DA06063A /* RDEPUBChapterRuntimeStore.swift */; };
-		6891AA35BABE5358C9BFCE3491FD5665 /* RDReaderPreloadController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F2E04ABBBF406CD73171124E45B5D49 /* RDReaderPreloadController.swift */; };
+		67E3C97E134504F622FB9E68D5647BF2 /* RDEPUBTextContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995FB0A24F88A5F7204BDE00B97BF00C /* RDEPUBTextContentView.swift */; };
+		682C728128E3E53A525D713B9123F6B2 /* ZIPFoundation-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A06A36ADBE678DB44158D32E751FAFF /* ZIPFoundation-dummy.m */; };
+		687C9429B0D64C0F4BA4C79242D42E66 /* NSString+DTPaths.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5EC7C3D1808C9CF53354D7A3D69EE7 /* NSString+DTPaths.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		68CBC6AA38AD3DB5067BEFF8E42886D0 /* ConstraintRelatableTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 885653999BD237A574B67DB279DE7E87 /* ConstraintRelatableTarget.swift */; };
 		69674FEA70899F07BE6098AAEC849978 /* DTAccessibilityViewProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 43CFADE0F46014990052AD67F17C86FF /* DTAccessibilityViewProxy.m */; };
-		6989BE7D78DC40CFCC5A4DD0DE4EBA3F /* RDEPUBReaderLoadCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E60E1300F32EB0B2296400EAA6C722E4 /* RDEPUBReaderLoadCoordinator.swift */; };
-		69B43F6264227B49106CE02FE5BB2E53 /* Typealiases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945D4549E0B9168D7DDB910DE874B874 /* Typealiases.swift */; };
-		6A559A6D190135E5251C0357CAB280DC /* RDEPUBCFIRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6484A5889C63CEDDDB03917738280B04 /* RDEPUBCFIRange.swift */; };
-		6B466804501F9AD2A8798BF8F7135B73 /* RDEPUBTextPageDecorationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AA601472E86DD75D0117D00794B2B2 /* RDEPUBTextPageDecorationView.swift */; };
-		6D64F06B9ECD3BB9C3BB8404D19E0CFC /* NSString+DTFormatNumbers.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D86C7063D1128EAEB3A30EBEF214B3F /* NSString+DTFormatNumbers.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		6E0DCCC04DD942BC1F6892E8E51FBDF0 /* RDEPUBSearchModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5617F58A26030228EAFABA05788642C6 /* RDEPUBSearchModels.swift */; };
+		69D8C5CBC71777316973C43255140F0B /* default.css in Resources */ = {isa = PBXBuildFile; fileRef = 05D57D16346FAF830F1F82067307EA9F /* default.css */; };
+		6AC430FFDF68F98357C898D6858904DB /* DTSmartPagingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 96EEB6B022E22A4ABC86D87469D4815B /* DTSmartPagingScrollView.m */; };
+		6CAB0255B42E803CEB8C200E106583F2 /* Constraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0EBAC7714A5F73B75AAB47D24B08B71 /* Constraint.swift */; };
+		6D4D2109A2EAD67D4A9C158FD694F0ED /* RDEPUBSearchModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E5EDA71849C1703A80094A7160A3D2 /* RDEPUBSearchModels.swift */; };
+		6DB057884F6AC5E5F0DB8664760A0C70 /* RDEPUBCFITextAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = A974D11C3D99A37FECDAB079565A275F /* RDEPUBCFITextAssertion.swift */; };
 		6E3D0FDD78ECC20F4B3697ED21D64224 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2B218B5EAA5831A036BBF7E1EFC1B9 /* MediaPlayer.framework */; };
-		6EB20044871ACD69CE8099B349A39188 /* RDEPUBAnnotationModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15D0092D232533829CFC9F1BD511CECE /* RDEPUBAnnotationModels.swift */; };
-		6EC9D5BC4A1538B0E1FB3DF1E0796A30 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
+		6E703383272C4AC66B55E946FB0F9E57 /* RDEPUBSearchEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2DA7CBEF685373784172A46130ECE9 /* RDEPUBSearchEngine.swift */; };
+		6EE3C48B9A280E4DFD4D8E7A85B7DB02 /* ConstraintPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C7129757B54DFD9E445D0A17D73A83 /* ConstraintPriority.swift */; };
+		6F5B28572DAF44B005898C57F42B2DED /* NSURL+DTAppLinks.h in Headers */ = {isa = PBXBuildFile; fileRef = 557DA029E15EC99631B647AE8922007F /* NSURL+DTAppLinks.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		6FA0125F16DDEDAD341DB75DEB084F4B /* DTHTMLWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = E16D20FA492E085BD0871B107B3077B7 /* DTHTMLWriter.m */; };
 		7027EF8D77D4082C1BB9B80FF61FCADC /* DTCoreTextLayoutFrame+Cursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 28043173CA3B3787DC401ACEB5398108 /* DTCoreTextLayoutFrame+Cursor.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		705EAED110DC2F226319FFD9B36B4CC9 /* RDEPUBParser+Resources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7223B82BE067D41E4311EBD45A2EBC6C /* RDEPUBParser+Resources.swift */; };
-		71E8A7F8BB7FB63B6D74C5F4F6ABC07F /* wxread-replace-latin.css in Resources */ = {isa = PBXBuildFile; fileRef = 9580876F40BE76D2473648FD60609A92 /* wxread-replace-latin.css */; };
-		7234916E634614EC8BDB209528321051 /* NSArray+DTError.m in Sources */ = {isa = PBXBuildFile; fileRef = 73940D215D644B6815A09DA802CFBDDF /* NSArray+DTError.m */; };
-		7236084C28CBD5B5A8FFB38A7F208C43 /* RDEPUBCFIMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04868FE00B6D7EBD363C6FF21769847 /* RDEPUBCFIMap.swift */; };
+		706B5BEE0D5AD080E9A835105AD37405 /* RDEPUBReaderBottomToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62CA2B8137FC8E99994C84CF0B18EBD1 /* RDEPUBReaderBottomToolView.swift */; };
+		710ABD1A096056EFC2A092E018DB1BA8 /* wxread-replace-latin.css in Resources */ = {isa = PBXBuildFile; fileRef = 6F768932648B61D9731F923A824F7617 /* wxread-replace-latin.css */; };
+		71154B7C21DE7DF8DD200B3C7CEA4ED8 /* RDEPUBTextPerformanceSampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DD02085DF060BFA07C4C65AC0F9ADAE /* RDEPUBTextPerformanceSampler.swift */; };
+		717AD0B57C4143CBBDB3FBA66DB48837 /* ConstraintMaker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60657D08CCDB38BFED30BD40F4720CE4 /* ConstraintMaker.swift */; };
+		7257D4B97C3B2C046A950B54C6AD31FB /* SSAlertCommonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE4EE750340347ED584C5A2C1164331A /* SSAlertCommonView.swift */; };
+		72AB99A1D05F6F5840DF1FD72BA3D54A /* RDEPUBReaderPersistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4517A0658C991352A0B5ED4B851CED2 /* RDEPUBReaderPersistence.swift */; };
+		72C8E000CCE9BD5F41657C2E08D4B83B /* RDEPUBTextLayoutFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66E601E685D0E9888AAFFDCAF0C0D1D6 /* RDEPUBTextLayoutFrame.swift */; };
 		730ACB99580C5982DC08D50FC5084D41 /* DTAttributedTextView.h in Headers */ = {isa = PBXBuildFile; fileRef = A276DE925253460239BFAEC7663F60D3 /* DTAttributedTextView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7326101D5DD269D447F2D8842D268255 /* RDEPUBPaginationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F92BE384325A770DEEB46797F1E54A /* RDEPUBPaginationState.swift */; };
+		73B3EE6535C27C69AB029A1BD1CA7D1F /* Entry+Serialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F991240340FA026C71B68EB25B9F9C8 /* Entry+Serialization.swift */; };
+		73D3BF552CEC4CFA6C76B920B60A5715 /* Archive+BackingConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61E36C4FE448DDDA03450847FCB785B6 /* Archive+BackingConfiguration.swift */; };
 		7459A1656EDC29D685073B83561B783E /* NSNumber+RomanNumerals.h in Headers */ = {isa = PBXBuildFile; fileRef = 8552BE1A1F6A6D2879763DE3B2B8A2DD /* NSNumber+RomanNumerals.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7475815C329728A28FE397F1F2AA0701 /* RDEPUBCFIParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8686290A5D2D84D7BC62F9AA5EA41C90 /* RDEPUBCFIParser.swift */; };
-		74CE3468F82BB2902D842848C9775B1B /* ZIPFoundation-ZIPFoundation_Privacy in Resources */ = {isa = PBXBuildFile; fileRef = CA4A114775B98CEA4A566C18123B145F /* ZIPFoundation-ZIPFoundation_Privacy */; };
-		76C1DA084D7739817E73CC0C60EEFC49 /* RDEPUBPaginationCacheCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1456F22F77D38DF0305563DB792771 /* RDEPUBPaginationCacheCoordinator.swift */; };
-		77AEBCE5F60D21F2CEB4BF3893D73D36 /* ConstraintInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = C241AD9CEC9D6732CFBA6A55B49E64C9 /* ConstraintInsets.swift */; };
-		77FFFEA4543216843977F6D8C9DD1D63 /* SSAlertAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D2EC0B845131A88247902AEA26F40AE /* SSAlertAnimation.swift */; };
+		76F23BA6E5F23E12B41BDB8E0DCEBAF7 /* RDEPUBWebContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCCB7B202BEDC5F5B8895F56085A2DCA /* RDEPUBWebContentView.swift */; };
+		77B7D4B5365FF6066E205393AD2DBA3A /* FileManager+ZIPDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9B298989305B9569B71E448E8C1D4 /* FileManager+ZIPDeprecated.swift */; };
 		7821105EF320619993B3BF7FB90C7ADA /* DTCSSStylesheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B610E558C4917C4257DC198EAFEE2F6 /* DTCSSStylesheet.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		787A89A480FCFCBE300480551367DAC0 /* rangy-serializer.js in Resources */ = {isa = PBXBuildFile; fileRef = 4531B3C89B7A6DC053BEF1373ACDFE18 /* rangy-serializer.js */; };
 		78D24D82D98D77E744FF73C9040618A8 /* DTHTMLParserNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 11B604FC3B0D5C91FEA763DCC0BE4DC5 /* DTHTMLParserNode.m */; };
-		78E15B8B4A98C888B5F9EC251680DB79 /* SSAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F410ED25E4E84C3D5166261CDF4B58F2 /* SSAlertView.swift */; };
-		79FDE3B452F1217568B4A79E663E6F34 /* ConstraintView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A02EA0374C693F881AB36202FB276DCD /* ConstraintView.swift */; };
+		7956B31CC6E4A4F49AD636605FE6E825 /* RDEPUBReaderContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD059368898F7F8B822A49571413B2B9 /* RDEPUBReaderContext.swift */; };
+		7A41EE89AA05F85E78CDC5A90963F6B0 /* NSMutableArray+DTMoving.h in Headers */ = {isa = PBXBuildFile; fileRef = B0AC307F12521444C973EA0DE38B4608 /* NSMutableArray+DTMoving.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7A48CDFB40202EFD09A2A9AB0EE0770D /* DTCoreTextFontDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = 56489D9BA834497E48438A4B4E1CCCFF /* DTCoreTextFontDescriptor.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7B7F58DE7B924C4BEBA57A26A96418AA /* NSData+DTCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 02EDFE0EEA47398F3E1A361A73AF6A6C /* NSData+DTCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		7B96C1EC26F7B6E1C02342D180FC07AC /* DTPieProgressIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B443D035BA5652B03A41BE905C5AC17 /* DTPieProgressIndicator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7B4E49B136C527BD20AD000696440B14 /* DTCoreGraphicsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B6425B2235BA00FE865AF58EF44F1144 /* DTCoreGraphicsUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7B57128D05B37B1935F9371C272A2397 /* ConstraintRelation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3593ADF561D422F73C8EABAD4A4F440 /* ConstraintRelation.swift */; };
 		7C05F56B62B15EFF344C5CDE4A52B8FB /* DTHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D4C9B7ED5E04C216AB28E3A4065C1C5 /* DTHTMLElement.m */; };
-		7C717061D9006B8C5BC620D4C3E6DCC0 /* ConstraintConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7176B677A350927FC670368313DC2CA1 /* ConstraintConfig.swift */; };
-		7C78B8C266AFAF03321FE8840A97E814 /* RDEPUBFixedLayoutTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 368E7118542A73184BE785303D88D895 /* RDEPUBFixedLayoutTemplate.swift */; };
-		7CC14FBE11FC07233CCAC05B923B42D9 /* RDEPUBCFIRecoveryEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8C6096A7B9404057346F143DF9BAA6 /* RDEPUBCFIRecoveryEngine.swift */; };
+		7C1789D42D48D122F21683DFE0117C05 /* ConstraintInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = C241AD9CEC9D6732CFBA6A55B49E64C9 /* ConstraintInsets.swift */; };
+		7C235EE866F95546F32C0F12A4777356 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEB14A8F8170777DB7CCC3F27C8EA57A /* ImageIO.framework */; };
+		7C5B4C8F6E0057ABF4BBC399146391D2 /* RDReaderView+ToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C92D6A531895CC82CDB6FFCE7205BC /* RDReaderView+ToolView.swift */; };
+		7CCC53404B62789AE3793E760997097D /* SSAlertSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 937CEFA81DA4227008DBFB114783A08B /* SSAlertSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7D1E7DDB0AD74FFCFED59D1D5900BDE9 /* RDEPUBCFIError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF8BD4198F6FFF3793A1EDD6E9FE2259 /* RDEPUBCFIError.swift */; };
 		7D29C0A53AB1B4C1B257D46EBBDC9DA3 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
-		7E287D2573C55B94FDFF9FE07D72C142 /* ConstraintDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6578DFAB51436E8DF266FD087700E26B /* ConstraintDescription.swift */; };
-		7EC875066CFAF967E3415BB525F73FAE /* RDReaderFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFFF9DD6D05B81A55BA5EE9E38F881C7 /* RDReaderFlowLayout.swift */; };
-		7F73E2ADFC433DE918E6F71916598B17 /* UIImage+DTFoundation.m in Sources */ = {isa = PBXBuildFile; fileRef = D85A85D891A320165843EF9F489178F7 /* UIImage+DTFoundation.m */; };
+		7D56C992720BEBF70F07BC75928B7E3A /* WeReadApi.js in Resources */ = {isa = PBXBuildFile; fileRef = 5214F772AE3CD906C0E5AE335E0A27E0 /* WeReadApi.js */; };
+		7EDD9B2DDD80A196D7798433666ACC95 /* RDEPUBTextLayouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC81F5F271A26EA7C1D7AFF9374188B8 /* RDEPUBTextLayouter.swift */; };
+		7EF238EB1273A1441D89BAEF214A773B /* RDEPUBTextPositionConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD39D5D16074428C43CD870060DBACA6 /* RDEPUBTextPositionConverter.swift */; };
+		7F6E040D6F0BD6E9CA8954018542D8EC /* RDEPUBCFI.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFB1ABFCCAC4DAE451803B7620A3E75B /* RDEPUBCFI.swift */; };
 		7F9CC306B17D409DB903DF850FEDA64C /* DTListItemHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = F7B0087DE7C394A677F5883541AB4FB7 /* DTListItemHTMLElement.m */; };
-		8025FC054F5B051F4076FA2FE7BBC975 /* ConstraintLayoutGuideDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4684B406B325B35F39322D75B59B6479 /* ConstraintLayoutGuideDSL.swift */; };
+		807EE34D2B6A76F67762766AE970F4EB /* Archive+Progress.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD987C2FA7C8FBC96FD024E421DA0E68 /* Archive+Progress.swift */; };
 		8099F1E613A15275EF5FC59ED3C73579 /* NSAttributedString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D3D7C8444F58D9B3FCB4F3006D2CFBA /* NSAttributedString+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		80AA377071E2AF381B547027B16FEDF3 /* Typealiases.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945D4549E0B9168D7DDB910DE874B874 /* Typealiases.swift */; };
+		80CCC9CEF8628C97D09B51EA7F588A04 /* DTWeakSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = C422BCADBB48E28B549495663705A0FB /* DTWeakSupport.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		811D7CBCD710AE45FF80A4B05BFE444C /* UIFont+DTCoreText.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E1548FC42118F1A4164739DE6BE4E9 /* UIFont+DTCoreText.m */; };
-		812EF243972726E849BA2372EED99D0A /* RDEPUBTextBuildPipelineInterfaces.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22E15788FC4F921DFE7FE4C2A2B3F722 /* RDEPUBTextBuildPipelineInterfaces.swift */; };
 		814D0D63E5FD4AB7231E63064FE9EB5C /* NSAttributedString+DTDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = BF4F3EC137168B92A5DA85AF50CD239F /* NSAttributedString+DTDebug.m */; };
 		81905A7717925A17E6B98E934A75B8BA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0834E84632886CDD9911CAB76183F1CE /* QuartzCore.framework */; };
 		82119A0DC4981CC2AF389C7C4CC08186 /* DTListItemHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 98658510AA525496EBF5792E5D9884ED /* DTListItemHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		82B4EB3101E2D9AB421C74516F7DDE73 /* DTCustomColoredAccessory.h in Headers */ = {isa = PBXBuildFile; fileRef = 33DB57DF8C5AE334B1BBE9F989352F1D /* DTCustomColoredAccessory.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		832290E95766703410BDA44A7BFF71BB /* Archive+ReadingDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 934F9BB2B3A313294F121484C3A97A14 /* Archive+ReadingDeprecated.swift */; };
+		822AF86AA4BF4CE9FAA4548CDB8E1BD4 /* RDEPUBCSSCompatibilityLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8441EA66830E22726BE52E29AA8FBA0 /* RDEPUBCSSCompatibilityLayer.swift */; };
+		8232E2F21AA4746F8FF80842EE706168 /* NSDictionary+DTError.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC368BD2A8D266EB771E5FB9A5A5B3C /* NSDictionary+DTError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		83A4BC9FE4765C9B848DD4925D99F362 /* DTAccessibilityElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 99299A9FD6EF739D18352AC5B9325CB0 /* DTAccessibilityElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		83F80B9D64BB77B62CAF8DD634D6E787 /* NSString+DTUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = BE547E464E5D34F9FFB24BAC81D1E4CC /* NSString+DTUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		854B85B62762731064F909236192B3A8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
-		8574BB4508B9A1E3E83F2F47858187DF /* FileManager+ZIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B7D3C6F0C845E3D42BBA613FFB0465 /* FileManager+ZIP.swift */; };
-		857D53BF180B0C00F246EBA242A44D1E /* RDEPUBPageMapReconciliationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42F099FFB667A63E58B2029DBA9474AB /* RDEPUBPageMapReconciliationCoordinator.swift */; };
-		8756466238E4204DE6C7327927630DC6 /* RDEPUBReaderContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60348C9FD3414B4F18924FF8BFF5DA8A /* RDEPUBReaderContext.swift */; };
-		889C26ED07D0A2F8796405247FC3AC39 /* DTAnimatedGIF.m in Sources */ = {isa = PBXBuildFile; fileRef = BC332335B380BC51C4F05C5CCDFB9189 /* DTAnimatedGIF.m */; };
-		8911BBBF7ADE926203F4423DC3DF3642 /* RDEPUBReaderDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57D263A80E3EF0FF3FD66578B7F4B9A6 /* RDEPUBReaderDelegate.swift */; };
-		891E0449FE11F17533AC779163D577E8 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 53D473C6F07982D3D25781A343EC5A99 /* PrivacyInfo.xcprivacy */; };
+		854FA236832E01DEBB7E96C36877C147 /* DTVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 4AF6156128A1A0CA24D9D06E346B9445 /* DTVersion.m */; };
+		860F6C94A7F6AC88CDC0EBCF54FBEB74 /* RDEPUBCFISerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F96D2805CAFF0D2370A761DD023C745 /* RDEPUBCFISerializer.swift */; };
+		8630480459E3E037BF860528792A5C9C /* RDEPUBPaginator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCF3686E574510BF6B5D13293E85F0E1 /* RDEPUBPaginator.swift */; };
+		8676468774C95A019F96AC16510826C2 /* RDEPUBSelectionState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0461A4D5A2D3198072DA0E85F0365880 /* RDEPUBSelectionState.swift */; };
+		872C5B6669490993860FB068B6EECA6C /* Data+CompressionDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D641809A99849F80FDCB02F8CE8D6A0 /* Data+CompressionDeprecated.swift */; };
+		881F85E9E489847191F88182118C8018 /* SSAlertPresentAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = E481007A8174943868EBC81CF3B04B9F /* SSAlertPresentAnimation.swift */; };
+		884EB17E0A17502856F505A72A7B854A /* RDEPUBTextIndexTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C186CC4BD7D2CFECDD3B037A8C1D5114 /* RDEPUBTextIndexTable.swift */; };
+		89E1D4F05CD7B039976926997D4F484D /* epub-fixed-layout.html in Resources */ = {isa = PBXBuildFile; fileRef = 435BCDDA491498B312BF8B10335F5F6D /* epub-fixed-layout.html */; };
 		8A0A0FB23DB0021ADC9AD0D90631883A /* NSMutableString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6293E97E128E98559FB74D9A342EAD /* NSMutableString+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		8A35CC67F0AA6B26397C10D756EA34E8 /* DTTextHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FB2ABB1D297442D91AA42F1407DB4A58 /* DTTextHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8A3E91511D35F720D24E0959AD33CC4A /* DTBlockFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 375179DD3A4576CEF947E1760BBDC69B /* DTBlockFunctions.m */; };
-		8A796167F78E7213BDBE910DA0EC51BD /* NSString+DTFormatNumbers.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ACA5E519F100582F0D772FCD76125C0 /* NSString+DTFormatNumbers.m */; };
-		8A9594A6C2B72DDA1774776112384E4B /* RDEPUBReadingLocationModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE28D164B27044F77AB8429DB5579FC /* RDEPUBReadingLocationModels.swift */; };
+		8A36D24AF7E197C7C3A37C7F6D6B3453 /* wxread-dark.css in Resources */ = {isa = PBXBuildFile; fileRef = 1541A3CEA0FCBABEF9872A60FAEF47B5 /* wxread-dark.css */; };
 		8AC90941E71199090BCED76DE89EFB60 /* DTAttributedTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 77A613841EB90827AF321DD50B21DB5D /* DTAttributedTextView.m */; };
 		8B405CE13E7D718A9340A82B52766AB2 /* NSCharacterSet+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 75FA8E843D9225BD65EB9D17825EC0F4 /* NSCharacterSet+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8C336E3E5E8E7EE5A052856E818333BE /* ConstraintOffsetTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F950CEF31AC0065C0BEAB26BA2CEFA1 /* ConstraintOffsetTarget.swift */; };
-		8C435FCC66E721453D7C759238497698 /* RDEPUBReaderController+ContentDelegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5DC987B28D5AF907FA09697E14A643C /* RDEPUBReaderController+ContentDelegates.swift */; };
-		8D0F14888E25D7A94560407906AEDB56 /* ZIPFoundation-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D927F128EBF26AD2C61FD0E6B6F6F5ED /* ZIPFoundation-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		8D4F4FAE8F8328B149BBAB395F43AB53 /* RDReaderView+ToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F0E7197A7DBF0EFC017D73F2350DB75 /* RDReaderView+ToolView.swift */; };
-		8DF5BA92DDF53DC055E8C7E975A30452 /* ConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28D62D3200AC3D4E42C81CDFF7E884E8 /* ConstraintItem.swift */; };
+		8BDE0118B6C160D20F0216C903323B9F /* RDEPUBWebView+FixedLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D9A0C2A7BCE48EB6E02279F8770F67B /* RDEPUBWebView+FixedLayout.swift */; };
+		8DE6BE54092C4BBC29DE857182C6893B /* RDEPUBReaderUIState.swift in Sources */ = {isa = PBXBuildFile; fileRef = B157210E873E2C199310B838E53286FD /* RDEPUBReaderUIState.swift */; };
+		8E1A93C0442BC9FC1E131BB841AACA59 /* UIScreen+DTFoundation.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F051D813D50D20D53205D5FDCAA877C /* UIScreen+DTFoundation.m */; };
+		8E79DA8D4AECEE0ECC24F9BA2117A9EB /* RDEPUBRuntimeChapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E2E2ACE965436483EDC14EC4262BAFC /* RDEPUBRuntimeChapter.swift */; };
 		8E8726381CBCFB1EDB350183456D4EF7 /* DTHTMLParserTextNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 13AB6A32A293E3DC21A7047C6DB958CA /* DTHTMLParserTextNode.m */; };
-		8F63C186A01840708367DDD0552B55D2 /* RDReaderView-RDReaderViewAssets in Resources */ = {isa = PBXBuildFile; fileRef = 83410CC9CF2ABE63B90A92F2F988BF65 /* RDReaderView-RDReaderViewAssets */; };
-		907FC3391070B837BBDB851543F442E2 /* RDEPUBStyleSheetBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2CE921060E7CE06DC952A187C2EBF69 /* RDEPUBStyleSheetBuilder.swift */; };
-		9080D65381750D0F5B23087BA599AE8E /* RDEPUBReaderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90299D3CC3DF1039283EA09284A99570 /* RDEPUBReaderController.swift */; };
-		908D54E4BF1977EAEA4C21EF0625E155 /* RDEPUBReaderSearchBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBEB3A80D9A6F54C140EFB7A60E7C1E5 /* RDEPUBReaderSearchBarView.swift */; };
-		908EE8F1D608C29BD92AE13D674C8C94 /* RDEPUBTextPaginationSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 433BD992E46EC4B310AB2C07DA6B5942 /* RDEPUBTextPaginationSupport.swift */; };
-		9121AA03AF52A60DEA2380B5CA89D1D7 /* RDEPUBReaderSearchCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85EF67ADDCE46E8FA21D881DDD21355B /* RDEPUBReaderSearchCoordinator.swift */; };
-		912C03B276B99D7AE64A767A9ED4F47F /* DTActivityTitleView.h in Headers */ = {isa = PBXBuildFile; fileRef = 8272D0B59ABD6652D0CAE3DFCC2C5EE1 /* DTActivityTitleView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		915041EAF44F49DD33026F2C5E5C73FA /* RDEPUBDTCoreTextRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3057AB65B5886A2792894ADB91E36D5C /* RDEPUBDTCoreTextRenderer.swift */; };
-		91C040B00DD058EDD3070C560E512870 /* RDEPUBWebView+Reflowable.swift in Sources */ = {isa = PBXBuildFile; fileRef = E068F2933C8F37973B331C4BE18453CA /* RDEPUBWebView+Reflowable.swift */; };
+		8F2972EE318ED16FFBFD216728961BB2 /* DTActivityTitleView.h in Headers */ = {isa = PBXBuildFile; fileRef = 8272D0B59ABD6652D0CAE3DFCC2C5EE1 /* DTActivityTitleView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8FB2AD1EFD08F0B66A34FCFB9385F2E9 /* RDEPUBRenderDiagnosticsCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63CB91E70707FEFE07F01B11C0DB5055 /* RDEPUBRenderDiagnosticsCollector.swift */; };
+		903C3E894FA36582171914FBBAAB044D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
+		90B16160AC5C4F3DFE8A93ADDCD9EB21 /* RDEPUBChapterLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = D64D8C9DC33119921466055ACC5347C7 /* RDEPUBChapterLoader.swift */; };
+		91F2004931EEB74080582412EC4A7E3E /* RDEPUBReaderConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = CFC94637FA2BC2BB996CB04F3AD382D7 /* RDEPUBReaderConfiguration.swift */; };
 		91FDA47810CE5CE2C48AED9205AE89B5 /* DTStylesheetHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = DA25968B7C9A40031DA45BB328EA8A2E /* DTStylesheetHTMLElement.m */; };
-		92148E09CF9637604A14853AB3FD3E95 /* NSString+DTURLEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 31BD7533867336DEA9B835F471767178 /* NSString+DTURLEncoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		92A4A806D06FAD5182EE471E96ACD2BC /* DTBase64Coding.m in Sources */ = {isa = PBXBuildFile; fileRef = 061BD3911E4E530C792E65CED7868C33 /* DTBase64Coding.m */; };
-		92ACE28EDBDDDE4B0C70C335C2E3B4EA /* ConstraintMakerRelatable+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFE19508E12BF8B0B52E8CB4F724217 /* ConstraintMakerRelatable+Extensions.swift */; };
+		92A408637C2F3E65E93800222550C88A /* RDEPUBPageInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C30031E4337458E885FA7A27960620DE /* RDEPUBPageInteractionController.swift */; };
 		92C59F96D443525E8833676479FA60C5 /* DTVideoTextAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 73A99927E52B24583A6A2CF7E6F23848 /* DTVideoTextAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		939A70A53856930A9D478413E2DEE941 /* RDEPUBCFIResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02BCA9E7A83D0CBEA1D291D218346B30 /* RDEPUBCFIResolver.swift */; };
-		939C4766C9553BC2665C89624A09D06E /* DTHTMLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D75FEDE65722CF41F7F32A164376926 /* DTHTMLParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		92CF67B6061DB4721656519090E6F3E5 /* RDReaderView+ContentAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23C0CE03056D1EF27F50F55B85D3A0D2 /* RDReaderView+ContentAccess.swift */; };
 		94F5846979DBC90E2B646E975F5ECBA8 /* DTHTMLWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B96B0998B49D8E149C995474DA5FE5F /* DTHTMLWriter.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9532BF0A971E323676EFDD2411749FDD /* RDEPUBReaderTableOfContentsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CD08D956799BC2853B0BAA33747516B /* RDEPUBReaderTableOfContentsItem.swift */; };
-		954A2998815478C63249339AF0BE4913 /* FileManager+ZIPDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9B298989305B9569B71E448E8C1D4 /* FileManager+ZIPDeprecated.swift */; };
-		958009C6CEEBFB5B3EE81410143C2CB7 /* RDEPUBWebContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58C245766BD2EFA6647D58344225E88A /* RDEPUBWebContentView.swift */; };
-		95D75F8EDCC13FE815C4817C8CFD5BC2 /* UILayoutSupport+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C647A2EB2720BCBF88B160D124B57BF /* UILayoutSupport+Extensions.swift */; };
-		95E55C11E0475441D48C0504D2283140 /* ConstraintPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C7129757B54DFD9E445D0A17D73A83 /* ConstraintPriority.swift */; };
 		96507B8910C8C9DE0B221CFF0E8518D0 /* Pods-ReadViewDemo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = EBA0272559B0F7FAD8AC670AC7431188 /* Pods-ReadViewDemo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		974B4B4C1037959C0374DBD8A0591EA5 /* URL+ZIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 537BB06317FA188DF7A8A960152520E8 /* URL+ZIP.swift */; };
+		97CC0A64419AC54341D34421B22B7034 /* DTExtendedFileAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 538572A5C098252D629F2185F1B1C9E8 /* DTExtendedFileAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		984027EA31EE692C1B917CE3B5B4D010 /* String+RDEPUB.swift in Sources */ = {isa = PBXBuildFile; fileRef = C409593D5FA3DD26DD8A3CDE6F8B221C /* String+RDEPUB.swift */; };
 		9854DC3F1763B6272C2EA3FC6EC40B95 /* NSAttributedStringRunDelegates.h in Headers */ = {isa = PBXBuildFile; fileRef = E20272295EC253826AEE1F83A15D47C5 /* NSAttributedStringRunDelegates.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		987538B07E11741899878EA8BC947F51 /* NSCoder+DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 354C5DD0ACC742762200A640ADA859C6 /* NSCoder+DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9917E9B804CD33AF3BE2A992A3510C97 /* NSNumber+RomanNumerals.m in Sources */ = {isa = PBXBuildFile; fileRef = B7672A26922DBD934FA1AC60D49EB322 /* NSNumber+RomanNumerals.m */; };
 		992B7C8C824B5EA190EF1DB096064DB7 /* DTDictationPlaceholderTextAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = F9A2565B302334B662AB51DCF8E65EEE /* DTDictationPlaceholderTextAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9935B693C0B9547788918B31D20DD26A /* Data+Serialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DC78D0B0F37BF9AD1058CACA9AAF9BE /* Data+Serialization.swift */; };
-		999F98E81D2EA3CAE05E459743D10063 /* RDEPUBStyleSheetComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BAE895FCD088AD6BFF6868DE8EBB5F7 /* RDEPUBStyleSheetComposer.swift */; };
-		99B21F07C375B29F061A58FD010C6D36 /* RDEPUBStyleCompatibilityModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 476AB0419C7F33B4AB2729364F2E8779 /* RDEPUBStyleCompatibilityModels.swift */; };
-		99FB033EE49723B26D55BAF112E959B5 /* SnapKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CE078B465FDEF40EC0469626A2C2469 /* SnapKit-dummy.m */; };
-		9A71E43FB3C8A5F8429105D2EDEBFA83 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
-		9A90F138CC446311E9EBF0BED8B1862C /* RDEPUBNoteDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = BBC75710290014EBFDEEA6B36F301AB4 /* RDEPUBNoteDetector.swift */; };
-		9A99AC0E41FD70DC5F6E1409DCB4D3A0 /* DTPieProgressIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DA1E8494B86FFD79C639DCB8C21E1BB /* DTPieProgressIndicator.m */; };
-		9B083C52CC3C864A5E180EB56C890C6E /* DTFoundationConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD568D38C209BA1CC0EBFA809A35204 /* DTFoundationConstants.m */; };
+		996F4301B6B7371F064F6C16A4242434 /* ConstraintPriorityTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 882FA707ED3513D263A1E0656AAD2D33 /* ConstraintPriorityTarget.swift */; };
+		9A7858B00D72FBEA2FE7774D92BACA32 /* UIScreen+DTFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = A3765B289CB7E6C5DF6160D8EBC83C3C /* UIScreen+DTFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9A878F793DEF9410001A3025DFA30BD8 /* RDEPUBFixedLayoutTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 786487AD4F6B37AE4B483566F3000C6F /* RDEPUBFixedLayoutTemplate.swift */; };
 		9B199D71D2F48B2055A7FDF9BD7051CC /* NSString+CSS.m in Sources */ = {isa = PBXBuildFile; fileRef = E27C503C8128BC3CE109FFE077AEF325 /* NSString+CSS.m */; };
-		9B368DAD70196B4F91CE19EC87FE7ED6 /* RDEPUBChapterTailNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7922FB20384529AC03B2689097070BE0 /* RDEPUBChapterTailNormalizer.swift */; };
+		9B6C11AC9941D02F1BCC15F5124ACB60 /* DTTiledLayerWithoutFade.h in Headers */ = {isa = PBXBuildFile; fileRef = DF5EDCA3B21964D0462BE0982E2F0BF8 /* DTTiledLayerWithoutFade.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9BD146F72B29C703798001F138B069C2 /* NSCoder+DTCompatibility.m in Sources */ = {isa = PBXBuildFile; fileRef = 9129D37C7F89AD8FD530663BB4503FC0 /* NSCoder+DTCompatibility.m */; };
-		9BEFAE4466A0B5A496BE74065C38645D /* String+SHA256.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAFFA8E198E1DF81FA44ACDBA022EBF0 /* String+SHA256.swift */; };
-		9C767620CD04CA91DE82024489960BA3 /* RDReaderView-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 593E047303291D8DC4F1A0BE766C9F12 /* RDReaderView-dummy.m */; };
-		9D12562D167F9B970FA5846FF7A4A697 /* ConstraintDirectionalInsets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91144FC099DD458E61625CD939577DAA /* ConstraintDirectionalInsets.swift */; };
-		9DC672DFFD27E2EF547BFCFBF3971A7F /* DTFoundation-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = FCC718115E5C31C88A680522AE36B089 /* DTFoundation-dummy.m */; };
+		9C37EBD71CE0C06085606E06B9602E07 /* Archive+Reading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0619F98DA80922E78A07321D0DC54F62 /* Archive+Reading.swift */; };
+		9DA15711057EECC0039842A782024C2C /* RDEPUBNavigatorState.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC59639D756DEA2914DF1A97050137A1 /* RDEPUBNavigatorState.swift */; };
 		9DE04C83A68C7512C0A860FFF5CEC113 /* DTCoreText.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F98F0F060B066CAFBCD3C85C26B2B4 /* DTCoreText.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9DEB9BB623EBC6B44295E85FD3EFFEE3 /* RDReaderPagingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 167BA0DE8AFB80B3FD2B8CAC4CD8FD02 /* RDReaderPagingController.swift */; };
+		9E0BECACB09C20F2A4C0B2C676D074DE /* NSMutableArray+DTMoving.m in Sources */ = {isa = PBXBuildFile; fileRef = 53499F40E1790A6CBE8AFEB3AC5BEFC8 /* NSMutableArray+DTMoving.m */; };
+		9E2751BDEA29783950FDBC6DA7805483 /* RDEPUBReaderTableOfContentsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AE9447E94AD6DD5AA1A3E1BBB03977A /* RDEPUBReaderTableOfContentsItem.swift */; };
+		9E3AB25F2D6F511C03EFB50D2256A6FD /* NSURL+DTUnshorten.m in Sources */ = {isa = PBXBuildFile; fileRef = C80065DBA5634DAA71129404975D7349 /* NSURL+DTUnshorten.m */; };
 		9E4AB71DE8B3E7218B53B2C8EF6B843A /* DTAttributedTextContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = F0D72C5680EBE6CA716EE77281AA4436 /* DTAttributedTextContentView.m */; };
-		9EDA37738AFCFBFEF1DD36DE8A7A49DB /* RDEPUBReaderHighlightsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96DE45A34DB87D787488D2059C7DFBE9 /* RDEPUBReaderHighlightsViewController.swift */; };
-		A06CB5E46628F4DE1ECB3A34A1791F07 /* DTFolderMonitor.m in Sources */ = {isa = PBXBuildFile; fileRef = B245F7E143F3091652C64F6593E33F7A /* DTFolderMonitor.m */; };
-		A076C50C4FD7E9417F294A573598A9D8 /* Date+ZIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76A97683FB5E8E8B86EA4AD71F6F4B4 /* Date+ZIP.swift */; };
+		9F3A7E6E019A523F112D66622F13D2C4 /* DTExtendedFileAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = F5389D4E96A4AFE175691B4D3D4524E7 /* DTExtendedFileAttributes.m */; };
+		9FAE9BBC8C82AFDB267CF042CAE91557 /* SSAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F410ED25E4E84C3D5166261CDF4B58F2 /* SSAlertView.swift */; };
 		A132A0C9EB13B65FB886B11AA2E6304C /* NSDictionary+DTCoreText.h in Headers */ = {isa = PBXBuildFile; fileRef = 27205D159B39090908CA0E9C3997B784 /* NSDictionary+DTCoreText.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A27E47D12F09D1A2958EAA72135A39B0 /* RDEPUBWebDecorationOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4128385BCC81F1701B3C11FFB2ED8FE /* RDEPUBWebDecorationOverlayView.swift */; };
-		A2A444207C3B1A5B72F73E2F999C534E /* RDEPUBPageInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BD360BDA6082E55A046601B16354F22 /* RDEPUBPageInteractionController.swift */; };
+		A2C4931C097B54AE8F7B1D61D99D512F /* ConstraintAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9593E7B37569219F8D9A504B47707DC /* ConstraintAttributes.swift */; };
 		A2CA9C27EB2B77637A12723F8CFE7AAB /* NSString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4428633C8EC3F6289CCF376F588CE0C4 /* NSString+HTML.m */; };
+		A2E1164041C2D80612C202F2766A9E9A /* RDEPUBCFICompatibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = C29508133496D51D5F24DDBFFEC54798 /* RDEPUBCFICompatibility.swift */; };
 		A30D5C1E413A3D319A83D3410A8A549F /* DTCoreTextParagraphStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F760D62F6C6F083374702146337F2CB /* DTCoreTextParagraphStyle.m */; };
-		A394725B4499E22C8669E55D912C91B4 /* RDEPUBReaderController+PublicAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998BCF777F83F1FB8750BD56EE84B2AE /* RDEPUBReaderController+PublicAPI.swift */; };
-		A395CCE5722E366B772BF6B1F6946127 /* Debugging.swift in Sources */ = {isa = PBXBuildFile; fileRef = D495E2AB1223BD4D4909F8FF1FF47DAF /* Debugging.swift */; };
-		A3C72E26D73B4403AD31910648E15966 /* DTTiledLayerWithoutFade.m in Sources */ = {isa = PBXBuildFile; fileRef = 70F5D03B9B3B7F182C8F5C1F5D4FA7E7 /* DTTiledLayerWithoutFade.m */; };
-		A4B36C7AD680BF85951DDB4212E61813 /* RDEPUBReaderSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437BAE8034EB06D39FB6465925E7C605 /* RDEPUBReaderSettingsViewController.swift */; };
-		A4DC5EAA80207BB182178B58807880D5 /* SSAlertDefaultAnmation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81B8F42440B802E6EC2B1FF7E3022F3A /* SSAlertDefaultAnmation.swift */; };
-		A4F298F535DCE8A56710325CD29C8E93 /* Data+Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5964AF1336E2F0DA0E2C32991E76C78C /* Data+Compression.swift */; };
-		A530446AD6CF65F8CE8CC7942C0FCD94 /* ConstraintMultiplierTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09BE22EE711B7A38A4443E1C1C12BD79 /* ConstraintMultiplierTarget.swift */; };
-		A5E40959919D780747C1315E7AC4E7EC /* RDEPUBChapterOffsetMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE43A186B4FB4AABB024CB325862CC15 /* RDEPUBChapterOffsetMap.swift */; };
-		A67994574E34ABDC487483B82E85BB5C /* RDEPUBJavaScriptBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3526BB8173BAFDCFF6B01FD5DD049264 /* RDEPUBJavaScriptBridge.swift */; };
+		A3FBC31F5CCE7882ABAC0C50BE2F1B9C /* DTBlockFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = A0BD48DAF5AE9DB087F2552E99069709 /* DTBlockFunctions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A617AECE5C0565EC362D58CECE76E01B /* ConstraintMakerEditable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392A75EAF280876545D14AA00517BA4C /* ConstraintMakerEditable.swift */; };
+		A691BA8AC2E9668EC2D30BF7C300086D /* RDEPUBBackgroundTrace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50244AA9BC4821A6CB64A7AF6D8BB332 /* RDEPUBBackgroundTrace.swift */; };
 		A72E9F983E5BBFA7485EFB482B80E89E /* DTWeakSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5155CCDD61E030184249A020FE5D74B0 /* DTWeakSupport.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		A7886390F2AF85602193E28F9F5983E8 /* DTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A1EBB9497F4846C84CA0BF5E4F84FC7 /* DTLog.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A77F198B69481699E6FCEAFBCDA2F8DA /* UIView+DTFoundation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4219E7C32019899890CAB66E5FBDF524 /* UIView+DTFoundation.m */; };
 		A7D665BBDADBE3D64023FF52E218FCFA /* DTCoreTextConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = B2B3D0CB47B0A8E9EC5AF48B7F2DD6B0 /* DTCoreTextConstants.m */; };
+		A8D3597AB26C2CBA7B5966BEAA1A252B /* RDEPUBNotePopupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2FEFB9BEB8FDB1839B78DBC6861BB90 /* RDEPUBNotePopupViewController.swift */; };
+		A8DBD4A1E923298D4959A63CAA45746A /* RDEPUBTextAnchor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1A3ADD8E5C9D2A848AA57AA083E168 /* RDEPUBTextAnchor.swift */; };
 		AA3722CC8B4992EDA8A9F5E9116835B7 /* DTCoreText-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 015F3EE69253C66E11B931E3360BA5FE /* DTCoreText-dummy.m */; };
-		AA542B6FF2517B5FB42279893006FD1A /* RDEPUBJumpSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9564D6E271823A4F52883925DD5AFC9 /* RDEPUBJumpSession.swift */; };
-		AB86D7DAB8714917AE61286A40FFB664 /* RDEPUBReaderBottomToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9BE6C1E41B26E8B9FBA46BD0E7FE189 /* RDEPUBReaderBottomToolView.swift */; };
+		AAB706F10104FB95DD95EFD0530C4C6D /* RDEPUBMetadataParseCancellationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B300D661A4E613B36517DEC8EC312AEA /* RDEPUBMetadataParseCancellationController.swift */; };
+		AB75C75F5D829A0BF57969234A63ED59 /* NSString+DTUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DCECDBD73595CA88A2208000B4B68352 /* NSString+DTUtilities.m */; };
 		AC7000465258822B466855B12F1F97A3 /* DTCoreTextGlyphRun.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A21AE1A0AB5383F895B34EA7D6973D /* DTCoreTextGlyphRun.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		ADA006AA88365E10705F06FE241E65FA /* WeReadApi.js in Resources */ = {isa = PBXBuildFile; fileRef = 198095122CF8A5D01FE08DB3522C4043 /* WeReadApi.js */; };
-		AE07EE1F495FEAC486341ECEFA5DBCFB /* RDEPUBNotePopupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5186CF593B077F83EDF6C1CC18ADDD38 /* RDEPUBNotePopupViewController.swift */; };
-		AE53CBB88AA774E6D70565B8F8D552C7 /* ConstraintLayoutGuide+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A82CB094636AFB53D6D130D6219BA /* ConstraintLayoutGuide+Extensions.swift */; };
-		AE7C303055D6AD3016B5B8635879D8FB /* ConstraintLayoutSupportDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5B34EE2160C27947D1EEFD42184CF5D /* ConstraintLayoutSupportDSL.swift */; };
+		AD3AA582C65B0D42CC2AA6053738737C /* RDEPUBTextBookCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 384B29CBEB4465D86BDA4AF5BF10C2F7 /* RDEPUBTextBookCache.swift */; };
+		AEEE68A6A3456F7B4DC24A7163D98F5F /* ZIPFoundation-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = D927F128EBF26AD2C61FD0E6B6F6F5ED /* ZIPFoundation-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AF7A1DC953992A149CB0815C90769529 /* DTIframeTextAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B931AB189BDDE2CCE8578B50BD60AF0 /* DTIframeTextAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		B0E03650B655E7A52FF5EA5E0CF570C3 /* ConstraintMakerEditable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392A75EAF280876545D14AA00517BA4C /* ConstraintMakerEditable.swift */; };
+		AFDC339729E3167A94E6D3EB45E8D4AA /* ConstraintDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CF362F88AB69253F1898E53D7A286A /* ConstraintDSL.swift */; };
+		AFEC35CEF2F2F0F83DF93E373C44AEB3 /* rangy-serializer.js in Resources */ = {isa = PBXBuildFile; fileRef = 7315B7878D20AD386748BCFFF68812DB /* rangy-serializer.js */; };
+		B21B66EF9EFBAA49EE4E8FFD51292FEF /* DTPieProgressIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B443D035BA5652B03A41BE905C5AC17 /* DTPieProgressIndicator.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B24FAD34A7915FC4B90FE9038E814FF2 /* DTLazyImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = A4E43DCDE0C8751557E7E65FEEB1C865 /* DTLazyImageView.m */; };
-		B562932FE745F1A6CA7930F5E41FC746 /* RDEPUBParser+Archive.swift in Sources */ = {isa = PBXBuildFile; fileRef = C78C0CDBA3CFB40D59A48E3C8B16868D /* RDEPUBParser+Archive.swift */; };
-		B576DE2193FF581A7224630D023D1F47 /* RDEPUBWebView+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 797EC05C144FFB8111C49280A138322C /* RDEPUBWebView+Configuration.swift */; };
-		B5AF31527268F433A01F893D5E4AAF6D /* RDEPUBReaderToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD388B4634128186073C32B45902588 /* RDEPUBReaderToolView.swift */; };
-		B5C060894953803A1C8E921C2F62B8AA /* RDEPUBRuntimeChapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 242D6AFEA3701AC66AE3A146E6B93557 /* RDEPUBRuntimeChapter.swift */; };
-		B5DFAAC5B3565D7DABE3DCE29921BF03 /* RDEPUBRenderDiagnosticsCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C112467B63073D840AE21FDE6ADDFC /* RDEPUBRenderDiagnosticsCollector.swift */; };
-		B6156859B01AE15CA20869141C0F5914 /* rangy-core.js in Resources */ = {isa = PBXBuildFile; fileRef = 022BE133FB557799F611B325C77A9F02 /* rangy-core.js */; };
-		B6AC6181DCC890816E18B694F7E0A8A2 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEB14A8F8170777DB7CCC3F27C8EA57A /* ImageIO.framework */; };
+		B35733574DA8B973FF3B77D92B8756B0 /* RDEPUBStyleSheetBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B9B9C10492C2477D3CA1E3B7027D4C5 /* RDEPUBStyleSheetBuilder.swift */; };
+		B499FCB6EB1F8BAE70CF0AAC369EA7E2 /* RDEPUBNavigatorLayoutContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0146E639757C4B0ED78C4CA12DA7FDD7 /* RDEPUBNavigatorLayoutContext.swift */; };
+		B4C2FB1FFAA1E94B6266CE735A8A130F /* RDEPUBSelectionLoupeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A845B04B94B0E1C1F7CAC1A19D0340D6 /* RDEPUBSelectionLoupeView.swift */; };
+		B50E295EEF6CBA47808C7520A79BEC5F /* RDEPUBBackgroundCoverageStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07F94C7EE98654BB19A56E9BB717727B /* RDEPUBBackgroundCoverageStore.swift */; };
+		B53E867CFD518A62EA593F4F4B3A3FAA /* RDEPUBNoteModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 902FAE3EE7603EA74B421F4F8B5160E1 /* RDEPUBNoteModels.swift */; };
+		B77E45849D821FEDD79D5446B6A490ED /* NSData+DTCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 02EDFE0EEA47398F3E1A361A73AF6A6C /* NSData+DTCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B794BC94DCEAB911E625BB167073309D /* RDEPUBReaderLoadCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013A3E32348433787547280A0B53E82D /* RDEPUBReaderLoadCoordinator.swift */; };
 		B7BDD79FC06A1E4E0E17592860844108 /* NSAttributedString+DTCoreText.h in Headers */ = {isa = PBXBuildFile; fileRef = FF3F7BA20A1213804048557D946CEEA9 /* NSAttributedString+DTCoreText.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B8332F36582F7A001FE85A8D54B27C9E /* DTCoreTextParagraphStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D62C5531667F364F14DB67D33FFA554 /* DTCoreTextParagraphStyle.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B86493B996A888D1DA7814ECB6028E22 /* DTHorizontalRuleHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = A68D72764140BC3DF67A2B9E52CEC7A4 /* DTHorizontalRuleHTMLElement.m */; };
-		B89ECFCE925AD94CD6E41E097CCDE392 /* RDReaderView+CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874E286151F929B28491A4FA5283F1AC /* RDReaderView+CollectionView.swift */; };
+		B93AFFE0B94B3B0C9E3E53A5689643AE /* ConstraintMakerRelatable+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFE19508E12BF8B0B52E8CB4F724217 /* ConstraintMakerRelatable+Extensions.swift */; };
 		B94CD41727DFCA8791EED8FB2CA397DD /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 2702E05AA7A266B7D8D0F881FD4E09DA /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		BA922B8060094435362C68B9E701A93D /* RDEPUBResourceResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27E533973CCDEBA09513F66161275794 /* RDEPUBResourceResolver.swift */; };
-		BB5D44E1C77D642626074B84023846CE /* RDEPUBReaderChapterListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B4BF13D3F4D6E26101F470D64D654C /* RDEPUBReaderChapterListController.swift */; };
-		BC41348E87B5BA8145E77BC43D319CE0 /* NSFileWrapper+DTCopying.m in Sources */ = {isa = PBXBuildFile; fileRef = 1756C6FFCA695290BA62DA4E7B6DD20B /* NSFileWrapper+DTCopying.m */; };
-		BD3C49EE066E848C75862554950B2AFE /* ConstraintLayoutSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50297AAB8278F2BB6FCFE82B20C7A049 /* ConstraintLayoutSupport.swift */; };
-		BD68AECDC3F4B54880C7609A8EF2C288 /* RDEPUBTextContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51DA38B1859EFFFCE0CF684F422174EB /* RDEPUBTextContentView.swift */; };
+		B9F50F644BF6273ECA00198152792102 /* RDEPUBChapterPageCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8189DB90B82FC06292365152D19B2393 /* RDEPUBChapterPageCounter.swift */; };
+		BAAB9C658BA5CE90D5A2DCB9FBCE1918 /* RDEPUBCFIParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5819FE718F1A4114395EBB6B8A8E8455 /* RDEPUBCFIParser.swift */; };
+		BCD5820BDBB0AC37772A5D613123BAAF /* RDEPUBPaginationCacheCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A759645FBF673FDEACE775045ADD6223 /* RDEPUBPaginationCacheCoordinator.swift */; };
+		BD9B40C9C8474E86F212487107F68A99 /* RDEPUBFragmentMarkerInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4221E1543BD892BF6D14538441477241 /* RDEPUBFragmentMarkerInjector.swift */; };
 		BE12CD112F82AD9050D7FB29395F27F9 /* DTVideoTextAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 63A6EDF10DA5A051C6CDCBE5D97AF11E /* DTVideoTextAttachment.m */; };
-		BF38A3D9899E21F3B93E3B8F5C215F87 /* RDEPUBPaginationModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = FACBBA5BB79E2143183296DE3F990265 /* RDEPUBPaginationModels.swift */; };
-		BFA431FA4D57E18F63FB9CF90356D8B8 /* RDEPUBTextAnchor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDEE2B0C36CB1021733FFEC7C956BF75 /* RDEPUBTextAnchor.swift */; };
-		C00D46824F42EBF7B0B0B500C4ED88DA /* UIView+DTFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 79A77584AB3B92B2508AE0BCFCB8FD87 /* UIView+DTFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C0CDBC33150FBC80ABE73E85F0B0E16F /* NSMutableArray+DTMoving.h in Headers */ = {isa = PBXBuildFile; fileRef = B0AC307F12521444C973EA0DE38B4608 /* NSMutableArray+DTMoving.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C11CEEFE19F7AD96531475BF3C2717C4 /* NSString+DTPaths.m in Sources */ = {isa = PBXBuildFile; fileRef = A3565FEE19F19CB43A43409AFFF2BD2C /* NSString+DTPaths.m */; };
-		C1EC7E24023F1217523A291E927977DE /* RDEPUBCFITextAssertion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54F7B652E5E27DA1796BA99978521973 /* RDEPUBCFITextAssertion.swift */; };
-		C2F92D244F61B2C60CF4D52497065AAD /* RDReaderView+ContentAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E4E0C5A9EF3B21584458076302D5D9C /* RDReaderView+ContentAccess.swift */; };
-		C303031A0364DA3E687B32D0B451F2F1 /* RDEPUBReaderLocationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CE36701F58B972FB3484704857B3D9 /* RDEPUBReaderLocationCoordinator.swift */; };
-		C3A4A65E35C3F6A9DA7CC179E23B1F6C /* RDEPUBCFISerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCB4352490C97D7AF33FFB9E2221300 /* RDEPUBCFISerializer.swift */; };
-		C42B3BDDA31EFA537A1C44507B40796E /* RDEPUBReaderSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6896293EFF5E39DBF421987CCF180DB0 /* RDEPUBReaderSettings.swift */; };
-		C435763538F1833C7585D0BEA76E8F7A /* RDEPUBWebView+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5483CC8050FA15BE81638FF503D0444D /* RDEPUBWebView+Search.swift */; };
-		C491DDDB34B6EDCFF6368A160CD25841 /* NSDictionary+DTError.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC368BD2A8D266EB771E5FB9A5A5B3C /* NSDictionary+DTError.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C508A072F350DB2FC91DA07ABD60AF54 /* RDEPUBWebViewDebug.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D804FE5568713D2D71E95B21D1A5A0 /* RDEPUBWebViewDebug.swift */; };
-		C52906BF2E859500BAEEF0278F349260 /* DTSmartPagingScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D2BA6D5DBD4C6A9285C4592721790A26 /* DTSmartPagingScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BE485F99DA45D2B416F45A0A869BFDEA /* DTAnimatedGIF.h in Headers */ = {isa = PBXBuildFile; fileRef = A9FBC69C7DA29A7283920FDA9EBBCE8A /* DTAnimatedGIF.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BF4C58CBD2578B555B57EAD2D527DA01 /* UIView+DTFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 79A77584AB3B92B2508AE0BCFCB8FD87 /* UIView+DTFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BF609F036C668EFAC178F93D521C1285 /* RDEPUBReaderChapterListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646429B6D94AE5D9F3ADDB5B9C6FBCCF /* RDEPUBReaderChapterListController.swift */; };
+		C00E44460F4E1E1B7100F7B97CC964AD /* RDEPUBChapterWarmupOrchestrator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCF1D4F0258C1F7B53CE73485F48442 /* RDEPUBChapterWarmupOrchestrator.swift */; };
+		C01F8DF6EB0351A95971D4ED5C00BA64 /* Data+Compression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5964AF1336E2F0DA0E2C32991E76C78C /* Data+Compression.swift */; };
+		C21E42AA79E5C63040B163B0C2FFC947 /* NSDictionary+DTError.m in Sources */ = {isa = PBXBuildFile; fileRef = C18480913E002315E3F5EC6945371697 /* NSDictionary+DTError.m */; };
+		C294B8A5C58978A6A6BF0ECFD4D8461F /* RDReaderFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59C9316B92152118F5AE8FD0EC0B9683 /* RDReaderFlowLayout.swift */; };
+		C44AC1B338F7162DA062A24F37F8B607 /* UIImage+DTFoundation.m in Sources */ = {isa = PBXBuildFile; fileRef = D85A85D891A320165843EF9F489178F7 /* UIImage+DTFoundation.m */; };
+		C4B90D10F9C4624C785803714C280807 /* RDEPUBTextRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D3B9EA3167BDEF0F47AA6554DF7D86 /* RDEPUBTextRenderer.swift */; };
+		C4FF52162D560D713AE888D84B0B5CDF /* RDEPUBPaginationModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23A9ED0D9E5AF895754BB1D2CA08DEF2 /* RDEPUBPaginationModels.swift */; };
+		C520AF807149FCF55A7F3C2C16165174 /* RDEPUBReaderChromeCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2140116657415560314C2D9847AEA192 /* RDEPUBReaderChromeCoordinator.swift */; };
 		C5EE8E7373FBD24E66C678356393D871 /* DTCoreTextFontCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E791886E59DC0FAB02C6BBAB5BE5B6B /* DTCoreTextFontCollection.m */; };
+		C611AD73978B800E1A2BCE318CF9F467 /* Debugging.swift in Sources */ = {isa = PBXBuildFile; fileRef = D495E2AB1223BD4D4909F8FF1FF47DAF /* Debugging.swift */; };
+		C635E005C211CAF7E9C78CA7C6143980 /* RDEPUBReaderController+ExternalLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BDA124143D52EAC7EDD8AB1F554C329 /* RDEPUBReaderController+ExternalLinks.swift */; };
 		C6B65C0EA759DF426FBBBB113BA3C3E8 /* DTBreakHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = F734214E067BDBDB581911E1A5CDAADB /* DTBreakHTMLElement.m */; };
-		C7003533316850A97C2BED0881B2034C /* RDReaderSpreadResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C7F95A27A34D7EEC4E8BC856EE3EF6B /* RDReaderSpreadResolver.swift */; };
 		C72CE4B974DFAE2C3037D425EB559314 /* DTCoreTextLayoutFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = CE6907AC04870132CCE3177E894607DD /* DTCoreTextLayoutFrame.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C740389CA25B550AA7B5F7F1DF9B1180 /* Archive+MemoryFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 174FC0CA05D20BB995E211DE5A0857DB /* Archive+MemoryFile.swift */; };
-		C76E76733AA9041D286AC0D8E38E8A41 /* ZIPFoundation-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A06A36ADBE678DB44158D32E751FAFF /* ZIPFoundation-dummy.m */; };
-		C82B082DF9CD6E51EC40E61B778EECDC /* Archive+Reading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0619F98DA80922E78A07321D0DC54F62 /* Archive+Reading.swift */; };
+		C88B339BEFAEC890D15B89A0ABF3FD4E /* RDEPUBCFIRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B63D29E831F61A0A7CD86FE7CD9CDA9 /* RDEPUBCFIRange.swift */; };
 		C8F753B56A6C4D2A938B6EA68CF522F8 /* DTColorFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 86A0361390AA0C29BC1A5487083A12A7 /* DTColorFunctions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		C9B4EEA299EB979DCEE23FC0AE86116D /* ConstraintMakerFinalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0B32EA4B7A492EEF26CE260E9AEFA0B /* ConstraintMakerFinalizable.swift */; };
+		C9C4CFBF5EF3AF45C5525D585DC3B486 /* ConstraintLayoutGuideDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4684B406B325B35F39322D75B59B6479 /* ConstraintLayoutGuideDSL.swift */; };
 		C9DD05EF2D27FFEBFA7BF6F437168501 /* DTCoreTextConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = C8C20D9A71E6605DEE80342E7122B683 /* DTCoreTextConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CA9F6422AE5FD205DDDBB917519B178B /* RDEPUBAssetRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7793B7E6BD09D16796968B33B07249 /* RDEPUBAssetRepository.swift */; };
-		CABC0BC38735E2A8FA70D3D40D49B546 /* DTFoundation-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FAB3C7F19A511C2B1B7DFBA3CA308C4 /* DTFoundation-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CAF3131A34F65AB4827FB6931331DA53 /* RDEPUBResourceURLSchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D44F4604F4C52081C73B238EE98B5B4C /* RDEPUBResourceURLSchemeHandler.swift */; };
-		CB128F282B7B6E5B7746FA0C693A1263 /* UIImage+DTFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 15941683D394FB8D7EAE91CD2CF03FF1 /* UIImage+DTFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CB44494C095409D4934FB8D5B2D789C9 /* Data+CompressionDeprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D641809A99849F80FDCB02F8CE8D6A0 /* Data+CompressionDeprecated.swift */; };
-		CC34EC85C707EE28DB85655982938E8F /* SSAlertSwift-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DE4FA5133891593CB45AF36B8EBF60C /* SSAlertSwift-dummy.m */; };
 		CC8B8F3D758E98B51F69EDFAA69663A4 /* NSString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ABDEFEA94DC6408D92AC66DA3625DE5 /* NSString+HTML.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CCEB2BAB2BA215317C7C0259362123AF /* UIViewFrameExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8C351514678D41C58869BD057D5483F /* UIViewFrameExtension.swift */; };
+		CD34CD25B6D8F562DAACBF8A8DBFB4A7 /* DTAnimatedGIF.m in Sources */ = {isa = PBXBuildFile; fileRef = BC332335B380BC51C4F05C5CCDFB9189 /* DTAnimatedGIF.m */; };
+		CD9B90F6EB39FFE1E34CCFE1304067BC /* RDEPUBWebView+Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCC472137332414147193AA5DB35E4E0 /* RDEPUBWebView+Search.swift */; };
+		CE4876B563FC74C40E0A5DD83F79B486 /* DTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A1EBB9497F4846C84CA0BF5E4F84FC7 /* DTLog.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		CF00DDCDE77C37AEF1EF253DB73AC6E3 /* RDEPUBTextBookModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 118CEB0580740B0E6F1922515A582397 /* RDEPUBTextBookModels.swift */; };
+		CF1E18BDAEB4D8D2DED3E2DD38C23E95 /* RDEPUBJumpSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0212A000358F15ACC53BA2FDEA31CB19 /* RDEPUBJumpSession.swift */; };
 		CFC49467FE75BFABC22A1CE2FFA26570 /* DTImage+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 12A5EA26EE7539EDDA90649D22FB675D /* DTImage+HTML.m */; };
-		CFFDCDD3FE460D5A6EB665AB8C1CDAB5 /* RDEPUBCFICompatibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9270B7B3412CC1F4AABA8D1DBE4BF7B /* RDEPUBCFICompatibility.swift */; };
-		D0653A4B8287A7DC32E1DD0F7DCA3691 /* NSURL+DTUnshorten.h in Headers */ = {isa = PBXBuildFile; fileRef = 054674EB90C625BB4BEA9368ED92592B /* NSURL+DTUnshorten.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D1A93B2D7F1B312755C48790338D7712 /* DTIframeTextAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = AA3CFD777AD76F97EBA05B3920F5786A /* DTIframeTextAttachment.m */; };
-		D4DE1BC83E043DC83AE7993B50DD2468 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0834E84632886CDD9911CAB76183F1CE /* QuartzCore.framework */; };
+		D1BF333A09A6BDABFA1AF5A6D7F0364D /* RDEPUBReaderTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 244A872053DAE74B0F4DC07228A08353 /* RDEPUBReaderTheme.swift */; };
+		D24F349DFE20048204D240D20C3144D2 /* NSFileWrapper+DTCopying.h in Headers */ = {isa = PBXBuildFile; fileRef = 09C957F3199C596781EFA1DEA1DDCEC8 /* NSFileWrapper+DTCopying.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D39BB74D08A120EADBBD1A2F5D306B9C /* DTHTMLParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D75FEDE65722CF41F7F32A164376926 /* DTHTMLParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		D43CB99286214EB5B234FF938ABC3BBD /* wxread-default.css in Resources */ = {isa = PBXBuildFile; fileRef = 111B17BCED09E0F8D5AA9E8F7A335AF0 /* wxread-default.css */; };
+		D4B8FE79789D1319E5EB3FDA4CF81F77 /* RDReaderViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B52533C54FDB9B4BEB5B173C34670F /* RDReaderViewProtocols.swift */; };
 		D526E03C098DA6CF8F01C1BC126C9BBA /* DTCoreText-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7768E097F8BDE9FBE3752B98CD0101 /* DTCoreText-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D69B79197D8DC887268D5A4322D2CF19 /* RDEPUBModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91AEB422F383ACBE457884C81CB49BC4 /* RDEPUBModels.swift */; };
-		D6CC2FB33F49D4BBBCD0401168697F2C /* RDEPUBCFIDOMPathBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C53F241AB70CA866F8946BE06DC418F /* RDEPUBCFIDOMPathBuilder.swift */; };
-		D7131B9C9E9054E4D26BDC521468BBD9 /* RDEPUBChapterLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8A32A5161990E0DFEB763A243286627 /* RDEPUBChapterLoader.swift */; };
-		D7EE1FC27B4E1A6B4D4A988B9E22D79D /* ConstraintMakerRelatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD768C27E392C934C06DFB4AC401037C /* ConstraintMakerRelatable.swift */; };
+		D5824E0CE23134116C927AB027FED5AC /* RDEPUBReaderDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87A3F451AC74F9A3D57EAD938B435AD6 /* RDEPUBReaderDelegate.swift */; };
+		D6BB51AC76A2639666B4C3B11E4F53A6 /* NSString+DTPaths.m in Sources */ = {isa = PBXBuildFile; fileRef = A3565FEE19F19CB43A43409AFFF2BD2C /* NSString+DTPaths.m */; };
+		D777DF8307388E85113173F9E88824CF /* RDEPUBReaderSearchCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC476BD15E1101987A52B894DC3CB02 /* RDEPUBReaderSearchCoordinator.swift */; };
+		D7ABE878F849DA06F8A108420028D0B1 /* wxread-replace.css in Resources */ = {isa = PBXBuildFile; fileRef = 8C63018B1CE90D338115DC072191A153 /* wxread-replace.css */; };
+		D82009338CF0770A05644859B1D9B2EE /* RDEPUBTypesettingPipeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87D486D53C26F9A8106173A8E30B255A /* RDEPUBTypesettingPipeline.swift */; };
+		D8216D4D553B85B657B45D539A8E4777 /* RDEPUBTextBuildPipelineInterfaces.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF73643D6C558218A30F86F03A594CBA /* RDEPUBTextBuildPipelineInterfaces.swift */; };
+		D82545E53018482BDC16B0FCB5CB6E6C /* ZIPFoundation-ZIPFoundation_Privacy in Resources */ = {isa = PBXBuildFile; fileRef = CA4A114775B98CEA4A566C18123B145F /* ZIPFoundation-ZIPFoundation_Privacy */; };
 		D82DDA4C1E5C4D5378A9E5EA3F8E9DFE /* DTBreakHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 533CFFF04BE7BC4BDEAE11DF675A84CA /* DTBreakHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D90FFBF1D556B06DE7B427BA2D3776DD /* RDEPUBChapterData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 443B6D96023C59834F7C25F4D63153C0 /* RDEPUBChapterData.swift */; };
+		D8A67D6CCD80C9BDCE4DFB88AF6A7A37 /* SnapKit-SnapKit_Privacy in Resources */ = {isa = PBXBuildFile; fileRef = B9DCB5EC0B1CDADD221717CADDF62359 /* SnapKit-SnapKit_Privacy */; };
+		D97F221A17BC3146FFA3C9D63EE5B232 /* LayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 932FD688DE493323BA6B691BC2CB5094 /* LayoutConstraint.swift */; };
+		DA1847B8B46AE4E2BEA8B767EE215437 /* UIViewFrameExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8C351514678D41C58869BD057D5483F /* UIViewFrameExtension.swift */; };
 		DA5B51E5D80C161D2902B6FC60DA5EC8 /* DTImageTextAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 426D442C01742E4361F5BC34D43152A6 /* DTImageTextAttachment.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAD16D3E6EBB32FF96C63BFE6037065F /* DTLinkButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A1B75050E71BDD96FC19EC6BA129E6A /* DTLinkButton.m */; };
+		DBA443EC801ABC4A0A3B6B47F8FEC945 /* UIColor+RDEPUBHex.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EE6DDF24FEC8EC73F462A296083A37B /* UIColor+RDEPUBHex.swift */; };
 		DBCA42F7E1697F4EC82E0E7C9657851D /* DTAttributedTextCell.h in Headers */ = {isa = PBXBuildFile; fileRef = D4093D30B372960168C1349100DF7DE0 /* DTAttributedTextCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DC03B7E7180F57A7F42BCB3847033A0B /* wxread-replace.css in Resources */ = {isa = PBXBuildFile; fileRef = C2DFA29C18DD99781280B72A68EC5264 /* wxread-replace.css */; };
+		DC249D01F1F962D4AFF9C73F1034B746 /* RDEPUBReaderAssemblyCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100543FF7E9F503BC7C3380C327A2DE2 /* RDEPUBReaderAssemblyCoordinator.swift */; };
 		DC3E2932A82AD5D88D8B1EFBF004BEC8 /* DTCSSListStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = B509CD4B498635D4536245E43D802ED9 /* DTCSSListStyle.m */; };
-		DCF1ACFE1AAB8684EB1B7B955C5D4317 /* DTExtendedFileAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = F5389D4E96A4AFE175691B4D3D4524E7 /* DTExtendedFileAttributes.m */; };
+		DD1CED401299E73280127E52CAB9C692 /* RDEPUBBookPageMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = E980E36577B236C9DC52A497F85388C3 /* RDEPUBBookPageMap.swift */; };
 		DD73CD0E5148961D1ABD80E050122314 /* DTCoreTextFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = A1B031E2B903C2F177195C1C3D1D1EDB /* DTCoreTextFunctions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		DD831DE756363B68C0F19F83877CBF0E /* RDEPUBParser+ReadingProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2FBA6F1FD4C72EAF706943C919B2070 /* RDEPUBParser+ReadingProfile.swift */; };
-		DD96A47938E81F63659B3CBB739D0DC1 /* RDEPUBChapterCacheKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348526CA4EF78175DE245BD2B6C2F864 /* RDEPUBChapterCacheKey.swift */; };
 		DE68AD2F426FD462BC70F968E5AF5553 /* DTTextAttachmentHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 1ABC2F552388CD08EC1EFDEF606AE222 /* DTTextAttachmentHTMLElement.m */; };
-		DF0D5EE64671C5F1138FE612E8BBE666 /* Archive+BackingConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61E36C4FE448DDDA03450847FCB785B6 /* Archive+BackingConfiguration.swift */; };
-		DF454D4C187602157213EA9AABBBF52D /* RDEPUBBookPageMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = E96C781E19115E60CF0F34702546A1F5 /* RDEPUBBookPageMap.swift */; };
+		DEF81BE500F074BE66B148987D5CD8A3 /* RDEPUBTextPaginationInterfaces.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D37EDA6C8F32FB02D2F5433B481ADDB /* RDEPUBTextPaginationInterfaces.swift */; };
+		DF36E555D742A4D54A6E9FE7CA4818C9 /* RDEPUBAttachmentNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B3BB74CCE3CE21C373751EFECCB8116 /* RDEPUBAttachmentNormalizer.swift */; };
 		DFB5A1C64C7908FD05BEFF7C7B571353 /* DTAttributedLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 5679D281C282896E6FC352C48E0AF439 /* DTAttributedLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E074FC6C1714AC53B2D7A9D0FFDB14A4 /* RDEPUBReaderAnnotationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AEB3745FE63700D81DA795528264CA5 /* RDEPUBReaderAnnotationCoordinator.swift */; };
+		DFC9D618545AE33032AEF2CA1BB3E07D /* SSAlertAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D2EC0B845131A88247902AEA26F40AE /* SSAlertAnimation.swift */; };
+		E0B3A75AFA1355C7D966546FCCECEDAB /* RDEPUBReaderLocationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60CCD58E796945CC72B9D6E8F81B2A9F /* RDEPUBReaderLocationCoordinator.swift */; };
+		E109CD1D23AF8F3224915E1B4821E305 /* SnapKit-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CE078B465FDEF40EC0469626A2C2469 /* SnapKit-dummy.m */; };
+		E1B3D40F705149804531ABB02BABAB2D /* RDEPUBReaderToolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9A160FAAD45590651794EEF3A2F67FE /* RDEPUBReaderToolView.swift */; };
+		E1D10A5A280E6697386740CB34C2DD54 /* RDEPUBNoteDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29AA31A90AEE6DCF012E1800AA10068B /* RDEPUBNoteDetector.swift */; };
 		E1DA58105A72D6C0B77A8A9F7822BD68 /* DTCoreTextLayoutFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 029130886CE8E422D16ADF97468CB1B0 /* DTCoreTextLayoutFrame.m */; };
-		E2139F184D3E5233D6B205AEA9B9B249 /* RDEPUBViewportTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A5DA43C399331C00E5C025737B5B66D /* RDEPUBViewportTypes.swift */; };
+		E2EF13E16C0AD5AA232A647699EBE949 /* DTTiledLayerWithoutFade.m in Sources */ = {isa = PBXBuildFile; fileRef = 70F5D03B9B3B7F182C8F5C1F5D4FA7E7 /* DTTiledLayerWithoutFade.m */; };
 		E38FC7829B5BDD1588FA487E0FBAC208 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
-		E3A350A70196BFE24CE5F93544E25519 /* RDEPUBReaderController+DataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CFBB714DE267D9E38298384A6F0284B /* RDEPUBReaderController+DataSource.swift */; };
-		E521272FEC36F66486F41370C8C13807 /* ConstraintMaker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60657D08CCDB38BFED30BD40F4720CE4 /* ConstraintMaker.swift */; };
-		E52EC412296A7717D7FA56B5BD01C513 /* RDEPUBChapterWindowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B66148AD1F378E8AB292A9E9B4703FD /* RDEPUBChapterWindowCoordinator.swift */; };
-		E773C6855B72CC824C66583C70B14B38 /* wxread-dark.css in Resources */ = {isa = PBXBuildFile; fileRef = FE4EDACEAF5E120641D74DA33A25F1AB /* wxread-dark.css */; };
+		E3DABD5EB079D2F846A71E05D6F9C58C /* DTFoundationConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD568D38C209BA1CC0EBFA809A35204 /* DTFoundationConstants.m */; };
+		E3EA77281840BF381947CA2DEFABB6E9 /* FileManager+ZIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B7D3C6F0C845E3D42BBA613FFB0465 /* FileManager+ZIP.swift */; };
+		E6A0C3405B2EDFE7309A03DE216EBE6C /* RDEPUBReaderPaginationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BBB1A6045BDF1E2F96D996DCCA1EF9 /* RDEPUBReaderPaginationCoordinator.swift */; };
+		E6A9F131D1E9D30C00A05682E8BB348A /* RDReaderView+CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A389B363039049240F249F3421CD7734 /* RDReaderView+CollectionView.swift */; };
+		E75650616E01EFA39EF0F42279CDB0DE /* DTCustomColoredAccessory.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C6BE3B2DA9A8C4CD3760CDAD6F305A5 /* DTCustomColoredAccessory.m */; };
+		E7D79D77E971BB2A846AAA0E545D1173 /* RDEPUBTextContentInteractionCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9957BD076B5327D9E830B98BDCF61189 /* RDEPUBTextContentInteractionCoordinator.swift */; };
+		E86782FC51128CD6D297E633D9D0F26E /* RDEPUBParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F6C930B6A92EF1CEA65FC355E7EABB /* RDEPUBParser.swift */; };
+		E89192AC5F15EB1326A03A886F9B5B73 /* ConstraintDirectionalInsetTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = A651CEE8062C84A597DBC44ECA3DBCC1 /* ConstraintDirectionalInsetTarget.swift */; };
 		E8AB5CE26A5224EF09E9E363D70C7775 /* DTDictationPlaceholderView.m in Sources */ = {isa = PBXBuildFile; fileRef = AFE0B56638AFB77F4455784A7ED59876 /* DTDictationPlaceholderView.m */; };
-		E94C09071F83FF35E5FA4FAFAFF3F03F /* RDEPUBAttachmentNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20F2E6309782FD3DE72E9EDC14BDB52B /* RDEPUBAttachmentNormalizer.swift */; };
-		E963A9AEBFCBB9295029E97839698434 /* DTCoreGraphicsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B6425B2235BA00FE865AF58EF44F1144 /* DTCoreGraphicsUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		E9A86376A9B8CE0E157973311E4437FB /* RDEPUBReaderConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53D2AB28FA0F01E7950776AFCFE7621 /* RDEPUBReaderConfiguration.swift */; };
-		E9FC1457B4A0674AA56701E9D471D1C9 /* URL+ZIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 537BB06317FA188DF7A8A960152520E8 /* URL+ZIP.swift */; };
+		E997293FB896E1C65526C5DEE74B4911 /* RDEPUBAssetRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EB8ACC635A2AF36962035B54B2CC2C6 /* RDEPUBAssetRepository.swift */; };
 		EA0040823CCF8E97363DB5891F5DA6D0 /* DTCoreTextFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2D44B82815CA3397BE2C9F64819B88 /* DTCoreTextFunctions.m */; };
-		EA5FC91A9CBA3D8A97C0460D24FD2907 /* NSString+DTPaths.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5EC7C3D1808C9CF53354D7A3D69EE7 /* NSString+DTPaths.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EA8D6C10D4CACE2008A0E96285AEC050 /* NSDictionary+DTError.m in Sources */ = {isa = PBXBuildFile; fileRef = C18480913E002315E3F5EC6945371697 /* NSDictionary+DTError.m */; };
-		EB8532601EE34C9E1755ABED430D4B34 /* RDEPUBTextAnnotationOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02058F9EDA540D0CFCC2F15A1D58EAF8 /* RDEPUBTextAnnotationOverlay.swift */; };
+		EA2A236F1F116705DE1A6C053969A220 /* RDEPUBReaderController+DataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F080C0809566114997B5E6B9AF967C76 /* RDEPUBReaderController+DataSource.swift */; };
+		EB0713283E3F74926A79C2E7D9151603 /* RDEPUBReaderController+RuntimeBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 019F2E2CAC5314EC6ACF38451D83955D /* RDEPUBReaderController+RuntimeBridge.swift */; };
+		EB443E9860A66D1EFC70136AC83E2FCA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0834E84632886CDD9911CAB76183F1CE /* QuartzCore.framework */; };
 		EBB7E4D4DB253B5F1267CF9B4DDB4E93 /* DTCoreTextFontDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = BCCA590DB72AA93275262A414F16578A /* DTCoreTextFontDescriptor.m */; };
-		EBC99AB5A6A74DD1BACCEA4D47F801B4 /* RDEPUBReaderPersistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBFBB5A21127005D1E96C572537C4CA /* RDEPUBReaderPersistence.swift */; };
-		EBDAD94BDD46CA5E364ADC8F7CDCE33F /* RDEPUBReaderChromeCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAD54D8A92ADBB4E5D6AEFBC9D5453E1 /* RDEPUBReaderChromeCoordinator.swift */; };
-		EC484AB2398C0459254FA4BFFF9098AB /* RDEPUBTextPageRenderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4DE5BECEF5C877313680D5412828254 /* RDEPUBTextPageRenderView.swift */; };
-		EC7C707E329F73E6A9E850D337EFA5C0 /* RDEPUBFontFallbackResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C3011ED9BD02EA9AE15AB5394563588 /* RDEPUBFontFallbackResolver.swift */; };
+		EC8BE26122FA096D22E9A3204847F5F6 /* SnapKit-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B10D3EC1701BBA4D69926915F942558 /* SnapKit-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED9EE6BE3F0C590D9E36A371406821BF /* RDEPUBFontFallbackResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED40EE4143B1EC69166CD58B11C00B40 /* RDEPUBFontFallbackResolver.swift */; };
 		EDA269B595D70EC2B9D81DC890157D63 /* DTAccessibilityViewProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = F37563A56C180CE18EEFADE56FA3C17F /* DTAccessibilityViewProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EE4F0992A0F597320FF7BDE4691D0FD4 /* NSString+CSS.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D6C48939A8498A09DCFC7F41ECB8A25 /* NSString+CSS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EF4941F634372438A6F3BFCCF1354C3D /* SSAlertSwift-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 937CEFA81DA4227008DBFB114783A08B /* SSAlertSwift-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EF1B4ECA85C386854877F6F8EB9B19DC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1E89FE5F2996336E862E82C1E14E0EE7 /* PrivacyInfo.xcprivacy */; };
+		EF2FC7B0D522E2F9B299079073295EA7 /* Data+Serialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DC78D0B0F37BF9AD1058CACA9AAF9BE /* Data+Serialization.swift */; };
+		EFBB4EBD4D8E1397CBAB0C89EB735322 /* RDReaderPageChildViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDFBDFD59B4D9B04D1AA516EA1A41F88 /* RDReaderPageChildViewController.swift */; };
 		F006F73F17F2E3CC0E7852E9357BA946 /* DTAnchorHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 424F12BEB0EDAAF1C719B5103D30C653 /* DTAnchorHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		F04F9A4C7D6A7E41E2EDCEFB7836BE88 /* DTCustomColoredAccessory.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C6BE3B2DA9A8C4CD3760CDAD6F305A5 /* DTCustomColoredAccessory.m */; };
+		F0B19530682C9B4FA79A5D238CEA771E /* RDEPUBFontNormalizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FED226E2FA9815E3B5D4F7081930466 /* RDEPUBFontNormalizer.swift */; };
 		F0F631056BADA32253528247DF493272 /* DTHTMLElement.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9D4A455723797A27F04A15C4E47823 /* DTHTMLElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F11AE2A2CF1BF53592BA52A221BE5C73 /* RDEPUBReaderEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4F887E8F4A5F82464101B5352D2AF31 /* RDEPUBReaderEnvironment.swift */; };
+		F1DA41F2D5EB8A732EB2E1A3D3775368 /* NSArray+DTError.m in Sources */ = {isa = PBXBuildFile; fileRef = 73940D215D644B6815A09DA802CFBDDF /* NSArray+DTError.m */; };
 		F1E9B6D0728711AE4D7154616DBC17EC /* Pods-ReadViewDemo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = AA0811310099A4BCB3D52683B70DB3D1 /* Pods-ReadViewDemo-dummy.m */; };
-		F2CFAE49CDC4289600B924208E5DEC2D /* RDEPUBCFIGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C6879860F2AFC7E574BA4E11D718623 /* RDEPUBCFIGenerator.swift */; };
-		F3A41EAF1A9C8FC48F8FA5C8FA81B858 /* UIApplication+DTNetworkActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = 77213203802F44012346181FED2856F9 /* UIApplication+DTNetworkActivity.m */; };
-		F46FE18A83609747A98BFB3011CB9F92 /* RDEPUBNoteResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CAE93D9542E6DD3595B8166F018B77C /* RDEPUBNoteResolver.swift */; };
+		F28F3DAE50B7D667187EF4CF4F6F79B9 /* ConstraintMultiplierTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09BE22EE711B7A38A4443E1C1C12BD79 /* ConstraintMultiplierTarget.swift */; };
+		F2BBFDBFAA439DB5545BBBE960CE81D7 /* RDEPUBJavaScriptBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16A4528D7724EB07379829622EC7C8BE /* RDEPUBJavaScriptBridge.swift */; };
 		F4A2E3C4237B8931F61B72FF0BDD6D69 /* DTObjectTextAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = F038FB491B9A4A53447EF0DC333301AE /* DTObjectTextAttachment.m */; };
-		F54B644C537B12EF0CF0537508D6CEC0 /* RDEPUBParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43E6985809E5F7502E763451C6B1EF52 /* RDEPUBParser.swift */; };
+		F4FA2E5B5507F0658C4E886A00795A22 /* RDEPUBCFIRecoveryEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B7F28B33E9CEA8C57E5E55EDC33C596 /* RDEPUBCFIRecoveryEngine.swift */; };
+		F5367C578F9CA3E525919A16F00120C9 /* ConstraintViewDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E5637603691B9B35C2A886B686D3CE7 /* ConstraintViewDSL.swift */; };
+		F545EE19BBCEFA1C7C58B15D9255859F /* RDEPUBSemanticMarkerInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FEFC049D874D868076BE0F19A3F643B /* RDEPUBSemanticMarkerInjector.swift */; };
 		F58ABA106C6200175DF574DF05A75BA8 /* DTAccessibilityElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F0486D3B46DC92AB254D6EE9CC233BF /* DTAccessibilityElement.m */; };
+		F5935539246A112F248693526C1503FC /* rangy-core.js in Resources */ = {isa = PBXBuildFile; fileRef = 212C8E23F9694FF5B5B5FEF9E774E0C6 /* rangy-core.js */; };
 		F5A424E67F41C4F7B830CE2F7E71570D /* DTCoreText-Resources in Resources */ = {isa = PBXBuildFile; fileRef = F4E2B1AC73977F10254628C0B7EBE38F /* DTCoreText-Resources */; };
+		F5F01F1B8993CC080F1F4EAFF1D19E40 /* RDEPUBChapterDataCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DE61097D0F21BED63801FD97D420AA7 /* RDEPUBChapterDataCache.swift */; };
 		F6036BBDFE7484F5A453F6876C97C098 /* NSAttributedString+SmallCaps.m in Sources */ = {isa = PBXBuildFile; fileRef = 76F99C8130EE83A22CD223C7F5E6E66E /* NSAttributedString+SmallCaps.m */; };
 		F61102C9BF3D6296CB6C6B754ABF98C5 /* DTTextHTMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CFEE298DD52246B46E6FA62B16B38DF /* DTTextHTMLElement.m */; };
-		F7CE9CF62DFAF054EE7BCA3DC610C5F9 /* RDEPUBSelectionOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3829ADFE2A87C8A5E8BEC7CB366B998 /* RDEPUBSelectionOverlayView.swift */; };
-		F8552322BBA4332CF73730B17CD042C9 /* RDEPUBBackgroundTrace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D74CE09D213078CADFCA761162B17BE /* RDEPUBBackgroundTrace.swift */; };
-		F99EFDC1C2600F286F247A6DB0894D75 /* DTCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = B5FCE04EBB553439D1C2BA1001936293 /* DTCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FA44FE4E1274B2F105418FB23EFE315A /* RDReaderTapRegionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31E87964D5A55E4CFB3416956FC2EDD1 /* RDReaderTapRegionHandler.swift */; };
-		FBEACC8DF62FC4C1FB93A4A2EFD38A15 /* RDEPUBRenderRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EE5BE986CBB2FB9A1F91958A4C2DB2A /* RDEPUBRenderRequest.swift */; };
-		FC2CF2109D38F732F80B01DBCF334F27 /* DTBlockFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = A0BD48DAF5AE9DB087F2552E99069709 /* DTBlockFunctions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		FC5B1F66ECCC30563048030C58964A1C /* DTFoundationConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = FD03567681A79FFB6E81B3105503065D /* DTFoundationConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F64C61879DA335A141871B74060C3659 /* RDEPUBTextPaginationSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02288EA3830887D01C4E6E67E9708C18 /* RDEPUBTextPaginationSupport.swift */; };
+		F6658D5406B461AC7E42F7A969A5F673 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */; };
+		F67A787600193EFF9F366980B3538A96 /* NSArray+DTError.h in Headers */ = {isa = PBXBuildFile; fileRef = CEA93EDA6ED54D374265AA5D6B9EBBA9 /* NSArray+DTError.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		F69B4C0B51AA5CEF254C09A066F90D32 /* ConstraintInsetTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32A5ABB8F3656A110B955B0306E9A8C3 /* ConstraintInsetTarget.swift */; };
+		F80C879270B540C7F5FBA52ED93EC572 /* Archive+Writing.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF988440049800DB7824A94B81D20254 /* Archive+Writing.swift */; };
+		F838B75559262C543111C53B7587AB9D /* RDPlainTextBookBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C2FB3A2214ED9328FC7A0B36FA1C5B /* RDPlainTextBookBuilder.swift */; };
+		F866E4E4499F3638ED1281A74171D2C8 /* RDEPUBPreferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F799B8BE1C80D381CED94E9496512A6 /* RDEPUBPreferences.swift */; };
+		FA1D78A8365F3A6C455670459C164745 /* RDEPUBTextPageDecorationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04DB4D5A8B4DC5C6698F73C872584EC6 /* RDEPUBTextPageDecorationView.swift */; };
+		FA61965EA4E8C06A34051FD983B851E3 /* RDEPUBReaderController+TableOfContents.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFF1EFC40E2A42337D7C758A6A4F26D7 /* RDEPUBReaderController+TableOfContents.swift */; };
+		FAC4A4BC1E708303B032039339027FE9 /* ConstraintMakerExtendable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5245010774F8F1C4857763CC7B96E7B4 /* ConstraintMakerExtendable.swift */; };
+		FB7DB5861C466FAC927E77FA86E49E84 /* RDEPUBTextSelectionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E79BD89A1ED27EEDC4DE2290FF3118DF /* RDEPUBTextSelectionController.swift */; };
+		FB85B50672F0BFADF5AA7F3B430B7B95 /* SSAlertViewExtention.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2280F2302F54E90122747821FE681543 /* SSAlertViewExtention.swift */; };
+		FBED75A2764DF39E8AFDF8B66AB145CF /* SSAlertAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97995C73297871C353364E685939DED9 /* SSAlertAnimationController.swift */; };
 		FC5F52919451A15639442B46B38E4C67 /* DTCoreTextLayoutFrame+Cursor.m in Sources */ = {isa = PBXBuildFile; fileRef = E62C5E593037EF8A45E7FAA847D0277C /* DTCoreTextLayoutFrame+Cursor.m */; };
-		FCBE9D4002A4EC620BDEF4F9A9DAEC9E /* RDEPUBWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E17854E59D7C436E8DEFB55F63660D /* RDEPUBWebView.swift */; };
+		FC665839522860AD2F7C6B4BB3464BE2 /* RDEPUBReaderAnnotationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED00B070AB7D3CFFF967D5978A298DA3 /* RDEPUBReaderAnnotationCoordinator.swift */; };
+		FD224ECAFC982C3AB83000CC33A6FAE3 /* Entry+ZIP64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7345CE45F696634CEA692A86D16F684C /* Entry+ZIP64.swift */; };
 		FD5D68887297CFA94F543C49DC68A156 /* DTHTMLAttributedStringBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C496AB6A73C2D0BD0FF340A6A2960D5 /* DTHTMLAttributedStringBuilder.m */; };
-		FDE9F03A81F1492AD60AF53730A61352 /* Archive+Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA251BAC8B430B3A4D4C4321046B990 /* Archive+Deprecated.swift */; };
-		FE5B20D993894A7905B8F6ABCA986548 /* RDReaderGestureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59759873C9137248C4FBC71818D67038 /* RDReaderGestureController.swift */; };
+		FD8E2F19C9BB614D91B36531A67C528C /* RDReaderTapRegionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6A8108BD01EDCF1A37193D87427C6D2 /* RDReaderTapRegionHandler.swift */; };
+		FDFEE2DFE07412D7170E12942E66BF2A /* RDEPUBPageResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61ED230892882E40FEE83CDBB7A9D93 /* RDEPUBPageResolver.swift */; };
+		FE0E10A48B6213CD3FDA7737C07EE445 /* NSString+DTFormatNumbers.h in Headers */ = {isa = PBXBuildFile; fileRef = 6D86C7063D1128EAEB3A30EBEF214B3F /* NSString+DTFormatNumbers.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FEB00C614DCB6A8A7BDF8DEE11260984 /* NSMutableAttributedString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = B0500CA69405E23B09291359EB28331E /* NSMutableAttributedString+HTML.m */; };
-		FED6159088F974B8E6A43A3A54DB8D2A /* RDEPUBNavigatorLayoutContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7BAB4D0972BC162A8A3B83E0773236E /* RDEPUBNavigatorLayoutContext.swift */; };
-		FF102EBF51F6E193AB12AC0390744ADD /* ConstraintMakerExtendable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5245010774F8F1C4857763CC7B96E7B4 /* ConstraintMakerExtendable.swift */; };
-		FFCEC4C0D66DB6782F57C14EDA462592 /* Archive+ZIP64.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED5693BD171B879406EA14C97F4AD8D8 /* Archive+ZIP64.swift */; };
+		FECA4D68B4246B2EF9483B1C55180EBD /* Archive+Deprecated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA251BAC8B430B3A4D4C4321046B990 /* Archive+Deprecated.swift */; };
+		FEF320B563A2815CFEFD132F9420F8E9 /* NSString+DTUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = BE547E464E5D34F9FFB24BAC81D1E4CC /* NSString+DTUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FF005292EE0721AD1102DB5A34A97E9D /* RDEPUBCFIResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645B67E60B0E03563BF2A759753BEEE2 /* RDEPUBCFIResolver.swift */; };
+		FF18F99842B1E8108D72650D124C49A0 /* RDEPUBReaderController+RenderSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0FCBCDE580CFE3B2A980871EE253246 /* RDEPUBReaderController+RenderSupport.swift */; };
+		FF30530E9BFE73D2EC9A20EB624B4528 /* epub-bridge.js in Resources */ = {isa = PBXBuildFile; fileRef = 2EDD5A25D7DC1EED92829AE2851EEF2A /* epub-bridge.js */; };
+		FF70E3AAA12064457129DF56B253D8AE /* RDEPUBChapterOffsetMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48051F94914D1A8DE273B7F6F3D8E9EB /* RDEPUBChapterOffsetMap.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		05811707AFE2A48281461E8CE630FE11 /* PBXContainerItemProxy */ = {
+		26971A0E8DB2A61E3862ECEEF1EEFCA1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8619D5ADECF2B26CFD9A9826D61D289A;
+			remoteInfo = SSAlertSwift;
+		};
+		3A10B21C14EB4C43BF4ACC905763F74A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 19622742EBA51E823D6DAE3F8CDBFAD4;
 			remoteInfo = SnapKit;
 		};
-		14024E610F2D27044F97BDC0709FCBBB /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 8619D5ADECF2B26CFD9A9826D61D289A;
-			remoteInfo = SSAlertSwift;
-		};
-		26720AD75B7A40BEC120F816EA6F721E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 8A8DB685241263AFDF5E6B20FE67B93A;
-			remoteInfo = "SnapKit-SnapKit_Privacy";
-		};
-		2ADA9BFFFC805046509B27E52CF1A246 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = AA2E57587AA8EECA63C4BE08EA3CB6D2;
-			remoteInfo = RDReaderView;
-		};
-		3E3E4FD3677794A27497466C57911856 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = AA15C8469D67684160CC2A7098EB841C;
-			remoteInfo = ZIPFoundation;
-		};
-		3F14C32E8DE470077A48E05AE0C8C27C /* PBXContainerItemProxy */ = {
+		55CF96AB18DBA5FBFAD43C7B70064B3A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 8F6E5A5BF72D62CDFD25F91A7CFA3309;
 			remoteInfo = DTFoundation;
 		};
-		5627AFEA3A80F383F17ADC5814B2979E /* PBXContainerItemProxy */ = {
+		59B49D2484B7E1D9D18A00AB4FF4BDB1 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 8619D5ADECF2B26CFD9A9826D61D289A;
-			remoteInfo = SSAlertSwift;
+			remoteGlobalIDString = AA15C8469D67684160CC2A7098EB841C;
+			remoteInfo = ZIPFoundation;
 		};
-		637DC5F35271F5B92561C968103920AE /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = B88F4EA0695B6B3165C64594850D72C7;
-			remoteInfo = DTCoreText;
-		};
-		8416F06AF71067D32BBFD21E943A2B18 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = AE7F393FB7805DE2664AB4111873F907;
-			remoteInfo = "RDReaderView-RDReaderViewAssets";
-		};
-		9FEBEEAAD360FE4D93A2C4B051D62F4D /* PBXContainerItemProxy */ = {
+		5AFE7731761C5AFC7B80D0792B571B09 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = C7A8D82E407CD3FDC3BA55CEE519B252;
 			remoteInfo = "ZIPFoundation-ZIPFoundation_Privacy";
 		};
-		B8AE2DD286FE2F4749EF9EAA20DBAFE2 /* PBXContainerItemProxy */ = {
+		724D7793A1E88452A32F4F274C9D605C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 19622742EBA51E823D6DAE3F8CDBFAD4;
-			remoteInfo = SnapKit;
+			remoteGlobalIDString = AE7F393FB7805DE2664AB4111873F907;
+			remoteInfo = "RDReaderView-RDReaderViewAssets";
 		};
-		D46DAB6B6E214AC8E63DC4C24B2CFFFA /* PBXContainerItemProxy */ = {
+		7261C923474564FED3877DEB0109CDE2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 8F6E5A5BF72D62CDFD25F91A7CFA3309;
-			remoteInfo = DTFoundation;
+			remoteGlobalIDString = 8619D5ADECF2B26CFD9A9826D61D289A;
+			remoteInfo = SSAlertSwift;
 		};
-		E9ED99C843404CCFC1975B23676B4E1D /* PBXContainerItemProxy */ = {
+		72E3B02DD9EF31111102B5A7D352AD70 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = B88F4EA0695B6B3165C64594850D72C7;
-			remoteInfo = DTCoreText;
+			remoteGlobalIDString = AA2E57587AA8EECA63C4BE08EA3CB6D2;
+			remoteInfo = RDReaderView;
 		};
-		EB434335B42822B70CBB1BE3AC9523A7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 0C24CB0E87A728A11AA1124CB360D6A1;
-			remoteInfo = "DTCoreText-Resources";
-		};
-		F32FF4675B74B367701842602FAC1042 /* PBXContainerItemProxy */ = {
+		9A1EA07419B17A0670A5EB80AA680965 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = AA15C8469D67684160CC2A7098EB841C;
 			remoteInfo = ZIPFoundation;
 		};
+		A4A04C0B68BF1A6736FC99F5AA474861 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8F6E5A5BF72D62CDFD25F91A7CFA3309;
+			remoteInfo = DTFoundation;
+		};
+		A73CA8977765B10396E9958EA55DA3A2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 19622742EBA51E823D6DAE3F8CDBFAD4;
+			remoteInfo = SnapKit;
+		};
+		B0DABEAAF6A0CA044722029D7BC1092E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = B88F4EA0695B6B3165C64594850D72C7;
+			remoteInfo = DTCoreText;
+		};
+		BD30C0E521B2BEE7799F9A6F7344848A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0C24CB0E87A728A11AA1124CB360D6A1;
+			remoteInfo = "DTCoreText-Resources";
+		};
+		EEC2953A3DDE3647455056298820283D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = B88F4EA0695B6B3165C64594850D72C7;
+			remoteInfo = DTCoreText;
+		};
+		FE70E592BC251F07D191F6827E2CF57C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8A8DB685241263AFDF5E6B20FE67B93A;
+			remoteInfo = "SnapKit-SnapKit_Privacy";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		010BA37F9FCB8C9AF363CC966A76A455 /* RDEPUBReaderSettings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSettings.swift; sourceTree = "<group>"; };
+		013A3E32348433787547280A0B53E82D /* RDEPUBReaderLoadCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderLoadCoordinator.swift; sourceTree = "<group>"; };
+		0146E639757C4B0ED78C4CA12DA7FDD7 /* RDEPUBNavigatorLayoutContext.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNavigatorLayoutContext.swift; sourceTree = "<group>"; };
 		015F3EE69253C66E11B931E3360BA5FE /* DTCoreText-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "DTCoreText-dummy.m"; sourceTree = "<group>"; };
-		02058F9EDA540D0CFCC2F15A1D58EAF8 /* RDEPUBTextAnnotationOverlay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextAnnotationOverlay.swift; sourceTree = "<group>"; };
-		022BE133FB557799F611B325C77A9F02 /* rangy-core.js */ = {isa = PBXFileReference; includeInIndex = 1; name = "rangy-core.js"; path = "Sources/RDReaderView/EPUBCore/Resources/rangy-core.js"; sourceTree = "<group>"; };
+		019F2E2CAC5314EC6ACF38451D83955D /* RDEPUBReaderController+RuntimeBridge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+RuntimeBridge.swift"; sourceTree = "<group>"; };
+		0212A000358F15ACC53BA2FDEA31CB19 /* RDEPUBJumpSession.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBJumpSession.swift; sourceTree = "<group>"; };
+		02288EA3830887D01C4E6E67E9708C18 /* RDEPUBTextPaginationSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPaginationSupport.swift; sourceTree = "<group>"; };
 		029130886CE8E422D16ADF97468CB1B0 /* DTCoreTextLayoutFrame.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextLayoutFrame.m; path = Core/Source/DTCoreTextLayoutFrame.m; sourceTree = "<group>"; };
-		02BCA9E7A83D0CBEA1D291D218346B30 /* RDEPUBCFIResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIResolver.swift; sourceTree = "<group>"; };
 		02CF362F88AB69253F1898E53D7A286A /* ConstraintDSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintDSL.swift; path = Sources/ConstraintDSL.swift; sourceTree = "<group>"; };
 		02EDFE0EEA47398F3E1A361A73AF6A6C /* NSData+DTCrypto.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSData+DTCrypto.h"; path = "Core/Source/NSData+DTCrypto.h"; sourceTree = "<group>"; };
-		03E17854E59D7C436E8DEFB55F63660D /* RDEPUBWebView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebView.swift; sourceTree = "<group>"; };
+		033DD9B982E8F1F948C5787EBF92FF84 /* RDEPUBPresentationRuntime.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPresentationRuntime.swift; sourceTree = "<group>"; };
+		0348219C5299B3BE84133818923C2495 /* RDEPUBChapterTailNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterTailNormalizer.swift; sourceTree = "<group>"; };
 		045ADBF2087ADD914A9CA0B62EBF2A9F /* Pods-ReadViewDemo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-ReadViewDemo.modulemap"; sourceTree = "<group>"; };
+		0461A4D5A2D3198072DA0E85F0365880 /* RDEPUBSelectionState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSelectionState.swift; sourceTree = "<group>"; };
+		04DB4D5A8B4DC5C6698F73C872584EC6 /* RDEPUBTextPageDecorationView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPageDecorationView.swift; sourceTree = "<group>"; };
 		04F9B298989305B9569B71E448E8C1D4 /* FileManager+ZIPDeprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "FileManager+ZIPDeprecated.swift"; path = "Sources/ZIPFoundation/FileManager+ZIPDeprecated.swift"; sourceTree = "<group>"; };
 		054674EB90C625BB4BEA9368ED92592B /* NSURL+DTUnshorten.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURL+DTUnshorten.h"; path = "Core/Source/NSURL+DTUnshorten.h"; sourceTree = "<group>"; };
 		05D57D16346FAF830F1F82067307EA9F /* default.css */ = {isa = PBXFileReference; includeInIndex = 1; name = default.css; path = Core/Source/default.css; sourceTree = "<group>"; };
 		0619F98DA80922E78A07321D0DC54F62 /* Archive+Reading.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+Reading.swift"; path = "Sources/ZIPFoundation/Archive+Reading.swift"; sourceTree = "<group>"; };
 		061BD3911E4E530C792E65CED7868C33 /* DTBase64Coding.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTBase64Coding.m; path = Core/Source/DTBase64Coding.m; sourceTree = "<group>"; };
 		073A7F9DF1A554BD1B324EA9E0090E91 /* DTObjectTextAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTObjectTextAttachment.h; path = Core/Source/DTObjectTextAttachment.h; sourceTree = "<group>"; };
+		07F94C7EE98654BB19A56E9BB717727B /* RDEPUBBackgroundCoverageStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBackgroundCoverageStore.swift; sourceTree = "<group>"; };
 		0834E84632886CDD9911CAB76183F1CE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.0.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
 		09BE22EE711B7A38A4443E1C1C12BD79 /* ConstraintMultiplierTarget.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintMultiplierTarget.swift; path = Sources/ConstraintMultiplierTarget.swift; sourceTree = "<group>"; };
 		09C2D4A3D4F602D125FF38B56C91CF84 /* ZIPFoundation.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = ZIPFoundation.modulemap; sourceTree = "<group>"; };
 		09C957F3199C596781EFA1DEA1DDCEC8 /* NSFileWrapper+DTCopying.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSFileWrapper+DTCopying.h"; path = "Core/Source/NSFileWrapper+DTCopying.h"; sourceTree = "<group>"; };
-		0AD3643718CB1E5CC5DF85EBB82F2022 /* RDEPUBWebView+FixedLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+FixedLayout.swift"; sourceTree = "<group>"; };
+		0A0A410374DBCE1B5533846F0BCBC36C /* RDEPUBStyleSheetComposer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBStyleSheetComposer.swift; sourceTree = "<group>"; };
 		0B10D3EC1701BBA4D69926915F942558 /* SnapKit-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SnapKit-umbrella.h"; sourceTree = "<group>"; };
 		0B7771FDE9AB1688166584C0AA03F12A /* DTCoreTextFontCollection.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextFontCollection.h; path = Core/Source/DTCoreTextFontCollection.h; sourceTree = "<group>"; };
-		0C4B7177D696E76F752265DA9978505A /* RDEPUBTextIndexTable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextIndexTable.swift; sourceTree = "<group>"; };
 		0C6BE3B2DA9A8C4CD3760CDAD6F305A5 /* DTCustomColoredAccessory.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCustomColoredAccessory.m; path = Core/Source/iOS/DTCustomColoredAccessory.m; sourceTree = "<group>"; };
 		0D75FEDE65722CF41F7F32A164376926 /* DTHTMLParser.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTHTMLParser.h; path = Core/Source/DTHTMLParser/DTHTMLParser.h; sourceTree = "<group>"; };
 		0E138EC76D0DF24544D29D1A4D7429E3 /* ConstraintMakerPrioritizable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintMakerPrioritizable.swift; path = Sources/ConstraintMakerPrioritizable.swift; sourceTree = "<group>"; };
 		0E8C0D83EB6EDE71B264B6B0DD4644F5 /* LayoutConstraintItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LayoutConstraintItem.swift; path = Sources/LayoutConstraintItem.swift; sourceTree = "<group>"; };
-		0EBFBB5A21127005D1E96C572537C4CA /* RDEPUBReaderPersistence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderPersistence.swift; sourceTree = "<group>"; };
+		0EA2FAD0839C3EB52650B2300B7E74AB /* RDReaderView.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RDReaderView.debug.xcconfig; sourceTree = "<group>"; };
+		0EB4A1F095257F5F9410518DCB1053FB /* UIColor+RDEPUB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UIColor+RDEPUB.swift"; sourceTree = "<group>"; };
+		0F0670803E8267332E1891D6AB6E5A3F /* RDEPUBReaderSearchBarView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSearchBarView.swift; sourceTree = "<group>"; };
 		0F5D34047BAA894BEF1DFA23E6A9DAB1 /* DTCoreTextMacros.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextMacros.h; path = Core/Source/DTCoreTextMacros.h; sourceTree = "<group>"; };
 		0FC368BD2A8D266EB771E5FB9A5A5B3C /* NSDictionary+DTError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+DTError.h"; path = "Core/Source/NSDictionary+DTError.h"; sourceTree = "<group>"; };
-		11846D2AA4295A15016D569CC747275E /* RDEPUBCFIError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIError.swift; sourceTree = "<group>"; };
+		100543FF7E9F503BC7C3380C327A2DE2 /* RDEPUBReaderAssemblyCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderAssemblyCoordinator.swift; sourceTree = "<group>"; };
+		111B17BCED09E0F8D5AA9E8F7A335AF0 /* wxread-default.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-default.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-default.css"; sourceTree = "<group>"; };
+		118CEB0580740B0E6F1922515A582397 /* RDEPUBTextBookModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBookModels.swift; sourceTree = "<group>"; };
 		11B604FC3B0D5C91FEA763DCC0BE4DC5 /* DTHTMLParserNode.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTHTMLParserNode.m; path = Core/Source/DTHTMLParserNode.m; sourceTree = "<group>"; };
-		11FD2C3FDE35580B59901C23E905647A /* RDEPUBPageBreakPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageBreakPolicy.swift; sourceTree = "<group>"; };
 		12A5EA26EE7539EDDA90649D22FB675D /* DTImage+HTML.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "DTImage+HTML.m"; path = "Core/Source/DTImage+HTML.m"; sourceTree = "<group>"; };
-		12B251B6FA033114DCF46872DA273A54 /* RDEPUBSearchEngine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSearchEngine.swift; sourceTree = "<group>"; };
-		131CFFE1A72EF99B7007E8D814659B67 /* RDReaderPageChildViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderPageChildViewController.swift; sourceTree = "<group>"; };
 		13AB6A32A293E3DC21A7047C6DB958CA /* DTHTMLParserTextNode.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTHTMLParserTextNode.m; path = Core/Source/DTHTMLParserTextNode.m; sourceTree = "<group>"; };
+		13DBC142B0461E436AACC85794DA80D0 /* RDEPUBReadingLocationModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReadingLocationModels.swift; sourceTree = "<group>"; };
 		13E1548FC42118F1A4164739DE6BE4E9 /* UIFont+DTCoreText.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIFont+DTCoreText.m"; path = "Core/Source/UIFont+DTCoreText.m"; sourceTree = "<group>"; };
+		1541A3CEA0FCBABEF9872A60FAEF47B5 /* wxread-dark.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-dark.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-dark.css"; sourceTree = "<group>"; };
 		15941683D394FB8D7EAE91CD2CF03FF1 /* UIImage+DTFoundation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+DTFoundation.h"; path = "Core/Source/iOS/UIImage+DTFoundation.h"; sourceTree = "<group>"; };
-		15D0092D232533829CFC9F1BD511CECE /* RDEPUBAnnotationModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAnnotationModels.swift; sourceTree = "<group>"; };
-		167BA0DE8AFB80B3FD2B8CAC4CD8FD02 /* RDReaderPagingController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderPagingController.swift; sourceTree = "<group>"; };
+		167AF6E907DF607CF1D5F5B0FA05B565 /* RDEPUBChapterLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterLocation.swift; sourceTree = "<group>"; };
+		16945B1BA7C2D8D318AA4A97FB53A619 /* RDEPUBPageLayoutSnapshot.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageLayoutSnapshot.swift; sourceTree = "<group>"; };
+		16A4528D7724EB07379829622EC7C8BE /* RDEPUBJavaScriptBridge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBJavaScriptBridge.swift; sourceTree = "<group>"; };
+		172DDB09A6DD0C1A92FCD7AF5060B657 /* RDReaderGestureController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderGestureController.swift; sourceTree = "<group>"; };
 		174FC0CA05D20BB995E211DE5A0857DB /* Archive+MemoryFile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+MemoryFile.swift"; path = "Sources/ZIPFoundation/Archive+MemoryFile.swift"; sourceTree = "<group>"; };
 		1756C6FFCA695290BA62DA4E7B6DD20B /* NSFileWrapper+DTCopying.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSFileWrapper+DTCopying.m"; path = "Core/Source/NSFileWrapper+DTCopying.m"; sourceTree = "<group>"; };
+		17D3B9EA3167BDEF0F47AA6554DF7D86 /* RDEPUBTextRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextRenderer.swift; sourceTree = "<group>"; };
 		17F750F38183302BF345F40F5A4CDD43 /* NSData+DTCrypto.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSData+DTCrypto.m"; path = "Core/Source/NSData+DTCrypto.m"; sourceTree = "<group>"; };
 		18387159515E0523AFB4204B1AF940ED /* SSAlertSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SSAlertSwift.debug.xcconfig; sourceTree = "<group>"; };
-		185B84B524EAE491C132A0D5767A47A1 /* epub-bridge.js */ = {isa = PBXFileReference; includeInIndex = 1; name = "epub-bridge.js"; path = "Sources/RDReaderView/EPUBCore/Resources/epub-bridge.js"; sourceTree = "<group>"; };
-		198095122CF8A5D01FE08DB3522C4043 /* WeReadApi.js */ = {isa = PBXFileReference; includeInIndex = 1; name = WeReadApi.js; path = Sources/RDReaderView/EPUBCore/Resources/WeReadApi.js; sourceTree = "<group>"; };
-		1A6FDEFB6939DB3DF5D5226B932821BA /* RDEPUBTextLayoutFrame.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextLayoutFrame.swift; sourceTree = "<group>"; };
 		1ABC2F552388CD08EC1EFDEF606AE222 /* DTTextAttachmentHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTTextAttachmentHTMLElement.m; path = Core/Source/DTTextAttachmentHTMLElement.m; sourceTree = "<group>"; };
 		1ACA5E519F100582F0D772FCD76125C0 /* NSString+DTFormatNumbers.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+DTFormatNumbers.m"; path = "Core/Source/NSString+DTFormatNumbers.m"; sourceTree = "<group>"; };
 		1AD502A1FA6EB1E38200B5283F979504 /* Pods-ReadViewDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ReadViewDemo.release.xcconfig"; sourceTree = "<group>"; };
+		1B3BB74CCE3CE21C373751EFECCB8116 /* RDEPUBAttachmentNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAttachmentNormalizer.swift; sourceTree = "<group>"; };
 		1B443D035BA5652B03A41BE905C5AC17 /* DTPieProgressIndicator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTPieProgressIndicator.h; path = Core/Source/iOS/DTPieProgressIndicator.h; sourceTree = "<group>"; };
+		1C24BD0148D661DA92DCD300C67D590D /* RDReaderPagingController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderPagingController.swift; sourceTree = "<group>"; };
 		1C8F0DCEAA5A3DF38C503CA30DC94C1C /* Archive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Archive.swift; path = Sources/ZIPFoundation/Archive.swift; sourceTree = "<group>"; };
-		1CD08D956799BC2853B0BAA33747516B /* RDEPUBReaderTableOfContentsItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderTableOfContentsItem.swift; sourceTree = "<group>"; };
 		1D4C9B7ED5E04C216AB28E3A4065C1C5 /* DTHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTHTMLElement.m; path = Core/Source/DTHTMLElement.m; sourceTree = "<group>"; };
 		1D6DA580F40DF113709E15CF6542A35C /* DTCoreTextLayouter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextLayouter.m; path = Core/Source/DTCoreTextLayouter.m; sourceTree = "<group>"; };
-		1E0D6AF2997BAD28F37F9D771B59F7E9 /* cssInjector.js */ = {isa = PBXFileReference; includeInIndex = 1; name = cssInjector.js; path = Sources/RDReaderView/EPUBCore/Resources/cssInjector.js; sourceTree = "<group>"; };
+		1DCD2E4F44A79B62DF96C3ABAE2B8592 /* RDEPUBModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBModels.swift; sourceTree = "<group>"; };
 		1E89FE5F2996336E862E82C1E14E0EE7 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = Sources/ZIPFoundation/Resources/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		1EB8ACC635A2AF36962035B54B2CC2C6 /* RDEPUBAssetRepository.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAssetRepository.swift; sourceTree = "<group>"; };
+		1EFA16D97F8CC8E61C22F3CEF546EAA3 /* RDEPUBReaderController+ContentDelegates.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+ContentDelegates.swift"; sourceTree = "<group>"; };
 		1F090A0289338B14050FAF16C22605B0 /* ConstraintConstantTarget.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintConstantTarget.swift; path = Sources/ConstraintConstantTarget.swift; sourceTree = "<group>"; };
 		2047430DF5C84E0A8FC8874A2B915FC3 /* Pods-ReadViewDemo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ReadViewDemo-acknowledgements.markdown"; sourceTree = "<group>"; };
-		20F2E6309782FD3DE72E9EDC14BDB52B /* RDEPUBAttachmentNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAttachmentNormalizer.swift; sourceTree = "<group>"; };
 		2101691D5743105B2E3E40376584B91C /* DTFolderMonitor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTFolderMonitor.h; path = Core/Source/DTFolderMonitor.h; sourceTree = "<group>"; };
+		212C8E23F9694FF5B5B5FEF9E774E0C6 /* rangy-core.js */ = {isa = PBXFileReference; includeInIndex = 1; name = "rangy-core.js"; path = "Sources/RDReaderView/EPUBCore/Resources/rangy-core.js"; sourceTree = "<group>"; };
+		2140116657415560314C2D9847AEA192 /* RDEPUBReaderChromeCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderChromeCoordinator.swift; sourceTree = "<group>"; };
+		21716AE96E14363317AB8A817ED38F1D /* RDReaderView.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RDReaderView.release.xcconfig; sourceTree = "<group>"; };
 		21BAA93E67D8CBC5297302D798FB4F7A /* DTAttributedLabel.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAttributedLabel.m; path = Core/Source/DTAttributedLabel.m; sourceTree = "<group>"; };
 		2280F2302F54E90122747821FE681543 /* SSAlertViewExtention.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SSAlertViewExtention.swift; path = Sources/SSAlertSwift/SSAlertViewExtention.swift; sourceTree = "<group>"; };
-		22E148D0D8C1F600CA1943413EF56747 /* RDEPUBCFIMarkerInjector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIMarkerInjector.swift; sourceTree = "<group>"; };
-		22E15788FC4F921DFE7FE4C2A2B3F722 /* RDEPUBTextBuildPipelineInterfaces.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBuildPipelineInterfaces.swift; sourceTree = "<group>"; };
+		236E0B22C7FAE0F5E5BC44A2D1C4726B /* RDEPUBReadingSession.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReadingSession.swift; sourceTree = "<group>"; };
 		238893C9CBD95CB9BDF069EB5A303E17 /* RDReaderView */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = RDReaderView; path = RDReaderView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		23C08F0993EC3E8BAECD557D0E6FEAE3 /* RDEPUBSemanticMarkerInjector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSemanticMarkerInjector.swift; sourceTree = "<group>"; };
-		242D6AFEA3701AC66AE3A146E6B93557 /* RDEPUBRuntimeChapter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRuntimeChapter.swift; sourceTree = "<group>"; };
+		23A9ED0D9E5AF895754BB1D2CA08DEF2 /* RDEPUBPaginationModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPaginationModels.swift; sourceTree = "<group>"; };
+		23C0CE03056D1EF27F50F55B85D3A0D2 /* RDReaderView+ContentAccess.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+ContentAccess.swift"; sourceTree = "<group>"; };
+		244A872053DAE74B0F4DC07228A08353 /* RDEPUBReaderTheme.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderTheme.swift; sourceTree = "<group>"; };
 		249747495DE8349E480E4789B12D366D /* SnapKit.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SnapKit.modulemap; sourceTree = "<group>"; };
 		25F52D9C765ED2FA87834D4310203E0B /* DTFoundation-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "DTFoundation-prefix.pch"; sourceTree = "<group>"; };
+		269D68D156A9D97C9C623160D509981D /* RDEPUBWebViewDebug.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebViewDebug.swift; sourceTree = "<group>"; };
 		2702E05AA7A266B7D8D0F881FD4E09DA /* DTCompatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCompatibility.h; path = Core/Source/DTCompatibility.h; sourceTree = "<group>"; };
-		2717E26568D6A20D8F557BDF5A379E85 /* RDEPUBChapterWindowSnapshot.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterWindowSnapshot.swift; sourceTree = "<group>"; };
 		27205D159B39090908CA0E9C3997B784 /* NSDictionary+DTCoreText.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSDictionary+DTCoreText.h"; path = "Core/Source/NSDictionary+DTCoreText.h"; sourceTree = "<group>"; };
 		27B7D3C6F0C845E3D42BBA613FFB0465 /* FileManager+ZIP.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "FileManager+ZIP.swift"; path = "Sources/ZIPFoundation/FileManager+ZIP.swift"; sourceTree = "<group>"; };
-		27E533973CCDEBA09513F66161275794 /* RDEPUBResourceResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBResourceResolver.swift; sourceTree = "<group>"; };
 		28043173CA3B3787DC401ACEB5398108 /* DTCoreTextLayoutFrame+Cursor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "DTCoreTextLayoutFrame+Cursor.h"; path = "Core/Source/DTCoreTextLayoutFrame+Cursor.h"; sourceTree = "<group>"; };
 		28D62D3200AC3D4E42C81CDFF7E884E8 /* ConstraintItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintItem.swift; path = Sources/ConstraintItem.swift; sourceTree = "<group>"; };
-		2B66148AD1F378E8AB292A9E9B4703FD /* RDEPUBChapterWindowCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterWindowCoordinator.swift; sourceTree = "<group>"; };
+		29AA31A90AEE6DCF012E1800AA10068B /* RDEPUBNoteDetector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNoteDetector.swift; sourceTree = "<group>"; };
+		2ABBF727ED6EB3FA3EA88597AD35642B /* RDEPUBPageBreakPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageBreakPolicy.swift; sourceTree = "<group>"; };
+		2B62D239E65A52677A36BA68DB820FEA /* RDEPUBBuildDiagnosticsReporter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBuildDiagnosticsReporter.swift; sourceTree = "<group>"; };
+		2B7F28B33E9CEA8C57E5E55EDC33C596 /* RDEPUBCFIRecoveryEngine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIRecoveryEngine.swift; sourceTree = "<group>"; };
 		2BA19BD582C1BD54AF673014C04848B6 /* DTFoundation-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "DTFoundation-Info.plist"; sourceTree = "<group>"; };
+		2BF8C1B2C40980FB07D49180D7285667 /* RDReaderView-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RDReaderView-umbrella.h"; sourceTree = "<group>"; };
 		2C50CAB4241C141EF6EC9ED22AB3A7E8 /* NSDictionary+DTCoreText.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+DTCoreText.m"; path = "Core/Source/NSDictionary+DTCoreText.m"; sourceTree = "<group>"; };
-		2C7F95A27A34D7EEC4E8BC856EE3EF6B /* RDReaderSpreadResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderSpreadResolver.swift; sourceTree = "<group>"; };
 		2CD63BBDA1CB02B15A54D2CDD8A3ACD7 /* SnapKit-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SnapKit-prefix.pch"; sourceTree = "<group>"; };
 		2D36F7CDCD7D5788CDCB3A1421DB242B /* NSURL+DTAppLinks.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURL+DTAppLinks.m"; path = "Core/Source/iOS/NSURL+DTAppLinks.m"; sourceTree = "<group>"; };
 		2D3D7C8444F58D9B3FCB4F3006D2CFBA /* NSAttributedString+HTML.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSAttributedString+HTML.h"; path = "Core/Source/NSAttributedString+HTML.h"; sourceTree = "<group>"; };
 		2DE4FA5133891593CB45AF36B8EBF60C /* SSAlertSwift-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SSAlertSwift-dummy.m"; sourceTree = "<group>"; };
-		2FA15767EC291461F99B4542D3B36765 /* UIColor+RDEPUBHex.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UIColor+RDEPUBHex.swift"; sourceTree = "<group>"; };
-		303D3169E20C9432C90A387A621055B7 /* wxread-default.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-default.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-default.css"; sourceTree = "<group>"; };
-		3057AB65B5886A2792894ADB91E36D5C /* RDEPUBDTCoreTextRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBDTCoreTextRenderer.swift; sourceTree = "<group>"; };
-		3057D9BAC5FEF58836805FA2BF615391 /* RDEPUBChapterPageCounter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterPageCounter.swift; sourceTree = "<group>"; };
+		2EDD5A25D7DC1EED92829AE2851EEF2A /* epub-bridge.js */ = {isa = PBXFileReference; includeInIndex = 1; name = "epub-bridge.js"; path = "Sources/RDReaderView/EPUBCore/Resources/epub-bridge.js"; sourceTree = "<group>"; };
+		2EE6DDF24FEC8EC73F462A296083A37B /* UIColor+RDEPUBHex.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UIColor+RDEPUBHex.swift"; sourceTree = "<group>"; };
 		306477706BBB1E784F55BCF8EB1AD737 /* Pods-ReadViewDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ReadViewDemo.debug.xcconfig"; sourceTree = "<group>"; };
-		30C112467B63073D840AE21FDE6ADDFC /* RDEPUBRenderDiagnosticsCollector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRenderDiagnosticsCollector.swift; sourceTree = "<group>"; };
 		31BD7533867336DEA9B835F471767178 /* NSString+DTURLEncoding.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+DTURLEncoding.h"; path = "Core/Source/NSString+DTURLEncoding.h"; sourceTree = "<group>"; };
-		31E87964D5A55E4CFB3416956FC2EDD1 /* RDReaderTapRegionHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderTapRegionHandler.swift; sourceTree = "<group>"; };
 		31F3F91D5624C451E5D44D85B1DDE7C5 /* NSMutableString+HTML.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSMutableString+HTML.m"; path = "Core/Source/NSMutableString+HTML.m"; sourceTree = "<group>"; };
 		32A5ABB8F3656A110B955B0306E9A8C3 /* ConstraintInsetTarget.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintInsetTarget.swift; path = Sources/ConstraintInsetTarget.swift; sourceTree = "<group>"; };
 		32A8BED62113FF47E3925378065FA3BE /* SSAlertSwift-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SSAlertSwift-prefix.pch"; sourceTree = "<group>"; };
 		32FB2B1B0498DCBE7B79BDF49E963E3D /* DTHTMLParser.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTHTMLParser.m; path = Core/Source/DTHTMLParser/DTHTMLParser.m; sourceTree = "<group>"; };
-		3344122296561C5CBCF4E54ABF146A05 /* RDEPUBTextPaginationInterfaces.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPaginationInterfaces.swift; sourceTree = "<group>"; };
 		33DB57DF8C5AE334B1BBE9F989352F1D /* DTCustomColoredAccessory.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCustomColoredAccessory.h; path = Core/Source/iOS/DTCustomColoredAccessory.h; sourceTree = "<group>"; };
-		348526CA4EF78175DE245BD2B6C2F864 /* RDEPUBChapterCacheKey.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterCacheKey.swift; sourceTree = "<group>"; };
-		3526BB8173BAFDCFF6B01FD5DD049264 /* RDEPUBJavaScriptBridge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBJavaScriptBridge.swift; sourceTree = "<group>"; };
-		353F8BB9AB59FF88C959A7878D4CA687 /* RDEPUBTextSearchEngine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextSearchEngine.swift; sourceTree = "<group>"; };
+		34649E5DA563878B374E0488CF7B450A /* RDEPUBAttachmentTooltipView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAttachmentTooltipView.swift; sourceTree = "<group>"; };
+		34AAF33D5968FF88E52BE323BE82F631 /* RDEPUBPublication.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPublication.swift; sourceTree = "<group>"; };
 		354C5DD0ACC742762200A640ADA859C6 /* NSCoder+DTCompatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSCoder+DTCompatibility.h"; path = "Core/Source/NSCoder+DTCompatibility.h"; sourceTree = "<group>"; };
-		359F75D2BB7409EFBC61AD7E6DE918CB /* RDEPUBReaderRuntime.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderRuntime.swift; sourceTree = "<group>"; };
 		365FB4C3E0FF364C076EE4E9E47C32EA /* DTCoreText.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = DTCoreText.modulemap; sourceTree = "<group>"; };
-		368E7118542A73184BE785303D88D895 /* RDEPUBFixedLayoutTemplate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFixedLayoutTemplate.swift; sourceTree = "<group>"; };
 		36FCB869246FE45FD1C9609A34EB4E74 /* DTCoreTextGlyphRun.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextGlyphRun.m; path = Core/Source/DTCoreTextGlyphRun.m; sourceTree = "<group>"; };
 		375179DD3A4576CEF947E1760BBDC69B /* DTBlockFunctions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTBlockFunctions.m; path = Core/Source/DTBlockFunctions.m; sourceTree = "<group>"; };
+		384B29CBEB4465D86BDA4AF5BF10C2F7 /* RDEPUBTextBookCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBookCache.swift; sourceTree = "<group>"; };
+		385AC715B035543F28D98F44262302E3 /* RDEPUBChapterSummaryDiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterSummaryDiskCache.swift; sourceTree = "<group>"; };
+		38CC6A6BEE99B6DD8A2CB0C3D94D3C2D /* RDEPUBReaderController+PublicAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+PublicAPI.swift"; sourceTree = "<group>"; };
 		392A75EAF280876545D14AA00517BA4C /* ConstraintMakerEditable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintMakerEditable.swift; path = Sources/ConstraintMakerEditable.swift; sourceTree = "<group>"; };
-		3B5F9162A2C23B3AFD078A809D60876F /* RDEPUBSelectionState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSelectionState.swift; sourceTree = "<group>"; };
 		3B610E558C4917C4257DC198EAFEE2F6 /* DTCSSStylesheet.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCSSStylesheet.h; path = Core/Source/DTCSSStylesheet.h; sourceTree = "<group>"; };
-		3B7793B7E6BD09D16796968B33B07249 /* RDEPUBAssetRepository.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAssetRepository.swift; sourceTree = "<group>"; };
 		3B931AB189BDDE2CCE8578B50BD60AF0 /* DTIframeTextAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTIframeTextAttachment.h; path = Core/Source/DTIframeTextAttachment.h; sourceTree = "<group>"; };
+		3BDA124143D52EAC7EDD8AB1F554C329 /* RDEPUBReaderController+ExternalLinks.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+ExternalLinks.swift"; sourceTree = "<group>"; };
+		3D9A0C2A7BCE48EB6E02279F8770F67B /* RDEPUBWebView+FixedLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+FixedLayout.swift"; sourceTree = "<group>"; };
 		3DC78D0B0F37BF9AD1058CACA9AAF9BE /* Data+Serialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Data+Serialization.swift"; path = "Sources/ZIPFoundation/Data+Serialization.swift"; sourceTree = "<group>"; };
-		3F0E7197A7DBF0EFC017D73F2350DB75 /* RDReaderView+ToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+ToolView.swift"; sourceTree = "<group>"; };
+		3F799B8BE1C80D381CED94E9496512A6 /* RDEPUBPreferences.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPreferences.swift; sourceTree = "<group>"; };
+		3FDBB942C7F43B24B5A42E6837AE5A80 /* RDEPUBReaderState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderState.swift; sourceTree = "<group>"; };
+		40BBB1A6045BDF1E2F96D996DCCA1EF9 /* RDEPUBReaderPaginationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderPaginationCoordinator.swift; sourceTree = "<group>"; };
 		4219E7C32019899890CAB66E5FBDF524 /* UIView+DTFoundation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIView+DTFoundation.m"; path = "Core/Source/iOS/UIView+DTFoundation.m"; sourceTree = "<group>"; };
+		4221E1543BD892BF6D14538441477241 /* RDEPUBFragmentMarkerInjector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFragmentMarkerInjector.swift; sourceTree = "<group>"; };
+		4245A0DA8D1ED324142168C60B775253 /* RDEPUBResourceURLSchemeHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBResourceURLSchemeHandler.swift; sourceTree = "<group>"; };
 		424F12BEB0EDAAF1C719B5103D30C653 /* DTAnchorHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAnchorHTMLElement.h; path = Core/Source/DTAnchorHTMLElement.h; sourceTree = "<group>"; };
 		426D442C01742E4361F5BC34D43152A6 /* DTImageTextAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTImageTextAttachment.h; path = Core/Source/DTImageTextAttachment.h; sourceTree = "<group>"; };
-		42F099FFB667A63E58B2029DBA9474AB /* RDEPUBPageMapReconciliationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageMapReconciliationCoordinator.swift; sourceTree = "<group>"; };
-		433BD992E46EC4B310AB2C07DA6B5942 /* RDEPUBTextPaginationSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPaginationSupport.swift; sourceTree = "<group>"; };
-		437BAE8034EB06D39FB6465925E7C605 /* RDEPUBReaderSettingsViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSettingsViewController.swift; sourceTree = "<group>"; };
+		435BCDDA491498B312BF8B10335F5F6D /* epub-fixed-layout.html */ = {isa = PBXFileReference; includeInIndex = 1; name = "epub-fixed-layout.html"; path = "Sources/RDReaderView/EPUBCore/Resources/epub-fixed-layout.html"; sourceTree = "<group>"; };
 		43CFADE0F46014990052AD67F17C86FF /* DTAccessibilityViewProxy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAccessibilityViewProxy.m; path = Core/Source/DTAccessibilityViewProxy.m; sourceTree = "<group>"; };
-		43E6985809E5F7502E763451C6B1EF52 /* RDEPUBParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBParser.swift; sourceTree = "<group>"; };
 		4428633C8EC3F6289CCF376F588CE0C4 /* NSString+HTML.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+HTML.m"; path = "Core/Source/NSString+HTML.m"; sourceTree = "<group>"; };
-		443B6D96023C59834F7C25F4D63153C0 /* RDEPUBChapterData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterData.swift; sourceTree = "<group>"; };
 		4472755F83C121DE5E1E505D145F6DBE /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.0.sdk/System/Library/Frameworks/CoreText.framework; sourceTree = DEVELOPER_DIR; };
-		4531B3C89B7A6DC053BEF1373ACDFE18 /* rangy-serializer.js */ = {isa = PBXFileReference; includeInIndex = 1; name = "rangy-serializer.js"; path = "Sources/RDReaderView/EPUBCore/Resources/rangy-serializer.js"; sourceTree = "<group>"; };
+		44A3A2C05CEC2C66E821919A93A14590 /* RDEPUBRenderRequest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRenderRequest.swift; sourceTree = "<group>"; };
 		45C7129757B54DFD9E445D0A17D73A83 /* ConstraintPriority.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintPriority.swift; path = Sources/ConstraintPriority.swift; sourceTree = "<group>"; };
 		4600E9C0EF3B23864C9D7E5E90155F9D /* SSAlertSwift.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SSAlertSwift.modulemap; sourceTree = "<group>"; };
 		4684B406B325B35F39322D75B59B6479 /* ConstraintLayoutGuideDSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintLayoutGuideDSL.swift; path = Sources/ConstraintLayoutGuideDSL.swift; sourceTree = "<group>"; };
-		4717049EE2F365C2ECA2B29A5F0CDC44 /* RDEPUBReaderUIState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderUIState.swift; sourceTree = "<group>"; };
-		476AB0419C7F33B4AB2729364F2E8779 /* RDEPUBStyleCompatibilityModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBStyleCompatibilityModels.swift; sourceTree = "<group>"; };
+		46A60E7129B6B8BA7355B63E9608DF37 /* RDReaderView-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "RDReaderView-Info.plist"; sourceTree = "<group>"; };
+		46B833FD47EDD18F132A4F3DABFD3E55 /* RDEPUBHTMLNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBHTMLNormalizer.swift; sourceTree = "<group>"; };
 		477A0FC2A1F0B7F7CCF72D201ECEBAB0 /* DTDictationPlaceholderTextAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTDictationPlaceholderTextAttachment.m; path = Core/Source/DTDictationPlaceholderTextAttachment.m; sourceTree = "<group>"; };
+		48051F94914D1A8DE273B7F6F3D8E9EB /* RDEPUBChapterOffsetMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterOffsetMap.swift; sourceTree = "<group>"; };
 		48A4A6EDC08C8AC933D0DCD507E9D173 /* ZIPFoundation */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = ZIPFoundation; path = ZIPFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		49A21AE1A0AB5383F895B34EA7D6973D /* DTCoreTextGlyphRun.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextGlyphRun.h; path = Core/Source/DTCoreTextGlyphRun.h; sourceTree = "<group>"; };
 		4A06A36ADBE678DB44158D32E751FAFF /* ZIPFoundation-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "ZIPFoundation-dummy.m"; sourceTree = "<group>"; };
 		4A2659DB0685E16ABAE0382F726DA8C8 /* Archive+Helpers.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+Helpers.swift"; path = "Sources/ZIPFoundation/Archive+Helpers.swift"; sourceTree = "<group>"; };
 		4AF6156128A1A0CA24D9D06E346B9445 /* DTVersion.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTVersion.m; path = Core/Source/DTVersion.m; sourceTree = "<group>"; };
-		4BCB4352490C97D7AF33FFB9E2221300 /* RDEPUBCFISerializer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFISerializer.swift; sourceTree = "<group>"; };
-		4BD360BDA6082E55A046601B16354F22 /* RDEPUBPageInteractionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageInteractionController.swift; sourceTree = "<group>"; };
+		4B63D29E831F61A0A7CD86FE7CD9CDA9 /* RDEPUBCFIRange.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIRange.swift; sourceTree = "<group>"; };
 		4BEC60CB3EDA1C189D3B062E29217440 /* ZIPFoundation.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = ZIPFoundation.debug.xcconfig; sourceTree = "<group>"; };
-		4C12BE94A7C945A1B14E5A6704E62098 /* RDReaderView.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RDReaderView.debug.xcconfig; sourceTree = "<group>"; };
 		4C2B218B5EAA5831A036BBF7E1EFC1B9 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.0.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; };
 		4D641809A99849F80FDCB02F8CE8D6A0 /* Data+CompressionDeprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Data+CompressionDeprecated.swift"; path = "Sources/ZIPFoundation/Data+CompressionDeprecated.swift"; sourceTree = "<group>"; };
-		4D74CE09D213078CADFCA761162B17BE /* RDEPUBBackgroundTrace.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBackgroundTrace.swift; sourceTree = "<group>"; };
-		4E8C6096A7B9404057346F143DF9BAA6 /* RDEPUBCFIRecoveryEngine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIRecoveryEngine.swift; sourceTree = "<group>"; };
+		4DD02085DF060BFA07C4C65AC0F9ADAE /* RDEPUBTextPerformanceSampler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPerformanceSampler.swift; sourceTree = "<group>"; };
+		4E2E2ACE965436483EDC14EC4262BAFC /* RDEPUBRuntimeChapter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRuntimeChapter.swift; sourceTree = "<group>"; };
 		4EEFAE80193E1F0DA53400C9AD641410 /* DTActivityTitleView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTActivityTitleView.m; path = Core/Source/iOS/DTActivityTitleView.m; sourceTree = "<group>"; };
 		4F0486D3B46DC92AB254D6EE9CC233BF /* DTAccessibilityElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAccessibilityElement.m; path = Core/Source/DTAccessibilityElement.m; sourceTree = "<group>"; };
+		50244AA9BC4821A6CB64A7AF6D8BB332 /* RDEPUBBackgroundTrace.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBackgroundTrace.swift; sourceTree = "<group>"; };
 		50297AAB8278F2BB6FCFE82B20C7A049 /* ConstraintLayoutSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintLayoutSupport.swift; path = Sources/ConstraintLayoutSupport.swift; sourceTree = "<group>"; };
 		5155CCDD61E030184249A020FE5D74B0 /* DTWeakSupport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTWeakSupport.h; path = Core/Source/DTWeakSupport.h; sourceTree = "<group>"; };
-		5186CF593B077F83EDF6C1CC18ADDD38 /* RDEPUBNotePopupViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNotePopupViewController.swift; sourceTree = "<group>"; };
-		51DA38B1859EFFFCE0CF684F422174EB /* RDEPUBTextContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextContentView.swift; sourceTree = "<group>"; };
+		51E8DDA0C0AF445B5BC5E2B60508BE58 /* RDEPUBTextAnnotationOverlay.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextAnnotationOverlay.swift; sourceTree = "<group>"; };
+		5214F772AE3CD906C0E5AE335E0A27E0 /* WeReadApi.js */ = {isa = PBXFileReference; includeInIndex = 1; name = WeReadApi.js; path = Sources/RDReaderView/EPUBCore/Resources/WeReadApi.js; sourceTree = "<group>"; };
+		523B2C383DBC263294C404FA85A5DE82 /* RDEPUBTextRendererSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextRendererSupport.swift; sourceTree = "<group>"; };
 		5245010774F8F1C4857763CC7B96E7B4 /* ConstraintMakerExtendable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintMakerExtendable.swift; path = Sources/ConstraintMakerExtendable.swift; sourceTree = "<group>"; };
 		533CFFF04BE7BC4BDEAE11DF675A84CA /* DTBreakHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTBreakHTMLElement.h; path = Core/Source/DTBreakHTMLElement.h; sourceTree = "<group>"; };
 		53499F40E1790A6CBE8AFEB3AC5BEFC8 /* NSMutableArray+DTMoving.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSMutableArray+DTMoving.m"; path = "Core/Source/NSMutableArray+DTMoving.m"; sourceTree = "<group>"; };
 		537BB06317FA188DF7A8A960152520E8 /* URL+ZIP.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "URL+ZIP.swift"; path = "Sources/ZIPFoundation/URL+ZIP.swift"; sourceTree = "<group>"; };
 		538572A5C098252D629F2185F1B1C9E8 /* DTExtendedFileAttributes.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTExtendedFileAttributes.h; path = Core/Source/DTExtendedFileAttributes.h; sourceTree = "<group>"; };
-		53A09D0189C0A8418BF8851BFCA4B857 /* RDPlainTextBookBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDPlainTextBookBuilder.swift; sourceTree = "<group>"; };
 		53D2AB2348A9B9C582FDC2CDB2E434FC /* SnapKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SnapKit.release.xcconfig; sourceTree = "<group>"; };
 		53D473C6F07982D3D25781A343EC5A99 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = Sources/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		53F98F0F060B066CAFBCD3C85C26B2B4 /* DTCoreText.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreText.h; path = Core/Source/DTCoreText.h; sourceTree = "<group>"; };
-		5483CC8050FA15BE81638FF503D0444D /* RDEPUBWebView+Search.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+Search.swift"; sourceTree = "<group>"; };
-		54DF306A281A8DA5FDD3314734FA5AFB /* RDEPUBReaderTopToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderTopToolView.swift; sourceTree = "<group>"; };
-		54F7B652E5E27DA1796BA99978521973 /* RDEPUBCFITextAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFITextAssertion.swift; sourceTree = "<group>"; };
 		557DA029E15EC99631B647AE8922007F /* NSURL+DTAppLinks.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURL+DTAppLinks.h"; path = "Core/Source/iOS/NSURL+DTAppLinks.h"; sourceTree = "<group>"; };
-		5617F58A26030228EAFABA05788642C6 /* RDEPUBSearchModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSearchModels.swift; sourceTree = "<group>"; };
 		56489D9BA834497E48438A4B4E1CCCFF /* DTCoreTextFontDescriptor.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextFontDescriptor.h; path = Core/Source/DTCoreTextFontDescriptor.h; sourceTree = "<group>"; };
-		564DFD9C0E67DFB3283FA05DD23C8F58 /* RDEPUBTextPerformanceSampler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPerformanceSampler.swift; sourceTree = "<group>"; };
 		5679D281C282896E6FC352C48E0AF439 /* DTAttributedLabel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAttributedLabel.h; path = Core/Source/DTAttributedLabel.h; sourceTree = "<group>"; };
-		5753416D2D985EAF1FF9D9062157847F /* RDURLReaderController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDURLReaderController.swift; sourceTree = "<group>"; };
-		57D263A80E3EF0FF3FD66578B7F4B9A6 /* RDEPUBReaderDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderDelegate.swift; sourceTree = "<group>"; };
-		57FEB4E33E705DD0A1EEBDB548856FEE /* RDEPUBCSSCompatibilityLayer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCSSCompatibilityLayer.swift; sourceTree = "<group>"; };
-		58C245766BD2EFA6647D58344225E88A /* RDEPUBWebContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebContentView.swift; sourceTree = "<group>"; };
-		593E047303291D8DC4F1A0BE766C9F12 /* RDReaderView-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RDReaderView-dummy.m"; sourceTree = "<group>"; };
+		5687CEB04DF925FAE0FC801EFA943FD8 /* RDEPUBWebView+Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+Configuration.swift"; sourceTree = "<group>"; };
+		5819FE718F1A4114395EBB6B8A8E8455 /* RDEPUBCFIParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIParser.swift; sourceTree = "<group>"; };
 		5964AF1336E2F0DA0E2C32991E76C78C /* Data+Compression.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Data+Compression.swift"; path = "Sources/ZIPFoundation/Data+Compression.swift"; sourceTree = "<group>"; };
-		59759873C9137248C4FBC71818D67038 /* RDReaderGestureController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderGestureController.swift; sourceTree = "<group>"; };
 		5977986EDFE76D5EF96A6D95483B12F7 /* Pods-ReadViewDemo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ReadViewDemo-frameworks.sh"; sourceTree = "<group>"; };
-		59DF20BA6C3F0FF52936AFFA6EDBC4FF /* RDEPUBFontNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFontNormalizer.swift; sourceTree = "<group>"; };
-		5A5DA43C399331C00E5C025737B5B66D /* RDEPUBViewportTypes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBViewportTypes.swift; sourceTree = "<group>"; };
+		59C9316B92152118F5AE8FD0EC0B9683 /* RDReaderFlowLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderFlowLayout.swift; sourceTree = "<group>"; };
 		5A9A82CB094636AFB53D6D130D6219BA /* ConstraintLayoutGuide+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ConstraintLayoutGuide+Extensions.swift"; path = "Sources/ConstraintLayoutGuide+Extensions.swift"; sourceTree = "<group>"; };
 		5B007AEEACE9EA271DD73AFD80A74D83 /* DTLog.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTLog.m; path = Core/Source/DTLog.m; sourceTree = "<group>"; };
+		5B888CEDF0E6ECE3807EF95D1BB7D400 /* RDEPUBAnnotationModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAnnotationModels.swift; sourceTree = "<group>"; };
 		5BA251BAC8B430B3A4D4C4321046B990 /* Archive+Deprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+Deprecated.swift"; path = "Sources/ZIPFoundation/Archive+Deprecated.swift"; sourceTree = "<group>"; };
-		5BAAA5BF0E7A1BE4850526485A29B155 /* RDReaderView-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RDReaderView-prefix.pch"; sourceTree = "<group>"; };
-		5CBBC6BFE9C0EC921FE326274C97A36A /* RDEPUBBackgroundPriorityPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBackgroundPriorityPolicy.swift; sourceTree = "<group>"; };
+		5C2DA7CBEF685373784172A46130ECE9 /* RDEPUBSearchEngine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSearchEngine.swift; sourceTree = "<group>"; };
 		5D62C5531667F364F14DB67D33FFA554 /* DTCoreTextParagraphStyle.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextParagraphStyle.h; path = Core/Source/DTCoreTextParagraphStyle.h; sourceTree = "<group>"; };
 		5DA1E8494B86FFD79C639DCB8C21E1BB /* DTPieProgressIndicator.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTPieProgressIndicator.m; path = Core/Source/iOS/DTPieProgressIndicator.m; sourceTree = "<group>"; };
-		5E4E0C5A9EF3B21584458076302D5D9C /* RDReaderView+ContentAccess.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+ContentAccess.swift"; sourceTree = "<group>"; };
+		5DE61097D0F21BED63801FD97D420AA7 /* RDEPUBChapterDataCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterDataCache.swift; sourceTree = "<group>"; };
 		5E791886E59DC0FAB02C6BBAB5BE5B6B /* DTCoreTextFontCollection.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextFontCollection.m; path = Core/Source/DTCoreTextFontCollection.m; sourceTree = "<group>"; };
 		5F760D62F6C6F083374702146337F2CB /* DTCoreTextParagraphStyle.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextParagraphStyle.m; path = Core/Source/DTCoreTextParagraphStyle.m; sourceTree = "<group>"; };
 		5F991240340FA026C71B68EB25B9F9C8 /* Entry+Serialization.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Entry+Serialization.swift"; path = "Sources/ZIPFoundation/Entry+Serialization.swift"; sourceTree = "<group>"; };
 		5FAB3C7F19A511C2B1B7DFBA3CA308C4 /* DTFoundation-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "DTFoundation-umbrella.h"; sourceTree = "<group>"; };
 		6014DA7213E4687224F2BF921E30002C /* DTFoundation.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = DTFoundation.debug.xcconfig; sourceTree = "<group>"; };
-		60348C9FD3414B4F18924FF8BFF5DA8A /* RDEPUBReaderContext.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderContext.swift; sourceTree = "<group>"; };
 		60657D08CCDB38BFED30BD40F4720CE4 /* ConstraintMaker.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintMaker.swift; path = Sources/ConstraintMaker.swift; sourceTree = "<group>"; };
+		60CCD58E796945CC72B9D6E8F81B2A9F /* RDEPUBReaderLocationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderLocationCoordinator.swift; sourceTree = "<group>"; };
 		61E36C4FE448DDDA03450847FCB785B6 /* Archive+BackingConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+BackingConfiguration.swift"; path = "Sources/ZIPFoundation/Archive+BackingConfiguration.swift"; sourceTree = "<group>"; };
-		631001401579A0D4E3E45FBE1C6638B4 /* RDEPUBPageLayoutSnapshot.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageLayoutSnapshot.swift; sourceTree = "<group>"; };
+		620F6EB9BD2515CCF9666EBD79D1E206 /* RDEPUBCoreTextPageFrameFactory.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCoreTextPageFrameFactory.swift; sourceTree = "<group>"; };
+		62CA2B8137FC8E99994C84CF0B18EBD1 /* RDEPUBReaderBottomToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderBottomToolView.swift; sourceTree = "<group>"; };
 		63A6EDF10DA5A051C6CDCBE5D97AF11E /* DTVideoTextAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTVideoTextAttachment.m; path = Core/Source/DTVideoTextAttachment.m; sourceTree = "<group>"; };
+		63CB91E70707FEFE07F01B11C0DB5055 /* RDEPUBRenderDiagnosticsCollector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRenderDiagnosticsCollector.swift; sourceTree = "<group>"; };
+		645B67E60B0E03563BF2A759753BEEE2 /* RDEPUBCFIResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIResolver.swift; sourceTree = "<group>"; };
+		646429B6D94AE5D9F3ADDB5B9C6FBCCF /* RDEPUBReaderChapterListController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderChapterListController.swift; sourceTree = "<group>"; };
 		647FB0C5AAF84C71A7784DD277E48910 /* UIFont+DTCoreText.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIFont+DTCoreText.h"; path = "Core/Source/UIFont+DTCoreText.h"; sourceTree = "<group>"; };
-		6484A5889C63CEDDDB03917738280B04 /* RDEPUBCFIRange.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIRange.swift; sourceTree = "<group>"; };
 		64868ADD0419A5D112863F638932DA34 /* ZIPFoundation-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ZIPFoundation-Info.plist"; sourceTree = "<group>"; };
 		64AB89EAB10148C39B726B26BE04F4F8 /* DTCoreTextLayoutLine.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextLayoutLine.h; path = Core/Source/DTCoreTextLayoutLine.h; sourceTree = "<group>"; };
 		6578DFAB51436E8DF266FD087700E26B /* ConstraintDescription.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintDescription.swift; path = Sources/ConstraintDescription.swift; sourceTree = "<group>"; };
-		672C726EE465BA99AAB74EA89472AC6E /* RDEPUBTypesettingPipeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTypesettingPipeline.swift; sourceTree = "<group>"; };
-		6896293EFF5E39DBF421987CCF180DB0 /* RDEPUBReaderSettings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSettings.swift; sourceTree = "<group>"; };
+		66E601E685D0E9888AAFFDCAF0C0D1D6 /* RDEPUBTextLayoutFrame.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextLayoutFrame.swift; sourceTree = "<group>"; };
+		6886C52EAE45B38A526CD917C8CBFED8 /* RDEPUBViewportTypes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBViewportTypes.swift; sourceTree = "<group>"; };
+		69510290E334432CAAC474A360B115BA /* ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist"; sourceTree = "<group>"; };
 		6A1EBB9497F4846C84CA0BF5E4F84FC7 /* DTLog.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTLog.h; path = Core/Source/DTLog.h; sourceTree = "<group>"; };
+		6AE9447E94AD6DD5AA1A3E1BBB03977A /* RDEPUBReaderTableOfContentsItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderTableOfContentsItem.swift; sourceTree = "<group>"; };
 		6B96B0998B49D8E149C995474DA5FE5F /* DTHTMLWriter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTHTMLWriter.h; path = Core/Source/DTHTMLWriter.h; sourceTree = "<group>"; };
 		6C647A2EB2720BCBF88B160D124B57BF /* UILayoutSupport+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "UILayoutSupport+Extensions.swift"; path = "Sources/UILayoutSupport+Extensions.swift"; sourceTree = "<group>"; };
+		6CF30C46F1B4F469D06B27690215880A /* RDEPUBWebDecorationOverlayView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebDecorationOverlayView.swift; sourceTree = "<group>"; };
 		6D2EC0B845131A88247902AEA26F40AE /* SSAlertAnimation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SSAlertAnimation.swift; path = Sources/SSAlertSwift/SSAlertAnimation.swift; sourceTree = "<group>"; };
 		6D86C7063D1128EAEB3A30EBEF214B3F /* NSString+DTFormatNumbers.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+DTFormatNumbers.h"; path = "Core/Source/NSString+DTFormatNumbers.h"; sourceTree = "<group>"; };
-		6EE5BE986CBB2FB9A1F91958A4C2DB2A /* RDEPUBRenderRequest.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRenderRequest.swift; sourceTree = "<group>"; };
-		7023A986F364F329C85DD8CB36828860 /* RDEPUBReaderPaginationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderPaginationCoordinator.swift; sourceTree = "<group>"; };
-		70CCDD71A0D77BA8E1C8D0FF8E739473 /* RDEPUBHTMLNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBHTMLNormalizer.swift; sourceTree = "<group>"; };
+		6E8A22827641532F651809A316008577 /* RDEPUBRuntimePageCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRuntimePageCount.swift; sourceTree = "<group>"; };
+		6F768932648B61D9731F923A824F7617 /* wxread-replace-latin.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-replace-latin.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-replace-latin.css"; sourceTree = "<group>"; };
 		70F5D03B9B3B7F182C8F5C1F5D4FA7E7 /* DTTiledLayerWithoutFade.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTTiledLayerWithoutFade.m; path = Core/Source/iOS/DTTiledLayerWithoutFade.m; sourceTree = "<group>"; };
 		713C9FD0354D16AFCCFA630A97F2DA68 /* NSCharacterSet+HTML.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSCharacterSet+HTML.m"; path = "Core/Source/NSCharacterSet+HTML.m"; sourceTree = "<group>"; };
 		7176B677A350927FC670368313DC2CA1 /* ConstraintConfig.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintConfig.swift; path = Sources/ConstraintConfig.swift; sourceTree = "<group>"; };
 		71E2D85A099C99CD82FD1842EE7C52D2 /* NSAttributedString+DTDebug.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSAttributedString+DTDebug.h"; path = "Core/Source/NSAttributedString+DTDebug.h"; sourceTree = "<group>"; };
-		7223B82BE067D41E4311EBD45A2EBC6C /* RDEPUBParser+Resources.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+Resources.swift"; sourceTree = "<group>"; };
+		7315B7878D20AD386748BCFFF68812DB /* rangy-serializer.js */ = {isa = PBXFileReference; includeInIndex = 1; name = "rangy-serializer.js"; path = "Sources/RDReaderView/EPUBCore/Resources/rangy-serializer.js"; sourceTree = "<group>"; };
 		731C0C61E3AD227D691FBA1C2C17BF7B /* NSURL+DTComparing.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSURL+DTComparing.h"; path = "Core/Source/NSURL+DTComparing.h"; sourceTree = "<group>"; };
 		7345CE45F696634CEA692A86D16F684C /* Entry+ZIP64.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Entry+ZIP64.swift"; path = "Sources/ZIPFoundation/Entry+ZIP64.swift"; sourceTree = "<group>"; };
-		7393C161B75A0E039B5BFF99E5C7B042 /* RDEPUBCFIPath.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIPath.swift; sourceTree = "<group>"; };
 		73940D215D644B6815A09DA802CFBDDF /* NSArray+DTError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSArray+DTError.m"; path = "Core/Source/NSArray+DTError.m"; sourceTree = "<group>"; };
 		73A99927E52B24583A6A2CF7E6F23848 /* DTVideoTextAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTVideoTextAttachment.h; path = Core/Source/DTVideoTextAttachment.h; sourceTree = "<group>"; };
-		73F0F6D6A2794703282450C5841C6D2C /* RDEPUBTextPositionConverter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPositionConverter.swift; sourceTree = "<group>"; };
-		74B74728A7753AF3421EBAAC5CBD6A11 /* RDEPUBReadingSession.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReadingSession.swift; sourceTree = "<group>"; };
+		744C73D1186E82ACC4BDB4FBB30CFACE /* RDEPUBReaderDependencies.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderDependencies.swift; sourceTree = "<group>"; };
+		75B52533C54FDB9B4BEB5B173C34670F /* RDReaderViewProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderViewProtocols.swift; sourceTree = "<group>"; };
 		75C5986EF2D63801A8A30B9D77A7FDD0 /* ResourceBundle-ZIPFoundation_Privacy-ZIPFoundation-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-ZIPFoundation_Privacy-ZIPFoundation-Info.plist"; sourceTree = "<group>"; };
 		75FA8E843D9225BD65EB9D17825EC0F4 /* NSCharacterSet+HTML.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSCharacterSet+HTML.h"; path = "Core/Source/NSCharacterSet+HTML.h"; sourceTree = "<group>"; };
+		76610C58FDE0133C7B8E5E15CD84C663 /* RDEPUBParser+ReadingProfile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+ReadingProfile.swift"; sourceTree = "<group>"; };
 		76F99C8130EE83A22CD223C7F5E6E66E /* NSAttributedString+SmallCaps.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSAttributedString+SmallCaps.m"; path = "Core/Source/NSAttributedString+SmallCaps.m"; sourceTree = "<group>"; };
 		77213203802F44012346181FED2856F9 /* UIApplication+DTNetworkActivity.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIApplication+DTNetworkActivity.m"; path = "Core/Source/iOS/UIApplication+DTNetworkActivity.m"; sourceTree = "<group>"; };
-		77584175DBE9233D48B49D24156EC5A5 /* RDEPUBParser+Package.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+Package.swift"; sourceTree = "<group>"; };
+		775E375A8BF4CD67FD85FF4C6E217AE5 /* RDReaderView.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = RDReaderView.modulemap; sourceTree = "<group>"; };
 		77A613841EB90827AF321DD50B21DB5D /* DTAttributedTextView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAttributedTextView.m; path = Core/Source/DTAttributedTextView.m; sourceTree = "<group>"; };
+		77E36CB709B0609F38B9C5F40B7A18C0 /* RDReaderView+PageCurl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+PageCurl.swift"; sourceTree = "<group>"; };
+		786487AD4F6B37AE4B483566F3000C6F /* RDEPUBFixedLayoutTemplate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFixedLayoutTemplate.swift; sourceTree = "<group>"; };
 		78873FAFC0AD9E930D6050A7F976714B /* DTCoreText.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = DTCoreText.debug.xcconfig; sourceTree = "<group>"; };
-		78BC6512B9C94FC8EA1B2D474A86110D /* RDReaderView.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = RDReaderView.release.xcconfig; sourceTree = "<group>"; };
 		78EA0DF405F8465A86BFD3DDFD2EC295 /* Pods-ReadViewDemo */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-ReadViewDemo"; path = Pods_ReadViewDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7922FB20384529AC03B2689097070BE0 /* RDEPUBChapterTailNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterTailNormalizer.swift; sourceTree = "<group>"; };
-		797EC05C144FFB8111C49280A138322C /* RDEPUBWebView+Configuration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+Configuration.swift"; sourceTree = "<group>"; };
 		79A77584AB3B92B2508AE0BCFCB8FD87 /* UIView+DTFoundation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIView+DTFoundation.h"; path = "Core/Source/iOS/UIView+DTFoundation.h"; sourceTree = "<group>"; };
-		7A867717C525A9DC522388125DC5DB70 /* RDReaderViewProtocols.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderViewProtocols.swift; sourceTree = "<group>"; };
 		7AB9016408894675D11069CDAACEDE94 /* DTImage+HTML.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "DTImage+HTML.h"; path = "Core/Source/DTImage+HTML.h"; sourceTree = "<group>"; };
+		7B9B9C10492C2477D3CA1E3B7027D4C5 /* RDEPUBStyleSheetBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBStyleSheetBuilder.swift; sourceTree = "<group>"; };
 		7C496AB6A73C2D0BD0FF340A6A2960D5 /* DTHTMLAttributedStringBuilder.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTHTMLAttributedStringBuilder.m; path = Core/Source/DTHTMLAttributedStringBuilder.m; sourceTree = "<group>"; };
-		7C6879860F2AFC7E574BA4E11D718623 /* RDEPUBCFIGenerator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIGenerator.swift; sourceTree = "<group>"; };
-		7CB475F3E2D12FD5ED7CA4CD01DC3323 /* epub-fixed-layout.html */ = {isa = PBXFileReference; includeInIndex = 1; name = "epub-fixed-layout.html"; path = "Sources/RDReaderView/EPUBCore/Resources/epub-fixed-layout.html"; sourceTree = "<group>"; };
+		7D37EDA6C8F32FB02D2F5433B481ADDB /* RDEPUBTextPaginationInterfaces.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPaginationInterfaces.swift; sourceTree = "<group>"; };
 		7D63AE1801C7AB149219317BE7529B26 /* DTAnchorHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAnchorHTMLElement.m; path = Core/Source/DTAnchorHTMLElement.m; sourceTree = "<group>"; };
 		7F051D813D50D20D53205D5FDCAA877C /* UIScreen+DTFoundation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIScreen+DTFoundation.m"; path = "Core/Source/iOS/UIScreen+DTFoundation.m"; sourceTree = "<group>"; };
+		7FEFC049D874D868076BE0F19A3F643B /* RDEPUBSemanticMarkerInjector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSemanticMarkerInjector.swift; sourceTree = "<group>"; };
 		80B3D15ED0D19D020663EF055386291A /* DTColor+Compatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "DTColor+Compatibility.h"; path = "Core/Source/DTColor+Compatibility.h"; sourceTree = "<group>"; };
+		80CBF12B91CD7E30B52521195ACD8066 /* RDEPUBTextBookBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBookBuilder.swift; sourceTree = "<group>"; };
+		8189DB90B82FC06292365152D19B2393 /* RDEPUBChapterPageCounter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterPageCounter.swift; sourceTree = "<group>"; };
 		81B8F42440B802E6EC2B1FF7E3022F3A /* SSAlertDefaultAnmation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SSAlertDefaultAnmation.swift; path = Sources/SSAlertSwift/SSAlertDefaultAnmation.swift; sourceTree = "<group>"; };
+		81C2FB3A2214ED9328FC7A0B36FA1C5B /* RDPlainTextBookBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDPlainTextBookBuilder.swift; sourceTree = "<group>"; };
 		8272D0B59ABD6652D0CAE3DFCC2C5EE1 /* DTActivityTitleView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTActivityTitleView.h; path = Core/Source/iOS/DTActivityTitleView.h; sourceTree = "<group>"; };
 		83410CC9CF2ABE63B90A92F2F988BF65 /* RDReaderView-RDReaderViewAssets */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "RDReaderView-RDReaderViewAssets"; path = RDReaderViewAssets.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		839B80DCB8EBDB9BFDEE18C4B160FE81 /* RDEPUBTextPageRenderView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPageRenderView.swift; sourceTree = "<group>"; };
 		83E37DC74BB53F90A5AD54842858A62F /* NSString+Paragraphs.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+Paragraphs.h"; path = "Core/Source/NSString+Paragraphs.h"; sourceTree = "<group>"; };
+		83FE23C4421208A77C790E396C2391EC /* RDEPUBAttachmentTooltipOverlayView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBAttachmentTooltipOverlayView.swift; sourceTree = "<group>"; };
+		84432C44761FA9535E1C1C00A97581F8 /* RDEPUBCFIMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIMap.swift; sourceTree = "<group>"; };
 		8552BE1A1F6A6D2879763DE3B2B8A2DD /* NSNumber+RomanNumerals.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSNumber+RomanNumerals.h"; path = "Core/Source/NSNumber+RomanNumerals.h"; sourceTree = "<group>"; };
-		85EF67ADDCE46E8FA21D881DDD21355B /* RDEPUBReaderSearchCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSearchCoordinator.swift; sourceTree = "<group>"; };
-		8686290A5D2D84D7BC62F9AA5EA41C90 /* RDEPUBCFIParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIParser.swift; sourceTree = "<group>"; };
 		86A0361390AA0C29BC1A5487083A12A7 /* DTColorFunctions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTColorFunctions.h; path = Core/Source/DTColorFunctions.h; sourceTree = "<group>"; };
-		874E286151F929B28491A4FA5283F1AC /* RDReaderView+CollectionView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+CollectionView.swift"; sourceTree = "<group>"; };
+		87A3F451AC74F9A3D57EAD938B435AD6 /* RDEPUBReaderDelegate.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderDelegate.swift; sourceTree = "<group>"; };
+		87D486D53C26F9A8106173A8E30B255A /* RDEPUBTypesettingPipeline.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTypesettingPipeline.swift; sourceTree = "<group>"; };
 		882FA707ED3513D263A1E0656AAD2D33 /* ConstraintPriorityTarget.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintPriorityTarget.swift; path = Sources/ConstraintPriorityTarget.swift; sourceTree = "<group>"; };
 		885653999BD237A574B67DB279DE7E87 /* ConstraintRelatableTarget.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintRelatableTarget.swift; path = Sources/ConstraintRelatableTarget.swift; sourceTree = "<group>"; };
-		894685F6BF9DF2124012989C5A853657 /* RDEPUBCoreTextPageFrameFactory.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCoreTextPageFrameFactory.swift; sourceTree = "<group>"; };
+		89F92BE384325A770DEEB46797F1E54A /* RDEPUBPaginationState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPaginationState.swift; sourceTree = "<group>"; };
+		8ABD098B435C30F2039019D7646E87ED /* RDEPUBParser+Archive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+Archive.swift"; sourceTree = "<group>"; };
 		8ABDEFEA94DC6408D92AC66DA3625DE5 /* NSString+HTML.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+HTML.h"; path = "Core/Source/NSString+HTML.h"; sourceTree = "<group>"; };
 		8B35D0622F339A5B8A864FAA0C9EAE47 /* Pods-ReadViewDemo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ReadViewDemo-acknowledgements.plist"; sourceTree = "<group>"; };
 		8B59C9A1B265393E4BA8383B308A5917 /* DTHTMLAttributedStringBuilder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTHTMLAttributedStringBuilder.h; path = Core/Source/DTHTMLAttributedStringBuilder.h; sourceTree = "<group>"; };
 		8BD568D38C209BA1CC0EBFA809A35204 /* DTFoundationConstants.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTFoundationConstants.m; path = Core/Source/DTFoundationConstants.m; sourceTree = "<group>"; };
 		8BD9F2023FF826F67E69E3407A70A8A6 /* DTVersion.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTVersion.h; path = Core/Source/DTVersion.h; sourceTree = "<group>"; };
-		8C53B14CB594A5D925B516A21278616E /* RDEPUBTextRendererSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextRendererSupport.swift; sourceTree = "<group>"; };
-		8C53F241AB70CA866F8946BE06DC418F /* RDEPUBCFIDOMPathBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIDOMPathBuilder.swift; sourceTree = "<group>"; };
-		8CAE93D9542E6DD3595B8166F018B77C /* RDEPUBNoteResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNoteResolver.swift; sourceTree = "<group>"; };
+		8C63018B1CE90D338115DC072191A153 /* wxread-replace.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-replace.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-replace.css"; sourceTree = "<group>"; };
 		8CFEE298DD52246B46E6FA62B16B38DF /* DTTextHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTTextHTMLElement.m; path = Core/Source/DTTextHTMLElement.m; sourceTree = "<group>"; };
-		8DCEB3A6D3DF3CC1DBE0AE0B947B9ABD /* RDEPUBTextBookModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBookModels.swift; sourceTree = "<group>"; };
 		8E3E834CCC952717089550F50A2DE59C /* SSAlertSwift-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "SSAlertSwift-Info.plist"; sourceTree = "<group>"; };
 		8E5637603691B9B35C2A886B686D3CE7 /* ConstraintViewDSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintViewDSL.swift; path = Sources/ConstraintViewDSL.swift; sourceTree = "<group>"; };
 		8F2D44B82815CA3397BE2C9F64819B88 /* DTCoreTextFunctions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextFunctions.m; path = Core/Source/DTCoreTextFunctions.m; sourceTree = "<group>"; };
-		8F2E04ABBBF406CD73171124E45B5D49 /* RDReaderPreloadController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderPreloadController.swift; sourceTree = "<group>"; };
 		8F950CEF31AC0065C0BEAB26BA2CEFA1 /* ConstraintOffsetTarget.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintOffsetTarget.swift; path = Sources/ConstraintOffsetTarget.swift; sourceTree = "<group>"; };
-		8FB9FC4847266E4F97CB262C4207B9D4 /* RDEPUBPageCountCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageCountCache.swift; sourceTree = "<group>"; };
-		90299D3CC3DF1039283EA09284A99570 /* RDEPUBReaderController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderController.swift; sourceTree = "<group>"; };
+		8FED226E2FA9815E3B5D4F7081930466 /* RDEPUBFontNormalizer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFontNormalizer.swift; sourceTree = "<group>"; };
+		902C1572982F594CBCFA71AF8CB6749A /* RDEPUBDTCoreTextRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBDTCoreTextRenderer.swift; sourceTree = "<group>"; };
+		902FAE3EE7603EA74B421F4F8B5160E1 /* RDEPUBNoteModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNoteModels.swift; sourceTree = "<group>"; };
+		90D060B1A624B2699F408C993E8C418B /* RDEPUBReaderController+AttachmentTooltip.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+AttachmentTooltip.swift"; sourceTree = "<group>"; };
 		91144FC099DD458E61625CD939577DAA /* ConstraintDirectionalInsets.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintDirectionalInsets.swift; path = Sources/ConstraintDirectionalInsets.swift; sourceTree = "<group>"; };
 		9129D37C7F89AD8FD530663BB4503FC0 /* NSCoder+DTCompatibility.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSCoder+DTCompatibility.m"; path = "Core/Source/NSCoder+DTCompatibility.m"; sourceTree = "<group>"; };
-		91AEB422F383ACBE457884C81CB49BC4 /* RDEPUBModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBModels.swift; sourceTree = "<group>"; };
 		92460D196C5300656C9649784EBD3C58 /* NSAttributedString+HTML.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSAttributedString+HTML.m"; path = "Core/Source/NSAttributedString+HTML.m"; sourceTree = "<group>"; };
 		932FD688DE493323BA6B691BC2CB5094 /* LayoutConstraint.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LayoutConstraint.swift; path = Sources/LayoutConstraint.swift; sourceTree = "<group>"; };
 		934F9BB2B3A313294F121484C3A97A14 /* Archive+ReadingDeprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+ReadingDeprecated.swift"; path = "Sources/ZIPFoundation/Archive+ReadingDeprecated.swift"; sourceTree = "<group>"; };
 		937CEFA81DA4227008DBFB114783A08B /* SSAlertSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SSAlertSwift-umbrella.h"; sourceTree = "<group>"; };
-		93972052546ECA81648EFF429E5957E7 /* RDReaderContentCell.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderContentCell.swift; sourceTree = "<group>"; };
 		945D4549E0B9168D7DDB910DE874B874 /* Typealiases.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Typealiases.swift; path = Sources/Typealiases.swift; sourceTree = "<group>"; };
-		94AA601472E86DD75D0117D00794B2B2 /* RDEPUBTextPageDecorationView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPageDecorationView.swift; sourceTree = "<group>"; };
 		957DB4675D5CCBD3CB1762F08619F3F7 /* UIApplication+DTNetworkActivity.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIApplication+DTNetworkActivity.h"; path = "Core/Source/iOS/UIApplication+DTNetworkActivity.h"; sourceTree = "<group>"; };
-		9580876F40BE76D2473648FD60609A92 /* wxread-replace-latin.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-replace-latin.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-replace-latin.css"; sourceTree = "<group>"; };
-		963D8A172A36F5B0FCCD67EC2C8D7C34 /* RDReaderView-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "RDReaderView-Info.plist"; sourceTree = "<group>"; };
-		96DE45A34DB87D787488D2059C7DFBE9 /* RDEPUBReaderHighlightsViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderHighlightsViewController.swift; sourceTree = "<group>"; };
+		963DB0508456E313DFDD8A01BD92C4AD /* RDEPUBCFIMarkerInjector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIMarkerInjector.swift; sourceTree = "<group>"; };
+		96E5EDA71849C1703A80094A7160A3D2 /* RDEPUBSearchModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSearchModels.swift; sourceTree = "<group>"; };
 		96EEB6B022E22A4ABC86D87469D4815B /* DTSmartPagingScrollView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTSmartPagingScrollView.m; path = Core/Source/iOS/DTSmartPagingScrollView.m; sourceTree = "<group>"; };
 		96FA99AA7D4AD0D4246C8DAC1CC0C24E /* DTStylesheetHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTStylesheetHTMLElement.h; path = Core/Source/DTStylesheetHTMLElement.h; sourceTree = "<group>"; };
 		979486118B3E90C08386079D57962701 /* SnapKit */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SnapKit; path = SnapKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		97995C73297871C353364E685939DED9 /* SSAlertAnimationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SSAlertAnimationController.swift; path = Sources/SSAlertSwift/SSAlertAnimationController.swift; sourceTree = "<group>"; };
+		97F7B41CF52C44365ABC89D0081C7DDF /* RDEPUBCFIGenerator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIGenerator.swift; sourceTree = "<group>"; };
 		982391EC8620A617B8788C8A6101C96A /* DTDictationPlaceholderView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTDictationPlaceholderView.h; path = Core/Source/DTDictationPlaceholderView.h; sourceTree = "<group>"; };
 		98658510AA525496EBF5792E5D9884ED /* DTListItemHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTListItemHTMLElement.h; path = Core/Source/DTListItemHTMLElement.h; sourceTree = "<group>"; };
 		98C7359A7C3FC7675FED220200A43A17 /* Archive+WritingDeprecated.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+WritingDeprecated.swift"; path = "Sources/ZIPFoundation/Archive+WritingDeprecated.swift"; sourceTree = "<group>"; };
+		98E0E994653153A8BF5451529E78BD86 /* RDEPUBReaderHighlightsViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderHighlightsViewController.swift; sourceTree = "<group>"; };
 		99299A9FD6EF739D18352AC5B9325CB0 /* DTAccessibilityElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAccessibilityElement.h; path = Core/Source/DTAccessibilityElement.h; sourceTree = "<group>"; };
-		998BCF777F83F1FB8750BD56EE84B2AE /* RDEPUBReaderController+PublicAPI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+PublicAPI.swift"; sourceTree = "<group>"; };
+		9957BD076B5327D9E830B98BDCF61189 /* RDEPUBTextContentInteractionCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextContentInteractionCoordinator.swift; sourceTree = "<group>"; };
+		995FB0A24F88A5F7204BDE00B97BF00C /* RDEPUBTextContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextContentView.swift; sourceTree = "<group>"; };
 		9A1B75050E71BDD96FC19EC6BA129E6A /* DTLinkButton.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTLinkButton.m; path = Core/Source/DTLinkButton.m; sourceTree = "<group>"; };
-		9AEB3745FE63700D81DA795528264CA5 /* RDEPUBReaderAnnotationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderAnnotationCoordinator.swift; sourceTree = "<group>"; };
-		9BAE895FCD088AD6BFF6868DE8EBB5F7 /* RDEPUBStyleSheetComposer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBStyleSheetComposer.swift; sourceTree = "<group>"; };
 		9BFCAC7C2AEA867E67C63A852576774F /* NSURL+DTComparing.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURL+DTComparing.m"; path = "Core/Source/NSURL+DTComparing.m"; sourceTree = "<group>"; };
-		9C3011ED9BD02EA9AE15AB5394563588 /* RDEPUBFontFallbackResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFontFallbackResolver.swift; sourceTree = "<group>"; };
-		9C505B31D0CDD88D76E0DF9050060A3B /* RDEPUBPreferences.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPreferences.swift; sourceTree = "<group>"; };
 		9C6293E97E128E98559FB74D9A342EAD /* NSMutableString+HTML.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSMutableString+HTML.h"; path = "Core/Source/NSMutableString+HTML.h"; sourceTree = "<group>"; };
 		9CE078B465FDEF40EC0469626A2C2469 /* SnapKit-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SnapKit-dummy.m"; sourceTree = "<group>"; };
-		9CFBB714DE267D9E38298384A6F0284B /* RDEPUBReaderController+DataSource.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+DataSource.swift"; sourceTree = "<group>"; };
-		9D1456F22F77D38DF0305563DB792771 /* RDEPUBPaginationCacheCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPaginationCacheCoordinator.swift; sourceTree = "<group>"; };
 		9D6C48939A8498A09DCFC7F41ECB8A25 /* NSString+CSS.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+CSS.h"; path = "Core/Source/NSString+CSS.h"; sourceTree = "<group>"; };
 		9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		9E6BA0ECCB0ACF8580C3B5192CA9F11B /* ConstraintLayoutGuide.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintLayoutGuide.swift; path = Sources/ConstraintLayoutGuide.swift; sourceTree = "<group>"; };
+		9F439346FABB45D193709E61E908A616 /* RDReaderSpreadResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderSpreadResolver.swift; sourceTree = "<group>"; };
 		9F8F40493DF0BBB3EA5FC1F759A883C4 /* ResourceBundle-Resources-DTCoreText-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-Resources-DTCoreText-Info.plist"; sourceTree = "<group>"; };
+		9F96D2805CAFF0D2370A761DD023C745 /* RDEPUBCFISerializer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFISerializer.swift; sourceTree = "<group>"; };
 		A02EA0374C693F881AB36202FB276DCD /* ConstraintView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintView.swift; path = Sources/ConstraintView.swift; sourceTree = "<group>"; };
-		A07475B86BDC87B5618833917A8D6846 /* RDEPUBPageResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageResolver.swift; sourceTree = "<group>"; };
 		A0927A875CA1F11DBCE60DFC6F0CA0B6 /* NSScanner+HTML.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSScanner+HTML.h"; path = "Core/Source/NSScanner+HTML.h"; sourceTree = "<group>"; };
-		A0970981DC5A3462A9E0B9FD7CF88E66 /* RDEPUBNoteModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNoteModels.swift; sourceTree = "<group>"; };
 		A0BD48DAF5AE9DB087F2552E99069709 /* DTBlockFunctions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTBlockFunctions.h; path = Core/Source/DTBlockFunctions.h; sourceTree = "<group>"; };
 		A0EBAC7714A5F73B75AAB47D24B08B71 /* Constraint.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Constraint.swift; path = Sources/Constraint.swift; sourceTree = "<group>"; };
+		A1A5E5B0F978E87E788096796E498EE1 /* RDEPUBNoteResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNoteResolver.swift; sourceTree = "<group>"; };
 		A1B031E2B903C2F177195C1C3D1D1EDB /* DTCoreTextFunctions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextFunctions.h; path = Core/Source/DTCoreTextFunctions.h; sourceTree = "<group>"; };
 		A276DE925253460239BFAEC7663F60D3 /* DTAttributedTextView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAttributedTextView.h; path = Core/Source/DTAttributedTextView.h; sourceTree = "<group>"; };
 		A2C299CFB47AA6ECF86F7348E1EB751F /* NSMutableAttributedString+HTML.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSMutableAttributedString+HTML.h"; path = "Core/Source/NSMutableAttributedString+HTML.h"; sourceTree = "<group>"; };
+		A2FEFB9BEB8FDB1839B78DBC6861BB90 /* RDEPUBNotePopupViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNotePopupViewController.swift; sourceTree = "<group>"; };
 		A3565FEE19F19CB43A43409AFFF2BD2C /* NSString+DTPaths.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+DTPaths.m"; path = "Core/Source/NSString+DTPaths.m"; sourceTree = "<group>"; };
 		A3765B289CB7E6C5DF6160D8EBC83C3C /* UIScreen+DTFoundation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIScreen+DTFoundation.h"; path = "Core/Source/iOS/UIScreen+DTFoundation.h"; sourceTree = "<group>"; };
+		A389B363039049240F249F3421CD7734 /* RDReaderView+CollectionView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+CollectionView.swift"; sourceTree = "<group>"; };
+		A4AC6CA9870D7941FA2F27711C6038E4 /* RDEPUBNavigationStateMachine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNavigationStateMachine.swift; sourceTree = "<group>"; };
 		A4E43DCDE0C8751557E7E65FEEB1C865 /* DTLazyImageView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTLazyImageView.m; path = Core/Source/DTLazyImageView.m; sourceTree = "<group>"; };
 		A651CEE8062C84A597DBC44ECA3DBCC1 /* ConstraintDirectionalInsetTarget.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintDirectionalInsetTarget.swift; path = Sources/ConstraintDirectionalInsetTarget.swift; sourceTree = "<group>"; };
 		A68D72764140BC3DF67A2B9E52CEC7A4 /* DTHorizontalRuleHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTHorizontalRuleHTMLElement.m; path = Core/Source/DTHorizontalRuleHTMLElement.m; sourceTree = "<group>"; };
-		A7CE36701F58B972FB3484704857B3D9 /* RDEPUBReaderLocationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderLocationCoordinator.swift; sourceTree = "<group>"; };
+		A759645FBF673FDEACE775045ADD6223 /* RDEPUBPaginationCacheCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPaginationCacheCoordinator.swift; sourceTree = "<group>"; };
+		A8441EA66830E22726BE52E29AA8FBA0 /* RDEPUBCSSCompatibilityLayer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCSSCompatibilityLayer.swift; sourceTree = "<group>"; };
+		A845B04B94B0E1C1F7CAC1A19D0340D6 /* RDEPUBSelectionLoupeView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSelectionLoupeView.swift; sourceTree = "<group>"; };
 		A8DFDCAB69B471EB5667C964865C26CF /* DTCoreGraphicsUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreGraphicsUtils.m; path = Core/Source/DTCoreGraphicsUtils.m; sourceTree = "<group>"; };
+		A974D11C3D99A37FECDAB079565A275F /* RDEPUBCFITextAssertion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFITextAssertion.swift; sourceTree = "<group>"; };
 		A9FBC69C7DA29A7283920FDA9EBBCE8A /* DTAnimatedGIF.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAnimatedGIF.h; path = Core/Source/iOS/DTAnimatedGIF/DTAnimatedGIF.h; sourceTree = "<group>"; };
 		AA0811310099A4BCB3D52683B70DB3D1 /* Pods-ReadViewDemo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-ReadViewDemo-dummy.m"; sourceTree = "<group>"; };
 		AA3CFD777AD76F97EBA05B3920F5786A /* DTIframeTextAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTIframeTextAttachment.m; path = Core/Source/DTIframeTextAttachment.m; sourceTree = "<group>"; };
-		AA69FA9C9BC5DF26BCD177FD42113865 /* RDEPUBReaderAssemblyCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderAssemblyCoordinator.swift; sourceTree = "<group>"; };
-		AA6DD0AAE60C26C35ADA0C19CE0FD97F /* RDEPUBTextBookCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBookCache.swift; sourceTree = "<group>"; };
+		AC2313F8B75FDFEFD0DBDD842F76D012 /* RDReaderPreloadController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderPreloadController.swift; sourceTree = "<group>"; };
+		ACBDBAB2D4A07BA86ABF3F196E275CD2 /* RDEPUBReaderController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderController.swift; sourceTree = "<group>"; };
 		AD987C2FA7C8FBC96FD024E421DA0E68 /* Archive+Progress.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+Progress.swift"; path = "Sources/ZIPFoundation/Archive+Progress.swift"; sourceTree = "<group>"; };
 		ADC5AC8FD4EC45E9BA5654A38715BB93 /* DTTextBlock.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTTextBlock.m; path = Core/Source/DTTextBlock.m; sourceTree = "<group>"; };
-		AE9A97D0E8929D0099B94184E082884D /* RDEPUBChapterSummaryDiskCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterSummaryDiskCache.swift; sourceTree = "<group>"; };
 		AFC4C9F69BF2D0CAEBAA83896C139D2C /* DTColorFunctions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTColorFunctions.m; path = Core/Source/DTColorFunctions.m; sourceTree = "<group>"; };
 		AFE0B56638AFB77F4455784A7ED59876 /* DTDictationPlaceholderView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTDictationPlaceholderView.m; path = Core/Source/DTDictationPlaceholderView.m; sourceTree = "<group>"; };
 		B0500CA69405E23B09291359EB28331E /* NSMutableAttributedString+HTML.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSMutableAttributedString+HTML.m"; path = "Core/Source/NSMutableAttributedString+HTML.m"; sourceTree = "<group>"; };
-		B058AAABBC8349D197F8931C2FFDF7D7 /* RDEPUBPublication.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPublication.swift; sourceTree = "<group>"; };
+		B092BF12D8045E3C72C39C19010E067F /* RDEPUBBackgroundPriorityPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBackgroundPriorityPolicy.swift; sourceTree = "<group>"; };
 		B0AC307F12521444C973EA0DE38B4608 /* NSMutableArray+DTMoving.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSMutableArray+DTMoving.h"; path = "Core/Source/NSMutableArray+DTMoving.h"; sourceTree = "<group>"; };
 		B0B32EA4B7A492EEF26CE260E9AEFA0B /* ConstraintMakerFinalizable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintMakerFinalizable.swift; path = Sources/ConstraintMakerFinalizable.swift; sourceTree = "<group>"; };
+		B157210E873E2C199310B838E53286FD /* RDEPUBReaderUIState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderUIState.swift; sourceTree = "<group>"; };
+		B19C4570618CC1C8B9E8488EBCD9B0F5 /* RDEPUBReaderSettingsViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSettingsViewController.swift; sourceTree = "<group>"; };
+		B2205C761CC6E3BD03E29D00247B8017 /* RDEPUBChapterCacheKey.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterCacheKey.swift; sourceTree = "<group>"; };
 		B245F7E143F3091652C64F6593E33F7A /* DTFolderMonitor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTFolderMonitor.m; path = Core/Source/DTFolderMonitor.m; sourceTree = "<group>"; };
 		B2B3D0CB47B0A8E9EC5AF48B7F2DD6B0 /* DTCoreTextConstants.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextConstants.m; path = Core/Source/DTCoreTextConstants.m; sourceTree = "<group>"; };
-		B4DE5BECEF5C877313680D5412828254 /* RDEPUBTextPageRenderView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPageRenderView.swift; sourceTree = "<group>"; };
+		B300D661A4E613B36517DEC8EC312AEA /* RDEPUBMetadataParseCancellationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBMetadataParseCancellationController.swift; sourceTree = "<group>"; };
+		B3C14E09958710059E09B6816BC50FF1 /* RDEPUBCFIUtilities.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIUtilities.swift; sourceTree = "<group>"; };
 		B50104DE2E35D820ECA22CDB3E6F96EA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		B509CD4B498635D4536245E43D802ED9 /* DTCSSListStyle.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCSSListStyle.m; path = Core/Source/DTCSSListStyle.m; sourceTree = "<group>"; };
-		B53D2AB28FA0F01E7950776AFCFE7621 /* RDEPUBReaderConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderConfiguration.swift; sourceTree = "<group>"; };
+		B5EF7020C5BFFD68865D54D1B940E73C /* RDEPUBChapterData.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterData.swift; sourceTree = "<group>"; };
 		B5FCE04EBB553439D1C2BA1001936293 /* DTCompatibility.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCompatibility.h; path = Core/Source/DTCompatibility.h; sourceTree = "<group>"; };
 		B6425B2235BA00FE865AF58EF44F1144 /* DTCoreGraphicsUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreGraphicsUtils.h; path = Core/Source/DTCoreGraphicsUtils.h; sourceTree = "<group>"; };
-		B6CD922C6490932E56AE12DC05A0323D /* RDEPUBChapterDataCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterDataCache.swift; sourceTree = "<group>"; };
+		B72D18F1336296178742C907A3956E45 /* RDEPUBChapterRuntimeStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterRuntimeStore.swift; sourceTree = "<group>"; };
 		B7672A26922DBD934FA1AC60D49EB322 /* NSNumber+RomanNumerals.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSNumber+RomanNumerals.m"; path = "Core/Source/NSNumber+RomanNumerals.m"; sourceTree = "<group>"; };
-		B7D8A417E2638BDB5390CD236CA05970 /* RDEPUBFragmentMarkerInjector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFragmentMarkerInjector.swift; sourceTree = "<group>"; };
+		B83D2091A24AC3D4A98E99AD499C381A /* RDEPUBReaderServices.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderServices.swift; sourceTree = "<group>"; };
 		B8E40E302B85493BDE0FE91F829EC01E /* DTBase64Coding.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTBase64Coding.h; path = Core/Source/DTBase64Coding.h; sourceTree = "<group>"; };
+		B9A160FAAD45590651794EEF3A2F67FE /* RDEPUBReaderToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderToolView.swift; sourceTree = "<group>"; };
 		B9DCB5EC0B1CDADD221717CADDF62359 /* SnapKit-SnapKit_Privacy */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "SnapKit-SnapKit_Privacy"; path = SnapKit_Privacy.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		B9E40164920C9AC1B1413C51835CD370 /* DTCoreText-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "DTCoreText-Info.plist"; sourceTree = "<group>"; };
-		BAFFA8E198E1DF81FA44ACDBA022EBF0 /* String+SHA256.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "String+SHA256.swift"; sourceTree = "<group>"; };
-		BBC75710290014EBFDEEA6B36F301AB4 /* RDEPUBNoteDetector.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNoteDetector.swift; sourceTree = "<group>"; };
-		BBEB3A80D9A6F54C140EFB7A60E7C1E5 /* RDEPUBReaderSearchBarView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSearchBarView.swift; sourceTree = "<group>"; };
+		BA7C5D50017972C1AF6905C1B3733B08 /* RDEPUBNotePopupCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNotePopupCoordinator.swift; sourceTree = "<group>"; };
 		BC332335B380BC51C4F05C5CCDFB9189 /* DTAnimatedGIF.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAnimatedGIF.m; path = Core/Source/iOS/DTAnimatedGIF/DTAnimatedGIF.m; sourceTree = "<group>"; };
+		BCC472137332414147193AA5DB35E4E0 /* RDEPUBWebView+Search.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+Search.swift"; sourceTree = "<group>"; };
 		BCCA590DB72AA93275262A414F16578A /* DTCoreTextFontDescriptor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextFontDescriptor.m; path = Core/Source/DTCoreTextFontDescriptor.m; sourceTree = "<group>"; };
+		BCF3686E574510BF6B5D13293E85F0E1 /* RDEPUBPaginator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPaginator.swift; sourceTree = "<group>"; };
+		BD1A3ADD8E5C9D2A848AA57AA083E168 /* RDEPUBTextAnchor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextAnchor.swift; sourceTree = "<group>"; };
 		BD768C27E392C934C06DFB4AC401037C /* ConstraintMakerRelatable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintMakerRelatable.swift; path = Sources/ConstraintMakerRelatable.swift; sourceTree = "<group>"; };
+		BD88D55D7F7F1667E4466071F740A3C9 /* RDEPUBReaderTopToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderTopToolView.swift; sourceTree = "<group>"; };
 		BDD081272B47A3B73CE693D21DC26827 /* Entry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Entry.swift; path = Sources/ZIPFoundation/Entry.swift; sourceTree = "<group>"; };
-		BDEE2B0C36CB1021733FFEC7C956BF75 /* RDEPUBTextAnchor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextAnchor.swift; sourceTree = "<group>"; };
 		BE547E464E5D34F9FFB24BAC81D1E4CC /* NSString+DTUtilities.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+DTUtilities.h"; path = "Core/Source/NSString+DTUtilities.h"; sourceTree = "<group>"; };
 		BF4F3EC137168B92A5DA85AF50CD239F /* NSAttributedString+DTDebug.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSAttributedString+DTDebug.m"; path = "Core/Source/NSAttributedString+DTDebug.m"; sourceTree = "<group>"; };
-		BFE28D164B27044F77AB8429DB5579FC /* RDEPUBReadingLocationModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReadingLocationModels.swift; sourceTree = "<group>"; };
+		BFCF1D4F0258C1F7B53CE73485F48442 /* RDEPUBChapterWarmupOrchestrator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterWarmupOrchestrator.swift; sourceTree = "<group>"; };
+		C0FCBCDE580CFE3B2A980871EE253246 /* RDEPUBReaderController+RenderSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+RenderSupport.swift"; sourceTree = "<group>"; };
 		C123C127CC539ACCB510F665DB774899 /* DTAttributedTextContentView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAttributedTextContentView.h; path = Core/Source/DTAttributedTextContentView.h; sourceTree = "<group>"; };
 		C18480913E002315E3F5EC6945371697 /* NSDictionary+DTError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSDictionary+DTError.m"; path = "Core/Source/NSDictionary+DTError.m"; sourceTree = "<group>"; };
+		C186CC4BD7D2CFECDD3B037A8C1D5114 /* RDEPUBTextIndexTable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextIndexTable.swift; sourceTree = "<group>"; };
+		C18CB52F788E649EF3C7AA2AC11100A4 /* RDEPUBReaderViewportMonitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderViewportMonitor.swift; sourceTree = "<group>"; };
 		C241AD9CEC9D6732CFBA6A55B49E64C9 /* ConstraintInsets.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintInsets.swift; path = Sources/ConstraintInsets.swift; sourceTree = "<group>"; };
 		C26DBE1150BC9A30B69839783E000358 /* DTCoreTextLayouter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextLayouter.h; path = Core/Source/DTCoreTextLayouter.h; sourceTree = "<group>"; };
 		C2840BE6D91479CCBC2E908FBD9DA183 /* DTCoreText.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = DTCoreText.release.xcconfig; sourceTree = "<group>"; };
+		C29508133496D51D5F24DDBFFEC54798 /* RDEPUBCFICompatibility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFICompatibility.swift; sourceTree = "<group>"; };
 		C298199F5DC5390E8B6666F638B34C10 /* DTTextAttachmentHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTTextAttachmentHTMLElement.h; path = Core/Source/DTTextAttachmentHTMLElement.h; sourceTree = "<group>"; };
-		C2B4BF13D3F4D6E26101F470D64D654C /* RDEPUBReaderChapterListController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderChapterListController.swift; sourceTree = "<group>"; };
-		C2DFA29C18DD99781280B72A68EC5264 /* wxread-replace.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-replace.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-replace.css"; sourceTree = "<group>"; };
+		C30031E4337458E885FA7A27960620DE /* RDEPUBPageInteractionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageInteractionController.swift; sourceTree = "<group>"; };
 		C30D143134EEC5D4BA99459104B76A2E /* DTHTMLParserTextNode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTHTMLParserTextNode.h; path = Core/Source/DTHTMLParserTextNode.h; sourceTree = "<group>"; };
+		C409593D5FA3DD26DD8A3CDE6F8B221C /* String+RDEPUB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "String+RDEPUB.swift"; sourceTree = "<group>"; };
 		C422BCADBB48E28B549495663705A0FB /* DTWeakSupport.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTWeakSupport.h; path = Core/Source/DTWeakSupport.h; sourceTree = "<group>"; };
-		C4D303A1D4012C1CBA18C229DA06063A /* RDEPUBChapterRuntimeStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterRuntimeStore.swift; sourceTree = "<group>"; };
-		C55CB28CF41D832FD4871111E37FEAB8 /* RDEPUBRuntimePageCount.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBRuntimePageCount.swift; sourceTree = "<group>"; };
 		C6DB34ACB132E465CDF8191F7DB71EF6 /* ConstraintView+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ConstraintView+Extensions.swift"; path = "Sources/ConstraintView+Extensions.swift"; sourceTree = "<group>"; };
 		C71D83D6AEF198FA680B8A80BF2D9605 /* DTCoreTextLayoutLine.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextLayoutLine.m; path = Core/Source/DTCoreTextLayoutLine.m; sourceTree = "<group>"; };
-		C78C0CDBA3CFB40D59A48E3C8B16868D /* RDEPUBParser+Archive.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+Archive.swift"; sourceTree = "<group>"; };
 		C80065DBA5634DAA71129404975D7349 /* NSURL+DTUnshorten.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSURL+DTUnshorten.m"; path = "Core/Source/NSURL+DTUnshorten.m"; sourceTree = "<group>"; };
 		C8343CDCF82729A8EBCCA37A6650E34F /* DTHTMLParserNode.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTHTMLParserNode.h; path = Core/Source/DTHTMLParserNode.h; sourceTree = "<group>"; };
 		C8C20D9A71E6605DEE80342E7122B683 /* DTCoreTextConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextConstants.h; path = Core/Source/DTCoreTextConstants.h; sourceTree = "<group>"; };
@@ -974,174 +1008,162 @@
 		C960B7AA0B9B8CC473FACFEC64F9906D /* SnapKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SnapKit.debug.xcconfig; sourceTree = "<group>"; };
 		CA4A114775B98CEA4A566C18123B145F /* ZIPFoundation-ZIPFoundation_Privacy */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "ZIPFoundation-ZIPFoundation_Privacy"; path = ZIPFoundation_Privacy.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		CA538A48DD3691701EC6B5021D7B7381 /* NSScanner+HTML.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSScanner+HTML.m"; path = "Core/Source/NSScanner+HTML.m"; sourceTree = "<group>"; };
-		CB7C9B1AA97A421E72968B30CE09C515 /* RDReaderView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderView.swift; sourceTree = "<group>"; };
+		CB5E488026478CA9CD4FAF23BF378F77 /* RDEPUBSelectionOverlayView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSelectionOverlayView.swift; sourceTree = "<group>"; };
 		CB7F3535507F56824BA21509302CF8B3 /* NSString+DTURLEncoding.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+DTURLEncoding.m"; path = "Core/Source/NSString+DTURLEncoding.m"; sourceTree = "<group>"; };
-		CE43A186B4FB4AABB024CB325862CC15 /* RDEPUBChapterOffsetMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterOffsetMap.swift; sourceTree = "<group>"; };
+		CBECF99D05CF4651818FB884017A0C69 /* RDEPUBMetadataParseWorker.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBMetadataParseWorker.swift; sourceTree = "<group>"; };
+		CC162013E2626B2489739C731077B43C /* RDEPUBWebView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebView.swift; sourceTree = "<group>"; };
+		CCEB096B8A5CC40D05995D4C8BCE6996 /* RDEPUBReaderController+LocationResolution.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+LocationResolution.swift"; sourceTree = "<group>"; };
 		CE6907AC04870132CCE3177E894607DD /* DTCoreTextLayoutFrame.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextLayoutFrame.h; path = Core/Source/DTCoreTextLayoutFrame.h; sourceTree = "<group>"; };
 		CE7768E097F8BDE9FBE3752B98CD0101 /* DTCoreText-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "DTCoreText-umbrella.h"; sourceTree = "<group>"; };
 		CEA93EDA6ED54D374265AA5D6B9EBBA9 /* NSArray+DTError.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSArray+DTError.h"; path = "Core/Source/NSArray+DTError.h"; sourceTree = "<group>"; };
-		D04868FE00B6D7EBD363C6FF21769847 /* RDEPUBCFIMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIMap.swift; sourceTree = "<group>"; };
-		D0FF725A363EE065F1A82DFDE5121520 /* RDEPUBReaderViewportMonitor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderViewportMonitor.swift; sourceTree = "<group>"; };
+		CEEA0316D9580EFCF73105A138F13E33 /* RDEPUBParser+Package.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+Package.swift"; sourceTree = "<group>"; };
+		CFC94637FA2BC2BB996CB04F3AD382D7 /* RDEPUBReaderConfiguration.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderConfiguration.swift; sourceTree = "<group>"; };
 		D1599698B5A62671C488F13E07272B09 /* DTCoreTextLayoutFrameAccessibilityElementGenerator.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCoreTextLayoutFrameAccessibilityElementGenerator.m; path = Core/Source/DTCoreTextLayoutFrameAccessibilityElementGenerator.m; sourceTree = "<group>"; };
+		D15EBEFE87571B56DE884F4C60118CE5 /* RDEPUBPageMapReconciliationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageMapReconciliationCoordinator.swift; sourceTree = "<group>"; };
 		D1E89A31867FF1FB44B4B999988F1B82 /* DTFoundation */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = DTFoundation; path = DTFoundation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D24D7F3F52B5BE585E06538DBA3CD6F7 /* RDEPUBResourceResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBResourceResolver.swift; sourceTree = "<group>"; };
 		D24FE8634A7AD2562DB8ADB9D4BBB36A /* CTLineUtils.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = CTLineUtils.m; path = Core/Source/CTLineUtils.m; sourceTree = "<group>"; };
 		D2BA6D5DBD4C6A9285C4592721790A26 /* DTSmartPagingScrollView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTSmartPagingScrollView.h; path = Core/Source/iOS/DTSmartPagingScrollView.h; sourceTree = "<group>"; };
-		D2CE921060E7CE06DC952A187C2EBF69 /* RDEPUBStyleSheetBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBStyleSheetBuilder.swift; sourceTree = "<group>"; };
 		D3593ADF561D422F73C8EABAD4A4F440 /* ConstraintRelation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintRelation.swift; path = Sources/ConstraintRelation.swift; sourceTree = "<group>"; };
 		D36ED8209C907E3E9B074DDB399F54FF /* DTTextAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTTextAttachment.h; path = Core/Source/DTTextAttachment.h; sourceTree = "<group>"; };
-		D3829ADFE2A87C8A5E8BEC7CB366B998 /* RDEPUBSelectionOverlayView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBSelectionOverlayView.swift; sourceTree = "<group>"; };
 		D4093D30B372960168C1349100DF7DE0 /* DTAttributedTextCell.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAttributedTextCell.h; path = Core/Source/DTAttributedTextCell.h; sourceTree = "<group>"; };
-		D4128385BCC81F1701B3C11FFB2ED8FE /* RDEPUBWebDecorationOverlayView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebDecorationOverlayView.swift; sourceTree = "<group>"; };
-		D44F4604F4C52081C73B238EE98B5B4C /* RDEPUBResourceURLSchemeHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBResourceURLSchemeHandler.swift; sourceTree = "<group>"; };
+		D4517A0658C991352A0B5ED4B851CED2 /* RDEPUBReaderPersistence.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderPersistence.swift; sourceTree = "<group>"; };
 		D495E2AB1223BD4D4909F8FF1FF47DAF /* Debugging.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Debugging.swift; path = Sources/Debugging.swift; sourceTree = "<group>"; };
 		D497C3CA364E37DAAFF2C3B90CC7DBE8 /* DTTextBlock.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTTextBlock.h; path = Core/Source/DTTextBlock.h; sourceTree = "<group>"; };
-		D62857539DB0215B98E04F70642B6FEF /* RDEPUBTextRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextRenderer.swift; sourceTree = "<group>"; };
+		D53FC89DDB339BF2C7F6BEAFEE0097F4 /* RDEPUBCFIDOMPathBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIDOMPathBuilder.swift; sourceTree = "<group>"; };
+		D5C92D6A531895CC82CDB6FFCE7205BC /* RDReaderView+ToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+ToolView.swift"; sourceTree = "<group>"; };
+		D5FB089C00DA0BE4FB492881E5CEFE62 /* RDReaderView-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RDReaderView-prefix.pch"; sourceTree = "<group>"; };
+		D61ED230892882E40FEE83CDBB7A9D93 /* RDEPUBPageResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageResolver.swift; sourceTree = "<group>"; };
+		D64D8C9DC33119921466055ACC5347C7 /* RDEPUBChapterLoader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterLoader.swift; sourceTree = "<group>"; };
 		D7B5E61166782ED8D585D4FCEE2074DB /* DTLinkButton.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTLinkButton.h; path = Core/Source/DTLinkButton.h; sourceTree = "<group>"; };
-		D7BAB4D0972BC162A8A3B83E0773236E /* RDEPUBNavigatorLayoutContext.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNavigatorLayoutContext.swift; sourceTree = "<group>"; };
 		D80CD20CB452B31CCCB14AF8567524D3 /* DTCoreText-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "DTCoreText-prefix.pch"; sourceTree = "<group>"; };
 		D85A85D891A320165843EF9F489178F7 /* UIImage+DTFoundation.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIImage+DTFoundation.m"; path = "Core/Source/iOS/UIImage+DTFoundation.m"; sourceTree = "<group>"; };
 		D863AE4F659A0F71B22DC9FF334DDF4E /* DTCoreTextLayoutFrameAccessibilityElementGenerator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCoreTextLayoutFrameAccessibilityElementGenerator.h; path = Core/Source/DTCoreTextLayoutFrameAccessibilityElementGenerator.h; sourceTree = "<group>"; };
-		D8A32A5161990E0DFEB763A243286627 /* RDEPUBChapterLoader.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterLoader.swift; sourceTree = "<group>"; };
 		D8C351514678D41C58869BD057D5483F /* UIViewFrameExtension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UIViewFrameExtension.swift; path = Sources/SSAlertSwift/UIViewFrameExtension.swift; sourceTree = "<group>"; };
-		D8D804FE5568713D2D71E95B21D1A5A0 /* RDEPUBWebViewDebug.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebViewDebug.swift; sourceTree = "<group>"; };
 		D927F128EBF26AD2C61FD0E6B6F6F5ED /* ZIPFoundation-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ZIPFoundation-umbrella.h"; sourceTree = "<group>"; };
+		D929EFDAB7B825037CC25F4A5D4C0462 /* RDReaderView.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = RDReaderView.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		D9AFC4B66F872436A059FE53780D216F /* SSAlertSwift */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SSAlertSwift; path = SSAlertSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA25968B7C9A40031DA45BB328EA8A2E /* DTStylesheetHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTStylesheetHTMLElement.m; path = Core/Source/DTStylesheetHTMLElement.m; sourceTree = "<group>"; };
 		DA9E9711A4073440ECC06C5BD6D8702F /* SnapKit-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "SnapKit-Info.plist"; sourceTree = "<group>"; };
-		DAD54D8A92ADBB4E5D6AEFBC9D5453E1 /* RDEPUBReaderChromeCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderChromeCoordinator.swift; sourceTree = "<group>"; };
-		DB81992F504A7D5880AADAEC0D3CA063 /* RDEPUBTextLayouter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextLayouter.swift; sourceTree = "<group>"; };
+		DAB14DCFE26C506AB370FDEE79883AE8 /* cssInjector.js */ = {isa = PBXFileReference; includeInIndex = 1; name = cssInjector.js; path = Sources/RDReaderView/EPUBCore/Resources/cssInjector.js; sourceTree = "<group>"; };
+		DBC476BD15E1101987A52B894DC3CB02 /* RDEPUBReaderSearchCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderSearchCoordinator.swift; sourceTree = "<group>"; };
 		DBC9280BA00935565E9658775DD7404D /* NSAttributedString+DTCoreText.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSAttributedString+DTCoreText.m"; path = "Core/Source/NSAttributedString+DTCoreText.m"; sourceTree = "<group>"; };
-		DCD388B4634128186073C32B45902588 /* RDEPUBReaderToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderToolView.swift; sourceTree = "<group>"; };
 		DCECDBD73595CA88A2208000B4B68352 /* NSString+DTUtilities.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+DTUtilities.m"; path = "Core/Source/NSString+DTUtilities.m"; sourceTree = "<group>"; };
 		DD189DA6054AAE2242F6644A2623B50E /* NSAttributedString+SmallCaps.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSAttributedString+SmallCaps.h"; path = "Core/Source/NSAttributedString+SmallCaps.h"; sourceTree = "<group>"; };
+		DD39D5D16074428C43CD870060DBACA6 /* RDEPUBTextPositionConverter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextPositionConverter.swift; sourceTree = "<group>"; };
 		DD58A1908F3C532210EA65ACE410A44D /* CTLineUtils.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = CTLineUtils.h; path = Core/Source/CTLineUtils.h; sourceTree = "<group>"; };
-		DDAEE3906C167B40C116FA472D9C78D0 /* RDEPUBChapterLocation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterLocation.swift; sourceTree = "<group>"; };
 		DE4821B98DDE6C71411EC139EC6D2762 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.0.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
+		DEDA10329B118CA762890DD7D8B64C6C /* RDURLReaderController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDURLReaderController.swift; sourceTree = "<group>"; };
+		DEEE722A6CEB62B173B8C71F0E7336C7 /* RDEPUBStyleCompatibilityModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBStyleCompatibilityModels.swift; sourceTree = "<group>"; };
 		DF5EDCA3B21964D0462BE0982E2F0BF8 /* DTTiledLayerWithoutFade.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTTiledLayerWithoutFade.h; path = Core/Source/iOS/DTTiledLayerWithoutFade.h; sourceTree = "<group>"; };
 		DF670EC438F05ACC1F1C7B725DBDAA18 /* DTFoundation.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = DTFoundation.release.xcconfig; sourceTree = "<group>"; };
 		DF988440049800DB7824A94B81D20254 /* Archive+Writing.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+Writing.swift"; path = "Sources/ZIPFoundation/Archive+Writing.swift"; sourceTree = "<group>"; };
-		DFE2EF5C5FBC43651748B45835D2341C /* RDEPUBPaginator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPaginator.swift; sourceTree = "<group>"; };
-		E068F2933C8F37973B331C4BE18453CA /* RDEPUBWebView+Reflowable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+Reflowable.swift"; sourceTree = "<group>"; };
+		DFB1ABFCCAC4DAE451803B7620A3E75B /* RDEPUBCFI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFI.swift; sourceTree = "<group>"; };
+		E05401D6B263F054E8B15A3B594BC5A5 /* RDEPUBPageCountCache.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPageCountCache.swift; sourceTree = "<group>"; };
 		E0D90EB06FC37D534934542F9CAB1D74 /* DTCSSStylesheet.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTCSSStylesheet.m; path = Core/Source/DTCSSStylesheet.m; sourceTree = "<group>"; };
+		E1689173E78766BA24FA271006949DD2 /* RDReaderContentCell.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderContentCell.swift; sourceTree = "<group>"; };
 		E16D20FA492E085BD0871B107B3077B7 /* DTHTMLWriter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTHTMLWriter.m; path = Core/Source/DTHTMLWriter.m; sourceTree = "<group>"; };
 		E196F56E68578181D5BDE787DE5C0F3A /* DTColor+Compatibility.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "DTColor+Compatibility.m"; path = "Core/Source/DTColor+Compatibility.m"; sourceTree = "<group>"; };
 		E1F63A854BBF28E93AC1D3F71CD48CBE /* DTAttributedTextCell.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAttributedTextCell.m; path = Core/Source/DTAttributedTextCell.m; sourceTree = "<group>"; };
 		E20272295EC253826AEE1F83A15D47C5 /* NSAttributedStringRunDelegates.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = NSAttributedStringRunDelegates.h; path = Core/Source/NSAttributedStringRunDelegates.h; sourceTree = "<group>"; };
-		E22603ADABAFC52F317EC7C03E6E2967 /* RDReaderView.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = RDReaderView.modulemap; sourceTree = "<group>"; };
 		E27C503C8128BC3CE109FFE077AEF325 /* NSString+CSS.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+CSS.m"; path = "Core/Source/NSString+CSS.m"; sourceTree = "<group>"; };
 		E28CA95D89DBAB2FE56BC8513D5838D7 /* DTHorizontalRuleHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTHorizontalRuleHTMLElement.h; path = Core/Source/DTHorizontalRuleHTMLElement.h; sourceTree = "<group>"; };
-		E372A80D548A620EDE72D9EF7CF565CC /* RDEPUBNotePopupCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNotePopupCoordinator.swift; sourceTree = "<group>"; };
+		E474E1489E80ABDF6B665BEA40856E40 /* RDEPUBWebView+Reflowable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+Reflowable.swift"; sourceTree = "<group>"; };
 		E481007A8174943868EBC81CF3B04B9F /* SSAlertPresentAnimation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SSAlertPresentAnimation.swift; path = Sources/SSAlertSwift/SSAlertPresentAnimation.swift; sourceTree = "<group>"; };
-		E51FACDEC04EA0E6A25312107613752B /* RDEPUBNavigatorState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNavigatorState.swift; sourceTree = "<group>"; };
-		E56F29EB0999064677A050AC08F04C84 /* RDEPUBCFI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFI.swift; sourceTree = "<group>"; };
 		E5F69A1E1260BAD7737BEB533F643A15 /* DTLazyImageView.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTLazyImageView.h; path = Core/Source/DTLazyImageView.h; sourceTree = "<group>"; };
-		E60E1300F32EB0B2296400EAA6C722E4 /* RDEPUBReaderLoadCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderLoadCoordinator.swift; sourceTree = "<group>"; };
 		E62C5E593037EF8A45E7FAA847D0277C /* DTCoreTextLayoutFrame+Cursor.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "DTCoreTextLayoutFrame+Cursor.m"; path = "Core/Source/DTCoreTextLayoutFrame+Cursor.m"; sourceTree = "<group>"; };
+		E6A8108BD01EDCF1A37193D87427C6D2 /* RDReaderTapRegionHandler.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderTapRegionHandler.swift; sourceTree = "<group>"; };
 		E6F2E79CC33E0823C4E719ECDDFBBE08 /* NSAttributedStringRunDelegates.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = NSAttributedStringRunDelegates.m; path = Core/Source/NSAttributedStringRunDelegates.m; sourceTree = "<group>"; };
-		E7FF1499504C6834902496A81DFD9063 /* ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist"; sourceTree = "<group>"; };
-		E856F4F78DEE5AE91066FCE2371A797D /* RDEPUBReaderDependencies.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderDependencies.swift; sourceTree = "<group>"; };
-		E9270B7B3412CC1F4AABA8D1DBE4BF7B /* RDEPUBCFICompatibility.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFICompatibility.swift; sourceTree = "<group>"; };
-		E9564D6E271823A4F52883925DD5AFC9 /* RDEPUBJumpSession.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBJumpSession.swift; sourceTree = "<group>"; };
-		E96C781E19115E60CF0F34702546A1F5 /* RDEPUBBookPageMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBookPageMap.swift; sourceTree = "<group>"; };
-		E9BE6C1E41B26E8B9FBA46BD0E7FE189 /* RDEPUBReaderBottomToolView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderBottomToolView.swift; sourceTree = "<group>"; };
-		EA95AEDCF40D954F678FD80D14334F22 /* RDEPUBParser+TOC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+TOC.swift"; sourceTree = "<group>"; };
-		EABC0A5DC75E27092EE4743115BA90E2 /* RDEPUBTextBookBuilder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBookBuilder.swift; sourceTree = "<group>"; };
-		EB9386EB6459AF8A05BC94E5005D8BAE /* RDEPUBReaderTheme.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderTheme.swift; sourceTree = "<group>"; };
+		E79BD89A1ED27EEDC4DE2290FF3118DF /* RDEPUBTextSelectionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextSelectionController.swift; sourceTree = "<group>"; };
+		E980E36577B236C9DC52A497F85388C3 /* RDEPUBBookPageMap.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBookPageMap.swift; sourceTree = "<group>"; };
+		EA25825AB5D083AD35744145AF10E718 /* RDEPUBChapterWindowCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterWindowCoordinator.swift; sourceTree = "<group>"; };
 		EBA0272559B0F7FAD8AC670AC7431188 /* Pods-ReadViewDemo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-ReadViewDemo-umbrella.h"; sourceTree = "<group>"; };
+		EC59639D756DEA2914DF1A97050137A1 /* RDEPUBNavigatorState.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBNavigatorState.swift; sourceTree = "<group>"; };
+		EC81F5F271A26EA7C1D7AFF9374188B8 /* RDEPUBTextLayouter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextLayouter.swift; sourceTree = "<group>"; };
 		ECFE19508E12BF8B0B52E8CB4F724217 /* ConstraintMakerRelatable+Extensions.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "ConstraintMakerRelatable+Extensions.swift"; path = "Sources/ConstraintMakerRelatable+Extensions.swift"; sourceTree = "<group>"; };
+		ED00B070AB7D3CFFF967D5978A298DA3 /* RDEPUBReaderAnnotationCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderAnnotationCoordinator.swift; sourceTree = "<group>"; };
+		ED40EE4143B1EC69166CD58B11C00B40 /* RDEPUBFontFallbackResolver.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBFontFallbackResolver.swift; sourceTree = "<group>"; };
 		ED5693BD171B879406EA14C97F4AD8D8 /* Archive+ZIP64.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Archive+ZIP64.swift"; path = "Sources/ZIPFoundation/Archive+ZIP64.swift"; sourceTree = "<group>"; };
 		EDA6D5D7D0A04878EE78FAAE94F65068 /* DTCoreText */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = DTCoreText; path = DTCoreText.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		EE4E65CBFE33A55487727CE851F95C96 /* RDEPUBParser+TOC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+TOC.swift"; sourceTree = "<group>"; };
 		EE4EE750340347ED584C5A2C1164331A /* SSAlertCommonView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SSAlertCommonView.swift; path = Sources/SSAlertSwift/SSAlertCommonView.swift; sourceTree = "<group>"; };
 		EE9D4A455723797A27F04A15C4E47823 /* DTHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTHTMLElement.h; path = Core/Source/DTHTMLElement.h; sourceTree = "<group>"; };
+		EEAA57C95D8912B8505C8DA1AD4B6AC6 /* RDEPUBDarkImageAdjuster.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBDarkImageAdjuster.swift; sourceTree = "<group>"; };
 		EF27E643619E369E8A9C1FE6EFE18C78 /* DTFoundation.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = DTFoundation.modulemap; sourceTree = "<group>"; };
+		EF8BD4198F6FFF3793A1EDD6E9FE2259 /* RDEPUBCFIError.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIError.swift; sourceTree = "<group>"; };
+		EFF1EFC40E2A42337D7C758A6A4F26D7 /* RDEPUBReaderController+TableOfContents.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+TableOfContents.swift"; sourceTree = "<group>"; };
 		F038FB491B9A4A53447EF0DC333301AE /* DTObjectTextAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTObjectTextAttachment.m; path = Core/Source/DTObjectTextAttachment.m; sourceTree = "<group>"; };
 		F0548F684CA2D8C445086389A2BD5265 /* ZIPFoundation-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ZIPFoundation-prefix.pch"; sourceTree = "<group>"; };
+		F080C0809566114997B5E6B9AF967C76 /* RDEPUBReaderController+DataSource.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+DataSource.swift"; sourceTree = "<group>"; };
 		F0D72C5680EBE6CA716EE77281AA4436 /* DTAttributedTextContentView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTAttributedTextContentView.m; path = Core/Source/DTAttributedTextContentView.m; sourceTree = "<group>"; };
-		F240829B62338026772A632D8857F072 /* RDEPUBBuildDiagnosticsReporter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBuildDiagnosticsReporter.swift; sourceTree = "<group>"; };
-		F2BD4E767D37F40AB6BF4221B97BA1D1 /* RDEPUBTextSelectionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextSelectionController.swift; sourceTree = "<group>"; };
-		F2FBA6F1FD4C72EAF706943C919B2070 /* RDEPUBParser+ReadingProfile.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+ReadingProfile.swift"; sourceTree = "<group>"; };
+		F13DE2B771ECF4C1C6DDAC4FCD18CD0A /* RDEPUBChapterWindowSnapshot.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBChapterWindowSnapshot.swift; sourceTree = "<group>"; };
+		F20C5D28C46992997B5F00839C906E95 /* RDReaderView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderView.swift; sourceTree = "<group>"; };
+		F25A8801661F7DE4DEAC12BE1F80C332 /* RDEPUBCFIPath.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBCFIPath.swift; sourceTree = "<group>"; };
+		F29D75FFF877587EAEA07BBE58C097FB /* RDReaderView-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "RDReaderView-dummy.m"; sourceTree = "<group>"; };
 		F35039A8D0AA1F7BAFC4E5E016057E15 /* DTTextAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTTextAttachment.m; path = Core/Source/DTTextAttachment.m; sourceTree = "<group>"; };
-		F36C27B109E47B171CAFFB567A6B181E /* RDReaderView.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = RDReaderView.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		F37563A56C180CE18EEFADE56FA3C17F /* DTAccessibilityViewProxy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTAccessibilityViewProxy.h; path = Core/Source/DTAccessibilityViewProxy.h; sourceTree = "<group>"; };
 		F410ED25E4E84C3D5166261CDF4B58F2 /* SSAlertView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SSAlertView.swift; path = Sources/SSAlertSwift/SSAlertView.swift; sourceTree = "<group>"; };
-		F43A220C0D3B9E71DCEA79B58CC78F8F /* RDReaderView+PageCurl.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDReaderView+PageCurl.swift"; sourceTree = "<group>"; };
 		F4E2B1AC73977F10254628C0B7EBE38F /* DTCoreText-Resources */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "DTCoreText-Resources"; path = Resources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		F4F887E8F4A5F82464101B5352D2AF31 /* RDEPUBReaderEnvironment.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderEnvironment.swift; sourceTree = "<group>"; };
 		F5389D4E96A4AFE175691B4D3D4524E7 /* DTExtendedFileAttributes.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTExtendedFileAttributes.m; path = Core/Source/DTExtendedFileAttributes.m; sourceTree = "<group>"; };
 		F53CCB60DE5D06A43E4A52EDB274E7D2 /* NSString+Paragraphs.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "NSString+Paragraphs.m"; path = "Core/Source/NSString+Paragraphs.m"; sourceTree = "<group>"; };
-		F5678FF32DD584BB87D6B278E74263B9 /* RDEPUBBackgroundCoverageStore.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBBackgroundCoverageStore.swift; sourceTree = "<group>"; };
+		F53F2F0463AC1292BFE9AFE159F8016F /* RDEPUBParser+Resources.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBParser+Resources.swift"; sourceTree = "<group>"; };
 		F5B34EE2160C27947D1EEFD42184CF5D /* ConstraintLayoutSupportDSL.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ConstraintLayoutSupportDSL.swift; path = Sources/ConstraintLayoutSupportDSL.swift; sourceTree = "<group>"; };
-		F5BC57D6984ABDAFFD87B95AFA6410F7 /* RDEPUBWebView+JavaScriptBridge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+JavaScriptBridge.swift"; sourceTree = "<group>"; };
-		F5C0A5C8BB9EAEE1C547D2FC03D475AE /* RDEPUBReaderController+TableOfContents.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+TableOfContents.swift"; sourceTree = "<group>"; };
-		F5DC987B28D5AF907FA09697E14A643C /* RDEPUBReaderController+ContentDelegates.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+ContentDelegates.swift"; sourceTree = "<group>"; };
+		F661AA03BC0EBFBDBBC00AC38E62EF34 /* RDEPUBWebView+JavaScriptBridge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBWebView+JavaScriptBridge.swift"; sourceTree = "<group>"; };
 		F699881ABDBEB419AEBA661AD5A21F35 /* ZIPFoundation.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = ZIPFoundation.release.xcconfig; sourceTree = "<group>"; };
 		F734214E067BDBDB581911E1A5CDAADB /* DTBreakHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTBreakHTMLElement.m; path = Core/Source/DTBreakHTMLElement.m; sourceTree = "<group>"; };
 		F76A97683FB5E8E8B86EA4AD71F6F4B4 /* Date+ZIP.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Date+ZIP.swift"; path = "Sources/ZIPFoundation/Date+ZIP.swift"; sourceTree = "<group>"; };
 		F7B0087DE7C394A677F5883541AB4FB7 /* DTListItemHTMLElement.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTListItemHTMLElement.m; path = Core/Source/DTListItemHTMLElement.m; sourceTree = "<group>"; };
-		F829B34569967604450F61013CCC9618 /* RDReaderView-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "RDReaderView-umbrella.h"; sourceTree = "<group>"; };
+		F7DF49DAD850A270AF8E92ED70F66184 /* RDEPUBTextSearchEngine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextSearchEngine.swift; sourceTree = "<group>"; };
+		F7F6C930B6A92EF1CEA65FC355E7EABB /* RDEPUBParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBParser.swift; sourceTree = "<group>"; };
 		F9A2565B302334B662AB51DCF8E65EEE /* DTDictationPlaceholderTextAttachment.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTDictationPlaceholderTextAttachment.h; path = Core/Source/DTDictationPlaceholderTextAttachment.h; sourceTree = "<group>"; };
-		FA169C9DF7B86076B3A4F1E4FCDB7197 /* RDEPUBReaderController+RuntimeBridge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+RuntimeBridge.swift"; sourceTree = "<group>"; };
-		FACBBA5BB79E2143183296DE3F990265 /* RDEPUBPaginationModels.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBPaginationModels.swift; sourceTree = "<group>"; };
 		FB2ABB1D297442D91AA42F1407DB4A58 /* DTTextHTMLElement.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTTextHTMLElement.h; path = Core/Source/DTTextHTMLElement.h; sourceTree = "<group>"; };
+		FC010729FF0DC7965F4E61FE4B7DAED8 /* RDEPUBReaderRuntime.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderRuntime.swift; sourceTree = "<group>"; };
 		FC5EC7C3D1808C9CF53354D7A3D69EE7 /* NSString+DTPaths.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSString+DTPaths.h"; path = "Core/Source/NSString+DTPaths.h"; sourceTree = "<group>"; };
 		FCC718115E5C31C88A680522AE36B089 /* DTFoundation-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "DTFoundation-dummy.m"; sourceTree = "<group>"; };
+		FCCB7B202BEDC5F5B8895F56085A2DCA /* RDEPUBWebContentView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBWebContentView.swift; sourceTree = "<group>"; };
 		FD03567681A79FFB6E81B3105503065D /* DTFoundationConstants.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTFoundationConstants.h; path = Core/Source/DTFoundationConstants.h; sourceTree = "<group>"; };
+		FD059368898F7F8B822A49571413B2B9 /* RDEPUBReaderContext.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBReaderContext.swift; sourceTree = "<group>"; };
 		FDD333B409D528E5006FA48F4D70A6F5 /* DTCSSListStyle.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DTCSSListStyle.h; path = Core/Source/DTCSSListStyle.h; sourceTree = "<group>"; };
+		FDFBDFD59B4D9B04D1AA516EA1A41F88 /* RDReaderPageChildViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderPageChildViewController.swift; sourceTree = "<group>"; };
 		FE2991699D0391172DEADF2F4613E320 /* SSAlertSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SSAlertSwift.release.xcconfig; sourceTree = "<group>"; };
-		FE4EDACEAF5E120641D74DA33A25F1AB /* wxread-dark.css */ = {isa = PBXFileReference; includeInIndex = 1; name = "wxread-dark.css"; path = "Sources/RDReaderView/EPUBCore/Resources/wxread-dark.css"; sourceTree = "<group>"; };
 		FEA9F91758013B23B0EEA71DA22E7475 /* Pods-ReadViewDemo-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ReadViewDemo-Info.plist"; sourceTree = "<group>"; };
 		FEB14A8F8170777DB7CCC3F27C8EA57A /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.0.sdk/System/Library/Frameworks/ImageIO.framework; sourceTree = DEVELOPER_DIR; };
 		FEEB15F87BA6575BBFE1C5FD19B17CD7 /* DTImageTextAttachment.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = DTImageTextAttachment.m; path = Core/Source/DTImageTextAttachment.m; sourceTree = "<group>"; };
-		FF166FC19259E17C130DF5E825B8A442 /* RDEPUBReaderController+RenderSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "RDEPUBReaderController+RenderSupport.swift"; sourceTree = "<group>"; };
 		FF3F7BA20A1213804048557D946CEEA9 /* NSAttributedString+DTCoreText.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSAttributedString+DTCoreText.h"; path = "Core/Source/NSAttributedString+DTCoreText.h"; sourceTree = "<group>"; };
-		FFFF9DD6D05B81A55BA5EE9E38F881C7 /* RDReaderFlowLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDReaderFlowLayout.swift; sourceTree = "<group>"; };
+		FF73643D6C558218A30F86F03A594CBA /* RDEPUBTextBuildPipelineInterfaces.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = RDEPUBTextBuildPipelineInterfaces.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		01AE9B85A96ADDE5E0FF73B8E76820AD /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9A71E43FB3C8A5F8429105D2EDEBFA83 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		238320E38DF4BEAC216E1AAA2FDA5568 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				341495A2CAABE7DB0220CA8E52685FEC /* Foundation.framework in Frameworks */,
-				B6AC6181DCC890816E18B694F7E0A8A2 /* ImageIO.framework in Frameworks */,
-				D4DE1BC83E043DC83AE7993B50DD2468 /* QuartzCore.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4BBDBC53B3387663B9E11DAB3D9A8E12 /* Frameworks */ = {
+		2FB1B011B93858D09A0C6CD143EA8261 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		51D55409F70E1897963927816BF39637 /* Frameworks */ = {
+		34461B07A262A084CD6DF7F81D13DE0E /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6EC9D5BC4A1538B0E1FB3DF1E0796A30 /* Foundation.framework in Frameworks */,
+				903C3E894FA36582171914FBBAAB044D /* Foundation.framework in Frameworks */,
+				7C235EE866F95546F32C0F12A4777356 /* ImageIO.framework in Frameworks */,
+				EB443E9860A66D1EFC70136AC83E2FCA /* QuartzCore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		5292D3D26A2DC560591441E981FB1A94 /* Frameworks */ = {
+		4FDA977A2376EC004EF757911EA147C2 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				40221D5B7717ED1BE8F6AC59EC9F3CEC /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		59D25E0B0855972948B27D4946DA072E /* Frameworks */ = {
+		53B99546E8009C9D78F6F6D12AE65A9A /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				28ACCBC0A505F96A4133B5C78DCF71EA /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1153,11 +1175,17 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		5B410CB9F9251380D43CF10EC78456FD /* Frameworks */ = {
+		5B6486B0E226A306E01E2AE183A60429 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6C5083F9338B8851E15F70B79A7F44F4 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				854B85B62762731064F909236192B3A8 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1174,17 +1202,27 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A4CE0F792ABC696E223E02E81A4DB656 /* Frameworks */ = {
+		781CAC434111081986005D6AE179F45B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				10E2206844CFF1FFD5815CDD1EA2CB5D /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		EFF80230C069867F23EC724DDF1D1FEE /* Frameworks */ = {
+		B1EC0A3CE04A823BC0DC435834EF6C64 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5EC18CDFDFBA1F4F0E3357D8079F68D4 /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		E3E7B730857EF8492B63F6A72BA7E464 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F6658D5406B461AC7E42F7A969A5F673 /* Foundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1199,6 +1237,38 @@
 			name = Resources;
 			sourceTree = "<group>";
 		};
+		05C1EB52F20A7DC6028431405637EAB2 /* RDReaderView */ = {
+			isa = PBXGroup;
+			children = (
+				DAB14DCFE26C506AB370FDEE79883AE8 /* cssInjector.js */,
+				2EDD5A25D7DC1EED92829AE2851EEF2A /* epub-bridge.js */,
+				435BCDDA491498B312BF8B10335F5F6D /* epub-fixed-layout.html */,
+				212C8E23F9694FF5B5B5FEF9E774E0C6 /* rangy-core.js */,
+				7315B7878D20AD386748BCFFF68812DB /* rangy-serializer.js */,
+				5214F772AE3CD906C0E5AE335E0A27E0 /* WeReadApi.js */,
+				1541A3CEA0FCBABEF9872A60FAEF47B5 /* wxread-dark.css */,
+				111B17BCED09E0F8D5AA9E8F7A335AF0 /* wxread-default.css */,
+				8C63018B1CE90D338115DC072191A153 /* wxread-replace.css */,
+				6F768932648B61D9731F923A824F7617 /* wxread-replace-latin.css */,
+				B992E04B329FC58B492A21B64F4D498D /* EPUBCore */,
+				4C802C971A396CAC03ED8A12D7664C03 /* EPUBTextRendering */,
+				E3A38F6522C2FB2799085A7CB3D55545 /* EPUBUI */,
+				071B90FD836A050A94621A34445BAF70 /* Pod */,
+				2792EC5669A2F913CCBBE84DBA8899AF /* ReaderView */,
+				A1C2DFEF90972D588DE06D2F96C32B6B /* Support Files */,
+			);
+			name = RDReaderView;
+			path = ../..;
+			sourceTree = "<group>";
+		};
+		071B90FD836A050A94621A34445BAF70 /* Pod */ = {
+			isa = PBXGroup;
+			children = (
+				D929EFDAB7B825037CC25F4A5D4C0462 /* RDReaderView.podspec */,
+			);
+			name = Pod;
+			sourceTree = "<group>";
+		};
 		0B2E031EFC525508B0D167AAA6E70507 /* SnapKit */ = {
 			isa = PBXGroup;
 			children = (
@@ -1263,18 +1333,6 @@
 			path = "Target Support Files/Pods-ReadViewDemo";
 			sourceTree = "<group>";
 		};
-		19B0B068C8A2B66FFE781289855F90F8 /* Settings */ = {
-			isa = PBXGroup;
-			children = (
-				B53D2AB28FA0F01E7950776AFCFE7621 /* RDEPUBReaderConfiguration.swift */,
-				6896293EFF5E39DBF421987CCF180DB0 /* RDEPUBReaderSettings.swift */,
-				437BAE8034EB06D39FB6465925E7C605 /* RDEPUBReaderSettingsViewController.swift */,
-				EB9386EB6459AF8A05BC94E5005D8BAE /* RDEPUBReaderTheme.swift */,
-			);
-			name = Settings;
-			path = Settings;
-			sourceTree = "<group>";
-		};
 		1B7515007EDD63EDCCE4BAD15D6CA9BA /* Support Files */ = {
 			isa = PBXGroup;
 			children = (
@@ -1290,6 +1348,25 @@
 			path = "../Target Support Files/DTFoundation";
 			sourceTree = "<group>";
 		};
+		2792EC5669A2F913CCBBE84DBA8899AF /* ReaderView */ = {
+			isa = PBXGroup;
+			children = (
+				E1689173E78766BA24FA271006949DD2 /* RDReaderContentCell.swift */,
+				59C9316B92152118F5AE8FD0EC0B9683 /* RDReaderFlowLayout.swift */,
+				172DDB09A6DD0C1A92FCD7AF5060B657 /* RDReaderGestureController.swift */,
+				FDFBDFD59B4D9B04D1AA516EA1A41F88 /* RDReaderPageChildViewController.swift */,
+				F20C5D28C46992997B5F00839C906E95 /* RDReaderView.swift */,
+				A389B363039049240F249F3421CD7734 /* RDReaderView+CollectionView.swift */,
+				23C0CE03056D1EF27F50F55B85D3A0D2 /* RDReaderView+ContentAccess.swift */,
+				77E36CB709B0609F38B9C5F40B7A18C0 /* RDReaderView+PageCurl.swift */,
+				D5C92D6A531895CC82CDB6FFCE7205BC /* RDReaderView+ToolView.swift */,
+				75B52533C54FDB9B4BEB5B173C34670F /* RDReaderViewProtocols.swift */,
+				A7DAD901D5C37AB60C0AE6E26C800756 /* Paging */,
+			);
+			name = ReaderView;
+			path = Sources/RDReaderView/ReaderView;
+			sourceTree = "<group>";
+		};
 		29A410FBD4C19138B1D732EC94D8EFB2 /* DTFoundation */ = {
 			isa = PBXGroup;
 			children = (
@@ -1303,49 +1380,16 @@
 			path = DTFoundation;
 			sourceTree = "<group>";
 		};
-		357697CF96021A11760C18058E9AB976 /* CFI */ = {
+		2AD3A82A102AC964D00BED8F3EB01CD4 /* Settings */ = {
 			isa = PBXGroup;
 			children = (
-				E56F29EB0999064677A050AC08F04C84 /* RDEPUBCFI.swift */,
-				E9270B7B3412CC1F4AABA8D1DBE4BF7B /* RDEPUBCFICompatibility.swift */,
-				8C53F241AB70CA866F8946BE06DC418F /* RDEPUBCFIDOMPathBuilder.swift */,
-				11846D2AA4295A15016D569CC747275E /* RDEPUBCFIError.swift */,
-				7C6879860F2AFC7E574BA4E11D718623 /* RDEPUBCFIGenerator.swift */,
-				D04868FE00B6D7EBD363C6FF21769847 /* RDEPUBCFIMap.swift */,
-				8686290A5D2D84D7BC62F9AA5EA41C90 /* RDEPUBCFIParser.swift */,
-				7393C161B75A0E039B5BFF99E5C7B042 /* RDEPUBCFIPath.swift */,
-				6484A5889C63CEDDDB03917738280B04 /* RDEPUBCFIRange.swift */,
-				4E8C6096A7B9404057346F143DF9BAA6 /* RDEPUBCFIRecoveryEngine.swift */,
-				02BCA9E7A83D0CBEA1D291D218346B30 /* RDEPUBCFIResolver.swift */,
-				4BCB4352490C97D7AF33FFB9E2221300 /* RDEPUBCFISerializer.swift */,
-				54F7B652E5E27DA1796BA99978521973 /* RDEPUBCFITextAssertion.swift */,
+				CFC94637FA2BC2BB996CB04F3AD382D7 /* RDEPUBReaderConfiguration.swift */,
+				010BA37F9FCB8C9AF363CC966A76A455 /* RDEPUBReaderSettings.swift */,
+				B19C4570618CC1C8B9E8488EBCD9B0F5 /* RDEPUBReaderSettingsViewController.swift */,
+				244A872053DAE74B0F4DC07228A08353 /* RDEPUBReaderTheme.swift */,
 			);
-			name = CFI;
-			path = CFI;
-			sourceTree = "<group>";
-		};
-		3582044EB6FBFA34720192E2CB238CCA /* RDReaderView */ = {
-			isa = PBXGroup;
-			children = (
-				1E0D6AF2997BAD28F37F9D771B59F7E9 /* cssInjector.js */,
-				185B84B524EAE491C132A0D5767A47A1 /* epub-bridge.js */,
-				7CB475F3E2D12FD5ED7CA4CD01DC3323 /* epub-fixed-layout.html */,
-				022BE133FB557799F611B325C77A9F02 /* rangy-core.js */,
-				4531B3C89B7A6DC053BEF1373ACDFE18 /* rangy-serializer.js */,
-				198095122CF8A5D01FE08DB3522C4043 /* WeReadApi.js */,
-				FE4EDACEAF5E120641D74DA33A25F1AB /* wxread-dark.css */,
-				303D3169E20C9432C90A387A621055B7 /* wxread-default.css */,
-				C2DFA29C18DD99781280B72A68EC5264 /* wxread-replace.css */,
-				9580876F40BE76D2473648FD60609A92 /* wxread-replace-latin.css */,
-				4D8591F608CDAF59C73F64578F963806 /* EPUBCore */,
-				6D35E646476A79245405D1252E6B6AF3 /* EPUBTextRendering */,
-				D0E3E03CE321F55127FCCD4DFF034B74 /* EPUBUI */,
-				ABC4761803CFDE7B9808B22B5B0E9215 /* Pod */,
-				B66ABD82C1A5560D08887DC14C457633 /* ReaderView */,
-				8A3DDE215CC33B50C166DDB80013925F /* Support Files */,
-			);
-			name = RDReaderView;
-			path = ../..;
+			name = Settings;
+			path = Settings;
 			sourceTree = "<group>";
 		};
 		3595ED200AA07F0B71CB42506574798F /* Support Files */ = {
@@ -1364,51 +1408,6 @@
 			path = "../Target Support Files/SnapKit";
 			sourceTree = "<group>";
 		};
-		35C3EB192D9EBE53F690B4806DF1AF51 /* Typesetter */ = {
-			isa = PBXGroup;
-			children = (
-				20F2E6309782FD3DE72E9EDC14BDB52B /* RDEPUBAttachmentNormalizer.swift */,
-				22E148D0D8C1F600CA1943413EF56747 /* RDEPUBCFIMarkerInjector.swift */,
-				59DF20BA6C3F0FF52936AFFA6EDBC4FF /* RDEPUBFontNormalizer.swift */,
-				B7D8A417E2638BDB5390CD236CA05970 /* RDEPUBFragmentMarkerInjector.swift */,
-				70CCDD71A0D77BA8E1C8D0FF8E739473 /* RDEPUBHTMLNormalizer.swift */,
-				30C112467B63073D840AE21FDE6ADDFC /* RDEPUBRenderDiagnosticsCollector.swift */,
-				23C08F0993EC3E8BAECD557D0E6FEAE3 /* RDEPUBSemanticMarkerInjector.swift */,
-				9BAE895FCD088AD6BFF6868DE8EBB5F7 /* RDEPUBStyleSheetComposer.swift */,
-				8C53B14CB594A5D925B516A21278616E /* RDEPUBTextRendererSupport.swift */,
-				672C726EE465BA99AAB74EA89472AC6E /* RDEPUBTypesettingPipeline.swift */,
-				B158F65C60FFDF3F85115B7C8A70CC16 /* Compatibility */,
-			);
-			name = Typesetter;
-			path = Typesetter;
-			sourceTree = "<group>";
-		};
-		3B4CBC3C28BC7492C09380CF1ACA752C /* ReaderController */ = {
-			isa = PBXGroup;
-			children = (
-				F5678FF32DD584BB87D6B278E74263B9 /* RDEPUBBackgroundCoverageStore.swift */,
-				5CBBC6BFE9C0EC921FE326274C97A36A /* RDEPUBBackgroundPriorityPolicy.swift */,
-				E9564D6E271823A4F52883925DD5AFC9 /* RDEPUBJumpSession.swift */,
-				42F099FFB667A63E58B2029DBA9474AB /* RDEPUBPageMapReconciliationCoordinator.swift */,
-				9AEB3745FE63700D81DA795528264CA5 /* RDEPUBReaderAnnotationCoordinator.swift */,
-				AA69FA9C9BC5DF26BCD177FD42113865 /* RDEPUBReaderAssemblyCoordinator.swift */,
-				DAD54D8A92ADBB4E5D6AEFBC9D5453E1 /* RDEPUBReaderChromeCoordinator.swift */,
-				60348C9FD3414B4F18924FF8BFF5DA8A /* RDEPUBReaderContext.swift */,
-				E856F4F78DEE5AE91066FCE2371A797D /* RDEPUBReaderDependencies.swift */,
-				E60E1300F32EB0B2296400EAA6C722E4 /* RDEPUBReaderLoadCoordinator.swift */,
-				A7CE36701F58B972FB3484704857B3D9 /* RDEPUBReaderLocationCoordinator.swift */,
-				7023A986F364F329C85DD8CB36828860 /* RDEPUBReaderPaginationCoordinator.swift */,
-				359F75D2BB7409EFBC61AD7E6DE918CB /* RDEPUBReaderRuntime.swift */,
-				85EF67ADDCE46E8FA21D881DDD21355B /* RDEPUBReaderSearchCoordinator.swift */,
-				4717049EE2F365C2ECA2B29A5F0CDC44 /* RDEPUBReaderUIState.swift */,
-				D0FF725A363EE065F1A82DFDE5121520 /* RDEPUBReaderViewportMonitor.swift */,
-				3B5F9162A2C23B3AFD078A809D60876F /* RDEPUBSelectionState.swift */,
-				C95A37BA0AB4B3AE8EA8DC63863FAA8C /* ChapterRuntime */,
-			);
-			name = ReaderController;
-			path = ReaderController;
-			sourceTree = "<group>";
-		};
 		3C15BAF0B39DC004AB2E6FA38175E25D /* DTAnimatedGIF */ = {
 			isa = PBXGroup;
 			children = (
@@ -1453,45 +1452,22 @@
 			path = SSAlertSwift;
 			sourceTree = "<group>";
 		};
-		4D8591F608CDAF59C73F64578F963806 /* EPUBCore */ = {
+		4C802C971A396CAC03ED8A12D7664C03 /* EPUBTextRendering */ = {
 			isa = PBXGroup;
 			children = (
-				3B7793B7E6BD09D16796968B33B07249 /* RDEPUBAssetRepository.swift */,
-				368E7118542A73184BE785303D88D895 /* RDEPUBFixedLayoutTemplate.swift */,
-				3526BB8173BAFDCFF6B01FD5DD049264 /* RDEPUBJavaScriptBridge.swift */,
-				91AEB422F383ACBE457884C81CB49BC4 /* RDEPUBModels.swift */,
-				D7BAB4D0972BC162A8A3B83E0773236E /* RDEPUBNavigatorLayoutContext.swift */,
-				E51FACDEC04EA0E6A25312107613752B /* RDEPUBNavigatorState.swift */,
-				DFE2EF5C5FBC43651748B45835D2341C /* RDEPUBPaginator.swift */,
-				43E6985809E5F7502E763451C6B1EF52 /* RDEPUBParser.swift */,
-				C78C0CDBA3CFB40D59A48E3C8B16868D /* RDEPUBParser+Archive.swift */,
-				77584175DBE9233D48B49D24156EC5A5 /* RDEPUBParser+Package.swift */,
-				F2FBA6F1FD4C72EAF706943C919B2070 /* RDEPUBParser+ReadingProfile.swift */,
-				7223B82BE067D41E4311EBD45A2EBC6C /* RDEPUBParser+Resources.swift */,
-				EA95AEDCF40D954F678FD80D14334F22 /* RDEPUBParser+TOC.swift */,
-				9C505B31D0CDD88D76E0DF9050060A3B /* RDEPUBPreferences.swift */,
-				B058AAABBC8349D197F8931C2FFDF7D7 /* RDEPUBPublication.swift */,
-				74B74728A7753AF3421EBAAC5CBD6A11 /* RDEPUBReadingSession.swift */,
-				6EE5BE986CBB2FB9A1F91958A4C2DB2A /* RDEPUBRenderRequest.swift */,
-				27E533973CCDEBA09513F66161275794 /* RDEPUBResourceResolver.swift */,
-				D44F4604F4C52081C73B238EE98B5B4C /* RDEPUBResourceURLSchemeHandler.swift */,
-				12B251B6FA033114DCF46872DA273A54 /* RDEPUBSearchEngine.swift */,
-				5617F58A26030228EAFABA05788642C6 /* RDEPUBSearchModels.swift */,
-				D2CE921060E7CE06DC952A187C2EBF69 /* RDEPUBStyleSheetBuilder.swift */,
-				BDEE2B0C36CB1021733FFEC7C956BF75 /* RDEPUBTextAnchor.swift */,
-				03E17854E59D7C436E8DEFB55F63660D /* RDEPUBWebView.swift */,
-				797EC05C144FFB8111C49280A138322C /* RDEPUBWebView+Configuration.swift */,
-				0AD3643718CB1E5CC5DF85EBB82F2022 /* RDEPUBWebView+FixedLayout.swift */,
-				F5BC57D6984ABDAFFD87B95AFA6410F7 /* RDEPUBWebView+JavaScriptBridge.swift */,
-				E068F2933C8F37973B331C4BE18453CA /* RDEPUBWebView+Reflowable.swift */,
-				5483CC8050FA15BE81638FF503D0444D /* RDEPUBWebView+Search.swift */,
-				D8D804FE5568713D2D71E95B21D1A5A0 /* RDEPUBWebViewDebug.swift */,
-				357697CF96021A11760C18058E9AB976 /* CFI */,
-				F5F72FA0D9A58022AD2469F1D6EDB577 /* Models */,
-				AA74DF54482B16BCA8B183023EB3EA5F /* Notes */,
+				B5EF7020C5BFFD68865D54D1B940E73C /* RDEPUBChapterData.swift */,
+				902C1572982F594CBCFA71AF8CB6749A /* RDEPUBDTCoreTextRenderer.swift */,
+				C186CC4BD7D2CFECDD3B037A8C1D5114 /* RDEPUBTextIndexTable.swift */,
+				DD39D5D16074428C43CD870060DBACA6 /* RDEPUBTextPositionConverter.swift */,
+				17D3B9EA3167BDEF0F47AA6554DF7D86 /* RDEPUBTextRenderer.swift */,
+				F7DF49DAD850A270AF8E92ED70F66184 /* RDEPUBTextSearchEngine.swift */,
+				81C2FB3A2214ED9328FC7A0B36FA1C5B /* RDPlainTextBookBuilder.swift */,
+				92146D1114F0840EF719BD3DE95D0FDE /* BuildPipeline */,
+				B922B4FD78A0C64D71B91A88E584C15C /* Pagination */,
+				A18EE9BDF8C601503312B2EB5B11520B /* Typesetter */,
 			);
-			name = EPUBCore;
-			path = Sources/RDReaderView/EPUBCore;
+			name = EPUBTextRendering;
+			path = Sources/RDReaderView/EPUBTextRendering;
 			sourceTree = "<group>";
 		};
 		4DABD1D106D01055A2AB87F3DA58A3CC /* iOS */ = {
@@ -1523,14 +1499,15 @@
 			path = "../Target Support Files/DTCoreText";
 			sourceTree = "<group>";
 		};
-		523116E3567051650753B0B7449FAF43 /* Notes */ = {
+		575231379BA6373258A5E3546CF4C366 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				E372A80D548A620EDE72D9EF7CF565CC /* RDEPUBNotePopupCoordinator.swift */,
-				5186CF593B077F83EDF6C1CC18ADDD38 /* RDEPUBNotePopupViewController.swift */,
+				5B888CEDF0E6ECE3807EF95D1BB7D400 /* RDEPUBAnnotationModels.swift */,
+				23A9ED0D9E5AF895754BB1D2CA08DEF2 /* RDEPUBPaginationModels.swift */,
+				13DBC142B0461E436AACC85794DA80D0 /* RDEPUBReadingLocationModels.swift */,
 			);
-			name = Notes;
-			path = Notes;
+			name = Models;
+			path = Models;
 			sourceTree = "<group>";
 		};
 		62598D566A90C2374701CEB798B77521 /* Support Files */ = {
@@ -1588,22 +1565,34 @@
 			name = DTHTMLParser;
 			sourceTree = "<group>";
 		};
-		6D35E646476A79245405D1252E6B6AF3 /* EPUBTextRendering */ = {
+		665A0BFB45C3F21B94BE1DB54BF3168F /* TextPage */ = {
 			isa = PBXGroup;
 			children = (
-				443B6D96023C59834F7C25F4D63153C0 /* RDEPUBChapterData.swift */,
-				3057AB65B5886A2792894ADB91E36D5C /* RDEPUBDTCoreTextRenderer.swift */,
-				0C4B7177D696E76F752265DA9978505A /* RDEPUBTextIndexTable.swift */,
-				73F0F6D6A2794703282450C5841C6D2C /* RDEPUBTextPositionConverter.swift */,
-				D62857539DB0215B98E04F70642B6FEF /* RDEPUBTextRenderer.swift */,
-				353F8BB9AB59FF88C959A7878D4CA687 /* RDEPUBTextSearchEngine.swift */,
-				53A09D0189C0A8418BF8851BFCA4B857 /* RDPlainTextBookBuilder.swift */,
-				C9C436AB25587C7388EA43B6C50EDE81 /* BuildPipeline */,
-				ABB6FDCB1874AF1191ECF41AF5436928 /* Pagination */,
-				35C3EB192D9EBE53F690B4806DF1AF51 /* Typesetter */,
+				EEAA57C95D8912B8505C8DA1AD4B6AC6 /* RDEPUBDarkImageAdjuster.swift */,
+				C30031E4337458E885FA7A27960620DE /* RDEPUBPageInteractionController.swift */,
+				16945B1BA7C2D8D318AA4A97FB53A619 /* RDEPUBPageLayoutSnapshot.swift */,
+				A845B04B94B0E1C1F7CAC1A19D0340D6 /* RDEPUBSelectionLoupeView.swift */,
+				CB5E488026478CA9CD4FAF23BF378F77 /* RDEPUBSelectionOverlayView.swift */,
+				51E8DDA0C0AF445B5BC5E2B60508BE58 /* RDEPUBTextAnnotationOverlay.swift */,
+				9957BD076B5327D9E830B98BDCF61189 /* RDEPUBTextContentInteractionCoordinator.swift */,
+				995FB0A24F88A5F7204BDE00B97BF00C /* RDEPUBTextContentView.swift */,
+				04DB4D5A8B4DC5C6698F73C872584EC6 /* RDEPUBTextPageDecorationView.swift */,
+				839B80DCB8EBDB9BFDEE18C4B160FE81 /* RDEPUBTextPageRenderView.swift */,
+				E79BD89A1ED27EEDC4DE2290FF3118DF /* RDEPUBTextSelectionController.swift */,
 			);
-			name = EPUBTextRendering;
-			path = Sources/RDReaderView/EPUBTextRendering;
+			name = TextPage;
+			path = TextPage;
+			sourceTree = "<group>";
+		};
+		68A54DEB33F41B15979C2E733EB04E42 /* Notes */ = {
+			isa = PBXGroup;
+			children = (
+				29AA31A90AEE6DCF012E1800AA10068B /* RDEPUBNoteDetector.swift */,
+				902FAE3EE7603EA74B421F4F8B5160E1 /* RDEPUBNoteModels.swift */,
+				A1A5E5B0F978E87E788096796E498EE1 /* RDEPUBNoteResolver.swift */,
+			);
+			name = Notes;
+			path = Notes;
 			sourceTree = "<group>";
 		};
 		81FAF4124052D4A411C0A8C21B48174C /* Core */ = {
@@ -1613,32 +1602,64 @@
 			name = Core;
 			sourceTree = "<group>";
 		};
-		8A3DDE215CC33B50C166DDB80013925F /* Support Files */ = {
+		852FAD9A7443AEE27600BD2805ADF45D /* ReaderController */ = {
 			isa = PBXGroup;
 			children = (
-				E22603ADABAFC52F317EC7C03E6E2967 /* RDReaderView.modulemap */,
-				593E047303291D8DC4F1A0BE766C9F12 /* RDReaderView-dummy.m */,
-				963D8A172A36F5B0FCCD67EC2C8D7C34 /* RDReaderView-Info.plist */,
-				5BAAA5BF0E7A1BE4850526485A29B155 /* RDReaderView-prefix.pch */,
-				F829B34569967604450F61013CCC9618 /* RDReaderView-umbrella.h */,
-				4C12BE94A7C945A1B14E5A6704E62098 /* RDReaderView.debug.xcconfig */,
-				78BC6512B9C94FC8EA1B2D474A86110D /* RDReaderView.release.xcconfig */,
-				E7FF1499504C6834902496A81DFD9063 /* ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist */,
+				07F94C7EE98654BB19A56E9BB717727B /* RDEPUBBackgroundCoverageStore.swift */,
+				B092BF12D8045E3C72C39C19010E067F /* RDEPUBBackgroundPriorityPolicy.swift */,
+				0212A000358F15ACC53BA2FDEA31CB19 /* RDEPUBJumpSession.swift */,
+				B300D661A4E613B36517DEC8EC312AEA /* RDEPUBMetadataParseCancellationController.swift */,
+				CBECF99D05CF4651818FB884017A0C69 /* RDEPUBMetadataParseWorker.swift */,
+				A4AC6CA9870D7941FA2F27711C6038E4 /* RDEPUBNavigationStateMachine.swift */,
+				D15EBEFE87571B56DE884F4C60118CE5 /* RDEPUBPageMapReconciliationCoordinator.swift */,
+				89F92BE384325A770DEEB46797F1E54A /* RDEPUBPaginationState.swift */,
+				033DD9B982E8F1F948C5787EBF92FF84 /* RDEPUBPresentationRuntime.swift */,
+				ED00B070AB7D3CFFF967D5978A298DA3 /* RDEPUBReaderAnnotationCoordinator.swift */,
+				100543FF7E9F503BC7C3380C327A2DE2 /* RDEPUBReaderAssemblyCoordinator.swift */,
+				2140116657415560314C2D9847AEA192 /* RDEPUBReaderChromeCoordinator.swift */,
+				FD059368898F7F8B822A49571413B2B9 /* RDEPUBReaderContext.swift */,
+				744C73D1186E82ACC4BDB4FBB30CFACE /* RDEPUBReaderDependencies.swift */,
+				F4F887E8F4A5F82464101B5352D2AF31 /* RDEPUBReaderEnvironment.swift */,
+				013A3E32348433787547280A0B53E82D /* RDEPUBReaderLoadCoordinator.swift */,
+				60CCD58E796945CC72B9D6E8F81B2A9F /* RDEPUBReaderLocationCoordinator.swift */,
+				40BBB1A6045BDF1E2F96D996DCCA1EF9 /* RDEPUBReaderPaginationCoordinator.swift */,
+				FC010729FF0DC7965F4E61FE4B7DAED8 /* RDEPUBReaderRuntime.swift */,
+				DBC476BD15E1101987A52B894DC3CB02 /* RDEPUBReaderSearchCoordinator.swift */,
+				B83D2091A24AC3D4A98E99AD499C381A /* RDEPUBReaderServices.swift */,
+				3FDBB942C7F43B24B5A42E6837AE5A80 /* RDEPUBReaderState.swift */,
+				B157210E873E2C199310B838E53286FD /* RDEPUBReaderUIState.swift */,
+				C18CB52F788E649EF3C7AA2AC11100A4 /* RDEPUBReaderViewportMonitor.swift */,
+				0461A4D5A2D3198072DA0E85F0365880 /* RDEPUBSelectionState.swift */,
+				FC1E68C4DD26E7918B807243D1B45C58 /* ChapterRuntime */,
 			);
-			name = "Support Files";
-			path = "ReadViewDemo/Pods/Target Support Files/RDReaderView";
+			name = ReaderController;
+			path = ReaderController;
 			sourceTree = "<group>";
 		};
-		9888F8A20B52AEE9047A65EEB6492749 /* Paging */ = {
+		906A945E02FD727B889DD116C6C0C0AF /* Notes */ = {
 			isa = PBXGroup;
 			children = (
-				167BA0DE8AFB80B3FD2B8CAC4CD8FD02 /* RDReaderPagingController.swift */,
-				8F2E04ABBBF406CD73171124E45B5D49 /* RDReaderPreloadController.swift */,
-				2C7F95A27A34D7EEC4E8BC856EE3EF6B /* RDReaderSpreadResolver.swift */,
-				31E87964D5A55E4CFB3416956FC2EDD1 /* RDReaderTapRegionHandler.swift */,
+				BA7C5D50017972C1AF6905C1B3733B08 /* RDEPUBNotePopupCoordinator.swift */,
+				A2FEFB9BEB8FDB1839B78DBC6861BB90 /* RDEPUBNotePopupViewController.swift */,
 			);
-			name = Paging;
-			path = Paging;
+			name = Notes;
+			path = Notes;
+			sourceTree = "<group>";
+		};
+		92146D1114F0840EF719BD3DE95D0FDE /* BuildPipeline */ = {
+			isa = PBXGroup;
+			children = (
+				2B62D239E65A52677A36BA68DB820FEA /* RDEPUBBuildDiagnosticsReporter.swift */,
+				0348219C5299B3BE84133818923C2495 /* RDEPUBChapterTailNormalizer.swift */,
+				A759645FBF673FDEACE775045ADD6223 /* RDEPUBPaginationCacheCoordinator.swift */,
+				80CBF12B91CD7E30B52521195ACD8066 /* RDEPUBTextBookBuilder.swift */,
+				384B29CBEB4465D86BDA4AF5BF10C2F7 /* RDEPUBTextBookCache.swift */,
+				118CEB0580740B0E6F1922515A582397 /* RDEPUBTextBookModels.swift */,
+				FF73643D6C558218A30F86F03A594CBA /* RDEPUBTextBuildPipelineInterfaces.swift */,
+				4DD02085DF060BFA07C4C65AC0F9ADAE /* RDEPUBTextPerformanceSampler.swift */,
+			);
+			name = BuildPipeline;
+			path = BuildPipeline;
 			sourceTree = "<group>";
 		};
 		994C39A644C0722C7A9E97AB46DB8965 /* Targets Support Files */ = {
@@ -1649,6 +1670,41 @@
 			name = "Targets Support Files";
 			sourceTree = "<group>";
 		};
+		A18EE9BDF8C601503312B2EB5B11520B /* Typesetter */ = {
+			isa = PBXGroup;
+			children = (
+				1B3BB74CCE3CE21C373751EFECCB8116 /* RDEPUBAttachmentNormalizer.swift */,
+				963DB0508456E313DFDD8A01BD92C4AD /* RDEPUBCFIMarkerInjector.swift */,
+				8FED226E2FA9815E3B5D4F7081930466 /* RDEPUBFontNormalizer.swift */,
+				4221E1543BD892BF6D14538441477241 /* RDEPUBFragmentMarkerInjector.swift */,
+				46B833FD47EDD18F132A4F3DABFD3E55 /* RDEPUBHTMLNormalizer.swift */,
+				63CB91E70707FEFE07F01B11C0DB5055 /* RDEPUBRenderDiagnosticsCollector.swift */,
+				7FEFC049D874D868076BE0F19A3F643B /* RDEPUBSemanticMarkerInjector.swift */,
+				0A0A410374DBCE1B5533846F0BCBC36C /* RDEPUBStyleSheetComposer.swift */,
+				523B2C383DBC263294C404FA85A5DE82 /* RDEPUBTextRendererSupport.swift */,
+				87D486D53C26F9A8106173A8E30B255A /* RDEPUBTypesettingPipeline.swift */,
+				D1BC245F7C0CCFC2996BC960FAE48404 /* Compatibility */,
+			);
+			name = Typesetter;
+			path = Typesetter;
+			sourceTree = "<group>";
+		};
+		A1C2DFEF90972D588DE06D2F96C32B6B /* Support Files */ = {
+			isa = PBXGroup;
+			children = (
+				775E375A8BF4CD67FD85FF4C6E217AE5 /* RDReaderView.modulemap */,
+				F29D75FFF877587EAEA07BBE58C097FB /* RDReaderView-dummy.m */,
+				46A60E7129B6B8BA7355B63E9608DF37 /* RDReaderView-Info.plist */,
+				D5FB089C00DA0BE4FB492881E5CEFE62 /* RDReaderView-prefix.pch */,
+				2BF8C1B2C40980FB07D49180D7285667 /* RDReaderView-umbrella.h */,
+				0EA2FAD0839C3EB52650B2300B7E74AB /* RDReaderView.debug.xcconfig */,
+				21716AE96E14363317AB8A817ED38F1D /* RDReaderView.release.xcconfig */,
+				69510290E334432CAAC474A360B115BA /* ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist */,
+			);
+			name = "Support Files";
+			path = "ReadViewDemo/Pods/Target Support Files/RDReaderView";
+			sourceTree = "<group>";
+		};
 		A5E1FCBC8B49DE230DF2EACDA19A840B /* DTCoreText */ = {
 			isa = PBXGroup;
 			children = (
@@ -1786,74 +1842,78 @@
 			path = DTCoreText;
 			sourceTree = "<group>";
 		};
-		AA74DF54482B16BCA8B183023EB3EA5F /* Notes */ = {
+		A7DAD901D5C37AB60C0AE6E26C800756 /* Paging */ = {
 			isa = PBXGroup;
 			children = (
-				BBC75710290014EBFDEEA6B36F301AB4 /* RDEPUBNoteDetector.swift */,
-				A0970981DC5A3462A9E0B9FD7CF88E66 /* RDEPUBNoteModels.swift */,
-				8CAE93D9542E6DD3595B8166F018B77C /* RDEPUBNoteResolver.swift */,
+				1C24BD0148D661DA92DCD300C67D590D /* RDReaderPagingController.swift */,
+				AC2313F8B75FDFEFD0DBDD842F76D012 /* RDReaderPreloadController.swift */,
+				9F439346FABB45D193709E61E908A616 /* RDReaderSpreadResolver.swift */,
+				E6A8108BD01EDCF1A37193D87427C6D2 /* RDReaderTapRegionHandler.swift */,
 			);
-			name = Notes;
-			path = Notes;
+			name = Paging;
+			path = Paging;
 			sourceTree = "<group>";
 		};
-		ABB6FDCB1874AF1191ECF41AF5436928 /* Pagination */ = {
+		B922B4FD78A0C64D71B91A88E584C15C /* Pagination */ = {
 			isa = PBXGroup;
 			children = (
-				3057D9BAC5FEF58836805FA2BF615391 /* RDEPUBChapterPageCounter.swift */,
-				894685F6BF9DF2124012989C5A853657 /* RDEPUBCoreTextPageFrameFactory.swift */,
-				11FD2C3FDE35580B59901C23E905647A /* RDEPUBPageBreakPolicy.swift */,
-				DB81992F504A7D5880AADAEC0D3CA063 /* RDEPUBTextLayouter.swift */,
-				1A6FDEFB6939DB3DF5D5226B932821BA /* RDEPUBTextLayoutFrame.swift */,
-				3344122296561C5CBCF4E54ABF146A05 /* RDEPUBTextPaginationInterfaces.swift */,
-				433BD992E46EC4B310AB2C07DA6B5942 /* RDEPUBTextPaginationSupport.swift */,
+				8189DB90B82FC06292365152D19B2393 /* RDEPUBChapterPageCounter.swift */,
+				620F6EB9BD2515CCF9666EBD79D1E206 /* RDEPUBCoreTextPageFrameFactory.swift */,
+				2ABBF727ED6EB3FA3EA88597AD35642B /* RDEPUBPageBreakPolicy.swift */,
+				EC81F5F271A26EA7C1D7AFF9374188B8 /* RDEPUBTextLayouter.swift */,
+				66E601E685D0E9888AAFFDCAF0C0D1D6 /* RDEPUBTextLayoutFrame.swift */,
+				7D37EDA6C8F32FB02D2F5433B481ADDB /* RDEPUBTextPaginationInterfaces.swift */,
+				02288EA3830887D01C4E6E67E9708C18 /* RDEPUBTextPaginationSupport.swift */,
 			);
 			name = Pagination;
 			path = Pagination;
 			sourceTree = "<group>";
 		};
-		ABC4761803CFDE7B9808B22B5B0E9215 /* Pod */ = {
+		B992E04B329FC58B492A21B64F4D498D /* EPUBCore */ = {
 			isa = PBXGroup;
 			children = (
-				F36C27B109E47B171CAFFB567A6B181E /* RDReaderView.podspec */,
+				1EB8ACC635A2AF36962035B54B2CC2C6 /* RDEPUBAssetRepository.swift */,
+				786487AD4F6B37AE4B483566F3000C6F /* RDEPUBFixedLayoutTemplate.swift */,
+				16A4528D7724EB07379829622EC7C8BE /* RDEPUBJavaScriptBridge.swift */,
+				1DCD2E4F44A79B62DF96C3ABAE2B8592 /* RDEPUBModels.swift */,
+				0146E639757C4B0ED78C4CA12DA7FDD7 /* RDEPUBNavigatorLayoutContext.swift */,
+				EC59639D756DEA2914DF1A97050137A1 /* RDEPUBNavigatorState.swift */,
+				BCF3686E574510BF6B5D13293E85F0E1 /* RDEPUBPaginator.swift */,
+				F7F6C930B6A92EF1CEA65FC355E7EABB /* RDEPUBParser.swift */,
+				8ABD098B435C30F2039019D7646E87ED /* RDEPUBParser+Archive.swift */,
+				CEEA0316D9580EFCF73105A138F13E33 /* RDEPUBParser+Package.swift */,
+				76610C58FDE0133C7B8E5E15CD84C663 /* RDEPUBParser+ReadingProfile.swift */,
+				F53F2F0463AC1292BFE9AFE159F8016F /* RDEPUBParser+Resources.swift */,
+				EE4E65CBFE33A55487727CE851F95C96 /* RDEPUBParser+TOC.swift */,
+				3F799B8BE1C80D381CED94E9496512A6 /* RDEPUBPreferences.swift */,
+				34AAF33D5968FF88E52BE323BE82F631 /* RDEPUBPublication.swift */,
+				236E0B22C7FAE0F5E5BC44A2D1C4726B /* RDEPUBReadingSession.swift */,
+				44A3A2C05CEC2C66E821919A93A14590 /* RDEPUBRenderRequest.swift */,
+				D24D7F3F52B5BE585E06538DBA3CD6F7 /* RDEPUBResourceResolver.swift */,
+				4245A0DA8D1ED324142168C60B775253 /* RDEPUBResourceURLSchemeHandler.swift */,
+				5C2DA7CBEF685373784172A46130ECE9 /* RDEPUBSearchEngine.swift */,
+				96E5EDA71849C1703A80094A7160A3D2 /* RDEPUBSearchModels.swift */,
+				7B9B9C10492C2477D3CA1E3B7027D4C5 /* RDEPUBStyleSheetBuilder.swift */,
+				BD1A3ADD8E5C9D2A848AA57AA083E168 /* RDEPUBTextAnchor.swift */,
+				CC162013E2626B2489739C731077B43C /* RDEPUBWebView.swift */,
+				5687CEB04DF925FAE0FC801EFA943FD8 /* RDEPUBWebView+Configuration.swift */,
+				3D9A0C2A7BCE48EB6E02279F8770F67B /* RDEPUBWebView+FixedLayout.swift */,
+				F661AA03BC0EBFBDBBC00AC38E62EF34 /* RDEPUBWebView+JavaScriptBridge.swift */,
+				E474E1489E80ABDF6B665BEA40856E40 /* RDEPUBWebView+Reflowable.swift */,
+				BCC472137332414147193AA5DB35E4E0 /* RDEPUBWebView+Search.swift */,
+				269D68D156A9D97C9C623160D509981D /* RDEPUBWebViewDebug.swift */,
+				C7AF89767F8BF2FD706F74657E1FB740 /* CFI */,
+				575231379BA6373258A5E3546CF4C366 /* Models */,
+				68A54DEB33F41B15979C2E733EB04E42 /* Notes */,
 			);
-			name = Pod;
-			sourceTree = "<group>";
-		};
-		B158F65C60FFDF3F85115B7C8A70CC16 /* Compatibility */ = {
-			isa = PBXGroup;
-			children = (
-				57FEB4E33E705DD0A1EEBDB548856FEE /* RDEPUBCSSCompatibilityLayer.swift */,
-				9C3011ED9BD02EA9AE15AB5394563588 /* RDEPUBFontFallbackResolver.swift */,
-				476AB0419C7F33B4AB2729364F2E8779 /* RDEPUBStyleCompatibilityModels.swift */,
-			);
-			name = Compatibility;
-			path = Compatibility;
-			sourceTree = "<group>";
-		};
-		B66ABD82C1A5560D08887DC14C457633 /* ReaderView */ = {
-			isa = PBXGroup;
-			children = (
-				93972052546ECA81648EFF429E5957E7 /* RDReaderContentCell.swift */,
-				FFFF9DD6D05B81A55BA5EE9E38F881C7 /* RDReaderFlowLayout.swift */,
-				59759873C9137248C4FBC71818D67038 /* RDReaderGestureController.swift */,
-				131CFFE1A72EF99B7007E8D814659B67 /* RDReaderPageChildViewController.swift */,
-				CB7C9B1AA97A421E72968B30CE09C515 /* RDReaderView.swift */,
-				874E286151F929B28491A4FA5283F1AC /* RDReaderView+CollectionView.swift */,
-				5E4E0C5A9EF3B21584458076302D5D9C /* RDReaderView+ContentAccess.swift */,
-				F43A220C0D3B9E71DCEA79B58CC78F8F /* RDReaderView+PageCurl.swift */,
-				3F0E7197A7DBF0EFC017D73F2350DB75 /* RDReaderView+ToolView.swift */,
-				7A867717C525A9DC522388125DC5DB70 /* RDReaderViewProtocols.swift */,
-				9888F8A20B52AEE9047A65EEB6492749 /* Paging */,
-			);
-			name = ReaderView;
-			path = Sources/RDReaderView/ReaderView;
+			name = EPUBCore;
+			path = Sources/RDReaderView/EPUBCore;
 			sourceTree = "<group>";
 		};
 		B9CF9F63ECCD4435AA8F5FEDC37E6258 /* Development Pods */ = {
 			isa = PBXGroup;
 			children = (
-				3582044EB6FBFA34720192E2CB238CCA /* RDReaderView */,
+				05C1EB52F20A7DC6028431405637EAB2 /* RDReaderView */,
 			);
 			name = "Development Pods";
 			sourceTree = "<group>";
@@ -1866,44 +1926,26 @@
 			name = Resources;
 			sourceTree = "<group>";
 		};
-		C95A37BA0AB4B3AE8EA8DC63863FAA8C /* ChapterRuntime */ = {
+		C7AF89767F8BF2FD706F74657E1FB740 /* CFI */ = {
 			isa = PBXGroup;
 			children = (
-				4D74CE09D213078CADFCA761162B17BE /* RDEPUBBackgroundTrace.swift */,
-				E96C781E19115E60CF0F34702546A1F5 /* RDEPUBBookPageMap.swift */,
-				348526CA4EF78175DE245BD2B6C2F864 /* RDEPUBChapterCacheKey.swift */,
-				B6CD922C6490932E56AE12DC05A0323D /* RDEPUBChapterDataCache.swift */,
-				D8A32A5161990E0DFEB763A243286627 /* RDEPUBChapterLoader.swift */,
-				DDAEE3906C167B40C116FA472D9C78D0 /* RDEPUBChapterLocation.swift */,
-				CE43A186B4FB4AABB024CB325862CC15 /* RDEPUBChapterOffsetMap.swift */,
-				C4D303A1D4012C1CBA18C229DA06063A /* RDEPUBChapterRuntimeStore.swift */,
-				AE9A97D0E8929D0099B94184E082884D /* RDEPUBChapterSummaryDiskCache.swift */,
-				2B66148AD1F378E8AB292A9E9B4703FD /* RDEPUBChapterWindowCoordinator.swift */,
-				2717E26568D6A20D8F557BDF5A379E85 /* RDEPUBChapterWindowSnapshot.swift */,
-				8FB9FC4847266E4F97CB262C4207B9D4 /* RDEPUBPageCountCache.swift */,
-				A07475B86BDC87B5618833917A8D6846 /* RDEPUBPageResolver.swift */,
-				242D6AFEA3701AC66AE3A146E6B93557 /* RDEPUBRuntimeChapter.swift */,
-				C55CB28CF41D832FD4871111E37FEAB8 /* RDEPUBRuntimePageCount.swift */,
-				BAFFA8E198E1DF81FA44ACDBA022EBF0 /* String+SHA256.swift */,
+				DFB1ABFCCAC4DAE451803B7620A3E75B /* RDEPUBCFI.swift */,
+				C29508133496D51D5F24DDBFFEC54798 /* RDEPUBCFICompatibility.swift */,
+				D53FC89DDB339BF2C7F6BEAFEE0097F4 /* RDEPUBCFIDOMPathBuilder.swift */,
+				EF8BD4198F6FFF3793A1EDD6E9FE2259 /* RDEPUBCFIError.swift */,
+				97F7B41CF52C44365ABC89D0081C7DDF /* RDEPUBCFIGenerator.swift */,
+				84432C44761FA9535E1C1C00A97581F8 /* RDEPUBCFIMap.swift */,
+				5819FE718F1A4114395EBB6B8A8E8455 /* RDEPUBCFIParser.swift */,
+				F25A8801661F7DE4DEAC12BE1F80C332 /* RDEPUBCFIPath.swift */,
+				4B63D29E831F61A0A7CD86FE7CD9CDA9 /* RDEPUBCFIRange.swift */,
+				2B7F28B33E9CEA8C57E5E55EDC33C596 /* RDEPUBCFIRecoveryEngine.swift */,
+				645B67E60B0E03563BF2A759753BEEE2 /* RDEPUBCFIResolver.swift */,
+				9F96D2805CAFF0D2370A761DD023C745 /* RDEPUBCFISerializer.swift */,
+				A974D11C3D99A37FECDAB079565A275F /* RDEPUBCFITextAssertion.swift */,
+				B3C14E09958710059E09B6816BC50FF1 /* RDEPUBCFIUtilities.swift */,
 			);
-			name = ChapterRuntime;
-			path = ChapterRuntime;
-			sourceTree = "<group>";
-		};
-		C9C436AB25587C7388EA43B6C50EDE81 /* BuildPipeline */ = {
-			isa = PBXGroup;
-			children = (
-				F240829B62338026772A632D8857F072 /* RDEPUBBuildDiagnosticsReporter.swift */,
-				7922FB20384529AC03B2689097070BE0 /* RDEPUBChapterTailNormalizer.swift */,
-				9D1456F22F77D38DF0305563DB792771 /* RDEPUBPaginationCacheCoordinator.swift */,
-				EABC0A5DC75E27092EE4743115BA90E2 /* RDEPUBTextBookBuilder.swift */,
-				AA6DD0AAE60C26C35ADA0C19CE0FD97F /* RDEPUBTextBookCache.swift */,
-				8DCEB3A6D3DF3CC1DBE0AE0B947B9ABD /* RDEPUBTextBookModels.swift */,
-				22E15788FC4F921DFE7FE4C2A2B3F722 /* RDEPUBTextBuildPipelineInterfaces.swift */,
-				564DFD9C0E67DFB3283FA05DD23C8F58 /* RDEPUBTextPerformanceSampler.swift */,
-			);
-			name = BuildPipeline;
-			path = BuildPipeline;
+			name = CFI;
+			path = CFI;
 			sourceTree = "<group>";
 		};
 		CA6142FEF8E51F79243E3C87378F50AF /* UIKit */ = {
@@ -1945,37 +1987,15 @@
 			);
 			sourceTree = "<group>";
 		};
-		D0E3E03CE321F55127FCCD4DFF034B74 /* EPUBUI */ = {
+		D1BC245F7C0CCFC2996BC960FAE48404 /* Compatibility */ = {
 			isa = PBXGroup;
 			children = (
-				E9BE6C1E41B26E8B9FBA46BD0E7FE189 /* RDEPUBReaderBottomToolView.swift */,
-				C2B4BF13D3F4D6E26101F470D64D654C /* RDEPUBReaderChapterListController.swift */,
-				90299D3CC3DF1039283EA09284A99570 /* RDEPUBReaderController.swift */,
-				F5DC987B28D5AF907FA09697E14A643C /* RDEPUBReaderController+ContentDelegates.swift */,
-				9CFBB714DE267D9E38298384A6F0284B /* RDEPUBReaderController+DataSource.swift */,
-				998BCF777F83F1FB8750BD56EE84B2AE /* RDEPUBReaderController+PublicAPI.swift */,
-				FF166FC19259E17C130DF5E825B8A442 /* RDEPUBReaderController+RenderSupport.swift */,
-				FA169C9DF7B86076B3A4F1E4FCDB7197 /* RDEPUBReaderController+RuntimeBridge.swift */,
-				F5C0A5C8BB9EAEE1C547D2FC03D475AE /* RDEPUBReaderController+TableOfContents.swift */,
-				57D263A80E3EF0FF3FD66578B7F4B9A6 /* RDEPUBReaderDelegate.swift */,
-				96DE45A34DB87D787488D2059C7DFBE9 /* RDEPUBReaderHighlightsViewController.swift */,
-				0EBFBB5A21127005D1E96C572537C4CA /* RDEPUBReaderPersistence.swift */,
-				BBEB3A80D9A6F54C140EFB7A60E7C1E5 /* RDEPUBReaderSearchBarView.swift */,
-				1CD08D956799BC2853B0BAA33747516B /* RDEPUBReaderTableOfContentsItem.swift */,
-				DCD388B4634128186073C32B45902588 /* RDEPUBReaderToolView.swift */,
-				54DF306A281A8DA5FDD3314734FA5AFB /* RDEPUBReaderTopToolView.swift */,
-				5A5DA43C399331C00E5C025737B5B66D /* RDEPUBViewportTypes.swift */,
-				58C245766BD2EFA6647D58344225E88A /* RDEPUBWebContentView.swift */,
-				D4128385BCC81F1701B3C11FFB2ED8FE /* RDEPUBWebDecorationOverlayView.swift */,
-				5753416D2D985EAF1FF9D9062157847F /* RDURLReaderController.swift */,
-				2FA15767EC291461F99B4542D3B36765 /* UIColor+RDEPUBHex.swift */,
-				523116E3567051650753B0B7449FAF43 /* Notes */,
-				3B4CBC3C28BC7492C09380CF1ACA752C /* ReaderController */,
-				19B0B068C8A2B66FFE781289855F90F8 /* Settings */,
-				FABC5799F358900A800EA511D30D0ADA /* TextPage */,
+				A8441EA66830E22726BE52E29AA8FBA0 /* RDEPUBCSSCompatibilityLayer.swift */,
+				ED40EE4143B1EC69166CD58B11C00B40 /* RDEPUBFontFallbackResolver.swift */,
+				DEEE722A6CEB62B173B8C71F0E7336C7 /* RDEPUBStyleCompatibilityModels.swift */,
 			);
-			name = EPUBUI;
-			path = Sources/RDReaderView/EPUBUI;
+			name = Compatibility;
+			path = Compatibility;
 			sourceTree = "<group>";
 		};
 		D68CA58901FBF589D75F5E40F1EAF5BA /* Frameworks */ = {
@@ -2041,6 +2061,46 @@
 			name = Core;
 			sourceTree = "<group>";
 		};
+		E3A38F6522C2FB2799085A7CB3D55545 /* EPUBUI */ = {
+			isa = PBXGroup;
+			children = (
+				83FE23C4421208A77C790E396C2391EC /* RDEPUBAttachmentTooltipOverlayView.swift */,
+				34649E5DA563878B374E0488CF7B450A /* RDEPUBAttachmentTooltipView.swift */,
+				62CA2B8137FC8E99994C84CF0B18EBD1 /* RDEPUBReaderBottomToolView.swift */,
+				646429B6D94AE5D9F3ADDB5B9C6FBCCF /* RDEPUBReaderChapterListController.swift */,
+				ACBDBAB2D4A07BA86ABF3F196E275CD2 /* RDEPUBReaderController.swift */,
+				90D060B1A624B2699F408C993E8C418B /* RDEPUBReaderController+AttachmentTooltip.swift */,
+				1EFA16D97F8CC8E61C22F3CEF546EAA3 /* RDEPUBReaderController+ContentDelegates.swift */,
+				F080C0809566114997B5E6B9AF967C76 /* RDEPUBReaderController+DataSource.swift */,
+				3BDA124143D52EAC7EDD8AB1F554C329 /* RDEPUBReaderController+ExternalLinks.swift */,
+				CCEB096B8A5CC40D05995D4C8BCE6996 /* RDEPUBReaderController+LocationResolution.swift */,
+				38CC6A6BEE99B6DD8A2CB0C3D94D3C2D /* RDEPUBReaderController+PublicAPI.swift */,
+				C0FCBCDE580CFE3B2A980871EE253246 /* RDEPUBReaderController+RenderSupport.swift */,
+				019F2E2CAC5314EC6ACF38451D83955D /* RDEPUBReaderController+RuntimeBridge.swift */,
+				EFF1EFC40E2A42337D7C758A6A4F26D7 /* RDEPUBReaderController+TableOfContents.swift */,
+				87A3F451AC74F9A3D57EAD938B435AD6 /* RDEPUBReaderDelegate.swift */,
+				98E0E994653153A8BF5451529E78BD86 /* RDEPUBReaderHighlightsViewController.swift */,
+				D4517A0658C991352A0B5ED4B851CED2 /* RDEPUBReaderPersistence.swift */,
+				0F0670803E8267332E1891D6AB6E5A3F /* RDEPUBReaderSearchBarView.swift */,
+				6AE9447E94AD6DD5AA1A3E1BBB03977A /* RDEPUBReaderTableOfContentsItem.swift */,
+				B9A160FAAD45590651794EEF3A2F67FE /* RDEPUBReaderToolView.swift */,
+				BD88D55D7F7F1667E4466071F740A3C9 /* RDEPUBReaderTopToolView.swift */,
+				6886C52EAE45B38A526CD917C8CBFED8 /* RDEPUBViewportTypes.swift */,
+				FCCB7B202BEDC5F5B8895F56085A2DCA /* RDEPUBWebContentView.swift */,
+				6CF30C46F1B4F469D06B27690215880A /* RDEPUBWebDecorationOverlayView.swift */,
+				DEDA10329B118CA762890DD7D8B64C6C /* RDURLReaderController.swift */,
+				C409593D5FA3DD26DD8A3CDE6F8B221C /* String+RDEPUB.swift */,
+				0EB4A1F095257F5F9410518DCB1053FB /* UIColor+RDEPUB.swift */,
+				2EE6DDF24FEC8EC73F462A296083A37B /* UIColor+RDEPUBHex.swift */,
+				906A945E02FD727B889DD116C6C0C0AF /* Notes */,
+				852FAD9A7443AEE27600BD2805ADF45D /* ReaderController */,
+				2AD3A82A102AC964D00BED8F3EB01CD4 /* Settings */,
+				665A0BFB45C3F21B94BE1DB54BF3168F /* TextPage */,
+			);
+			name = EPUBUI;
+			path = Sources/RDReaderView/EPUBUI;
+			sourceTree = "<group>";
+		};
 		E861498A78913BA984BA96358FC61449 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -2069,77 +2129,33 @@
 			path = "../Target Support Files/ZIPFoundation";
 			sourceTree = "<group>";
 		};
-		F5F72FA0D9A58022AD2469F1D6EDB577 /* Models */ = {
+		FC1E68C4DD26E7918B807243D1B45C58 /* ChapterRuntime */ = {
 			isa = PBXGroup;
 			children = (
-				15D0092D232533829CFC9F1BD511CECE /* RDEPUBAnnotationModels.swift */,
-				FACBBA5BB79E2143183296DE3F990265 /* RDEPUBPaginationModels.swift */,
-				BFE28D164B27044F77AB8429DB5579FC /* RDEPUBReadingLocationModels.swift */,
+				50244AA9BC4821A6CB64A7AF6D8BB332 /* RDEPUBBackgroundTrace.swift */,
+				E980E36577B236C9DC52A497F85388C3 /* RDEPUBBookPageMap.swift */,
+				B2205C761CC6E3BD03E29D00247B8017 /* RDEPUBChapterCacheKey.swift */,
+				5DE61097D0F21BED63801FD97D420AA7 /* RDEPUBChapterDataCache.swift */,
+				D64D8C9DC33119921466055ACC5347C7 /* RDEPUBChapterLoader.swift */,
+				167AF6E907DF607CF1D5F5B0FA05B565 /* RDEPUBChapterLocation.swift */,
+				48051F94914D1A8DE273B7F6F3D8E9EB /* RDEPUBChapterOffsetMap.swift */,
+				B72D18F1336296178742C907A3956E45 /* RDEPUBChapterRuntimeStore.swift */,
+				385AC715B035543F28D98F44262302E3 /* RDEPUBChapterSummaryDiskCache.swift */,
+				BFCF1D4F0258C1F7B53CE73485F48442 /* RDEPUBChapterWarmupOrchestrator.swift */,
+				EA25825AB5D083AD35744145AF10E718 /* RDEPUBChapterWindowCoordinator.swift */,
+				F13DE2B771ECF4C1C6DDAC4FCD18CD0A /* RDEPUBChapterWindowSnapshot.swift */,
+				E05401D6B263F054E8B15A3B594BC5A5 /* RDEPUBPageCountCache.swift */,
+				D61ED230892882E40FEE83CDBB7A9D93 /* RDEPUBPageResolver.swift */,
+				4E2E2ACE965436483EDC14EC4262BAFC /* RDEPUBRuntimeChapter.swift */,
+				6E8A22827641532F651809A316008577 /* RDEPUBRuntimePageCount.swift */,
 			);
-			name = Models;
-			path = Models;
-			sourceTree = "<group>";
-		};
-		FABC5799F358900A800EA511D30D0ADA /* TextPage */ = {
-			isa = PBXGroup;
-			children = (
-				4BD360BDA6082E55A046601B16354F22 /* RDEPUBPageInteractionController.swift */,
-				631001401579A0D4E3E45FBE1C6638B4 /* RDEPUBPageLayoutSnapshot.swift */,
-				D3829ADFE2A87C8A5E8BEC7CB366B998 /* RDEPUBSelectionOverlayView.swift */,
-				02058F9EDA540D0CFCC2F15A1D58EAF8 /* RDEPUBTextAnnotationOverlay.swift */,
-				51DA38B1859EFFFCE0CF684F422174EB /* RDEPUBTextContentView.swift */,
-				94AA601472E86DD75D0117D00794B2B2 /* RDEPUBTextPageDecorationView.swift */,
-				B4DE5BECEF5C877313680D5412828254 /* RDEPUBTextPageRenderView.swift */,
-				F2BD4E767D37F40AB6BF4221B97BA1D1 /* RDEPUBTextSelectionController.swift */,
-			);
-			name = TextPage;
-			path = TextPage;
+			name = ChapterRuntime;
+			path = ChapterRuntime;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		294491FE857B2B09B3F9D8DC77D9FCD8 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				912C03B276B99D7AE64A767A9ED4F47F /* DTActivityTitleView.h in Headers */,
-				5BC39453A3690A2A210EB9E5E0E0650F /* DTAnimatedGIF.h in Headers */,
-				2739C4856206A85B576605B1678F0976 /* DTBase64Coding.h in Headers */,
-				FC2CF2109D38F732F80B01DBCF334F27 /* DTBlockFunctions.h in Headers */,
-				F99EFDC1C2600F286F247A6DB0894D75 /* DTCompatibility.h in Headers */,
-				E963A9AEBFCBB9295029E97839698434 /* DTCoreGraphicsUtils.h in Headers */,
-				82B4EB3101E2D9AB421C74516F7DDE73 /* DTCustomColoredAccessory.h in Headers */,
-				540822933C75A6D634E642A6D47C3891 /* DTExtendedFileAttributes.h in Headers */,
-				20CD6C8384E3F61636633BEDFC351B83 /* DTFolderMonitor.h in Headers */,
-				CABC0BC38735E2A8FA70D3D40D49B546 /* DTFoundation-umbrella.h in Headers */,
-				FC5B1F66ECCC30563048030C58964A1C /* DTFoundationConstants.h in Headers */,
-				939C4766C9553BC2665C89624A09D06E /* DTHTMLParser.h in Headers */,
-				A7886390F2AF85602193E28F9F5983E8 /* DTLog.h in Headers */,
-				7B96C1EC26F7B6E1C02342D180FC07AC /* DTPieProgressIndicator.h in Headers */,
-				C52906BF2E859500BAEEF0278F349260 /* DTSmartPagingScrollView.h in Headers */,
-				3168249FF21A14A541C5B33CA9F100BF /* DTTiledLayerWithoutFade.h in Headers */,
-				0BEBA9C63C306195F2D4AE398C69716D /* DTVersion.h in Headers */,
-				4A3A26648CAB8160C7F75594F2A84ABB /* DTWeakSupport.h in Headers */,
-				3EBAA73012237F0806BAC1EE895E43CF /* NSArray+DTError.h in Headers */,
-				7B7F58DE7B924C4BEBA57A26A96418AA /* NSData+DTCrypto.h in Headers */,
-				C491DDDB34B6EDCFF6368A160CD25841 /* NSDictionary+DTError.h in Headers */,
-				0D77BD996001EE46C8F5CEDDA68988A5 /* NSFileWrapper+DTCopying.h in Headers */,
-				C0CDBC33150FBC80ABE73E85F0B0E16F /* NSMutableArray+DTMoving.h in Headers */,
-				6D64F06B9ECD3BB9C3BB8404D19E0CFC /* NSString+DTFormatNumbers.h in Headers */,
-				EA5FC91A9CBA3D8A97C0460D24FD2907 /* NSString+DTPaths.h in Headers */,
-				92148E09CF9637604A14853AB3FD3E95 /* NSString+DTURLEncoding.h in Headers */,
-				83F80B9D64BB77B62CAF8DD634D6E787 /* NSString+DTUtilities.h in Headers */,
-				65B3BF819494AA7520FA388ED60951DF /* NSURL+DTAppLinks.h in Headers */,
-				2F08C642151D4365F5311B1E4BEB9DF5 /* NSURL+DTComparing.h in Headers */,
-				D0653A4B8287A7DC32E1DD0F7DCA3691 /* NSURL+DTUnshorten.h in Headers */,
-				4871F893C7D297F99210CB66E4DB7FEB /* UIApplication+DTNetworkActivity.h in Headers */,
-				CB128F282B7B6E5B7746FA0C693A1263 /* UIImage+DTFoundation.h in Headers */,
-				31CD9BFD4FC3440B65D2BAECF5498C67 /* UIScreen+DTFoundation.h in Headers */,
-				C00D46824F42EBF7B0B0B500C4ED88DA /* UIView+DTFoundation.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		29CB77F5EC62298B8E19FEFFD791AEAD /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -2213,19 +2229,60 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		59EEB497F2439B603D4B9D1B7CE45700 /* Headers */ = {
+		571F382EFC19F10F5C7722C9E796B9A5 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EF4941F634372438A6F3BFCCF1354C3D /* SSAlertSwift-umbrella.h in Headers */,
+				8F2972EE318ED16FFBFD216728961BB2 /* DTActivityTitleView.h in Headers */,
+				BE485F99DA45D2B416F45A0A869BFDEA /* DTAnimatedGIF.h in Headers */,
+				59BFBA6A99843138AE3FAD9B61093B4C /* DTBase64Coding.h in Headers */,
+				A3FBC31F5CCE7882ABAC0C50BE2F1B9C /* DTBlockFunctions.h in Headers */,
+				040559B03C1A5E027594EAF859293F6C /* DTCompatibility.h in Headers */,
+				7B4E49B136C527BD20AD000696440B14 /* DTCoreGraphicsUtils.h in Headers */,
+				622B1B472DED191F34262A04CE05DD83 /* DTCustomColoredAccessory.h in Headers */,
+				97CC0A64419AC54341D34421B22B7034 /* DTExtendedFileAttributes.h in Headers */,
+				35C3A7AAA0BC0F615EF7159D64EB4372 /* DTFolderMonitor.h in Headers */,
+				069C5149522B38C8AB7C735FF83EE099 /* DTFoundation-umbrella.h in Headers */,
+				1763403B89A04B154B404C19CEBA335F /* DTFoundationConstants.h in Headers */,
+				D39BB74D08A120EADBBD1A2F5D306B9C /* DTHTMLParser.h in Headers */,
+				CE4876B563FC74C40E0A5DD83F79B486 /* DTLog.h in Headers */,
+				B21B66EF9EFBAA49EE4E8FFD51292FEF /* DTPieProgressIndicator.h in Headers */,
+				301B3D81C6A28B5777E01246CD33D13F /* DTSmartPagingScrollView.h in Headers */,
+				9B6C11AC9941D02F1BCC15F5124ACB60 /* DTTiledLayerWithoutFade.h in Headers */,
+				307AA99D0BF12F418BB9CA6275F5EFA0 /* DTVersion.h in Headers */,
+				80CCC9CEF8628C97D09B51EA7F588A04 /* DTWeakSupport.h in Headers */,
+				F67A787600193EFF9F366980B3538A96 /* NSArray+DTError.h in Headers */,
+				B77E45849D821FEDD79D5446B6A490ED /* NSData+DTCrypto.h in Headers */,
+				8232E2F21AA4746F8FF80842EE706168 /* NSDictionary+DTError.h in Headers */,
+				D24F349DFE20048204D240D20C3144D2 /* NSFileWrapper+DTCopying.h in Headers */,
+				7A41EE89AA05F85E78CDC5A90963F6B0 /* NSMutableArray+DTMoving.h in Headers */,
+				FE0E10A48B6213CD3FDA7737C07EE445 /* NSString+DTFormatNumbers.h in Headers */,
+				687C9429B0D64C0F4BA4C79242D42E66 /* NSString+DTPaths.h in Headers */,
+				38B74778B7E961F82ED9083E7BC612DF /* NSString+DTURLEncoding.h in Headers */,
+				FEF320B563A2815CFEFD132F9420F8E9 /* NSString+DTUtilities.h in Headers */,
+				6F5B28572DAF44B005898C57F42B2DED /* NSURL+DTAppLinks.h in Headers */,
+				23F8E9928335EB706B9D340097111305 /* NSURL+DTComparing.h in Headers */,
+				020F2DBF2B0D499C7D5FDB014AA03CF5 /* NSURL+DTUnshorten.h in Headers */,
+				5D5FDFA60EDACF69E7CE113BB41859E9 /* UIApplication+DTNetworkActivity.h in Headers */,
+				0B32362B15FCBE685C9515F89022F858 /* UIImage+DTFoundation.h in Headers */,
+				9A7858B00D72FBEA2FE7774D92BACA32 /* UIScreen+DTFoundation.h in Headers */,
+				BF4C58CBD2578B555B57EAD2D527DA01 /* UIView+DTFoundation.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		882A35DD2D138E869538936BB36990F5 /* Headers */ = {
+		5AD1BB607FC19B3D2A843E71EAD9C079 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				50A66D5CD5F84EDB743A777CCA3B7DAA /* RDReaderView-umbrella.h in Headers */,
+				AEEE68A6A3456F7B4DC24A7163D98F5F /* ZIPFoundation-umbrella.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		6265744458134AF241442FE14DC7C075 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EC8BE26122FA096D22E9A3204847F5F6 /* SnapKit-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2237,19 +2294,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		E83EC0256DFFB1714EF2D18F83DD8FC5 /* Headers */ = {
+		D88B7D67BC75EF5FD2DC460CA1594EDC /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				03D91639D7EF7C7380ED101A9521967F /* SnapKit-umbrella.h in Headers */,
+				7CCC53404B62789AE3793E760997097D /* SSAlertSwift-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F49DA9218C0C59A855ECB555ABE20205 /* Headers */ = {
+		DE3F4C7F9377D100DB74BA3F000B09AF /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8D0F14888E25D7A94560407906AEDB56 /* ZIPFoundation-umbrella.h in Headers */,
+				2D9711ECF31F92B6344A4B4769E7D18F /* RDReaderView-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2258,11 +2315,11 @@
 /* Begin PBXNativeTarget section */
 		0C24CB0E87A728A11AA1124CB360D6A1 /* DTCoreText-Resources */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 3E6D13FB79638DFD856E25EB22C24E3C /* Build configuration list for PBXNativeTarget "DTCoreText-Resources" */;
+			buildConfigurationList = 42DB324304DB4062633BD5C0B743F536 /* Build configuration list for PBXNativeTarget "DTCoreText-Resources" */;
 			buildPhases = (
-				5C0CA40E9BF5DBC3C23B9C4230AFD8E0 /* Sources */,
-				A4CE0F792ABC696E223E02E81A4DB656 /* Frameworks */,
-				FBC8CA4E77AABAFCAD355F06CC7A27CA /* Resources */,
+				9C4295C345FBDB725AC038F15F3C6185 /* Sources */,
+				6C5083F9338B8851E15F70B79A7F44F4 /* Frameworks */,
+				C2B4CAC57336570A5968115BB042A4AB /* Resources */,
 			);
 			buildRules = (
 			);
@@ -2275,17 +2332,17 @@
 		};
 		19622742EBA51E823D6DAE3F8CDBFAD4 /* SnapKit */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = FA1C5C8E6E90BB44DEBCD79890BF2130 /* Build configuration list for PBXNativeTarget "SnapKit" */;
+			buildConfigurationList = 188A603D94CFDFC4ECFFB0A731A69DB3 /* Build configuration list for PBXNativeTarget "SnapKit" */;
 			buildPhases = (
-				E83EC0256DFFB1714EF2D18F83DD8FC5 /* Headers */,
-				9198736E7F85E7AEFEBFB9B08762695C /* Sources */,
-				51D55409F70E1897963927816BF39637 /* Frameworks */,
-				A8758C9177186CF7ED8A31A1291FF064 /* Resources */,
+				6265744458134AF241442FE14DC7C075 /* Headers */,
+				BC13B8090DA45467A744E6CAF3DE34C8 /* Sources */,
+				B1EC0A3CE04A823BC0DC435834EF6C64 /* Frameworks */,
+				F9E2A4D154004CF62A22F6BAFDA37431 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				D1CC72BF86B5F0455D97FE9C6E37E0C5 /* PBXTargetDependency */,
+				B9E2159A01F2995BDD2FACD0ECC521C0 /* PBXTargetDependency */,
 			);
 			name = SnapKit;
 			productName = SnapKit;
@@ -2294,12 +2351,12 @@
 		};
 		8619D5ADECF2B26CFD9A9826D61D289A /* SSAlertSwift */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0F7B26392DBDEF1A30383994647A7057 /* Build configuration list for PBXNativeTarget "SSAlertSwift" */;
+			buildConfigurationList = 48F9AC50432927A34356729C1F4F40CF /* Build configuration list for PBXNativeTarget "SSAlertSwift" */;
 			buildPhases = (
-				59EEB497F2439B603D4B9D1B7CE45700 /* Headers */,
-				4A00B8E75E30533B7636BC36ABC85ECC /* Sources */,
-				59D25E0B0855972948B27D4946DA072E /* Frameworks */,
-				8446E19BDCE9F10BF75CF46493F64473 /* Resources */,
+				D88B7D67BC75EF5FD2DC460CA1594EDC /* Headers */,
+				37F8F3221F85D579243C81EB7F1B3791 /* Sources */,
+				4FDA977A2376EC004EF757911EA147C2 /* Frameworks */,
+				86ACDD3DC75BBF3794E1D7168E84C2A1 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -2322,12 +2379,12 @@
 			buildRules = (
 			);
 			dependencies = (
-				784C4B43D49129F31825902D3419FD88 /* PBXTargetDependency */,
-				26F9F475CD1321CBDD5C353E074B1558 /* PBXTargetDependency */,
-				B1E509D0188F9C97F33A5BC619019C96 /* PBXTargetDependency */,
-				C5509DD3E9B1E0761FD53D0EAB0E4946 /* PBXTargetDependency */,
-				371932C62B0ACD6888179B86D3FE2F14 /* PBXTargetDependency */,
-				45AE29FA56CD9CCFAF5DD67AB155C787 /* PBXTargetDependency */,
+				73FE24F20CEB796A3A23687C50F6D477 /* PBXTargetDependency */,
+				274DD071CC54BE127BC9F94B8A04FD08 /* PBXTargetDependency */,
+				D3B19E5313783C954E0A3FBE9BF2DCA3 /* PBXTargetDependency */,
+				CA1C9D3EA1543C5004456530ED9E56AE /* PBXTargetDependency */,
+				7D1896023BCA82E202B28B0753AC68C8 /* PBXTargetDependency */,
+				E543D69FB495D7206BFA590CEF0ED78B /* PBXTargetDependency */,
 			);
 			name = "Pods-ReadViewDemo";
 			productName = Pods_ReadViewDemo;
@@ -2336,11 +2393,11 @@
 		};
 		8A8DB685241263AFDF5E6B20FE67B93A /* SnapKit-SnapKit_Privacy */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 212A5725332C221DE8024FEE9BB598CE /* Build configuration list for PBXNativeTarget "SnapKit-SnapKit_Privacy" */;
+			buildConfigurationList = DB4C9521DD01DA7BACFF7BF85DE74E69 /* Build configuration list for PBXNativeTarget "SnapKit-SnapKit_Privacy" */;
 			buildPhases = (
-				3408CC4FF47B56867DF8C6C59DE3D265 /* Sources */,
-				4BBDBC53B3387663B9E11DAB3D9A8E12 /* Frameworks */,
-				B9F0E549414EF5B58BF105B2047E6D63 /* Resources */,
+				45178994E85B3554E2F8C03CE228B2F8 /* Sources */,
+				5B6486B0E226A306E01E2AE183A60429 /* Frameworks */,
+				E5B263B619ECBCC8AF126A3C64B39129 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -2353,12 +2410,12 @@
 		};
 		8F6E5A5BF72D62CDFD25F91A7CFA3309 /* DTFoundation */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B39579BB04CF59A762EE60FF463DBBC3 /* Build configuration list for PBXNativeTarget "DTFoundation" */;
+			buildConfigurationList = 1D0D2A022E25C95190510FD3F7ECB9B6 /* Build configuration list for PBXNativeTarget "DTFoundation" */;
 			buildPhases = (
-				294491FE857B2B09B3F9D8DC77D9FCD8 /* Headers */,
-				579910B7BBE50695FD70458D3209F68A /* Sources */,
-				238320E38DF4BEAC216E1AAA2FDA5568 /* Frameworks */,
-				2E8D20617D350B51A325B5D2F7641008 /* Resources */,
+				571F382EFC19F10F5C7722C9E796B9A5 /* Headers */,
+				33C49E2D6C2695929880A62FAE989328 /* Sources */,
+				34461B07A262A084CD6DF7F81D13DE0E /* Frameworks */,
+				723A5A68AB37315B01EF2160C4D58249 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -2371,17 +2428,17 @@
 		};
 		AA15C8469D67684160CC2A7098EB841C /* ZIPFoundation */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = E54D4DA42645E99F760FD3EEB1686360 /* Build configuration list for PBXNativeTarget "ZIPFoundation" */;
+			buildConfigurationList = A70F5C0077A52024EC5922BD4B5EACE2 /* Build configuration list for PBXNativeTarget "ZIPFoundation" */;
 			buildPhases = (
-				F49DA9218C0C59A855ECB555ABE20205 /* Headers */,
-				612716D206ABF0D3B09EB925A2CE6661 /* Sources */,
-				01AE9B85A96ADDE5E0FF73B8E76820AD /* Frameworks */,
-				4D836059F00B0DBA4273B5538B05C8B8 /* Resources */,
+				5AD1BB607FC19B3D2A843E71EAD9C079 /* Headers */,
+				B3BC25F2B6585813D66042BA127945B4 /* Sources */,
+				781CAC434111081986005D6AE179F45B /* Frameworks */,
+				2A8C522002C381BD6379B621162EBD6C /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				231E9103A12C9D6D2FFD36A8C93EF047 /* PBXTargetDependency */,
+				43AFA46D98684D09B99287E674E5F02E /* PBXTargetDependency */,
 			);
 			name = ZIPFoundation;
 			productName = ZIPFoundation;
@@ -2390,21 +2447,21 @@
 		};
 		AA2E57587AA8EECA63C4BE08EA3CB6D2 /* RDReaderView */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = F16D8B273EBEE37B1D02577C1F80FBC0 /* Build configuration list for PBXNativeTarget "RDReaderView" */;
+			buildConfigurationList = 8540EC9800531BDA0C03FB4845F659B1 /* Build configuration list for PBXNativeTarget "RDReaderView" */;
 			buildPhases = (
-				882A35DD2D138E869538936BB36990F5 /* Headers */,
-				47D8FA6E64D374024A5F50412AE93F3A /* Sources */,
-				5B410CB9F9251380D43CF10EC78456FD /* Frameworks */,
-				0120E6CA91614494E73B25F963A172F0 /* Resources */,
+				DE3F4C7F9377D100DB74BA3F000B09AF /* Headers */,
+				E6425B0EE108EC8A74541DB0B963F16C /* Sources */,
+				E3E7B730857EF8492B63F6A72BA7E464 /* Frameworks */,
+				FFD07DB66DA92409892FE96247148801 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				439A5D204CA132E43B7266F13FDF7388 /* PBXTargetDependency */,
-				33B60FF4C9084A8C14F6F30C892BB2F2 /* PBXTargetDependency */,
-				01A7972E6B103D4FB665E6F8A7E1C556 /* PBXTargetDependency */,
-				F350E2BB76E9CD7B2BC4F30A529B67E8 /* PBXTargetDependency */,
-				4459335B1945B61BAFA82948CCDF5395 /* PBXTargetDependency */,
+				9AD27F66DA7E0D563340B6F20847F1C1 /* PBXTargetDependency */,
+				78502F06764BDC57A62D0C0A9F6E47D7 /* PBXTargetDependency */,
+				AC5A977034ED0B78AB5AE6C0C01DF0F4 /* PBXTargetDependency */,
+				1A6C9AD23C6554E3B62FA27710F2529D /* PBXTargetDependency */,
+				1030C22C57487EEEEE38DA568E70CBAB /* PBXTargetDependency */,
 			);
 			name = RDReaderView;
 			productName = RDReaderView;
@@ -2413,11 +2470,11 @@
 		};
 		AE7F393FB7805DE2664AB4111873F907 /* RDReaderView-RDReaderViewAssets */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 7B599DA10DBC43C031892AD62FAC7602 /* Build configuration list for PBXNativeTarget "RDReaderView-RDReaderViewAssets" */;
+			buildConfigurationList = FFB0B0C7770CDF7D1B0D2C8AB9A23EBC /* Build configuration list for PBXNativeTarget "RDReaderView-RDReaderViewAssets" */;
 			buildPhases = (
-				96683BD3472EB03A6A827FFCDB7797D4 /* Sources */,
-				5292D3D26A2DC560591441E981FB1A94 /* Frameworks */,
-				45521B9502775D0F06DEFA296CB0EBD0 /* Resources */,
+				5F464A0FAD44FF0690CE3793A04B3CBC /* Sources */,
+				2FB1B011B93858D09A0C6CD143EA8261 /* Frameworks */,
+				BBCA1427D5F1E8B09DA951857DF20A2F /* Resources */,
 			);
 			buildRules = (
 			);
@@ -2440,8 +2497,8 @@
 			buildRules = (
 			);
 			dependencies = (
-				3A4CA85CD501E26F47FEF54D2C836592 /* PBXTargetDependency */,
-				185983DF043945740D105A6741AF5D2B /* PBXTargetDependency */,
+				F63064D99717857A12A17BB77C2AF85D /* PBXTargetDependency */,
+				B8836D5EED68BA0E84AB53546B21C8C4 /* PBXTargetDependency */,
 			);
 			name = DTCoreText;
 			productName = DTCoreText;
@@ -2450,11 +2507,11 @@
 		};
 		C7A8D82E407CD3FDC3BA55CEE519B252 /* ZIPFoundation-ZIPFoundation_Privacy */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0CB12E502C69001797C4D5CDD0E7B2ED /* Build configuration list for PBXNativeTarget "ZIPFoundation-ZIPFoundation_Privacy" */;
+			buildConfigurationList = 75FB14909AEE2EADAF6FE7C23AFBFF36 /* Build configuration list for PBXNativeTarget "ZIPFoundation-ZIPFoundation_Privacy" */;
 			buildPhases = (
-				572FB42B212D2778EF8B6B9DEF7DDD12 /* Sources */,
-				EFF80230C069867F23EC724DDF1D1FEE /* Frameworks */,
-				B9A4D278AAE4FE4651BF2CEF487DC90A /* Resources */,
+				8842B178264377602772367EC5CA5E6B /* Sources */,
+				53B99546E8009C9D78F6F6D12AE65A9A /* Frameworks */,
+				EFD3E676324FAF2E9105D56BF9F44307 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -2505,18 +2562,11 @@
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		0120E6CA91614494E73B25F963A172F0 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8F63C186A01840708367DDD0552B55D2 /* RDReaderView-RDReaderViewAssets in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		2E8D20617D350B51A325B5D2F7641008 /* Resources */ = {
+		2A8C522002C381BD6379B621162EBD6C /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D82545E53018482BDC16B0FCB5CB6E6C /* ZIPFoundation-ZIPFoundation_Privacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2528,28 +2578,10 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		45521B9502775D0F06DEFA296CB0EBD0 /* Resources */ = {
+		723A5A68AB37315B01EF2160C4D58249 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				04CC1B53A7996C3112B381C0841422F6 /* cssInjector.js in Resources */,
-				1821DCCE34F09CFAFC840B8056261A3B /* epub-bridge.js in Resources */,
-				098C86F512F5D27BE51A986EE53F04D7 /* epub-fixed-layout.html in Resources */,
-				B6156859B01AE15CA20869141C0F5914 /* rangy-core.js in Resources */,
-				787A89A480FCFCBE300480551367DAC0 /* rangy-serializer.js in Resources */,
-				ADA006AA88365E10705F06FE241E65FA /* WeReadApi.js in Resources */,
-				E773C6855B72CC824C66583C70B14B38 /* wxread-dark.css in Resources */,
-				5F788EB474B6ACAA7BF1378543E68C21 /* wxread-default.css in Resources */,
-				DC03B7E7180F57A7F42BCB3847033A0B /* wxread-replace.css in Resources */,
-				71E8A7F8BB7FB63B6D74C5F4F6ABC07F /* wxread-replace-latin.css in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4D836059F00B0DBA4273B5538B05C8B8 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				74CE3468F82BB2902D842848C9775B1B /* ZIPFoundation-ZIPFoundation_Privacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2560,324 +2592,139 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		8446E19BDCE9F10BF75CF46493F64473 /* Resources */ = {
+		86ACDD3DC75BBF3794E1D7168E84C2A1 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A8758C9177186CF7ED8A31A1291FF064 /* Resources */ = {
+		BBCA1427D5F1E8B09DA951857DF20A2F /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0557AE0592F9E47318DE2506BEE0C38A /* SnapKit-SnapKit_Privacy in Resources */,
+				622E2F71BD252D844AC6838D3B58CB84 /* cssInjector.js in Resources */,
+				FF30530E9BFE73D2EC9A20EB624B4528 /* epub-bridge.js in Resources */,
+				89E1D4F05CD7B039976926997D4F484D /* epub-fixed-layout.html in Resources */,
+				F5935539246A112F248693526C1503FC /* rangy-core.js in Resources */,
+				AFEC35CEF2F2F0F83DF93E373C44AEB3 /* rangy-serializer.js in Resources */,
+				7D56C992720BEBF70F07BC75928B7E3A /* WeReadApi.js in Resources */,
+				8A36D24AF7E197C7C3A37C7F6D6B3453 /* wxread-dark.css in Resources */,
+				D43CB99286214EB5B234FF938ABC3BBD /* wxread-default.css in Resources */,
+				D7ABE878F849DA06F8A108420028D0B1 /* wxread-replace.css in Resources */,
+				710ABD1A096056EFC2A092E018DB1BA8 /* wxread-replace-latin.css in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		B9A4D278AAE4FE4651BF2CEF487DC90A /* Resources */ = {
+		C2B4CAC57336570A5968115BB042A4AB /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C08EE3D59E015F70D7DA1B6FFFFD5F5 /* PrivacyInfo.xcprivacy in Resources */,
+				69D8C5CBC71777316973C43255140F0B /* default.css in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		B9F0E549414EF5B58BF105B2047E6D63 /* Resources */ = {
+		E5B263B619ECBCC8AF126A3C64B39129 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				891E0449FE11F17533AC779163D577E8 /* PrivacyInfo.xcprivacy in Resources */,
+				0D92A7F76F994F8709CACA82062165CC /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		FBC8CA4E77AABAFCAD355F06CC7A27CA /* Resources */ = {
+		EFD3E676324FAF2E9105D56BF9F44307 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				06F07DCF356C7F3C8924701B45FB9317 /* default.css in Resources */,
+				EF1B4ECA85C386854877F6F8EB9B19DC /* PrivacyInfo.xcprivacy in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		F9E2A4D154004CF62A22F6BAFDA37431 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D8A67D6CCD80C9BDCE4DFB88AF6A7A37 /* SnapKit-SnapKit_Privacy in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		FFD07DB66DA92409892FE96247148801 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				46489255286B880DBCB326C15E0058BF /* RDReaderView-RDReaderViewAssets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		3408CC4FF47B56867DF8C6C59DE3D265 /* Sources */ = {
+		33C49E2D6C2695929880A62FAE989328 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				31936037BAEE5E4BEE51079EBCBE7979 /* DTActivityTitleView.m in Sources */,
+				CD34CD25B6D8F562DAACBF8A8DBFB4A7 /* DTAnimatedGIF.m in Sources */,
+				0EC42ADE0B83491854E458B0D00EE49A /* DTBase64Coding.m in Sources */,
+				31D1715DF1621964DCA8D10501899FF8 /* DTBlockFunctions.m in Sources */,
+				3044AAD1DE4C39601994F84CEE57223D /* DTCoreGraphicsUtils.m in Sources */,
+				E75650616E01EFA39EF0F42279CDB0DE /* DTCustomColoredAccessory.m in Sources */,
+				9F3A7E6E019A523F112D66622F13D2C4 /* DTExtendedFileAttributes.m in Sources */,
+				5EC723A8387A3F88A30A25863FFBA52F /* DTFolderMonitor.m in Sources */,
+				665EE2D835C5DF71A6A4FFA82994C388 /* DTFoundation-dummy.m in Sources */,
+				E3DABD5EB079D2F846A71E05D6F9C58C /* DTFoundationConstants.m in Sources */,
+				2B636C6C8FFECF2614162FD48ED07017 /* DTHTMLParser.m in Sources */,
+				017C8BDE742F347FB3D4D7E5A365B757 /* DTLog.m in Sources */,
+				0CB5057B141757B491EA31E8D6DB33EB /* DTPieProgressIndicator.m in Sources */,
+				6AC430FFDF68F98357C898D6858904DB /* DTSmartPagingScrollView.m in Sources */,
+				E2EF13E16C0AD5AA232A647699EBE949 /* DTTiledLayerWithoutFade.m in Sources */,
+				854FA236832E01DEBB7E96C36877C147 /* DTVersion.m in Sources */,
+				F1DA41F2D5EB8A732EB2E1A3D3775368 /* NSArray+DTError.m in Sources */,
+				00EC20B980D829A07C2F25D0E317DBAA /* NSData+DTCrypto.m in Sources */,
+				C21E42AA79E5C63040B163B0C2FFC947 /* NSDictionary+DTError.m in Sources */,
+				074DAE005137E6E89D69DC0E8765EAB0 /* NSFileWrapper+DTCopying.m in Sources */,
+				9E0BECACB09C20F2A4C0B2C676D074DE /* NSMutableArray+DTMoving.m in Sources */,
+				2ACF19FB7F905D8831BF3779A1D2E0DC /* NSString+DTFormatNumbers.m in Sources */,
+				D6BB51AC76A2639666B4C3B11E4F53A6 /* NSString+DTPaths.m in Sources */,
+				175182AF75968DA8966AFC28250C3E0F /* NSString+DTURLEncoding.m in Sources */,
+				AB75C75F5D829A0BF57969234A63ED59 /* NSString+DTUtilities.m in Sources */,
+				51BE76461ABF61F23EF33C7806706720 /* NSURL+DTAppLinks.m in Sources */,
+				653FF238952AF22C828EFD68EA3A2BBE /* NSURL+DTComparing.m in Sources */,
+				9E3AB25F2D6F511C03EFB50D2256A6FD /* NSURL+DTUnshorten.m in Sources */,
+				6576F9624F055FF3E27A20613FBF8EAF /* UIApplication+DTNetworkActivity.m in Sources */,
+				C44AC1B338F7162DA062A24F37F8B607 /* UIImage+DTFoundation.m in Sources */,
+				8E1A93C0442BC9FC1E131BB841AACA59 /* UIScreen+DTFoundation.m in Sources */,
+				A77F198B69481699E6FCEAFBCDA2F8DA /* UIView+DTFoundation.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		37F8F3221F85D579243C81EB7F1B3791 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DFC9D618545AE33032AEF2CA1BB3E07D /* SSAlertAnimation.swift in Sources */,
+				FBED75A2764DF39E8AFDF8B66AB145CF /* SSAlertAnimationController.swift in Sources */,
+				7257D4B97C3B2C046A950B54C6AD31FB /* SSAlertCommonView.swift in Sources */,
+				663A22A63DF740DE2DDD9F94FBCDED1B /* SSAlertDefaultAnmation.swift in Sources */,
+				881F85E9E489847191F88182118C8018 /* SSAlertPresentAnimation.swift in Sources */,
+				40BFADA4560F1139652A89FA86489ABE /* SSAlertSwift-dummy.m in Sources */,
+				9FAE9BBC8C82AFDB267CF042CAE91557 /* SSAlertView.swift in Sources */,
+				FB85B50672F0BFADF5AA7F3B430B7B95 /* SSAlertViewExtention.swift in Sources */,
+				DA1847B8B46AE4E2BEA8B767EE215437 /* UIViewFrameExtension.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		45178994E85B3554E2F8C03CE228B2F8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		47D8FA6E64D374024A5F50412AE93F3A /* Sources */ = {
+		5F464A0FAD44FF0690CE3793A04B3CBC /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6EB20044871ACD69CE8099B349A39188 /* RDEPUBAnnotationModels.swift in Sources */,
-				CA9F6422AE5FD205DDDBB917519B178B /* RDEPUBAssetRepository.swift in Sources */,
-				E94C09071F83FF35E5FA4FAFAFF3F03F /* RDEPUBAttachmentNormalizer.swift in Sources */,
-				02D5DD3053995A6414F5E74AA62A9D86 /* RDEPUBBackgroundCoverageStore.swift in Sources */,
-				56C59D6D236063909A0518D75B67C300 /* RDEPUBBackgroundPriorityPolicy.swift in Sources */,
-				F8552322BBA4332CF73730B17CD042C9 /* RDEPUBBackgroundTrace.swift in Sources */,
-				DF454D4C187602157213EA9AABBBF52D /* RDEPUBBookPageMap.swift in Sources */,
-				30152FAF375CFF872A8224FDCA86F1C6 /* RDEPUBBuildDiagnosticsReporter.swift in Sources */,
-				63D821BF32D922084839CAC146A92CD9 /* RDEPUBCFI.swift in Sources */,
-				CFFDCDD3FE460D5A6EB665AB8C1CDAB5 /* RDEPUBCFICompatibility.swift in Sources */,
-				D6CC2FB33F49D4BBBCD0401168697F2C /* RDEPUBCFIDOMPathBuilder.swift in Sources */,
-				5B7D36E8DAB6192ECC0EBCEFA2A8F4A4 /* RDEPUBCFIError.swift in Sources */,
-				F2CFAE49CDC4289600B924208E5DEC2D /* RDEPUBCFIGenerator.swift in Sources */,
-				7236084C28CBD5B5A8FFB38A7F208C43 /* RDEPUBCFIMap.swift in Sources */,
-				372C0740C5EED5C26DC875692045C5D0 /* RDEPUBCFIMarkerInjector.swift in Sources */,
-				7475815C329728A28FE397F1F2AA0701 /* RDEPUBCFIParser.swift in Sources */,
-				6470C19989C547D12A434E2A53717224 /* RDEPUBCFIPath.swift in Sources */,
-				6A559A6D190135E5251C0357CAB280DC /* RDEPUBCFIRange.swift in Sources */,
-				7CC14FBE11FC07233CCAC05B923B42D9 /* RDEPUBCFIRecoveryEngine.swift in Sources */,
-				939A70A53856930A9D478413E2DEE941 /* RDEPUBCFIResolver.swift in Sources */,
-				C3A4A65E35C3F6A9DA7CC179E23B1F6C /* RDEPUBCFISerializer.swift in Sources */,
-				C1EC7E24023F1217523A291E927977DE /* RDEPUBCFITextAssertion.swift in Sources */,
-				DD96A47938E81F63659B3CBB739D0DC1 /* RDEPUBChapterCacheKey.swift in Sources */,
-				D90FFBF1D556B06DE7B427BA2D3776DD /* RDEPUBChapterData.swift in Sources */,
-				27E3B09CFC53A752CE3AAD42C2AA1534 /* RDEPUBChapterDataCache.swift in Sources */,
-				D7131B9C9E9054E4D26BDC521468BBD9 /* RDEPUBChapterLoader.swift in Sources */,
-				53D40D48ED1D448218140D554BDA8D72 /* RDEPUBChapterLocation.swift in Sources */,
-				A5E40959919D780747C1315E7AC4E7EC /* RDEPUBChapterOffsetMap.swift in Sources */,
-				566BAF8F3A4F7CDC18257CDC85026824 /* RDEPUBChapterPageCounter.swift in Sources */,
-				68435959192A7323E065BD7FACCA1BF6 /* RDEPUBChapterRuntimeStore.swift in Sources */,
-				52175713D0946A41E8B3456962C66497 /* RDEPUBChapterSummaryDiskCache.swift in Sources */,
-				9B368DAD70196B4F91CE19EC87FE7ED6 /* RDEPUBChapterTailNormalizer.swift in Sources */,
-				E52EC412296A7717D7FA56B5BD01C513 /* RDEPUBChapterWindowCoordinator.swift in Sources */,
-				650AA0BA1DAEA3F329B56E95AB1D42CF /* RDEPUBChapterWindowSnapshot.swift in Sources */,
-				321B7492C392FD926990F3C22046D36C /* RDEPUBCoreTextPageFrameFactory.swift in Sources */,
-				4A2DFBC6BC78F69E2E1271B172961573 /* RDEPUBCSSCompatibilityLayer.swift in Sources */,
-				915041EAF44F49DD33026F2C5E5C73FA /* RDEPUBDTCoreTextRenderer.swift in Sources */,
-				7C78B8C266AFAF03321FE8840A97E814 /* RDEPUBFixedLayoutTemplate.swift in Sources */,
-				EC7C707E329F73E6A9E850D337EFA5C0 /* RDEPUBFontFallbackResolver.swift in Sources */,
-				5F6F3D933CE5D01482234305856739AF /* RDEPUBFontNormalizer.swift in Sources */,
-				3DA0E91F1BA8F67C49BE76D012A51C24 /* RDEPUBFragmentMarkerInjector.swift in Sources */,
-				08EBB80B87F5589594B1EA582F688465 /* RDEPUBHTMLNormalizer.swift in Sources */,
-				A67994574E34ABDC487483B82E85BB5C /* RDEPUBJavaScriptBridge.swift in Sources */,
-				AA542B6FF2517B5FB42279893006FD1A /* RDEPUBJumpSession.swift in Sources */,
-				D69B79197D8DC887268D5A4322D2CF19 /* RDEPUBModels.swift in Sources */,
-				FED6159088F974B8E6A43A3A54DB8D2A /* RDEPUBNavigatorLayoutContext.swift in Sources */,
-				163366AF0E3A9C2D35D4B214AE517BFE /* RDEPUBNavigatorState.swift in Sources */,
-				9A90F138CC446311E9EBF0BED8B1862C /* RDEPUBNoteDetector.swift in Sources */,
-				18DC401EAF2806E997C291DA99117777 /* RDEPUBNoteModels.swift in Sources */,
-				1E9D894DBECB080883E51F02663B39F3 /* RDEPUBNotePopupCoordinator.swift in Sources */,
-				AE07EE1F495FEAC486341ECEFA5DBCFB /* RDEPUBNotePopupViewController.swift in Sources */,
-				F46FE18A83609747A98BFB3011CB9F92 /* RDEPUBNoteResolver.swift in Sources */,
-				42A88BC5E0C5515E4B19A41507D8F08E /* RDEPUBPageBreakPolicy.swift in Sources */,
-				3C140FC052F8A1D7EF246A1029FD4C69 /* RDEPUBPageCountCache.swift in Sources */,
-				A2A444207C3B1A5B72F73E2F999C534E /* RDEPUBPageInteractionController.swift in Sources */,
-				65F0FB3107C4EB7C89DFDC4DD5567154 /* RDEPUBPageLayoutSnapshot.swift in Sources */,
-				857D53BF180B0C00F246EBA242A44D1E /* RDEPUBPageMapReconciliationCoordinator.swift in Sources */,
-				18BBD23FB90837351F558436FC08FF06 /* RDEPUBPageResolver.swift in Sources */,
-				76C1DA084D7739817E73CC0C60EEFC49 /* RDEPUBPaginationCacheCoordinator.swift in Sources */,
-				BF38A3D9899E21F3B93E3B8F5C215F87 /* RDEPUBPaginationModels.swift in Sources */,
-				4F1F69CAEDB394394069F0D48FB63D3C /* RDEPUBPaginator.swift in Sources */,
-				F54B644C537B12EF0CF0537508D6CEC0 /* RDEPUBParser.swift in Sources */,
-				B562932FE745F1A6CA7930F5E41FC746 /* RDEPUBParser+Archive.swift in Sources */,
-				5DC3DEE7A8C6824615C9A743FC27F993 /* RDEPUBParser+Package.swift in Sources */,
-				DD831DE756363B68C0F19F83877CBF0E /* RDEPUBParser+ReadingProfile.swift in Sources */,
-				705EAED110DC2F226319FFD9B36B4CC9 /* RDEPUBParser+Resources.swift in Sources */,
-				031DCDCD6003C70308E7A4B45790F95C /* RDEPUBParser+TOC.swift in Sources */,
-				3A19DC1CCF05E3E0E03E1D2F649E9B25 /* RDEPUBPreferences.swift in Sources */,
-				11A0AF34C098CABA6F95B2BFBEB8C33C /* RDEPUBPublication.swift in Sources */,
-				E074FC6C1714AC53B2D7A9D0FFDB14A4 /* RDEPUBReaderAnnotationCoordinator.swift in Sources */,
-				2FEF9BD3D2DCF9984F302B0B342E2FDE /* RDEPUBReaderAssemblyCoordinator.swift in Sources */,
-				AB86D7DAB8714917AE61286A40FFB664 /* RDEPUBReaderBottomToolView.swift in Sources */,
-				BB5D44E1C77D642626074B84023846CE /* RDEPUBReaderChapterListController.swift in Sources */,
-				EBDAD94BDD46CA5E364ADC8F7CDCE33F /* RDEPUBReaderChromeCoordinator.swift in Sources */,
-				E9A86376A9B8CE0E157973311E4437FB /* RDEPUBReaderConfiguration.swift in Sources */,
-				8756466238E4204DE6C7327927630DC6 /* RDEPUBReaderContext.swift in Sources */,
-				9080D65381750D0F5B23087BA599AE8E /* RDEPUBReaderController.swift in Sources */,
-				8C435FCC66E721453D7C759238497698 /* RDEPUBReaderController+ContentDelegates.swift in Sources */,
-				E3A350A70196BFE24CE5F93544E25519 /* RDEPUBReaderController+DataSource.swift in Sources */,
-				A394725B4499E22C8669E55D912C91B4 /* RDEPUBReaderController+PublicAPI.swift in Sources */,
-				0E847D1383A858DE31A259F51A5DEAC6 /* RDEPUBReaderController+RenderSupport.swift in Sources */,
-				6021C418957959D68D53C7E1FB3C4B0B /* RDEPUBReaderController+RuntimeBridge.swift in Sources */,
-				148E8A59B31A7BCB2C1175ADAF5B1021 /* RDEPUBReaderController+TableOfContents.swift in Sources */,
-				8911BBBF7ADE926203F4423DC3DF3642 /* RDEPUBReaderDelegate.swift in Sources */,
-				02E41306F02C87A79CC3902900607CBC /* RDEPUBReaderDependencies.swift in Sources */,
-				9EDA37738AFCFBFEF1DD36DE8A7A49DB /* RDEPUBReaderHighlightsViewController.swift in Sources */,
-				6989BE7D78DC40CFCC5A4DD0DE4EBA3F /* RDEPUBReaderLoadCoordinator.swift in Sources */,
-				C303031A0364DA3E687B32D0B451F2F1 /* RDEPUBReaderLocationCoordinator.swift in Sources */,
-				6010BB9D0F5416E28349CA1DB2110CD5 /* RDEPUBReaderPaginationCoordinator.swift in Sources */,
-				EBC99AB5A6A74DD1BACCEA4D47F801B4 /* RDEPUBReaderPersistence.swift in Sources */,
-				38C261F16337E9B69ED2742E534A74DA /* RDEPUBReaderRuntime.swift in Sources */,
-				908D54E4BF1977EAEA4C21EF0625E155 /* RDEPUBReaderSearchBarView.swift in Sources */,
-				9121AA03AF52A60DEA2380B5CA89D1D7 /* RDEPUBReaderSearchCoordinator.swift in Sources */,
-				C42B3BDDA31EFA537A1C44507B40796E /* RDEPUBReaderSettings.swift in Sources */,
-				A4B36C7AD680BF85951DDB4212E61813 /* RDEPUBReaderSettingsViewController.swift in Sources */,
-				9532BF0A971E323676EFDD2411749FDD /* RDEPUBReaderTableOfContentsItem.swift in Sources */,
-				375C7EC87B5FB3F6680B1F0E91141FB0 /* RDEPUBReaderTheme.swift in Sources */,
-				B5AF31527268F433A01F893D5E4AAF6D /* RDEPUBReaderToolView.swift in Sources */,
-				07FDD48A01F5971181FBF1E103EA8CDE /* RDEPUBReaderTopToolView.swift in Sources */,
-				5CDFEE586150D99255A6F6318B3A5199 /* RDEPUBReaderUIState.swift in Sources */,
-				5B9AF3B2FA07F664822E2C84C68DA81F /* RDEPUBReaderViewportMonitor.swift in Sources */,
-				8A9594A6C2B72DDA1774776112384E4B /* RDEPUBReadingLocationModels.swift in Sources */,
-				5DD8AA7E9E05A8BC5A963DED5BD87440 /* RDEPUBReadingSession.swift in Sources */,
-				B5DFAAC5B3565D7DABE3DCE29921BF03 /* RDEPUBRenderDiagnosticsCollector.swift in Sources */,
-				FBEACC8DF62FC4C1FB93A4A2EFD38A15 /* RDEPUBRenderRequest.swift in Sources */,
-				BA922B8060094435362C68B9E701A93D /* RDEPUBResourceResolver.swift in Sources */,
-				CAF3131A34F65AB4827FB6931331DA53 /* RDEPUBResourceURLSchemeHandler.swift in Sources */,
-				B5C060894953803A1C8E921C2F62B8AA /* RDEPUBRuntimeChapter.swift in Sources */,
-				27CA932D638248B5B6E6461F2141ECAA /* RDEPUBRuntimePageCount.swift in Sources */,
-				0E8C12C184757856BAC8A177F0E54E63 /* RDEPUBSearchEngine.swift in Sources */,
-				6E0DCCC04DD942BC1F6892E8E51FBDF0 /* RDEPUBSearchModels.swift in Sources */,
-				F7CE9CF62DFAF054EE7BCA3DC610C5F9 /* RDEPUBSelectionOverlayView.swift in Sources */,
-				0C73CB58FBC9B43ED47146B319B25478 /* RDEPUBSelectionState.swift in Sources */,
-				0DD457CB67E0BA8ECD06B62C25ED5761 /* RDEPUBSemanticMarkerInjector.swift in Sources */,
-				99B21F07C375B29F061A58FD010C6D36 /* RDEPUBStyleCompatibilityModels.swift in Sources */,
-				907FC3391070B837BBDB851543F442E2 /* RDEPUBStyleSheetBuilder.swift in Sources */,
-				999F98E81D2EA3CAE05E459743D10063 /* RDEPUBStyleSheetComposer.swift in Sources */,
-				BFA431FA4D57E18F63FB9CF90356D8B8 /* RDEPUBTextAnchor.swift in Sources */,
-				EB8532601EE34C9E1755ABED430D4B34 /* RDEPUBTextAnnotationOverlay.swift in Sources */,
-				02794ACD3F42F5491DEF84BA009B0F5A /* RDEPUBTextBookBuilder.swift in Sources */,
-				44FD96B04359F05543DD91BF291C3396 /* RDEPUBTextBookCache.swift in Sources */,
-				212137325B8B7FA304F53A2A9FA1D207 /* RDEPUBTextBookModels.swift in Sources */,
-				812EF243972726E849BA2372EED99D0A /* RDEPUBTextBuildPipelineInterfaces.swift in Sources */,
-				BD68AECDC3F4B54880C7609A8EF2C288 /* RDEPUBTextContentView.swift in Sources */,
-				139994D6DAE38BD8EE102EB342C8E61D /* RDEPUBTextIndexTable.swift in Sources */,
-				41C76F526D6730D50F949F441B3A5622 /* RDEPUBTextLayouter.swift in Sources */,
-				430B7F50CA10F44CEA21D1ADC7AAD7F7 /* RDEPUBTextLayoutFrame.swift in Sources */,
-				6B466804501F9AD2A8798BF8F7135B73 /* RDEPUBTextPageDecorationView.swift in Sources */,
-				EC484AB2398C0459254FA4BFFF9098AB /* RDEPUBTextPageRenderView.swift in Sources */,
-				4973DD76014C7D52D49336FB09FF40B2 /* RDEPUBTextPaginationInterfaces.swift in Sources */,
-				908EE8F1D608C29BD92AE13D674C8C94 /* RDEPUBTextPaginationSupport.swift in Sources */,
-				59973A202457D00093195534132A5C7E /* RDEPUBTextPerformanceSampler.swift in Sources */,
-				66322F6BE870B4070610CD0606084C18 /* RDEPUBTextPositionConverter.swift in Sources */,
-				2B5D066B1A3182465F3BC487E09E75A7 /* RDEPUBTextRenderer.swift in Sources */,
-				19B463842FAB4F381F5029633C3A4BBA /* RDEPUBTextRendererSupport.swift in Sources */,
-				32E7466AFBD2A21BE166BC60E3FBC6A1 /* RDEPUBTextSearchEngine.swift in Sources */,
-				19F0D582B0D7ACF55B5DED2F3C574D7F /* RDEPUBTextSelectionController.swift in Sources */,
-				5A1875EEE50E68B95B134392785F33AD /* RDEPUBTypesettingPipeline.swift in Sources */,
-				E2139F184D3E5233D6B205AEA9B9B249 /* RDEPUBViewportTypes.swift in Sources */,
-				958009C6CEEBFB5B3EE81410143C2CB7 /* RDEPUBWebContentView.swift in Sources */,
-				A27E47D12F09D1A2958EAA72135A39B0 /* RDEPUBWebDecorationOverlayView.swift in Sources */,
-				FCBE9D4002A4EC620BDEF4F9A9DAEC9E /* RDEPUBWebView.swift in Sources */,
-				B576DE2193FF581A7224630D023D1F47 /* RDEPUBWebView+Configuration.swift in Sources */,
-				014DF767E7F65A77A6B37D043CED5BAA /* RDEPUBWebView+FixedLayout.swift in Sources */,
-				44DF1D504693C82463D12814053B3129 /* RDEPUBWebView+JavaScriptBridge.swift in Sources */,
-				91C040B00DD058EDD3070C560E512870 /* RDEPUBWebView+Reflowable.swift in Sources */,
-				C435763538F1833C7585D0BEA76E8F7A /* RDEPUBWebView+Search.swift in Sources */,
-				C508A072F350DB2FC91DA07ABD60AF54 /* RDEPUBWebViewDebug.swift in Sources */,
-				13389E3AE0A86063B6E3A5BD45B8202C /* RDPlainTextBookBuilder.swift in Sources */,
-				34B9FF3A8CF941CD7CD9672B32B035E1 /* RDReaderContentCell.swift in Sources */,
-				7EC875066CFAF967E3415BB525F73FAE /* RDReaderFlowLayout.swift in Sources */,
-				FE5B20D993894A7905B8F6ABCA986548 /* RDReaderGestureController.swift in Sources */,
-				2188FC782E46E8511439AEAFD9D714C8 /* RDReaderPageChildViewController.swift in Sources */,
-				9DEB9BB623EBC6B44295E85FD3EFFEE3 /* RDReaderPagingController.swift in Sources */,
-				6891AA35BABE5358C9BFCE3491FD5665 /* RDReaderPreloadController.swift in Sources */,
-				C7003533316850A97C2BED0881B2034C /* RDReaderSpreadResolver.swift in Sources */,
-				FA44FE4E1274B2F105418FB23EFE315A /* RDReaderTapRegionHandler.swift in Sources */,
-				2980081BE00EA77C2AF67C725958E14E /* RDReaderView.swift in Sources */,
-				B89ECFCE925AD94CD6E41E097CCDE392 /* RDReaderView+CollectionView.swift in Sources */,
-				C2F92D244F61B2C60CF4D52497065AAD /* RDReaderView+ContentAccess.swift in Sources */,
-				0A79F0C5247E793991BCCC3C4C8FBCEA /* RDReaderView+PageCurl.swift in Sources */,
-				8D4F4FAE8F8328B149BBAB395F43AB53 /* RDReaderView+ToolView.swift in Sources */,
-				9C767620CD04CA91DE82024489960BA3 /* RDReaderView-dummy.m in Sources */,
-				4C33C6784F628AF36EABA082613B7F50 /* RDReaderViewProtocols.swift in Sources */,
-				5245E48FEB0384830479DC0E5C87C7E0 /* RDURLReaderController.swift in Sources */,
-				9BEFAE4466A0B5A496BE74065C38645D /* String+SHA256.swift in Sources */,
-				2607587B5FDA75B26AA6752D53807F08 /* UIColor+RDEPUBHex.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		4A00B8E75E30533B7636BC36ABC85ECC /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				77FFFEA4543216843977F6D8C9DD1D63 /* SSAlertAnimation.swift in Sources */,
-				00A2A1FA31C654A3F77457EB74C3A413 /* SSAlertAnimationController.swift in Sources */,
-				463D329012D5C787425D1345B1633E57 /* SSAlertCommonView.swift in Sources */,
-				A4DC5EAA80207BB182178B58807880D5 /* SSAlertDefaultAnmation.swift in Sources */,
-				4220674496D5B5AE5B59CE4B3CB78E09 /* SSAlertPresentAnimation.swift in Sources */,
-				CC34EC85C707EE28DB85655982938E8F /* SSAlertSwift-dummy.m in Sources */,
-				78E15B8B4A98C888B5F9EC251680DB79 /* SSAlertView.swift in Sources */,
-				198B592D09442217CE19FCB164656801 /* SSAlertViewExtention.swift in Sources */,
-				CCEB2BAB2BA215317C7C0259362123AF /* UIViewFrameExtension.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		572FB42B212D2778EF8B6B9DEF7DDD12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		579910B7BBE50695FD70458D3209F68A /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				30918A2B4503249D8335CEA4211F7F3D /* DTActivityTitleView.m in Sources */,
-				889C26ED07D0A2F8796405247FC3AC39 /* DTAnimatedGIF.m in Sources */,
-				92A4A806D06FAD5182EE471E96ACD2BC /* DTBase64Coding.m in Sources */,
-				8A3E91511D35F720D24E0959AD33CC4A /* DTBlockFunctions.m in Sources */,
-				2007C62F53DDCBE211EB0B023BBB7CE9 /* DTCoreGraphicsUtils.m in Sources */,
-				F04F9A4C7D6A7E41E2EDCEFB7836BE88 /* DTCustomColoredAccessory.m in Sources */,
-				DCF1ACFE1AAB8684EB1B7B955C5D4317 /* DTExtendedFileAttributes.m in Sources */,
-				A06CB5E46628F4DE1ECB3A34A1791F07 /* DTFolderMonitor.m in Sources */,
-				9DC672DFFD27E2EF547BFCFBF3971A7F /* DTFoundation-dummy.m in Sources */,
-				9B083C52CC3C864A5E180EB56C890C6E /* DTFoundationConstants.m in Sources */,
-				38D4A2C8E463ABD4D15994EFD7BAE2FA /* DTHTMLParser.m in Sources */,
-				466E26F6E7B4C5857B1C2C6693AAE07D /* DTLog.m in Sources */,
-				9A99AC0E41FD70DC5F6E1409DCB4D3A0 /* DTPieProgressIndicator.m in Sources */,
-				6737262A5610AAE852865AED829531FF /* DTSmartPagingScrollView.m in Sources */,
-				A3C72E26D73B4403AD31910648E15966 /* DTTiledLayerWithoutFade.m in Sources */,
-				1121E539EAEFEB583A86DEA256B1DF16 /* DTVersion.m in Sources */,
-				7234916E634614EC8BDB209528321051 /* NSArray+DTError.m in Sources */,
-				51FC51399196DA502C5A7087A976BAA9 /* NSData+DTCrypto.m in Sources */,
-				EA8D6C10D4CACE2008A0E96285AEC050 /* NSDictionary+DTError.m in Sources */,
-				BC41348E87B5BA8145E77BC43D319CE0 /* NSFileWrapper+DTCopying.m in Sources */,
-				36EA1AECCD44BFCB0B0F5D813C498BA5 /* NSMutableArray+DTMoving.m in Sources */,
-				8A796167F78E7213BDBE910DA0EC51BD /* NSString+DTFormatNumbers.m in Sources */,
-				C11CEEFE19F7AD96531475BF3C2717C4 /* NSString+DTPaths.m in Sources */,
-				3EE5432AB09356A3B677F4EB66257001 /* NSString+DTURLEncoding.m in Sources */,
-				48410E1D5D8A303BFE707BF9D06A9210 /* NSString+DTUtilities.m in Sources */,
-				280F95B9F931FA58FB5BF0AD31364517 /* NSURL+DTAppLinks.m in Sources */,
-				644114C901096954AA267E5D3A85A182 /* NSURL+DTComparing.m in Sources */,
-				09479E3AAA909AA4F39578B7EF7C12A2 /* NSURL+DTUnshorten.m in Sources */,
-				F3A41EAF1A9C8FC48F8FA5C8FA81B858 /* UIApplication+DTNetworkActivity.m in Sources */,
-				7F73E2ADFC433DE918E6F71916598B17 /* UIImage+DTFoundation.m in Sources */,
-				34E5F03407D6D33E77BC9F05BB743636 /* UIScreen+DTFoundation.m in Sources */,
-				3B49766F799BF9C74FBC713811681F70 /* UIView+DTFoundation.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		5C0CA40E9BF5DBC3C23B9C4230AFD8E0 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		612716D206ABF0D3B09EB925A2CE6661 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				4C1E7C46DA5071BD121AF6FF7B07D26A /* Archive.swift in Sources */,
-				DF0D5EE64671C5F1138FE612E8BBE666 /* Archive+BackingConfiguration.swift in Sources */,
-				FDE9F03A81F1492AD60AF53730A61352 /* Archive+Deprecated.swift in Sources */,
-				5945DD8DDFF95E316EBEDF4AC65A7DFB /* Archive+Helpers.swift in Sources */,
-				C740389CA25B550AA7B5F7F1DF9B1180 /* Archive+MemoryFile.swift in Sources */,
-				62F47F2402C4E4EB1CA3D37E59F8F426 /* Archive+Progress.swift in Sources */,
-				C82B082DF9CD6E51EC40E61B778EECDC /* Archive+Reading.swift in Sources */,
-				832290E95766703410BDA44A7BFF71BB /* Archive+ReadingDeprecated.swift in Sources */,
-				64B956A1D635977726C4EA16569355DD /* Archive+Writing.swift in Sources */,
-				06045B0044D4688219C0A02186A69E8B /* Archive+WritingDeprecated.swift in Sources */,
-				FFCEC4C0D66DB6782F57C14EDA462592 /* Archive+ZIP64.swift in Sources */,
-				A4F298F535DCE8A56710325CD29C8E93 /* Data+Compression.swift in Sources */,
-				CB44494C095409D4934FB8D5B2D789C9 /* Data+CompressionDeprecated.swift in Sources */,
-				9935B693C0B9547788918B31D20DD26A /* Data+Serialization.swift in Sources */,
-				A076C50C4FD7E9417F294A573598A9D8 /* Date+ZIP.swift in Sources */,
-				45FE3D80303BBDE2949908CCE024A12A /* Entry.swift in Sources */,
-				0699E23859E051B40C29FAEE703AAE3B /* Entry+Serialization.swift in Sources */,
-				14CE63869011AB39B35A85672A9C5160 /* Entry+ZIP64.swift in Sources */,
-				8574BB4508B9A1E3E83F2F47858187DF /* FileManager+ZIP.swift in Sources */,
-				954A2998815478C63249339AF0BE4913 /* FileManager+ZIPDeprecated.swift in Sources */,
-				E9FC1457B4A0674AA56701E9D471D1C9 /* URL+ZIP.swift in Sources */,
-				C76E76733AA9041D286AC0D8E38E8A41 /* ZIPFoundation-dummy.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2889,58 +2736,287 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9198736E7F85E7AEFEBFB9B08762695C /* Sources */ = {
+		8842B178264377602772367EC5CA5E6B /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				60F04C8C1CFCDC5E38F8663859412A03 /* Constraint.swift in Sources */,
-				1CA3B649A1C37BF66FA7A3C7759169D5 /* ConstraintAttributes.swift in Sources */,
-				7C717061D9006B8C5BC620D4C3E6DCC0 /* ConstraintConfig.swift in Sources */,
-				61959A29CBBD6A210737E5F55071189E /* ConstraintConstantTarget.swift in Sources */,
-				7E287D2573C55B94FDFF9FE07D72C142 /* ConstraintDescription.swift in Sources */,
-				9D12562D167F9B970FA5846FF7A4A697 /* ConstraintDirectionalInsets.swift in Sources */,
-				201C85ECDAAC33554D4F6F42BC88E98F /* ConstraintDirectionalInsetTarget.swift in Sources */,
-				004A896E9268C5C8310A2C546B18A54A /* ConstraintDSL.swift in Sources */,
-				77AEBCE5F60D21F2CEB4BF3893D73D36 /* ConstraintInsets.swift in Sources */,
-				199F1C8881CDBEAE57DFB65506C7DEF4 /* ConstraintInsetTarget.swift in Sources */,
-				8DF5BA92DDF53DC055E8C7E975A30452 /* ConstraintItem.swift in Sources */,
-				3135BC3DE6BF95DD048166D4009250F2 /* ConstraintLayoutGuide.swift in Sources */,
-				AE53CBB88AA774E6D70565B8F8D552C7 /* ConstraintLayoutGuide+Extensions.swift in Sources */,
-				8025FC054F5B051F4076FA2FE7BBC975 /* ConstraintLayoutGuideDSL.swift in Sources */,
-				BD3C49EE066E848C75862554950B2AFE /* ConstraintLayoutSupport.swift in Sources */,
-				AE7C303055D6AD3016B5B8635879D8FB /* ConstraintLayoutSupportDSL.swift in Sources */,
-				E521272FEC36F66486F41370C8C13807 /* ConstraintMaker.swift in Sources */,
-				B0E03650B655E7A52FF5EA5E0CF570C3 /* ConstraintMakerEditable.swift in Sources */,
-				FF102EBF51F6E193AB12AC0390744ADD /* ConstraintMakerExtendable.swift in Sources */,
-				C9B4EEA299EB979DCEE23FC0AE86116D /* ConstraintMakerFinalizable.swift in Sources */,
-				4A4D88B930A08AB452F0F005AD56092C /* ConstraintMakerPrioritizable.swift in Sources */,
-				D7EE1FC27B4E1A6B4D4A988B9E22D79D /* ConstraintMakerRelatable.swift in Sources */,
-				92ACE28EDBDDDE4B0C70C335C2E3B4EA /* ConstraintMakerRelatable+Extensions.swift in Sources */,
-				A530446AD6CF65F8CE8CC7942C0FCD94 /* ConstraintMultiplierTarget.swift in Sources */,
-				8C336E3E5E8E7EE5A052856E818333BE /* ConstraintOffsetTarget.swift in Sources */,
-				95E55C11E0475441D48C0504D2283140 /* ConstraintPriority.swift in Sources */,
-				52899BA81CC02CA4AD6FED39E1950CE8 /* ConstraintPriorityTarget.swift in Sources */,
-				2B06CE855FB063A11BB658BE6E5AEE47 /* ConstraintRelatableTarget.swift in Sources */,
-				3FCE06668A09A4C516EF313BE8353CD8 /* ConstraintRelation.swift in Sources */,
-				79FDE3B452F1217568B4A79E663E6F34 /* ConstraintView.swift in Sources */,
-				591BB5793CEEFE57788C1B4A60032EE5 /* ConstraintView+Extensions.swift in Sources */,
-				37B64EB1C9E1459F5AC2B2BBBAF99DC5 /* ConstraintViewDSL.swift in Sources */,
-				A395CCE5722E366B772BF6B1F6946127 /* Debugging.swift in Sources */,
-				1F2667B7B6FC86EB64C1AAB7FF52B6BC /* LayoutConstraint.swift in Sources */,
-				250AC11D6AA2C09A43005F7396750BA1 /* LayoutConstraintItem.swift in Sources */,
-				99FB033EE49723B26D55BAF112E959B5 /* SnapKit-dummy.m in Sources */,
-				69B43F6264227B49106CE02FE5BB2E53 /* Typealiases.swift in Sources */,
-				95D75F8EDCC13FE815C4817C8CFD5BC2 /* UILayoutSupport+Extensions.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		96683BD3472EB03A6A827FFCDB7797D4 /* Sources */ = {
+		9C4295C345FBDB725AC038F15F3C6185 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		B3BC25F2B6585813D66042BA127945B4 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				27A49CAF4369774F8BAFA4829F4DC303 /* Archive.swift in Sources */,
+				73D3BF552CEC4CFA6C76B920B60A5715 /* Archive+BackingConfiguration.swift in Sources */,
+				FECA4D68B4246B2EF9483B1C55180EBD /* Archive+Deprecated.swift in Sources */,
+				3FB97DCC2725FEDD8D19633B8C363F4B /* Archive+Helpers.swift in Sources */,
+				539FF993AAAE6D3C0F5D0038DB1E0673 /* Archive+MemoryFile.swift in Sources */,
+				807EE34D2B6A76F67762766AE970F4EB /* Archive+Progress.swift in Sources */,
+				9C37EBD71CE0C06085606E06B9602E07 /* Archive+Reading.swift in Sources */,
+				4586631E0F11BDF2C667A8DAB6E33D7C /* Archive+ReadingDeprecated.swift in Sources */,
+				F80C879270B540C7F5FBA52ED93EC572 /* Archive+Writing.swift in Sources */,
+				1FEEAE25C66FA8EA607876915ADC1830 /* Archive+WritingDeprecated.swift in Sources */,
+				08F54A15BE50EA69DC223672EC21DC36 /* Archive+ZIP64.swift in Sources */,
+				C01F8DF6EB0351A95971D4ED5C00BA64 /* Data+Compression.swift in Sources */,
+				872C5B6669490993860FB068B6EECA6C /* Data+CompressionDeprecated.swift in Sources */,
+				EF2FC7B0D522E2F9B299079073295EA7 /* Data+Serialization.swift in Sources */,
+				1EA6B0C9801AAFE8C4A27717B91E7A7A /* Date+ZIP.swift in Sources */,
+				1EB37E83C162AEBF22EFA71AECE18298 /* Entry.swift in Sources */,
+				73B3EE6535C27C69AB029A1BD1CA7D1F /* Entry+Serialization.swift in Sources */,
+				FD224ECAFC982C3AB83000CC33A6FAE3 /* Entry+ZIP64.swift in Sources */,
+				E3EA77281840BF381947CA2DEFABB6E9 /* FileManager+ZIP.swift in Sources */,
+				77B7D4B5365FF6066E205393AD2DBA3A /* FileManager+ZIPDeprecated.swift in Sources */,
+				974B4B4C1037959C0374DBD8A0591EA5 /* URL+ZIP.swift in Sources */,
+				682C728128E3E53A525D713B9123F6B2 /* ZIPFoundation-dummy.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		BC13B8090DA45467A744E6CAF3DE34C8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6CAB0255B42E803CEB8C200E106583F2 /* Constraint.swift in Sources */,
+				A2C4931C097B54AE8F7B1D61D99D512F /* ConstraintAttributes.swift in Sources */,
+				2DC30426D54A9ACE171812C9B71CAC68 /* ConstraintConfig.swift in Sources */,
+				01B1B8AF1056EF71658BE02D0850C34F /* ConstraintConstantTarget.swift in Sources */,
+				25D59C50A9C2B60F797B1BFDB50A8AE0 /* ConstraintDescription.swift in Sources */,
+				20EBD9A7748D5BB4D24ACCF08EAEBC17 /* ConstraintDirectionalInsets.swift in Sources */,
+				E89192AC5F15EB1326A03A886F9B5B73 /* ConstraintDirectionalInsetTarget.swift in Sources */,
+				AFDC339729E3167A94E6D3EB45E8D4AA /* ConstraintDSL.swift in Sources */,
+				7C1789D42D48D122F21683DFE0117C05 /* ConstraintInsets.swift in Sources */,
+				F69B4C0B51AA5CEF254C09A066F90D32 /* ConstraintInsetTarget.swift in Sources */,
+				1B0EA0C22B5B0469D49C4E19BB68D7DE /* ConstraintItem.swift in Sources */,
+				48B88876F05C31838B1F49392467CD64 /* ConstraintLayoutGuide.swift in Sources */,
+				2FE5650E3D74E35D130BD0BAC8C37E5B /* ConstraintLayoutGuide+Extensions.swift in Sources */,
+				C9C4CFBF5EF3AF45C5525D585DC3B486 /* ConstraintLayoutGuideDSL.swift in Sources */,
+				32DC4D93DFCF2924AAF7EF4AD7447DB7 /* ConstraintLayoutSupport.swift in Sources */,
+				0E5A4BBE6AEFFCC15F458099FAAA65E7 /* ConstraintLayoutSupportDSL.swift in Sources */,
+				717AD0B57C4143CBBDB3FBA66DB48837 /* ConstraintMaker.swift in Sources */,
+				A617AECE5C0565EC362D58CECE76E01B /* ConstraintMakerEditable.swift in Sources */,
+				FAC4A4BC1E708303B032039339027FE9 /* ConstraintMakerExtendable.swift in Sources */,
+				03BC4A9B24919C76E85CB50869D47858 /* ConstraintMakerFinalizable.swift in Sources */,
+				00E8757FB94E0A8100BE11635D545831 /* ConstraintMakerPrioritizable.swift in Sources */,
+				5CA39C9A333268929BA1DDE1254ADD9A /* ConstraintMakerRelatable.swift in Sources */,
+				B93AFFE0B94B3B0C9E3E53A5689643AE /* ConstraintMakerRelatable+Extensions.swift in Sources */,
+				F28F3DAE50B7D667187EF4CF4F6F79B9 /* ConstraintMultiplierTarget.swift in Sources */,
+				55A24FCD955BEC5081C3AB397905B17C /* ConstraintOffsetTarget.swift in Sources */,
+				6EE3C48B9A280E4DFD4D8E7A85B7DB02 /* ConstraintPriority.swift in Sources */,
+				996F4301B6B7371F064F6C16A4242434 /* ConstraintPriorityTarget.swift in Sources */,
+				68CBC6AA38AD3DB5067BEFF8E42886D0 /* ConstraintRelatableTarget.swift in Sources */,
+				7B57128D05B37B1935F9371C272A2397 /* ConstraintRelation.swift in Sources */,
+				06DF025C3F6A6A0BAE23D1AA2ACB9BB7 /* ConstraintView.swift in Sources */,
+				11154670AA2AB4CC361FB7A3E5D47B2C /* ConstraintView+Extensions.swift in Sources */,
+				F5367C578F9CA3E525919A16F00120C9 /* ConstraintViewDSL.swift in Sources */,
+				C611AD73978B800E1A2BCE318CF9F467 /* Debugging.swift in Sources */,
+				D97F221A17BC3146FFA3C9D63EE5B232 /* LayoutConstraint.swift in Sources */,
+				2F24F22928E575299BF137619DE2C018 /* LayoutConstraintItem.swift in Sources */,
+				E109CD1D23AF8F3224915E1B4821E305 /* SnapKit-dummy.m in Sources */,
+				80AA377071E2AF381B547027B16FEDF3 /* Typealiases.swift in Sources */,
+				08AF1E234EC84C5B105AD119DD68C7C7 /* UILayoutSupport+Extensions.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		E6425B0EE108EC8A74541DB0B963F16C /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2744CEF2A6D29AD6AD3B262FE5A17395 /* RDEPUBAnnotationModels.swift in Sources */,
+				E997293FB896E1C65526C5DEE74B4911 /* RDEPUBAssetRepository.swift in Sources */,
+				DF36E555D742A4D54A6E9FE7CA4818C9 /* RDEPUBAttachmentNormalizer.swift in Sources */,
+				455B57E7D4F7025BCAA9686237ECE4D6 /* RDEPUBAttachmentTooltipOverlayView.swift in Sources */,
+				099FEDF9807830FA98B165701170023D /* RDEPUBAttachmentTooltipView.swift in Sources */,
+				B50E295EEF6CBA47808C7520A79BEC5F /* RDEPUBBackgroundCoverageStore.swift in Sources */,
+				62D144BF0E62D22C5C0C8C4F2F80342F /* RDEPUBBackgroundPriorityPolicy.swift in Sources */,
+				A691BA8AC2E9668EC2D30BF7C300086D /* RDEPUBBackgroundTrace.swift in Sources */,
+				DD1CED401299E73280127E52CAB9C692 /* RDEPUBBookPageMap.swift in Sources */,
+				375E640C8EA1A38D61C1566EE7691017 /* RDEPUBBuildDiagnosticsReporter.swift in Sources */,
+				7F6E040D6F0BD6E9CA8954018542D8EC /* RDEPUBCFI.swift in Sources */,
+				A2E1164041C2D80612C202F2766A9E9A /* RDEPUBCFICompatibility.swift in Sources */,
+				08742D7AA435FD9CA20294F408FC44AC /* RDEPUBCFIDOMPathBuilder.swift in Sources */,
+				7D1E7DDB0AD74FFCFED59D1D5900BDE9 /* RDEPUBCFIError.swift in Sources */,
+				1B274610DB6E2AABA67FFC50BF1B5BDE /* RDEPUBCFIGenerator.swift in Sources */,
+				5A4C8D7A61A831DFE6191CE9EE8FC0FF /* RDEPUBCFIMap.swift in Sources */,
+				17254666C151CD8FED29CD9ED51556D8 /* RDEPUBCFIMarkerInjector.swift in Sources */,
+				BAAB9C658BA5CE90D5A2DCB9FBCE1918 /* RDEPUBCFIParser.swift in Sources */,
+				50E6F4B858B375E9AA9C0307C166513F /* RDEPUBCFIPath.swift in Sources */,
+				C88B339BEFAEC890D15B89A0ABF3FD4E /* RDEPUBCFIRange.swift in Sources */,
+				F4FA2E5B5507F0658C4E886A00795A22 /* RDEPUBCFIRecoveryEngine.swift in Sources */,
+				FF005292EE0721AD1102DB5A34A97E9D /* RDEPUBCFIResolver.swift in Sources */,
+				860F6C94A7F6AC88CDC0EBCF54FBEB74 /* RDEPUBCFISerializer.swift in Sources */,
+				6DB057884F6AC5E5F0DB8664760A0C70 /* RDEPUBCFITextAssertion.swift in Sources */,
+				17B3296FE8254C2D47DFE4FD19949503 /* RDEPUBCFIUtilities.swift in Sources */,
+				194A976E63A09667F53C9FE293F5B8C6 /* RDEPUBChapterCacheKey.swift in Sources */,
+				23AC535B4DC5D8475ED2B1273C501F95 /* RDEPUBChapterData.swift in Sources */,
+				F5F01F1B8993CC080F1F4EAFF1D19E40 /* RDEPUBChapterDataCache.swift in Sources */,
+				90B16160AC5C4F3DFE8A93ADDCD9EB21 /* RDEPUBChapterLoader.swift in Sources */,
+				5C6C440EBBA7062516303A3D7AF1001A /* RDEPUBChapterLocation.swift in Sources */,
+				FF70E3AAA12064457129DF56B253D8AE /* RDEPUBChapterOffsetMap.swift in Sources */,
+				B9F50F644BF6273ECA00198152792102 /* RDEPUBChapterPageCounter.swift in Sources */,
+				3C976145343B9E986CF8D88E0D0EF51F /* RDEPUBChapterRuntimeStore.swift in Sources */,
+				1B3D933930FC50612BEEADBB84204EA6 /* RDEPUBChapterSummaryDiskCache.swift in Sources */,
+				31E3EDECC6470B4E92C97F58E80965E8 /* RDEPUBChapterTailNormalizer.swift in Sources */,
+				C00E44460F4E1E1B7100F7B97CC964AD /* RDEPUBChapterWarmupOrchestrator.swift in Sources */,
+				1D236F47AD10304D7E61547C956BDD9B /* RDEPUBChapterWindowCoordinator.swift in Sources */,
+				08D7E5A0D65FAEA0FFE71946A00FFF1E /* RDEPUBChapterWindowSnapshot.swift in Sources */,
+				3970919FD97D377196BA9EC376C18679 /* RDEPUBCoreTextPageFrameFactory.swift in Sources */,
+				822AF86AA4BF4CE9FAA4548CDB8E1BD4 /* RDEPUBCSSCompatibilityLayer.swift in Sources */,
+				26EA72F11D12D8B2990F0EAC76459EA3 /* RDEPUBDarkImageAdjuster.swift in Sources */,
+				32ACD94F1F25F38FB0D6073734C3436C /* RDEPUBDTCoreTextRenderer.swift in Sources */,
+				9A878F793DEF9410001A3025DFA30BD8 /* RDEPUBFixedLayoutTemplate.swift in Sources */,
+				ED9EE6BE3F0C590D9E36A371406821BF /* RDEPUBFontFallbackResolver.swift in Sources */,
+				F0B19530682C9B4FA79A5D238CEA771E /* RDEPUBFontNormalizer.swift in Sources */,
+				BD9B40C9C8474E86F212487107F68A99 /* RDEPUBFragmentMarkerInjector.swift in Sources */,
+				4AFFC3A7A62BC90E2BBD7529AE89CD36 /* RDEPUBHTMLNormalizer.swift in Sources */,
+				F2BBFDBFAA439DB5545BBBE960CE81D7 /* RDEPUBJavaScriptBridge.swift in Sources */,
+				CF1E18BDAEB4D8D2DED3E2DD38C23E95 /* RDEPUBJumpSession.swift in Sources */,
+				AAB706F10104FB95DD95EFD0530C4C6D /* RDEPUBMetadataParseCancellationController.swift in Sources */,
+				108BB5B3F866558C1DA53A5A684A2C9D /* RDEPUBMetadataParseWorker.swift in Sources */,
+				02CBB350FE8E8C48D48347519605408E /* RDEPUBModels.swift in Sources */,
+				1982F649017D511A11E32DEAC7236CE4 /* RDEPUBNavigationStateMachine.swift in Sources */,
+				B499FCB6EB1F8BAE70CF0AAC369EA7E2 /* RDEPUBNavigatorLayoutContext.swift in Sources */,
+				9DA15711057EECC0039842A782024C2C /* RDEPUBNavigatorState.swift in Sources */,
+				E1D10A5A280E6697386740CB34C2DD54 /* RDEPUBNoteDetector.swift in Sources */,
+				B53E867CFD518A62EA593F4F4B3A3FAA /* RDEPUBNoteModels.swift in Sources */,
+				146CE7A97D2DAC1A9CB084C0E2ADD67A /* RDEPUBNotePopupCoordinator.swift in Sources */,
+				A8D3597AB26C2CBA7B5966BEAA1A252B /* RDEPUBNotePopupViewController.swift in Sources */,
+				60290057447E24C8AE5CAE49B2B628F8 /* RDEPUBNoteResolver.swift in Sources */,
+				207D9BDB05964DA9EA4418E83C1530FE /* RDEPUBPageBreakPolicy.swift in Sources */,
+				4287D10B8D0884C63F409C49114962DC /* RDEPUBPageCountCache.swift in Sources */,
+				92A408637C2F3E65E93800222550C88A /* RDEPUBPageInteractionController.swift in Sources */,
+				3A3A1DC5BEAF852DDD4816158D34F2C8 /* RDEPUBPageLayoutSnapshot.swift in Sources */,
+				1D4D78DA0BD6B1928CD54AC5DC82353B /* RDEPUBPageMapReconciliationCoordinator.swift in Sources */,
+				FDFEE2DFE07412D7170E12942E66BF2A /* RDEPUBPageResolver.swift in Sources */,
+				BCD5820BDBB0AC37772A5D613123BAAF /* RDEPUBPaginationCacheCoordinator.swift in Sources */,
+				C4FF52162D560D713AE888D84B0B5CDF /* RDEPUBPaginationModels.swift in Sources */,
+				7326101D5DD269D447F2D8842D268255 /* RDEPUBPaginationState.swift in Sources */,
+				8630480459E3E037BF860528792A5C9C /* RDEPUBPaginator.swift in Sources */,
+				E86782FC51128CD6D297E633D9D0F26E /* RDEPUBParser.swift in Sources */,
+				4B640F3B02D43DE8B78B644E0A95449A /* RDEPUBParser+Archive.swift in Sources */,
+				463882F4C6BCD5B6329CEC1CAADADD0A /* RDEPUBParser+Package.swift in Sources */,
+				475B19074137EFDA4106EBCCCF36FC6F /* RDEPUBParser+ReadingProfile.swift in Sources */,
+				3DDC7432B3FE5E5A9B1A42256329F234 /* RDEPUBParser+Resources.swift in Sources */,
+				1F89F883CC03311F2801F0B80B3A1CF3 /* RDEPUBParser+TOC.swift in Sources */,
+				F866E4E4499F3638ED1281A74171D2C8 /* RDEPUBPreferences.swift in Sources */,
+				361AAB8943E201F1BF3256580CA4ACDE /* RDEPUBPresentationRuntime.swift in Sources */,
+				2869C86624156F94B05ABC01C47DA085 /* RDEPUBPublication.swift in Sources */,
+				FC665839522860AD2F7C6B4BB3464BE2 /* RDEPUBReaderAnnotationCoordinator.swift in Sources */,
+				DC249D01F1F962D4AFF9C73F1034B746 /* RDEPUBReaderAssemblyCoordinator.swift in Sources */,
+				706B5BEE0D5AD080E9A835105AD37405 /* RDEPUBReaderBottomToolView.swift in Sources */,
+				BF609F036C668EFAC178F93D521C1285 /* RDEPUBReaderChapterListController.swift in Sources */,
+				C520AF807149FCF55A7F3C2C16165174 /* RDEPUBReaderChromeCoordinator.swift in Sources */,
+				91F2004931EEB74080582412EC4A7E3E /* RDEPUBReaderConfiguration.swift in Sources */,
+				7956B31CC6E4A4F49AD636605FE6E825 /* RDEPUBReaderContext.swift in Sources */,
+				1D5093C35F8EF012FF48FCB91F312F0C /* RDEPUBReaderController.swift in Sources */,
+				1D397699D725D0B63980271F92D9672F /* RDEPUBReaderController+AttachmentTooltip.swift in Sources */,
+				5130C9666BA0D9DACF1D4017B6E94D96 /* RDEPUBReaderController+ContentDelegates.swift in Sources */,
+				EA2A236F1F116705DE1A6C053969A220 /* RDEPUBReaderController+DataSource.swift in Sources */,
+				C635E005C211CAF7E9C78CA7C6143980 /* RDEPUBReaderController+ExternalLinks.swift in Sources */,
+				034CDAD58DD721808C23222EE79E2FB6 /* RDEPUBReaderController+LocationResolution.swift in Sources */,
+				062898C7FA5797A1327D7CDDEB000DAA /* RDEPUBReaderController+PublicAPI.swift in Sources */,
+				FF18F99842B1E8108D72650D124C49A0 /* RDEPUBReaderController+RenderSupport.swift in Sources */,
+				EB0713283E3F74926A79C2E7D9151603 /* RDEPUBReaderController+RuntimeBridge.swift in Sources */,
+				FA61965EA4E8C06A34051FD983B851E3 /* RDEPUBReaderController+TableOfContents.swift in Sources */,
+				D5824E0CE23134116C927AB027FED5AC /* RDEPUBReaderDelegate.swift in Sources */,
+				418D49534E919DB3A6D1285C6550DF52 /* RDEPUBReaderDependencies.swift in Sources */,
+				F11AE2A2CF1BF53592BA52A221BE5C73 /* RDEPUBReaderEnvironment.swift in Sources */,
+				162118890D7B65D3C4E7D257A1C10913 /* RDEPUBReaderHighlightsViewController.swift in Sources */,
+				B794BC94DCEAB911E625BB167073309D /* RDEPUBReaderLoadCoordinator.swift in Sources */,
+				E0B3A75AFA1355C7D966546FCCECEDAB /* RDEPUBReaderLocationCoordinator.swift in Sources */,
+				E6A0C3405B2EDFE7309A03DE216EBE6C /* RDEPUBReaderPaginationCoordinator.swift in Sources */,
+				72AB99A1D05F6F5840DF1FD72BA3D54A /* RDEPUBReaderPersistence.swift in Sources */,
+				38CE5AE7F08F51BCA49E57210C73DD8A /* RDEPUBReaderRuntime.swift in Sources */,
+				2787D611BA02BB3CF87E83D0D576BD1E /* RDEPUBReaderSearchBarView.swift in Sources */,
+				D777DF8307388E85113173F9E88824CF /* RDEPUBReaderSearchCoordinator.swift in Sources */,
+				1908212D1BAB262381AEE80002D1C7FC /* RDEPUBReaderServices.swift in Sources */,
+				5D52B44C0898B6A4860C9EE59DA59ED4 /* RDEPUBReaderSettings.swift in Sources */,
+				332B3EE547B4ECCFD2179D50888BDF6A /* RDEPUBReaderSettingsViewController.swift in Sources */,
+				6143B5040E1B4A7149C35447B8DE2CD0 /* RDEPUBReaderState.swift in Sources */,
+				9E2751BDEA29783950FDBC6DA7805483 /* RDEPUBReaderTableOfContentsItem.swift in Sources */,
+				D1BF333A09A6BDABFA1AF5A6D7F0364D /* RDEPUBReaderTheme.swift in Sources */,
+				E1B3D40F705149804531ABB02BABAB2D /* RDEPUBReaderToolView.swift in Sources */,
+				61D7D7C7063E2E3F3EFBEA67343D5BC1 /* RDEPUBReaderTopToolView.swift in Sources */,
+				8DE6BE54092C4BBC29DE857182C6893B /* RDEPUBReaderUIState.swift in Sources */,
+				54E64A136D38FA0FD478BD00E3783754 /* RDEPUBReaderViewportMonitor.swift in Sources */,
+				5BDB7BAE4BE48E109F955C3497E31026 /* RDEPUBReadingLocationModels.swift in Sources */,
+				66CA591CC2C5DDEB9F10DF6201AC73E2 /* RDEPUBReadingSession.swift in Sources */,
+				8FB2AD1EFD08F0B66A34FCFB9385F2E9 /* RDEPUBRenderDiagnosticsCollector.swift in Sources */,
+				38DA59D7FEE7CE3915421A2AB5AC24A0 /* RDEPUBRenderRequest.swift in Sources */,
+				5EBCD616AF7BB46CB2CC43B5736F94A1 /* RDEPUBResourceResolver.swift in Sources */,
+				2F4CB2CA3F00A4AAA725F3C17D95D991 /* RDEPUBResourceURLSchemeHandler.swift in Sources */,
+				8E79DA8D4AECEE0ECC24F9BA2117A9EB /* RDEPUBRuntimeChapter.swift in Sources */,
+				093B7188B6717318AD5CD0CBBB6BB1B6 /* RDEPUBRuntimePageCount.swift in Sources */,
+				6E703383272C4AC66B55E946FB0F9E57 /* RDEPUBSearchEngine.swift in Sources */,
+				6D4D2109A2EAD67D4A9C158FD694F0ED /* RDEPUBSearchModels.swift in Sources */,
+				B4C2FB1FFAA1E94B6266CE735A8A130F /* RDEPUBSelectionLoupeView.swift in Sources */,
+				34F6005B80DA064C0B099A3288AD95D5 /* RDEPUBSelectionOverlayView.swift in Sources */,
+				8676468774C95A019F96AC16510826C2 /* RDEPUBSelectionState.swift in Sources */,
+				F545EE19BBCEFA1C7C58B15D9255859F /* RDEPUBSemanticMarkerInjector.swift in Sources */,
+				2E2F479275A0D936C2A1E87C6765A47D /* RDEPUBStyleCompatibilityModels.swift in Sources */,
+				B35733574DA8B973FF3B77D92B8756B0 /* RDEPUBStyleSheetBuilder.swift in Sources */,
+				53AA94D0D8A26ADEA82DF5FF5A984948 /* RDEPUBStyleSheetComposer.swift in Sources */,
+				A8DBD4A1E923298D4959A63CAA45746A /* RDEPUBTextAnchor.swift in Sources */,
+				256B83F8FFBB3009C30A49DC549A6EC3 /* RDEPUBTextAnnotationOverlay.swift in Sources */,
+				187488196599FAE35DE1E51925A0DF6A /* RDEPUBTextBookBuilder.swift in Sources */,
+				AD3AA582C65B0D42CC2AA6053738737C /* RDEPUBTextBookCache.swift in Sources */,
+				CF00DDCDE77C37AEF1EF253DB73AC6E3 /* RDEPUBTextBookModels.swift in Sources */,
+				D8216D4D553B85B657B45D539A8E4777 /* RDEPUBTextBuildPipelineInterfaces.swift in Sources */,
+				E7D79D77E971BB2A846AAA0E545D1173 /* RDEPUBTextContentInteractionCoordinator.swift in Sources */,
+				67E3C97E134504F622FB9E68D5647BF2 /* RDEPUBTextContentView.swift in Sources */,
+				884EB17E0A17502856F505A72A7B854A /* RDEPUBTextIndexTable.swift in Sources */,
+				7EDD9B2DDD80A196D7798433666ACC95 /* RDEPUBTextLayouter.swift in Sources */,
+				72C8E000CCE9BD5F41657C2E08D4B83B /* RDEPUBTextLayoutFrame.swift in Sources */,
+				FA1D78A8365F3A6C455670459C164745 /* RDEPUBTextPageDecorationView.swift in Sources */,
+				13CCBD97D8AF4C50A6888B78325A192B /* RDEPUBTextPageRenderView.swift in Sources */,
+				DEF81BE500F074BE66B148987D5CD8A3 /* RDEPUBTextPaginationInterfaces.swift in Sources */,
+				F64C61879DA335A141871B74060C3659 /* RDEPUBTextPaginationSupport.swift in Sources */,
+				71154B7C21DE7DF8DD200B3C7CEA4ED8 /* RDEPUBTextPerformanceSampler.swift in Sources */,
+				7EF238EB1273A1441D89BAEF214A773B /* RDEPUBTextPositionConverter.swift in Sources */,
+				C4B90D10F9C4624C785803714C280807 /* RDEPUBTextRenderer.swift in Sources */,
+				5B2118C44FFE62D2001AFA9857425C8F /* RDEPUBTextRendererSupport.swift in Sources */,
+				614F13CF514CEAEAE30F07B22E58DDA5 /* RDEPUBTextSearchEngine.swift in Sources */,
+				FB7DB5861C466FAC927E77FA86E49E84 /* RDEPUBTextSelectionController.swift in Sources */,
+				D82009338CF0770A05644859B1D9B2EE /* RDEPUBTypesettingPipeline.swift in Sources */,
+				2BBF15A41205114D992E57839B93A738 /* RDEPUBViewportTypes.swift in Sources */,
+				76F23BA6E5F23E12B41BDB8E0DCEBAF7 /* RDEPUBWebContentView.swift in Sources */,
+				42CC3E0AE7FD1C91407FA62F312257D0 /* RDEPUBWebDecorationOverlayView.swift in Sources */,
+				4722E3071B57E0DF9CB521EC230360E3 /* RDEPUBWebView.swift in Sources */,
+				57F03CA9FCCEFDCB22586C14B9D81E35 /* RDEPUBWebView+Configuration.swift in Sources */,
+				8BDE0118B6C160D20F0216C903323B9F /* RDEPUBWebView+FixedLayout.swift in Sources */,
+				15E9894983D8DC1E17BDAF2DAA245360 /* RDEPUBWebView+JavaScriptBridge.swift in Sources */,
+				2CD768D642EF8DE4EBD5F9D5836FAFD2 /* RDEPUBWebView+Reflowable.swift in Sources */,
+				CD9B90F6EB39FFE1E34CCFE1304067BC /* RDEPUBWebView+Search.swift in Sources */,
+				5C6705569165F0E5D806396692FD8953 /* RDEPUBWebViewDebug.swift in Sources */,
+				F838B75559262C543111C53B7587AB9D /* RDPlainTextBookBuilder.swift in Sources */,
+				04CF747CD2BE5158C1B372F1CC7B5009 /* RDReaderContentCell.swift in Sources */,
+				C294B8A5C58978A6A6BF0ECFD4D8461F /* RDReaderFlowLayout.swift in Sources */,
+				16C0E9481964DFB28C80DB847403036A /* RDReaderGestureController.swift in Sources */,
+				EFBB4EBD4D8E1397CBAB0C89EB735322 /* RDReaderPageChildViewController.swift in Sources */,
+				651E573C03B07E8930AE7A3E61A5C5A3 /* RDReaderPagingController.swift in Sources */,
+				171DCD68BA95D701F1FBA8F02A865BCE /* RDReaderPreloadController.swift in Sources */,
+				587C85989F02ACED1B59047E57DD68A7 /* RDReaderSpreadResolver.swift in Sources */,
+				FD8E2F19C9BB614D91B36531A67C528C /* RDReaderTapRegionHandler.swift in Sources */,
+				47DC0686898DE2FE0A1603ED796362B7 /* RDReaderView.swift in Sources */,
+				E6A9F131D1E9D30C00A05682E8BB348A /* RDReaderView+CollectionView.swift in Sources */,
+				92CF67B6061DB4721656519090E6F3E5 /* RDReaderView+ContentAccess.swift in Sources */,
+				500F1BD399C196CDACC137DCD7D53541 /* RDReaderView+PageCurl.swift in Sources */,
+				7C5B4C8F6E0057ABF4BBC399146391D2 /* RDReaderView+ToolView.swift in Sources */,
+				25FDC87B68FFF9003A4DDA8C20C9B8D2 /* RDReaderView-dummy.m in Sources */,
+				D4B8FE79789D1319E5EB3FDA4CF81F77 /* RDReaderViewProtocols.swift in Sources */,
+				27CB714678010A30099E9B7A6A945451 /* RDURLReaderController.swift in Sources */,
+				984027EA31EE692C1B917CE3B5B4D010 /* String+RDEPUB.swift in Sources */,
+				0E7D32BFD4B09BEB911DB10CCD874648 /* UIColor+RDEPUB.swift in Sources */,
+				DBA443EC801ABC4A0A3B6B47F8FEC945 /* UIColor+RDEPUBHex.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		F5FD889341D3D1DCCA58EA12D78CF9E8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -3013,95 +3089,95 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		01A7972E6B103D4FB665E6F8A7E1C556 /* PBXTargetDependency */ = {
+		1030C22C57487EEEEE38DA568E70CBAB /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = SSAlertSwift;
-			target = 8619D5ADECF2B26CFD9A9826D61D289A /* SSAlertSwift */;
-			targetProxy = 5627AFEA3A80F383F17ADC5814B2979E /* PBXContainerItemProxy */;
+			name = ZIPFoundation;
+			target = AA15C8469D67684160CC2A7098EB841C /* ZIPFoundation */;
+			targetProxy = 59B49D2484B7E1D9D18A00AB4FF4BDB1 /* PBXContainerItemProxy */;
 		};
-		185983DF043945740D105A6741AF5D2B /* PBXTargetDependency */ = {
+		1A6C9AD23C6554E3B62FA27710F2529D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = SnapKit;
+			target = 19622742EBA51E823D6DAE3F8CDBFAD4 /* SnapKit */;
+			targetProxy = 3A10B21C14EB4C43BF4ACC905763F74A /* PBXContainerItemProxy */;
+		};
+		274DD071CC54BE127BC9F94B8A04FD08 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = DTFoundation;
 			target = 8F6E5A5BF72D62CDFD25F91A7CFA3309 /* DTFoundation */;
-			targetProxy = 3F14C32E8DE470077A48E05AE0C8C27C /* PBXContainerItemProxy */;
+			targetProxy = A4A04C0B68BF1A6736FC99F5AA474861 /* PBXContainerItemProxy */;
 		};
-		231E9103A12C9D6D2FFD36A8C93EF047 /* PBXTargetDependency */ = {
+		43AFA46D98684D09B99287E674E5F02E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "ZIPFoundation-ZIPFoundation_Privacy";
 			target = C7A8D82E407CD3FDC3BA55CEE519B252 /* ZIPFoundation-ZIPFoundation_Privacy */;
-			targetProxy = 9FEBEEAAD360FE4D93A2C4B051D62F4D /* PBXContainerItemProxy */;
+			targetProxy = 5AFE7731761C5AFC7B80D0792B571B09 /* PBXContainerItemProxy */;
 		};
-		26F9F475CD1321CBDD5C353E074B1558 /* PBXTargetDependency */ = {
+		73FE24F20CEB796A3A23687C50F6D477 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = DTFoundation;
-			target = 8F6E5A5BF72D62CDFD25F91A7CFA3309 /* DTFoundation */;
-			targetProxy = D46DAB6B6E214AC8E63DC4C24B2CFFFA /* PBXContainerItemProxy */;
+			name = DTCoreText;
+			target = B88F4EA0695B6B3165C64594850D72C7 /* DTCoreText */;
+			targetProxy = EEC2953A3DDE3647455056298820283D /* PBXContainerItemProxy */;
 		};
-		33B60FF4C9084A8C14F6F30C892BB2F2 /* PBXTargetDependency */ = {
+		78502F06764BDC57A62D0C0A9F6E47D7 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "RDReaderView-RDReaderViewAssets";
 			target = AE7F393FB7805DE2664AB4111873F907 /* RDReaderView-RDReaderViewAssets */;
-			targetProxy = 8416F06AF71067D32BBFD21E943A2B18 /* PBXContainerItemProxy */;
+			targetProxy = 724D7793A1E88452A32F4F274C9D605C /* PBXContainerItemProxy */;
 		};
-		371932C62B0ACD6888179B86D3FE2F14 /* PBXTargetDependency */ = {
+		7D1896023BCA82E202B28B0753AC68C8 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = SnapKit;
 			target = 19622742EBA51E823D6DAE3F8CDBFAD4 /* SnapKit */;
-			targetProxy = B8AE2DD286FE2F4749EF9EAA20DBAFE2 /* PBXContainerItemProxy */;
+			targetProxy = A73CA8977765B10396E9958EA55DA3A2 /* PBXContainerItemProxy */;
 		};
-		3A4CA85CD501E26F47FEF54D2C836592 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "DTCoreText-Resources";
-			target = 0C24CB0E87A728A11AA1124CB360D6A1 /* DTCoreText-Resources */;
-			targetProxy = EB434335B42822B70CBB1BE3AC9523A7 /* PBXContainerItemProxy */;
-		};
-		439A5D204CA132E43B7266F13FDF7388 /* PBXTargetDependency */ = {
+		9AD27F66DA7E0D563340B6F20847F1C1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = DTCoreText;
 			target = B88F4EA0695B6B3165C64594850D72C7 /* DTCoreText */;
-			targetProxy = E9ED99C843404CCFC1975B23676B4E1D /* PBXContainerItemProxy */;
+			targetProxy = B0DABEAAF6A0CA044722029D7BC1092E /* PBXContainerItemProxy */;
 		};
-		4459335B1945B61BAFA82948CCDF5395 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = ZIPFoundation;
-			target = AA15C8469D67684160CC2A7098EB841C /* ZIPFoundation */;
-			targetProxy = 3E3E4FD3677794A27497466C57911856 /* PBXContainerItemProxy */;
-		};
-		45AE29FA56CD9CCFAF5DD67AB155C787 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = ZIPFoundation;
-			target = AA15C8469D67684160CC2A7098EB841C /* ZIPFoundation */;
-			targetProxy = F32FF4675B74B367701842602FAC1042 /* PBXContainerItemProxy */;
-		};
-		784C4B43D49129F31825902D3419FD88 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = DTCoreText;
-			target = B88F4EA0695B6B3165C64594850D72C7 /* DTCoreText */;
-			targetProxy = 637DC5F35271F5B92561C968103920AE /* PBXContainerItemProxy */;
-		};
-		B1E509D0188F9C97F33A5BC619019C96 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = RDReaderView;
-			target = AA2E57587AA8EECA63C4BE08EA3CB6D2 /* RDReaderView */;
-			targetProxy = 2ADA9BFFFC805046509B27E52CF1A246 /* PBXContainerItemProxy */;
-		};
-		C5509DD3E9B1E0761FD53D0EAB0E4946 /* PBXTargetDependency */ = {
+		AC5A977034ED0B78AB5AE6C0C01DF0F4 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = SSAlertSwift;
 			target = 8619D5ADECF2B26CFD9A9826D61D289A /* SSAlertSwift */;
-			targetProxy = 14024E610F2D27044F97BDC0709FCBBB /* PBXContainerItemProxy */;
+			targetProxy = 26971A0E8DB2A61E3862ECEEF1EEFCA1 /* PBXContainerItemProxy */;
 		};
-		D1CC72BF86B5F0455D97FE9C6E37E0C5 /* PBXTargetDependency */ = {
+		B8836D5EED68BA0E84AB53546B21C8C4 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = DTFoundation;
+			target = 8F6E5A5BF72D62CDFD25F91A7CFA3309 /* DTFoundation */;
+			targetProxy = 55CF96AB18DBA5FBFAD43C7B70064B3A /* PBXContainerItemProxy */;
+		};
+		B9E2159A01F2995BDD2FACD0ECC521C0 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "SnapKit-SnapKit_Privacy";
 			target = 8A8DB685241263AFDF5E6B20FE67B93A /* SnapKit-SnapKit_Privacy */;
-			targetProxy = 26720AD75B7A40BEC120F816EA6F721E /* PBXContainerItemProxy */;
+			targetProxy = FE70E592BC251F07D191F6827E2CF57C /* PBXContainerItemProxy */;
 		};
-		F350E2BB76E9CD7B2BC4F30A529B67E8 /* PBXTargetDependency */ = {
+		CA1C9D3EA1543C5004456530ED9E56AE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			name = SnapKit;
-			target = 19622742EBA51E823D6DAE3F8CDBFAD4 /* SnapKit */;
-			targetProxy = 05811707AFE2A48281461E8CE630FE11 /* PBXContainerItemProxy */;
+			name = SSAlertSwift;
+			target = 8619D5ADECF2B26CFD9A9826D61D289A /* SSAlertSwift */;
+			targetProxy = 7261C923474564FED3877DEB0109CDE2 /* PBXContainerItemProxy */;
+		};
+		D3B19E5313783C954E0A3FBE9BF2DCA3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = RDReaderView;
+			target = AA2E57587AA8EECA63C4BE08EA3CB6D2 /* RDReaderView */;
+			targetProxy = 72E3B02DD9EF31111102B5A7D352AD70 /* PBXContainerItemProxy */;
+		};
+		E543D69FB495D7206BFA590CEF0ED78B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = ZIPFoundation;
+			target = AA15C8469D67684160CC2A7098EB841C /* ZIPFoundation */;
+			targetProxy = 9A1EA07419B17A0670A5EB80AA680965 /* PBXContainerItemProxy */;
+		};
+		F63064D99717857A12A17BB77C2AF85D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "DTCoreText-Resources";
+			target = 0C24CB0E87A728A11AA1124CB360D6A1 /* DTCoreText-Resources */;
+			targetProxy = BD30C0E521B2BEE7799F9A6F7344848A /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -3146,25 +3222,86 @@
 			};
 			name = Release;
 		};
-		1650C4B897075680B2BFB61ADE9ABE9B /* Release */ = {
+		1041A05D33C6B6E90E71B52C7F51BE6E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 78BC6512B9C94FC8EA1B2D474A86110D /* RDReaderView.release.xcconfig */;
+			baseConfigurationReference = 21716AE96E14363317AB8A817ED38F1D /* RDReaderView.release.xcconfig */;
 			buildSettings = {
-				CODE_SIGNING_ALLOWED = NO;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/RDReaderView";
+				CLANG_ENABLE_OBJC_WEAK = NO;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				IBSC_MODULE = RDReaderView;
-				INFOPLIST_FILE = "Target Support Files/RDReaderView/ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist";
+				GCC_PREFIX_HEADER = "Target Support Files/RDReaderView/RDReaderView-prefix.pch";
+				GENERATE_INFOPLIST_FILE = NO;
+				INFOPLIST_FILE = "Target Support Files/RDReaderView/RDReaderView-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				PRODUCT_NAME = RDReaderViewAssets;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULEMAP_FILE = "Target Support Files/RDReaderView/RDReaderView.modulemap";
+				PRODUCT_MODULE_NAME = RDReaderView;
+				PRODUCT_NAME = RDReaderView;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_INSTALL_OBJC_HEADER = YES;
+				SWIFT_VERSION = 5.10;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = bundle;
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		1966AE692A75B5135FAF76C192324AFB /* Release */ = {
+		2323749632FA6CA6C58B888AC36857E4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FE2991699D0391172DEADF2F4613E320 /* SSAlertSwift.release.xcconfig */;
+			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_PREFIX_HEADER = "Target Support Files/SSAlertSwift/SSAlertSwift-prefix.pch";
+				GENERATE_INFOPLIST_FILE = NO;
+				INFOPLIST_FILE = "Target Support Files/SSAlertSwift/SSAlertSwift-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULEMAP_FILE = "Target Support Files/SSAlertSwift/SSAlertSwift.modulemap";
+				PRODUCT_MODULE_NAME = SSAlertSwift;
+				PRODUCT_NAME = SSAlertSwift;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_INSTALL_OBJC_HEADER = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		2770A3EF05AD4BA592A8D8970B4AF008 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 53D2AB2348A9B9C582FDC2CDB2E434FC /* SnapKit.release.xcconfig */;
 			buildSettings = {
@@ -3182,7 +3319,25 @@
 			};
 			name = Release;
 		};
-		1ED0AF8A36DEECE16AD4EB6D248F6793 /* Debug */ = {
+		2BC2A58FD59FDBAAC078A8F928104432 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 21716AE96E14363317AB8A817ED38F1D /* RDReaderView.release.xcconfig */;
+			buildSettings = {
+				CODE_SIGNING_ALLOWED = NO;
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/RDReaderView";
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				IBSC_MODULE = RDReaderView;
+				INFOPLIST_FILE = "Target Support Files/RDReaderView/ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				PRODUCT_NAME = RDReaderViewAssets;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				WRAPPER_EXTENSION = bundle;
+			};
+			name = Release;
+		};
+		2D6AC662A2CA9434AFE6810AAC75BEE2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C960B7AA0B9B8CC473FACFEC64F9906D /* SnapKit.debug.xcconfig */;
 			buildSettings = {
@@ -3200,27 +3355,9 @@
 			};
 			name = Debug;
 		};
-		2C0FD551137755CA06D0EE941AF483EC /* Release */ = {
+		37489243AB0678F8DB1D4BF77BC6D582 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = F699881ABDBEB419AEBA661AD5A21F35 /* ZIPFoundation.release.xcconfig */;
-			buildSettings = {
-				CODE_SIGNING_ALLOWED = NO;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/ZIPFoundation";
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				IBSC_MODULE = ZIPFoundation;
-				INFOPLIST_FILE = "Target Support Files/ZIPFoundation/ResourceBundle-ZIPFoundation_Privacy-ZIPFoundation-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				PRODUCT_NAME = ZIPFoundation_Privacy;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = bundle;
-			};
-			name = Release;
-		};
-		302D896CB9F118AADB033D4DA75D5437 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = DF670EC438F05ACC1F1C7B725DBDAA18 /* DTFoundation.release.xcconfig */;
+			baseConfigurationReference = 6014DA7213E4687224F2BF921E30002C /* DTFoundation.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_WEAK = NO;
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -3252,29 +3389,67 @@
 				SWIFT_INSTALL_OBJC_HEADER = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
-			name = Release;
+			name = Debug;
 		};
-		367434DC266B3E933BD99009AF4CE9B8 /* Release */ = {
+		42F3763AF02FA23A1353BEEDF6143730 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C2840BE6D91479CCBC2E908FBD9DA183 /* DTCoreText.release.xcconfig */;
+			baseConfigurationReference = C960B7AA0B9B8CC473FACFEC64F9906D /* SnapKit.debug.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = NO;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_PREFIX_HEADER = "Target Support Files/SnapKit/SnapKit-prefix.pch";
+				GENERATE_INFOPLIST_FILE = NO;
+				INFOPLIST_FILE = "Target Support Files/SnapKit/SnapKit-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULEMAP_FILE = "Target Support Files/SnapKit/SnapKit.modulemap";
+				PRODUCT_MODULE_NAME = SnapKit;
+				PRODUCT_NAME = SnapKit;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_INSTALL_OBJC_HEADER = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		4456BC0938ABF4D223F2DC3B80FEAD47 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4BEC60CB3EDA1C189D3B062E29217440 /* ZIPFoundation.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGNING_ALLOWED = NO;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/DTCoreText";
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/ZIPFoundation";
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				IBSC_MODULE = DTCoreText;
-				INFOPLIST_FILE = "Target Support Files/DTCoreText/ResourceBundle-Resources-DTCoreText-Info.plist";
+				IBSC_MODULE = ZIPFoundation;
+				INFOPLIST_FILE = "Target Support Files/ZIPFoundation/ResourceBundle-ZIPFoundation_Privacy-ZIPFoundation-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				PRODUCT_NAME = Resources;
+				PRODUCT_NAME = ZIPFoundation_Privacy;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = bundle;
 			};
-			name = Release;
+			name = Debug;
 		};
 		44A4B2FB6211B90C1949A44A381F6D1F /* Release */ = {
 			isa = XCBuildConfiguration;
@@ -3339,9 +3514,9 @@
 			};
 			name = Release;
 		};
-		51E012BC752CC701A2E988A1974CA521 /* Release */ = {
+		4960E7132D05253390C775BA91388B35 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 53D2AB2348A9B9C582FDC2CDB2E434FC /* SnapKit.release.xcconfig */;
+			baseConfigurationReference = F699881ABDBEB419AEBA661AD5A21F35 /* ZIPFoundation.release.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_WEAK = NO;
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -3354,9 +3529,9 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_MODULE_VERIFIER = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_PREFIX_HEADER = "Target Support Files/SnapKit/SnapKit-prefix.pch";
+				GCC_PREFIX_HEADER = "Target Support Files/ZIPFoundation/ZIPFoundation-prefix.pch";
 				GENERATE_INFOPLIST_FILE = NO;
-				INFOPLIST_FILE = "Target Support Files/SnapKit/SnapKit-Info.plist";
+				INFOPLIST_FILE = "Target Support Files/ZIPFoundation/ZIPFoundation-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -3364,9 +3539,9 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MODULEMAP_FILE = "Target Support Files/SnapKit/SnapKit.modulemap";
-				PRODUCT_MODULE_NAME = SnapKit;
-				PRODUCT_NAME = SnapKit;
+				MODULEMAP_FILE = "Target Support Files/ZIPFoundation/ZIPFoundation.modulemap";
+				PRODUCT_MODULE_NAME = ZIPFoundation;
+				PRODUCT_NAME = ZIPFoundation;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
@@ -3379,24 +3554,6 @@
 			};
 			name = Release;
 		};
-		6CFA18F51EEF293D6C50AB6D0D723F31 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4C12BE94A7C945A1B14E5A6704E62098 /* RDReaderView.debug.xcconfig */;
-			buildSettings = {
-				CODE_SIGNING_ALLOWED = NO;
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/RDReaderView";
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				IBSC_MODULE = RDReaderView;
-				INFOPLIST_FILE = "Target Support Files/RDReaderView/ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				PRODUCT_NAME = RDReaderViewAssets;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = bundle;
-			};
-			name = Debug;
-		};
 		73BBB08AD96AC1A6A095E15ADC5FCEE1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 306477706BBB1E784F55BCF8EB1AD737 /* Pods-ReadViewDemo.debug.xcconfig */;
@@ -3436,124 +3593,7 @@
 			};
 			name = Debug;
 		};
-		741F688068F172D8501ED655854641E6 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4BEC60CB3EDA1C189D3B062E29217440 /* ZIPFoundation.debug.xcconfig */;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = NO;
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_PREFIX_HEADER = "Target Support Files/ZIPFoundation/ZIPFoundation-prefix.pch";
-				GENERATE_INFOPLIST_FILE = NO;
-				INFOPLIST_FILE = "Target Support Files/ZIPFoundation/ZIPFoundation-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MODULEMAP_FILE = "Target Support Files/ZIPFoundation/ZIPFoundation.modulemap";
-				PRODUCT_MODULE_NAME = ZIPFoundation;
-				PRODUCT_NAME = ZIPFoundation;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		8499104E62F9D7227780DAD77E1CAC36 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = FE2991699D0391172DEADF2F4613E320 /* SSAlertSwift.release.xcconfig */;
-			buildSettings = {
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_PREFIX_HEADER = "Target Support Files/SSAlertSwift/SSAlertSwift-prefix.pch";
-				GENERATE_INFOPLIST_FILE = NO;
-				INFOPLIST_FILE = "Target Support Files/SSAlertSwift/SSAlertSwift-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MODULEMAP_FILE = "Target Support Files/SSAlertSwift/SSAlertSwift.modulemap";
-				PRODUCT_MODULE_NAME = SSAlertSwift;
-				PRODUCT_NAME = SSAlertSwift;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Release;
-		};
-		8AFA22FD70DBE0B0B79CC7E1E74402A3 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = C960B7AA0B9B8CC473FACFEC64F9906D /* SnapKit.debug.xcconfig */;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = NO;
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_PREFIX_HEADER = "Target Support Files/SnapKit/SnapKit-prefix.pch";
-				GENERATE_INFOPLIST_FILE = NO;
-				INFOPLIST_FILE = "Target Support Files/SnapKit/SnapKit-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MODULEMAP_FILE = "Target Support Files/SnapKit/SnapKit.modulemap";
-				PRODUCT_MODULE_NAME = SnapKit;
-				PRODUCT_NAME = SnapKit;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		9B792699F7DBA82F9042DC5BB08BE5EE /* Debug */ = {
+		7EC52C433659785200D671A22D1AB0BF /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 18387159515E0523AFB4204B1AF940ED /* SSAlertSwift.debug.xcconfig */;
 			buildSettings = {
@@ -3591,6 +3631,85 @@
 			};
 			name = Debug;
 		};
+		80A7D005F49BD159F4FE6A41AB022724 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = DF670EC438F05ACC1F1C7B725DBDAA18 /* DTFoundation.release.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = NO;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_PREFIX_HEADER = "Target Support Files/DTFoundation/DTFoundation-prefix.pch";
+				GENERATE_INFOPLIST_FILE = NO;
+				INFOPLIST_FILE = "Target Support Files/DTFoundation/DTFoundation-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULEMAP_FILE = "Target Support Files/DTFoundation/DTFoundation.modulemap";
+				PRODUCT_MODULE_NAME = DTFoundation;
+				PRODUCT_NAME = DTFoundation;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_INSTALL_OBJC_HEADER = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		896355E28491E9255F09AA6799DA8ED9 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 0EA2FAD0839C3EB52650B2300B7E74AB /* RDReaderView.debug.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = NO;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_PREFIX_HEADER = "Target Support Files/RDReaderView/RDReaderView-prefix.pch";
+				GENERATE_INFOPLIST_FILE = NO;
+				INFOPLIST_FILE = "Target Support Files/RDReaderView/RDReaderView-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULEMAP_FILE = "Target Support Files/RDReaderView/RDReaderView.modulemap";
+				PRODUCT_MODULE_NAME = RDReaderView;
+				PRODUCT_NAME = RDReaderView;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_INSTALL_OBJC_HEADER = YES;
+				SWIFT_VERSION = 5.10;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
 		A0DC1C2C814704734F83EAB35BB20B21 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -3698,6 +3817,24 @@
 			};
 			name = Release;
 		};
+		A5D3EC6F106FA3776B832A7E8015BA89 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 78873FAFC0AD9E930D6050A7F976714B /* DTCoreText.debug.xcconfig */;
+			buildSettings = {
+				CODE_SIGNING_ALLOWED = NO;
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/DTCoreText";
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				IBSC_MODULE = DTCoreText;
+				INFOPLIST_FILE = "Target Support Files/DTCoreText/ResourceBundle-Resources-DTCoreText-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				PRODUCT_NAME = Resources;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				WRAPPER_EXTENSION = bundle;
+			};
+			name = Debug;
+		};
 		A843E21C1B95C92BE904EB3F8115DD30 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 78873FAFC0AD9E930D6050A7F976714B /* DTCoreText.debug.xcconfig */;
@@ -3737,48 +3874,9 @@
 			};
 			name = Debug;
 		};
-		A8C6E325FCC6AA6731D204723F21B213 /* Debug */ = {
+		B43FDB57FAE9573E70C164168FCF655A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4C12BE94A7C945A1B14E5A6704E62098 /* RDReaderView.debug.xcconfig */;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = NO;
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_PREFIX_HEADER = "Target Support Files/RDReaderView/RDReaderView-prefix.pch";
-				GENERATE_INFOPLIST_FILE = NO;
-				INFOPLIST_FILE = "Target Support Files/RDReaderView/RDReaderView-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MODULEMAP_FILE = "Target Support Files/RDReaderView/RDReaderView.modulemap";
-				PRODUCT_MODULE_NAME = RDReaderView;
-				PRODUCT_NAME = RDReaderView;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 5.10;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		B44B68E497E8CA29F0E057F3EC73706F /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = F699881ABDBEB419AEBA661AD5A21F35 /* ZIPFoundation.release.xcconfig */;
+			baseConfigurationReference = 4BEC60CB3EDA1C189D3B062E29217440 /* ZIPFoundation.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_WEAK = NO;
 				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
@@ -3810,15 +3908,72 @@
 				SWIFT_INSTALL_OBJC_HEADER = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		D7A1A49E10BD3978439AC9CC9D6C4AA4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 0EA2FAD0839C3EB52650B2300B7E74AB /* RDReaderView.debug.xcconfig */;
+			buildSettings = {
+				CODE_SIGNING_ALLOWED = NO;
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/RDReaderView";
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				IBSC_MODULE = RDReaderView;
+				INFOPLIST_FILE = "Target Support Files/RDReaderView/ResourceBundle-RDReaderViewAssets-RDReaderView-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				PRODUCT_NAME = RDReaderViewAssets;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				WRAPPER_EXTENSION = bundle;
+			};
+			name = Debug;
+		};
+		E7FB97206E736B87661709EAD8EE604D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 53D2AB2348A9B9C582FDC2CDB2E434FC /* SnapKit.release.xcconfig */;
+			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = NO;
+				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				GCC_PREFIX_HEADER = "Target Support Files/SnapKit/SnapKit-prefix.pch";
+				GENERATE_INFOPLIST_FILE = NO;
+				INFOPLIST_FILE = "Target Support Files/SnapKit/SnapKit-Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				MODULEMAP_FILE = "Target Support Files/SnapKit/SnapKit.modulemap";
+				PRODUCT_MODULE_NAME = SnapKit;
+				PRODUCT_NAME = SnapKit;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
+				SWIFT_INSTALL_OBJC_HEADER = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
-		D39DAAC6A7110744378A38D15F1D8C3E /* Debug */ = {
+		F980EC84B5A97159DC55CC71FB375474 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 78873FAFC0AD9E930D6050A7F976714B /* DTCoreText.debug.xcconfig */;
+			baseConfigurationReference = C2840BE6D91479CCBC2E908FBD9DA183 /* DTCoreText.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGNING_ALLOWED = NO;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/DTCoreText";
@@ -3832,50 +3987,11 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = bundle;
 			};
-			name = Debug;
+			name = Release;
 		};
-		D4A49CEC138C8AD4AE1356D17681A12D /* Debug */ = {
+		FB55CBDCF90D9EA687B32747A2C5BFEA /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6014DA7213E4687224F2BF921E30002C /* DTFoundation.debug.xcconfig */;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = NO;
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_PREFIX_HEADER = "Target Support Files/DTFoundation/DTFoundation-prefix.pch";
-				GENERATE_INFOPLIST_FILE = NO;
-				INFOPLIST_FILE = "Target Support Files/DTFoundation/DTFoundation-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MODULEMAP_FILE = "Target Support Files/DTFoundation/DTFoundation.modulemap";
-				PRODUCT_MODULE_NAME = DTFoundation;
-				PRODUCT_NAME = DTFoundation;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
-			name = Debug;
-		};
-		D51907EA478AC38D246522E81943F999 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4BEC60CB3EDA1C189D3B062E29217440 /* ZIPFoundation.debug.xcconfig */;
+			baseConfigurationReference = F699881ABDBEB419AEBA661AD5A21F35 /* ZIPFoundation.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGNING_ALLOWED = NO;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/ZIPFoundation";
@@ -3889,46 +4005,6 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				WRAPPER_EXTENSION = bundle;
 			};
-			name = Debug;
-		};
-		D76765DC6DCA3C682219D3F55B328DF3 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 78BC6512B9C94FC8EA1B2D474A86110D /* RDReaderView.release.xcconfig */;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = NO;
-				"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
-				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				ENABLE_MODULE_VERIFIER = NO;
-				ENABLE_USER_SCRIPT_SANDBOXING = NO;
-				GCC_PREFIX_HEADER = "Target Support Files/RDReaderView/RDReaderView-prefix.pch";
-				GENERATE_INFOPLIST_FILE = NO;
-				INFOPLIST_FILE = "Target Support Files/RDReaderView/RDReaderView-Info.plist";
-				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-				);
-				MODULEMAP_FILE = "Target Support Files/RDReaderView/RDReaderView.modulemap";
-				PRODUCT_MODULE_NAME = RDReaderView;
-				PRODUCT_NAME = RDReaderView;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) ";
-				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 5.10;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				VERSIONING_SYSTEM = "apple-generic";
-				VERSION_INFO_PREFIX = "";
-			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
@@ -3943,38 +4019,29 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0CB12E502C69001797C4D5CDD0E7B2ED /* Build configuration list for PBXNativeTarget "ZIPFoundation-ZIPFoundation_Privacy" */ = {
+		188A603D94CFDFC4ECFFB0A731A69DB3 /* Build configuration list for PBXNativeTarget "SnapKit" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D51907EA478AC38D246522E81943F999 /* Debug */,
-				2C0FD551137755CA06D0EE941AF483EC /* Release */,
+				42F3763AF02FA23A1353BEEDF6143730 /* Debug */,
+				E7FB97206E736B87661709EAD8EE604D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0F7B26392DBDEF1A30383994647A7057 /* Build configuration list for PBXNativeTarget "SSAlertSwift" */ = {
+		1D0D2A022E25C95190510FD3F7ECB9B6 /* Build configuration list for PBXNativeTarget "DTFoundation" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				9B792699F7DBA82F9042DC5BB08BE5EE /* Debug */,
-				8499104E62F9D7227780DAD77E1CAC36 /* Release */,
+				37489243AB0678F8DB1D4BF77BC6D582 /* Debug */,
+				80A7D005F49BD159F4FE6A41AB022724 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		212A5725332C221DE8024FEE9BB598CE /* Build configuration list for PBXNativeTarget "SnapKit-SnapKit_Privacy" */ = {
+		42DB324304DB4062633BD5C0B743F536 /* Build configuration list for PBXNativeTarget "DTCoreText-Resources" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				1ED0AF8A36DEECE16AD4EB6D248F6793 /* Debug */,
-				1966AE692A75B5135FAF76C192324AFB /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		3E6D13FB79638DFD856E25EB22C24E3C /* Build configuration list for PBXNativeTarget "DTCoreText-Resources" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				D39DAAC6A7110744378A38D15F1D8C3E /* Debug */,
-				367434DC266B3E933BD99009AF4CE9B8 /* Release */,
+				A5D3EC6F106FA3776B832A7E8015BA89 /* Debug */,
+				F980EC84B5A97159DC55CC71FB375474 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -3988,20 +4055,38 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		7B599DA10DBC43C031892AD62FAC7602 /* Build configuration list for PBXNativeTarget "RDReaderView-RDReaderViewAssets" */ = {
+		48F9AC50432927A34356729C1F4F40CF /* Build configuration list for PBXNativeTarget "SSAlertSwift" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				6CFA18F51EEF293D6C50AB6D0D723F31 /* Debug */,
-				1650C4B897075680B2BFB61ADE9ABE9B /* Release */,
+				7EC52C433659785200D671A22D1AB0BF /* Debug */,
+				2323749632FA6CA6C58B888AC36857E4 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B39579BB04CF59A762EE60FF463DBBC3 /* Build configuration list for PBXNativeTarget "DTFoundation" */ = {
+		75FB14909AEE2EADAF6FE7C23AFBFF36 /* Build configuration list for PBXNativeTarget "ZIPFoundation-ZIPFoundation_Privacy" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				D4A49CEC138C8AD4AE1356D17681A12D /* Debug */,
-				302D896CB9F118AADB033D4DA75D5437 /* Release */,
+				4456BC0938ABF4D223F2DC3B80FEAD47 /* Debug */,
+				FB55CBDCF90D9EA687B32747A2C5BFEA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		8540EC9800531BDA0C03FB4845F659B1 /* Build configuration list for PBXNativeTarget "RDReaderView" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				896355E28491E9255F09AA6799DA8ED9 /* Debug */,
+				1041A05D33C6B6E90E71B52C7F51BE6E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A70F5C0077A52024EC5922BD4B5EACE2 /* Build configuration list for PBXNativeTarget "ZIPFoundation" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B43FDB57FAE9573E70C164168FCF655A /* Debug */,
+				4960E7132D05253390C775BA91388B35 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -4015,29 +4100,20 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		E54D4DA42645E99F760FD3EEB1686360 /* Build configuration list for PBXNativeTarget "ZIPFoundation" */ = {
+		DB4C9521DD01DA7BACFF7BF85DE74E69 /* Build configuration list for PBXNativeTarget "SnapKit-SnapKit_Privacy" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				741F688068F172D8501ED655854641E6 /* Debug */,
-				B44B68E497E8CA29F0E057F3EC73706F /* Release */,
+				2D6AC662A2CA9434AFE6810AAC75BEE2 /* Debug */,
+				2770A3EF05AD4BA592A8D8970B4AF008 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		F16D8B273EBEE37B1D02577C1F80FBC0 /* Build configuration list for PBXNativeTarget "RDReaderView" */ = {
+		FFB0B0C7770CDF7D1B0D2C8AB9A23EBC /* Build configuration list for PBXNativeTarget "RDReaderView-RDReaderViewAssets" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				A8C6E325FCC6AA6731D204723F21B213 /* Debug */,
-				D76765DC6DCA3C682219D3F55B328DF3 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		FA1C5C8E6E90BB44DEBCD79890BF2130 /* Build configuration list for PBXNativeTarget "SnapKit" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				8AFA22FD70DBE0B0B79CC7E1E74402A3 /* Debug */,
-				51E012BC752CC701A2E988A1974CA521 /* Release */,
+				D7A1A49E10BD3978439AC9CC9D6C4AA4 /* Debug */,
+				2BC2A58FD59FDBAAC078A8F928104432 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/ReadViewDemo/ReadViewDemoUITests/ReaderUITests/AsyncChapterLoadingTests.swift b/ReadViewDemo/ReadViewDemoUITests/ReaderUITests/AsyncChapterLoadingTests.swift
index 22362de..81fd61d 100644
--- a/ReadViewDemo/ReadViewDemoUITests/ReaderUITests/AsyncChapterLoadingTests.swift
+++ b/ReadViewDemo/ReadViewDemoUITests/ReaderUITests/AsyncChapterLoadingTests.swift
@@ -17,6 +17,7 @@ final class AsyncChapterLoadingTests: XCTestCase {
 
     private let app = XCUIApplication()
     private let largeBook = "凡人修仙传"
+    private let singlePageOpeningBook = "宝山辽墓"
 
     override func setUpWithError() throws {
         continueAfterFailure = false
@@ -106,6 +107,25 @@ final class AsyncChapterLoadingTests: XCTestCase {
 
     // MARK: - 3. Cross-chapter page turning in scroll mode
 
+    func testSinglePageOpeningChapterIncludesImmediateLookaheadPages() throws {
+        app.launchAndOpenSampleBook(
+            bookTitleQuery: singlePageOpeningBook,
+            displayType: "scroll",
+            resetsReaderState: true
+        )
+        app.waitForReader(timeout: 20)
+
+        let initialState = app.waitForDemoReaderState(timeout: 15, description: "首开局部分页可立即前翻") { state in
+            state.mode == "bookPageMap" && state.knownPages != nil
+        }
+
+        XCTAssertGreaterThan(
+            initialState.knownPages ?? 0,
+            1,
+            "首章只有 1 页时，首开局部分页也应补充前瞻页，避免停留在总页数=1"
+        )
+    }
+
     func testCrossChapterPageTurningInScrollMode() throws {
         // Swipes forward across a chapter boundary in horizontal scroll mode,
         // verifying continuous page number increments.
diff --git a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIDOMPathBuilder.swift b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIDOMPathBuilder.swift
index 4dc5203..671823d 100644
--- a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIDOMPathBuilder.swift
+++ b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIDOMPathBuilder.swift
@@ -75,7 +75,7 @@ public enum RDEPUBCFIDOMPathBuilder {
               match.numberOfRanges > 2 else {
             return nil
         }
-        return nsAttributes.substring(with: match.range(at: 2)).rd_cfiNilIfEmpty
+        return nsAttributes.substring(with: match.range(at: 2)).rd_nilIfEmpty
     }
 
     static func isIgnorableTag(_ tagName: String) -> Bool {
@@ -138,8 +138,8 @@ enum RDEPUBCFITextNodeMapBuilder {
             markers: markers,
             pathRanges: pathRanges,
             recoveryMetadata: RDEPUBCFIRecoveryMetadata(
-                domFingerprint: rawHTML.sha256Hex,
-                normalizedTextChecksum: normalizedChapter.normalizedText.sha256Hex,
+                domFingerprint: rawHTML.rd_sha256Hex,
+                normalizedTextChecksum: normalizedChapter.normalizedText.rd_sha256Hex,
                 tokenIndex: makeTokenAnchors(
                     normalizedChapter: normalizedChapter,
                     markers: markers,
@@ -516,14 +516,6 @@ private struct RDEPUBNormalizedTextIndex {
     }
 }
 
-extension String {
-    var rd_cfiNilIfEmpty: String? {
-        let trimmed = trimmingCharacters(in: .whitespacesAndNewlines)
-        return trimmed.isEmpty ? nil : trimmed
-    }
-
-}
-
 private extension String {
     var fnv1a64: UInt64 {
         let offsetBasis: UInt64 = 14695981039346656037
diff --git a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIParser.swift b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIParser.swift
index 02c8d84..c0982bd 100644
--- a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIParser.swift
+++ b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIParser.swift
@@ -114,7 +114,7 @@ public enum RDEPUBCFIParser {
         if let open = rawStep.firstIndex(of: "["),
            let close = rawStep.lastIndex(of: "]"),
            open < close {
-            idAssertion = String(rawStep[rawStep.index(after: open)..<close]).rd_cfiNilIfEmpty
+            idAssertion = String(rawStep[rawStep.index(after: open)..<close]).rd_nilIfEmpty
         } else {
             idAssertion = nil
         }
diff --git a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIPath.swift b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIPath.swift
index 9a29147..0e4e01d 100644
--- a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIPath.swift
+++ b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIPath.swift
@@ -34,6 +34,6 @@ public struct RDEPUBCFIStep: Codable, Equatable, Hashable {
 
     public init(index: Int, idAssertion: String? = nil) {
         self.index = index
-        self.idAssertion = idAssertion?.rd_cfiNilIfEmpty
+        self.idAssertion = idAssertion?.rd_nilIfEmpty
     }
 }
diff --git a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIResolver.swift b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIResolver.swift
index 9d73e48..8b6367a 100644
--- a/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIResolver.swift
+++ b/Sources/RDReaderView/EPUBCore/CFI/RDEPUBCFIResolver.swift
@@ -28,7 +28,7 @@ public enum RDEPUBCFIResolver {
         if cfi.packagePath.steps.count >= 3 {
             manifestStep = cfi.packagePath.steps[2]
         } else {
-            manifestStep = cfi.packagePath.steps.last(where: { $0.idAssertion?.rd_cfiNilIfEmpty != nil })
+            manifestStep = cfi.packagePath.steps.last(where: { $0.idAssertion?.rd_nilIfEmpty != nil })
         }
         let href = manifestStep?.idAssertion
 
@@ -40,7 +40,7 @@ public enum RDEPUBCFIResolver {
             fileIndex = nil
         }
 
-        let fragmentID = cfi.contentPath.steps.last(where: { $0.idAssertion?.rd_cfiNilIfEmpty != nil })?.idAssertion
+        let fragmentID = cfi.contentPath.steps.last(where: { $0.idAssertion?.rd_nilIfEmpty != nil })?.idAssertion
         return RDEPUBCFIResolverResult(
             href: href,
             fileIndex: fileIndex,
diff --git a/Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteModels.swift b/Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteModels.swift
index 9cdcb7c..be75e57 100644
--- a/Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteModels.swift
+++ b/Sources/RDReaderView/EPUBCore/Notes/RDEPUBNoteModels.swift
@@ -41,7 +41,7 @@ public struct RDEPUBNoteReference: Codable, Equatable {
         self.targetHref = targetHref
         self.targetFragment = targetFragment
         self.targetCFI = targetCFI
-        self.label = label?.rdNoteNilIfEmpty
+        self.label = label?.rd_nilIfEmpty
         self.kind = kind
     }
 }
@@ -71,15 +71,8 @@ public struct RDEPUBResolvedNote: Equatable {
         self.reference = reference
         self.sourceLocation = sourceLocation
         self.targetLocation = targetLocation
-        self.title = title?.rdNoteNilIfEmpty
+        self.title = title?.rd_nilIfEmpty
         self.html = html
         self.plainText = plainText
     }
 }
-
-private extension String {
-    var rdNoteNilIfEmpty: String? {
-        let trimmed = trimmingCharacters(in: .whitespacesAndNewlines)
-        return trimmed.isEmpty ? nil : trimmed
-    }
-}
diff --git a/Sources/RDReaderView/EPUBCore/RDEPUBReadingSession.swift b/Sources/RDReaderView/EPUBCore/RDEPUBReadingSession.swift
index 1dfdea4..9da3738 100644
--- a/Sources/RDReaderView/EPUBCore/RDEPUBReadingSession.swift
+++ b/Sources/RDReaderView/EPUBCore/RDEPUBReadingSession.swift
@@ -261,7 +261,11 @@ public final class RDEPUBReadingSession {
             href: location.href,
             progression: location.progression,
             lastProgression: location.lastProgression,
-            fragment: location.fragment
+            fragment: location.fragment,
+            rangeAnchor: location.rangeAnchor,
+            cfi: location.cfi,
+            lastCFI: location.lastCFI,
+            rangeCFI: location.rangeCFI
         )
 
         let resource = RDEPUBViewportResource(
diff --git a/Sources/RDReaderView/EPUBCore/RDEPUBWebView+Configuration.swift b/Sources/RDReaderView/EPUBCore/RDEPUBWebView+Configuration.swift
index 7be3c6e..5bd4b28 100644
--- a/Sources/RDReaderView/EPUBCore/RDEPUBWebView+Configuration.swift
+++ b/Sources/RDReaderView/EPUBCore/RDEPUBWebView+Configuration.swift
@@ -96,15 +96,3 @@ extension RDEPUBWebView {
         currentLoadSignature = nil
     }
 }
-
-extension UIColor {
-
-    var ss_hexString: String {
-        var red: CGFloat = 0
-        var green: CGFloat = 0
-        var blue: CGFloat = 0
-        var alpha: CGFloat = 0
-        getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-        return String(format: "#%02X%02X%02X", Int(red * 255), Int(green * 255), Int(blue * 255))
-    }
-}
diff --git a/Sources/RDReaderView/EPUBCore/RDEPUBWebView+FixedLayout.swift b/Sources/RDReaderView/EPUBCore/RDEPUBWebView+FixedLayout.swift
index d9c866e..1458105 100644
--- a/Sources/RDReaderView/EPUBCore/RDEPUBWebView+FixedLayout.swift
+++ b/Sources/RDReaderView/EPUBCore/RDEPUBWebView+FixedLayout.swift
@@ -16,7 +16,7 @@ extension RDEPUBWebView {
                 spread: spread,
                 viewportSize: viewportSize,
                 contentInset: contentInset,
-                backgroundColorCSS: backgroundColor?.ss_hexString,
+                backgroundColorCSS: backgroundColor?.rd_hexString,
                 fit: .page,
                 searchPresentation: nil
             )
@@ -50,7 +50,7 @@ extension RDEPUBWebView {
         RDEPUBWebViewDebug.log(debugScope, message: "load fixed spread resources=\(request.spread.resources.map(\.href).joined(separator: ",")) fit=\(request.fit.rawValue)")
         webView.loadHTMLString(
             html,
-            baseURL: URL(string: "\(RDEPUBResourceURLSchemeHandler.scheme):///")
+            baseURL: URL(string: "\(RDEPUBResourceURLSchemeHandler.scheme)://\(RDEPUBResourceURLSchemeHandler.host)/")
         )
     }
 
diff --git a/Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBTextPaginationSupport.swift b/Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBTextPaginationSupport.swift
index ecb3a59..a7ab73c 100644
--- a/Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBTextPaginationSupport.swift
+++ b/Sources/RDReaderView/EPUBTextRendering/Pagination/RDEPUBTextPaginationSupport.swift
@@ -17,15 +17,3 @@ extension NSAttributedString {
         rd_paginatedFrames(size: size).map(\.contentRange)
     }
 }
-
-extension UIColor {
-
-    var ss_cssString: String {
-        var red: CGFloat = 0
-        var green: CGFloat = 0
-        var blue: CGFloat = 0
-        var alpha: CGFloat = 0
-        getRed(&red, green: &green, blue: &blue, alpha: &alpha)
-        return String(format: "rgba(%d, %d, %d, %.3f)", Int(red * 255), Int(green * 255), Int(blue * 255), alpha)
-    }
-}
diff --git a/Sources/RDReaderView/EPUBTextRendering/RDEPUBTextIndexTable.swift b/Sources/RDReaderView/EPUBTextRendering/RDEPUBTextIndexTable.swift
index 05b9d66..5d01418 100644
--- a/Sources/RDReaderView/EPUBTextRendering/RDEPUBTextIndexTable.swift
+++ b/Sources/RDReaderView/EPUBTextRendering/RDEPUBTextIndexTable.swift
@@ -102,8 +102,8 @@ public struct RDEPUBTextIndexTable {
     }
 
     public func anchor(for location: RDEPUBLocation) -> RDEPUBTextAnchor? {
-        if let cfi = RDEPUBCFICompatibility.parseLossy(location.cfi),
-           let anchor = anchor(for: cfi) {
+        if let cfiRange = RDEPUBCFICompatibility.parseRangeLossy(location.rangeCFI),
+           let anchor = anchor(for: cfiRange.start) {
             return anchor
         }
 
@@ -111,6 +111,11 @@ public struct RDEPUBTextIndexTable {
             return anchor
         }
 
+        if let cfi = RDEPUBCFICompatibility.parseLossy(location.cfi),
+           let anchor = anchor(for: cfi) {
+            return anchor
+        }
+
         guard let chapterIndex = hrefToChapterIndex[location.href],
               let fileIndex = hrefToFileIndex[location.href] else { return nil }
         let fragments = fragmentOffsetsByHref[location.href] ?? [:]
diff --git a/Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBStyleSheetComposer.swift b/Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBStyleSheetComposer.swift
index 722eb70..45015ac 100644
--- a/Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBStyleSheetComposer.swift
+++ b/Sources/RDReaderView/EPUBTextRendering/Typesetter/RDEPUBStyleSheetComposer.swift
@@ -134,8 +134,8 @@ struct RDEPUBStyleSheetComposer {
     }
 
     private static func darkCSS(style: RDEPUBTextRenderStyle) -> String {
-        let background = style.backgroundColor?.ss_cssString ?? "rgba(0, 0, 0, 1.000)"
-        let text = style.textColor?.ss_cssString ?? "rgba(255, 255, 255, 1.000)"
+        let background = style.backgroundColor?.rd_cssString ?? "rgba(0, 0, 0, 1.000)"
+        let text = style.textColor?.rd_cssString ?? "rgba(255, 255, 255, 1.000)"
         return RDEPUBAssetRepository.string(for: .wxReadDarkCSS) + "\n\n" + """
         html, body {
           background: \(background) !important;
@@ -149,8 +149,8 @@ struct RDEPUBStyleSheetComposer {
 
     private static func userCSS(style: RDEPUBTextRenderStyle) -> String {
         let lineHeight = max((style.font.lineHeight + style.lineSpacing) / max(style.font.lineHeight, 1), 1)
-        let text = style.textColor.map { "color: \($0.ss_cssString) !important;" } ?? ""
-        let background = style.backgroundColor.map { "background: \($0.ss_cssString) !important;" } ?? ""
+        let text = style.textColor.map { "color: \($0.rd_cssString) !important;" } ?? ""
+        let background = style.backgroundColor.map { "background: \($0.rd_cssString) !important;" } ?? ""
         return """
         html, body {
           font-family: "\(style.font.familyName)" !important;
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBAttachmentTooltipOverlayView.swift b/Sources/RDReaderView/EPUBUI/RDEPUBAttachmentTooltipOverlayView.swift
new file mode 100644
index 0000000..73eed51
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBAttachmentTooltipOverlayView.swift
@@ -0,0 +1,36 @@
+
+import UIKit
+
+final class RDEPUBAttachmentTooltipOverlayView: UIView {
+
+    var onBackgroundTap: (() -> Void)?
+
+    var tooltipView: RDEPUBAttachmentTooltipView? {
+        subviews.compactMap { $0 as? RDEPUBAttachmentTooltipView }.first
+    }
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = .clear
+
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap(_:)))
+        tapGesture.cancelsTouchesInView = false
+        addGestureRecognizer(tapGesture)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    @objc
+    private func handleTap(_ gesture: UITapGestureRecognizer) {
+        let point = gesture.location(in: self)
+        guard let tooltipView else {
+            onBackgroundTap?()
+            return
+        }
+        if !tooltipView.frame.contains(point) {
+            onBackgroundTap?()
+        }
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBAttachmentTooltipView.swift b/Sources/RDReaderView/EPUBUI/RDEPUBAttachmentTooltipView.swift
new file mode 100644
index 0000000..f82fd91
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBAttachmentTooltipView.swift
@@ -0,0 +1,188 @@
+
+import UIKit
+
+final class RDEPUBAttachmentTooltipView: UIView {
+
+    enum ArrowPlacement {
+
+        case top
+
+        case bottom
+    }
+
+    private let contentInsets = UIEdgeInsets(top: 18, left: 20, bottom: 24, right: 20)
+
+    private let arrowSize = CGSize(width: 20, height: 10)
+
+    private let cornerRadius: CGFloat = 18
+
+    private(set) var minimumArrowX: CGFloat = 28
+
+    private var arrowTipX: CGFloat?
+
+    private var arrowPlacement: ArrowPlacement = .bottom
+
+    private let textLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        label.textColor = .white
+        label.font = .systemFont(ofSize: 16, weight: .regular)
+        label.lineBreakMode = .byWordWrapping
+        return label
+    }()
+
+    private let shapeLayer = CAShapeLayer()
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = .clear
+        isOpaque = false
+        layer.addSublayer(shapeLayer)
+        addSubview(textLabel)
+        accessibilityIdentifier = "epub.reader.attachment.tooltip"
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        shapeLayer.frame = bounds
+        shapeLayer.path = bubblePath(in: bounds).cgPath
+        shapeLayer.fillColor = UIColor(white: 0.26, alpha: 0.96).cgColor
+
+        let topInset = contentInsets.top + (arrowPlacement == .top ? arrowSize.height : 0)
+        let bottomInset = contentInsets.bottom + (arrowPlacement == .bottom ? arrowSize.height : 0)
+        let labelFrame = bounds.inset(by: UIEdgeInsets(
+            top: topInset,
+            left: contentInsets.left,
+            bottom: bottomInset,
+            right: contentInsets.right
+        ))
+        textLabel.frame = labelFrame
+    }
+
+    func setArrowTipX(_ value: CGFloat, placement: ArrowPlacement) {
+        arrowTipX = value
+        arrowPlacement = placement
+        setNeedsLayout()
+    }
+
+    func configure(text: String, maxWidth: CGFloat) {
+        textLabel.text = text
+        let labelMaxWidth = max(maxWidth - contentInsets.left - contentInsets.right, 120)
+        let labelSize = textLabel.sizeThatFits(CGSize(width: labelMaxWidth, height: .greatestFiniteMagnitude))
+        frame.size = CGSize(
+            width: min(maxWidth, labelSize.width + contentInsets.left + contentInsets.right),
+            height: labelSize.height + contentInsets.top + contentInsets.bottom + arrowSize.height
+        )
+        setNeedsLayout()
+        layoutIfNeeded()
+    }
+
+    private func bubblePath(in rect: CGRect) -> UIBezierPath {
+        let bubbleRect: CGRect
+        switch arrowPlacement {
+        case .bottom:
+            bubbleRect = CGRect(
+                x: rect.minX,
+                y: rect.minY,
+                width: rect.width,
+                height: rect.height - arrowSize.height
+            )
+        case .top:
+            bubbleRect = CGRect(
+                x: rect.minX,
+                y: rect.minY + arrowSize.height,
+                width: rect.width,
+                height: rect.height - arrowSize.height
+            )
+        }
+        let arrowMidX = min(
+            max(arrowTipX ?? bubbleRect.midX, minimumArrowX),
+            bubbleRect.width - minimumArrowX
+        )
+        let arrowHalfWidth = arrowSize.width / 2
+
+        let path = UIBezierPath()
+        switch arrowPlacement {
+        case .bottom:
+            path.move(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY))
+            path.addLine(to: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY + cornerRadius),
+                radius: cornerRadius,
+                startAngle: -.pi / 2,
+                endAngle: 0,
+                clockwise: true
+            )
+            path.addLine(to: CGPoint(x: bubbleRect.maxX, y: bubbleRect.maxY - cornerRadius))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.maxY - cornerRadius),
+                radius: cornerRadius,
+                startAngle: 0,
+                endAngle: .pi / 2,
+                clockwise: true
+            )
+            path.addLine(to: CGPoint(x: arrowMidX + arrowHalfWidth, y: bubbleRect.maxY))
+            path.addLine(to: CGPoint(x: arrowMidX, y: bubbleRect.maxY + arrowSize.height))
+            path.addLine(to: CGPoint(x: arrowMidX - arrowHalfWidth, y: bubbleRect.maxY))
+            path.addLine(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY - cornerRadius),
+                radius: cornerRadius,
+                startAngle: .pi / 2,
+                endAngle: .pi,
+                clockwise: true
+            )
+            path.addLine(to: CGPoint(x: bubbleRect.minX, y: bubbleRect.minY + cornerRadius))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY + cornerRadius),
+                radius: cornerRadius,
+                startAngle: .pi,
+                endAngle: -.pi / 2,
+                clockwise: true
+            )
+        case .top:
+            path.move(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY))
+            path.addLine(to: CGPoint(x: arrowMidX - arrowHalfWidth, y: bubbleRect.minY))
+            path.addLine(to: CGPoint(x: arrowMidX, y: bubbleRect.minY - arrowSize.height))
+            path.addLine(to: CGPoint(x: arrowMidX + arrowHalfWidth, y: bubbleRect.minY))
+            path.addLine(to: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY + cornerRadius),
+                radius: cornerRadius,
+                startAngle: -.pi / 2,
+                endAngle: 0,
+                clockwise: true
+            )
+            path.addLine(to: CGPoint(x: bubbleRect.maxX, y: bubbleRect.maxY - cornerRadius))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.maxY - cornerRadius),
+                radius: cornerRadius,
+                startAngle: 0,
+                endAngle: .pi / 2,
+                clockwise: true
+            )
+            path.addLine(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY - cornerRadius),
+                radius: cornerRadius,
+                startAngle: .pi / 2,
+                endAngle: .pi,
+                clockwise: true
+            )
+            path.addLine(to: CGPoint(x: bubbleRect.minX, y: bubbleRect.minY + cornerRadius))
+            path.addArc(
+                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY + cornerRadius),
+                radius: cornerRadius,
+                startAngle: .pi,
+                endAngle: -.pi / 2,
+                clockwise: true
+            )
+        }
+        path.close()
+        return path
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+AttachmentTooltip.swift b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+AttachmentTooltip.swift
new file mode 100644
index 0000000..8ba839b
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+AttachmentTooltip.swift
@@ -0,0 +1,79 @@
+
+import UIKit
+
+extension RDEPUBReaderController {
+
+    func presentAttachmentTooltip(text: String, sourceView: UIView, sourceRect: CGRect, sourcePoint: CGPoint) {
+        hideAttachmentTooltipIfNeeded()
+
+        let overlay = RDEPUBAttachmentTooltipOverlayView(frame: view.bounds)
+        overlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        overlay.onBackgroundTap = { [weak self, weak overlay] in
+            guard let self, let overlay else { return }
+            self.dismissAttachmentTooltipOverlay(overlay)
+        }
+
+        let tooltip = RDEPUBAttachmentTooltipView()
+        tooltip.alpha = 0
+        let horizontalPadding = max(view.safeAreaInsets.left, view.safeAreaInsets.right) + 12
+        tooltip.configure(text: text, maxWidth: min(view.bounds.width - horizontalPadding * 2, 320))
+
+        let anchorRect = sourceView.convert(sourceRect, to: view)
+        let rawAnchorPoint = sourceView.convert(sourcePoint, to: view)
+        let anchorPoint = CGPoint(
+            x: min(max(rawAnchorPoint.x, anchorRect.minX), anchorRect.maxX),
+            y: min(max(rawAnchorPoint.y, anchorRect.minY), anchorRect.maxY)
+        )
+        let verticalSpacing: CGFloat = 6
+        let tooltipSize = tooltip.frame.size
+        let idealX = anchorPoint.x - tooltipSize.width / 2
+        let minX = horizontalPadding
+        let maxX = max(minX, view.bounds.width - horizontalPadding - tooltipSize.width)
+        let originX = min(max(idealX, minX), maxX)
+        let topSafeY = view.safeAreaInsets.top + 12
+        let bottomSafeY = view.bounds.height - view.safeAreaInsets.bottom - 12
+        let availableSpaceAbove = anchorRect.minY - topSafeY
+        let availableSpaceBelow = bottomSafeY - anchorRect.maxY
+        let prefersAbove = availableSpaceAbove >= tooltipSize.height + verticalSpacing || availableSpaceAbove >= availableSpaceBelow
+        let tooltipPlacement: RDEPUBAttachmentTooltipView.ArrowPlacement = prefersAbove ? .bottom : .top
+        let originY: CGFloat
+        switch tooltipPlacement {
+        case .bottom:
+            originY = max(topSafeY, anchorRect.minY - tooltipSize.height - verticalSpacing)
+        case .top:
+            originY = min(bottomSafeY - tooltipSize.height, anchorRect.maxY + verticalSpacing)
+        }
+        let arrowTipX = min(
+            max(anchorPoint.x - originX, tooltip.minimumArrowX),
+            tooltipSize.width - tooltip.minimumArrowX
+        )
+
+        tooltip.setArrowTipX(arrowTipX, placement: tooltipPlacement)
+        tooltip.frame.origin = CGPoint(x: originX, y: originY)
+        overlay.addSubview(tooltip)
+        view.addSubview(overlay)
+
+        UIView.animate(withDuration: 0.2) {
+            tooltip.alpha = 1
+        }
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + 3.5) { [weak self, weak overlay] in
+            guard let self, let overlay else { return }
+            self.dismissAttachmentTooltipOverlay(overlay)
+        }
+    }
+
+    private func hideAttachmentTooltipIfNeeded() {
+        view.subviews
+            .compactMap { $0 as? RDEPUBAttachmentTooltipOverlayView }
+            .forEach { $0.removeFromSuperview() }
+    }
+
+    private func dismissAttachmentTooltipOverlay(_ overlay: RDEPUBAttachmentTooltipOverlayView) {
+        UIView.animate(withDuration: 0.18, animations: {
+            overlay.tooltipView?.alpha = 0
+        }, completion: { _ in
+            overlay.removeFromSuperview()
+        })
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift
index 2a24446..ecc79f7 100644
--- a/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ContentDelegates.swift
@@ -104,210 +104,6 @@ extension RDEPUBReaderController: RDEPUBTextContentViewDelegate {
         runtime.presentHighlightActions(for: highlight, sourceView: contentView, sourceRect: sourceRect)
     }
 
-    func pageNumber(for location: RDEPUBLocation) -> Int? {
-        if let publication,
-           let bookPageMap = readerContext.bookPageMap,
-           let spineIndex = readerContext.normalizedSpineIndex(for: location),
-           let entry = bookPageMap.entry(forSpineIndex: spineIndex) {
-            let normalizedLocation = publication.resourceResolver.normalizedLocation(
-                location,
-                relativeToSpineIndex: nil,
-                bookIdentifier: currentBookIdentifier
-            ) ?? location
-            let localPageIndex: Int
-            if let summary = readerContext.chapterSummary(forSpineIndex: spineIndex) {
-                let offset = chapterOffset(for: normalizedLocation, fallbackEntry: entry)
-                localPageIndex = summary.pageRanges.firstIndex {
-                    let range = $0.nsRange
-                    return offset >= range.location && offset <= max(range.location + range.length - 1, range.location)
-                } ?? fallbackLocalPageIndex(for: normalizedLocation, pageCount: entry.pageCount)
-            } else {
-                localPageIndex = fallbackLocalPageIndex(for: normalizedLocation, pageCount: entry.pageCount)
-            }
-            return bookPageMap.absolutePageIndex(
-                spineIndex: spineIndex,
-                localPageIndex: min(max(localPageIndex, 0), max(entry.pageCount - 1, 0))
-            ).map { $0 + 1 }
-        }
-
-        if let textBook, let publication {
-            if let anchor = location.rangeAnchor?.start {
-                if let page = textBook.indexTable.pageNumber(for: anchor, in: textBook) {
-                    return page + 1
-                }
-            }
-
-            let normalizedLocation = publication.resourceResolver.normalizedLocation(
-                location,
-                relativeToSpineIndex: nil,
-                bookIdentifier: currentBookIdentifier
-            ) ?? location
-            return textBook.pageNumber(
-                for: normalizedLocation,
-                resolver: publication.resourceResolver,
-                bookIdentifier: currentBookIdentifier
-            )
-        }
-
-        return readingSession?.queueNavigation(
-            to: location,
-            relativeToSpineIndex: nil,
-            bookIdentifier: currentBookIdentifier
-        )
-    }
-
-    func resolvedTextLocation(forPageNumber pageNumber: Int) -> RDEPUBLocation? {
-        if let resolvedPage = resolvedRuntimePage(forPageNumber: pageNumber) {
-            let startOffset = resolvedPage.page.pageStartOffset
-            let endOffset = max(startOffset, resolvedPage.page.pageEndOffset)
-            let chapterData = makeRuntimeChapterData(from: resolvedPage)
-            let location = chapterData.location(
-                for: NSRange(location: startOffset, length: max(endOffset - startOffset + 1, 1)),
-                bookIdentifier: currentBookIdentifier
-            )
-            if let publication {
-                return publication.resourceResolver.normalizedLocation(
-                    location,
-                    relativeToSpineIndex: nil,
-                    bookIdentifier: currentBookIdentifier
-                ) ?? location
-            }
-            return location
-        }
-
-        guard let textBook,
-              let page = textBook.page(at: pageNumber) else {
-            return nil
-        }
-
-        let location = textBook.chapterData(forPageNumber: pageNumber)?.location(forPage: page, bookIdentifier: currentBookIdentifier)
-            ?? textBook.location(forPageNumber: pageNumber, bookIdentifier: currentBookIdentifier)
-        guard let location else { return nil }
-
-        if let publication {
-            return publication.resourceResolver.normalizedLocation(
-                location,
-                relativeToSpineIndex: nil,
-                bookIdentifier: currentBookIdentifier
-            ) ?? location
-        }
-        return location
-    }
-
-    func synchronizeTextReadingState(pageNumber: Int, location: RDEPUBLocation) {
-        if let resolvedPage = resolvedRuntimePage(forPageNumber: pageNumber) {
-            readingSession?.updateReadingContext(
-                pageNumber: pageNumber,
-                location: location,
-                spineIndex: resolvedPage.page.spineIndex,
-                chapterIndex: resolvedPage.chapterIndex,
-                bookIdentifier: currentBookIdentifier
-            )
-            return
-        }
-
-        guard let textBook,
-              let page = textBook.page(at: pageNumber) else {
-            readingSession?.transition(to: .idle)
-            return
-        }
-
-        readingSession?.updateReadingContext(
-            pageNumber: pageNumber,
-            location: location,
-            spineIndex: page.spineIndex,
-            chapterIndex: page.chapterIndex,
-            bookIdentifier: currentBookIdentifier
-        )
-    }
-
-    func nativeTextSnapshot(from textBook: RDEPUBTextBook) -> RDEPUBNativeTextSnapshot {
-        let chapters = textBook.chapterInfos
-        let pages = textBook.pages.map {
-            EPUBPage(
-                spineIndex: $0.spineIndex,
-                chapterIndex: $0.chapterIndex,
-                pageIndexInChapter: $0.pageIndexInChapter,
-                totalPagesInChapter: $0.totalPagesInChapter,
-                chapterTitle: $0.chapterTitle,
-                fixedSpread: nil
-            )
-        }
-        return (pages, chapters)
-    }
-
-    private func resolvedRuntimePage(forPageNumber pageNumber: Int) -> RDEPUBResolvedPage? {
-        runtime.pageResolver.resolvePage(absolutePageIndex: pageNumber - 1)
-    }
-
-    func chapterOffset(for location: RDEPUBLocation, fallbackEntry: RDEPUBBookPageMapEntry) -> Int {
-        if let spineIndex = readerContext.normalizedSpineIndex(for: location),
-           let runtimeChapter = runtime.chapterRuntimeStore.chapterData(for: spineIndex),
-           let offset = runtimeChapter.chapterOffsetMap.chapterOffset(forCFI: location.cfi) {
-            return offset
-        }
-        if let cfi = RDEPUBCFICompatibility.parseLossy(location.cfi),
-           let cfiOffset = RDEPUBCFIResolver.resolve(cfi).chapterOffset {
-            return cfiOffset
-        }
-        if let anchor = location.rangeAnchor?.start {
-            return anchor.chapterOffset
-        }
-        if let fragment = location.fragment,
-           let offset = fallbackEntry.fragmentOffsets[fragment] {
-            return offset
-        }
-        return 0
-    }
-
-    func fallbackLocalPageIndex(for location: RDEPUBLocation, pageCount: Int) -> Int {
-        guard pageCount > 1 else { return 0 }
-        return min(
-            pageCount - 1,
-            max(0, Int(round(location.navigationProgression * Double(pageCount - 1))))
-        )
-    }
-
-    private func nearestFragmentID(beforeOrAt offset: Int, fragmentOffsets: [String: Int]) -> String? {
-        var bestID: String?
-        var bestOffset = Int.min
-        for (fragmentID, fragmentOffset) in fragmentOffsets where fragmentOffset <= offset && fragmentOffset > bestOffset {
-            bestOffset = fragmentOffset
-            bestID = fragmentID
-        }
-        return bestID
-    }
-
-    private func shouldAllowExternalURL(_ url: URL) -> Bool {
-        guard let scheme = url.scheme?.lowercased() else { return false }
-        if delegate?.epubReader(self, shouldOpenExternalURL: url) == false {
-            return false
-        }
-        return configuration.allowedExternalURLSchemes.contains(scheme)
-    }
-
-    private func openExternalURLIfAllowed(_ url: URL) {
-        guard shouldAllowExternalURL(url) else { return }
-        if configuration.requiresExternalLinkConfirmation {
-            presentExternalLinkConfirmation(for: url)
-        } else {
-            UIApplication.shared.open(url, options: [:], completionHandler: nil)
-        }
-    }
-
-    private func presentExternalLinkConfirmation(for url: URL) {
-        let alert = UIAlertController(
-            title: "打开外部链接",
-            message: url.absoluteString,
-            preferredStyle: .alert
-        )
-        alert.addAction(UIAlertAction(title: "取消", style: .cancel))
-        alert.addAction(UIAlertAction(title: "打开", style: .default) { _ in
-            UIApplication.shared.open(url, options: [:], completionHandler: nil)
-        })
-        present(alert, animated: true)
-    }
-
     private func presentNotePopupIfPossible(for location: RDEPUBLocation, fromSpineIndex: Int) -> Bool {
         guard let publication else { return false }
         let sourceHref = publication.resourceResolver.href(forSpineIndex: fromSpineIndex) ?? location.href
@@ -354,317 +150,4 @@ extension RDEPUBReaderController: RDEPUBTextContentViewDelegate {
         readerView.transitionToPage(pageNum: max(pageNumber - 1, 0), animated: animated)
     }
 
-    private func presentAttachmentTooltip(text: String, sourceView: UIView, sourceRect: CGRect, sourcePoint: CGPoint) {
-        hideAttachmentTooltipIfNeeded()
-
-        let overlay = RDEPUBAttachmentTooltipOverlayView(frame: view.bounds)
-        overlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        overlay.onBackgroundTap = { [weak self, weak overlay] in
-            guard let self, let overlay else { return }
-            self.dismissAttachmentTooltipOverlay(overlay)
-        }
-
-        let tooltip = RDEPUBAttachmentTooltipView()
-        tooltip.alpha = 0
-        let horizontalPadding = max(view.safeAreaInsets.left, view.safeAreaInsets.right) + 12
-        tooltip.configure(text: text, maxWidth: min(view.bounds.width - horizontalPadding * 2, 320))
-
-        let anchorRect = sourceView.convert(sourceRect, to: view)
-        let rawAnchorPoint = sourceView.convert(sourcePoint, to: view)
-        let anchorPoint = CGPoint(
-            x: min(max(rawAnchorPoint.x, anchorRect.minX), anchorRect.maxX),
-            y: min(max(rawAnchorPoint.y, anchorRect.minY), anchorRect.maxY)
-        )
-        let verticalSpacing: CGFloat = 6
-        let tooltipSize = tooltip.frame.size
-        let idealX = anchorPoint.x - tooltipSize.width / 2
-        let minX = horizontalPadding
-        let maxX = max(minX, view.bounds.width - horizontalPadding - tooltipSize.width)
-        let originX = min(max(idealX, minX), maxX)
-        let topSafeY = view.safeAreaInsets.top + 12
-        let bottomSafeY = view.bounds.height - view.safeAreaInsets.bottom - 12
-        let availableSpaceAbove = anchorRect.minY - topSafeY
-        let availableSpaceBelow = bottomSafeY - anchorRect.maxY
-        let prefersAbove = availableSpaceAbove >= tooltipSize.height + verticalSpacing || availableSpaceAbove >= availableSpaceBelow
-        let tooltipPlacement: RDEPUBAttachmentTooltipView.ArrowPlacement = prefersAbove ? .bottom : .top
-        let originY: CGFloat
-        switch tooltipPlacement {
-        case .bottom:
-            originY = max(topSafeY, anchorRect.minY - tooltipSize.height - verticalSpacing)
-        case .top:
-            originY = min(bottomSafeY - tooltipSize.height, anchorRect.maxY + verticalSpacing)
-        }
-        let arrowTipX = min(
-            max(anchorPoint.x - originX, tooltip.minimumArrowX),
-            tooltipSize.width - tooltip.minimumArrowX
-        )
-
-        tooltip.setArrowTipX(arrowTipX, placement: tooltipPlacement)
-        tooltip.frame.origin = CGPoint(x: originX, y: originY)
-        overlay.addSubview(tooltip)
-        view.addSubview(overlay)
-
-        UIView.animate(withDuration: 0.2) {
-            tooltip.alpha = 1
-        }
-
-        DispatchQueue.main.asyncAfter(deadline: .now() + 3.5) { [weak self, weak overlay] in
-            guard let self, let overlay else { return }
-            self.dismissAttachmentTooltipOverlay(overlay)
-        }
-    }
-
-    private func hideAttachmentTooltipIfNeeded() {
-        view.subviews
-            .compactMap { $0 as? RDEPUBAttachmentTooltipOverlayView }
-            .forEach { $0.removeFromSuperview() }
-    }
-
-    private func dismissAttachmentTooltipOverlay(_ overlay: RDEPUBAttachmentTooltipOverlayView) {
-        UIView.animate(withDuration: 0.18, animations: {
-            overlay.tooltipView?.alpha = 0
-        }, completion: { _ in
-            overlay.removeFromSuperview()
-        })
-    }
-}
-
-private extension RDEPUBReaderController {
-    func makeRuntimeChapterData(from resolvedPage: RDEPUBResolvedPage) -> RDEPUBChapterData {
-        let textChapter = RDEPUBTextChapter(
-            chapterIndex: resolvedPage.chapterIndex,
-            spineIndex: resolvedPage.chapter.spineIndex,
-            href: resolvedPage.chapter.href,
-            title: resolvedPage.chapter.title,
-            attributedContent: resolvedPage.chapter.typesetAttributedString,
-            fragmentOffsets: resolvedPage.chapter.chapterOffsetMap.fragmentOffsets,
-            cfiMap: resolvedPage.chapter.chapterOffsetMap.cfiMap,
-            pageBreakReasons: resolvedPage.chapter.pages.map(\.metadata.breakReason),
-            pages: resolvedPage.chapter.pages
-        )
-        return RDEPUBChapterData(
-            chapter: textChapter,
-            indexTable: RDEPUBTextIndexTable(chapters: [textChapter])
-        )
-    }
-}
-
-private final class RDEPUBAttachmentTooltipOverlayView: UIView {
-
-    var onBackgroundTap: (() -> Void)?
-
-    var tooltipView: RDEPUBAttachmentTooltipView? {
-        subviews.compactMap { $0 as? RDEPUBAttachmentTooltipView }.first
-    }
-
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        backgroundColor = .clear
-
-        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(handleTap(_:)))
-        tapGesture.cancelsTouchesInView = false
-        addGestureRecognizer(tapGesture)
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    @objc
-    private func handleTap(_ gesture: UITapGestureRecognizer) {
-        let point = gesture.location(in: self)
-        guard let tooltipView else {
-            onBackgroundTap?()
-            return
-        }
-        if !tooltipView.frame.contains(point) {
-            onBackgroundTap?()
-        }
-    }
-}
-
-private final class RDEPUBAttachmentTooltipView: UIView {
-
-    enum ArrowPlacement {
-
-        case top
-
-        case bottom
-    }
-
-    private let contentInsets = UIEdgeInsets(top: 18, left: 20, bottom: 24, right: 20)
-
-    private let arrowSize = CGSize(width: 20, height: 10)
-
-    private let cornerRadius: CGFloat = 18
-
-    private(set) var minimumArrowX: CGFloat = 28
-
-    private var arrowTipX: CGFloat?
-
-    private var arrowPlacement: ArrowPlacement = .bottom
-
-    private let textLabel: UILabel = {
-        let label = UILabel()
-        label.numberOfLines = 0
-        label.textColor = .white
-        label.font = .systemFont(ofSize: 16, weight: .regular)
-        label.lineBreakMode = .byWordWrapping
-        return label
-    }()
-
-    private let shapeLayer = CAShapeLayer()
-
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        backgroundColor = .clear
-        isOpaque = false
-        layer.addSublayer(shapeLayer)
-        addSubview(textLabel)
-        accessibilityIdentifier = "epub.reader.attachment.tooltip"
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    override func layoutSubviews() {
-        super.layoutSubviews()
-        shapeLayer.frame = bounds
-        shapeLayer.path = bubblePath(in: bounds).cgPath
-        shapeLayer.fillColor = UIColor(white: 0.26, alpha: 0.96).cgColor
-
-        let topInset = contentInsets.top + (arrowPlacement == .top ? arrowSize.height : 0)
-        let bottomInset = contentInsets.bottom + (arrowPlacement == .bottom ? arrowSize.height : 0)
-        let labelFrame = bounds.inset(by: UIEdgeInsets(
-            top: topInset,
-            left: contentInsets.left,
-            bottom: bottomInset,
-            right: contentInsets.right
-        ))
-        textLabel.frame = labelFrame
-    }
-
-    func setArrowTipX(_ value: CGFloat, placement: ArrowPlacement) {
-        arrowTipX = value
-        arrowPlacement = placement
-        setNeedsLayout()
-    }
-
-    func configure(text: String, maxWidth: CGFloat) {
-        textLabel.text = text
-        let labelMaxWidth = max(maxWidth - contentInsets.left - contentInsets.right, 120)
-        let labelSize = textLabel.sizeThatFits(CGSize(width: labelMaxWidth, height: .greatestFiniteMagnitude))
-        frame.size = CGSize(
-            width: min(maxWidth, labelSize.width + contentInsets.left + contentInsets.right),
-            height: labelSize.height + contentInsets.top + contentInsets.bottom + arrowSize.height
-        )
-        setNeedsLayout()
-        layoutIfNeeded()
-    }
-
-    private func bubblePath(in rect: CGRect) -> UIBezierPath {
-        let bubbleRect: CGRect
-        switch arrowPlacement {
-        case .bottom:
-            bubbleRect = CGRect(
-                x: rect.minX,
-                y: rect.minY,
-                width: rect.width,
-                height: rect.height - arrowSize.height
-            )
-        case .top:
-            bubbleRect = CGRect(
-                x: rect.minX,
-                y: rect.minY + arrowSize.height,
-                width: rect.width,
-                height: rect.height - arrowSize.height
-            )
-        }
-        let arrowMidX = min(
-            max(arrowTipX ?? bubbleRect.midX, minimumArrowX),
-            bubbleRect.width - minimumArrowX
-        )
-        let arrowHalfWidth = arrowSize.width / 2
-
-        let path = UIBezierPath()
-        switch arrowPlacement {
-        case .bottom:
-            path.move(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY))
-            path.addLine(to: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY + cornerRadius),
-                radius: cornerRadius,
-                startAngle: -.pi / 2,
-                endAngle: 0,
-                clockwise: true
-            )
-            path.addLine(to: CGPoint(x: bubbleRect.maxX, y: bubbleRect.maxY - cornerRadius))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.maxY - cornerRadius),
-                radius: cornerRadius,
-                startAngle: 0,
-                endAngle: .pi / 2,
-                clockwise: true
-            )
-            path.addLine(to: CGPoint(x: arrowMidX + arrowHalfWidth, y: bubbleRect.maxY))
-            path.addLine(to: CGPoint(x: arrowMidX, y: bubbleRect.maxY + arrowSize.height))
-            path.addLine(to: CGPoint(x: arrowMidX - arrowHalfWidth, y: bubbleRect.maxY))
-            path.addLine(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY - cornerRadius),
-                radius: cornerRadius,
-                startAngle: .pi / 2,
-                endAngle: .pi,
-                clockwise: true
-            )
-            path.addLine(to: CGPoint(x: bubbleRect.minX, y: bubbleRect.minY + cornerRadius))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY + cornerRadius),
-                radius: cornerRadius,
-                startAngle: .pi,
-                endAngle: -.pi / 2,
-                clockwise: true
-            )
-        case .top:
-            path.move(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY))
-            path.addLine(to: CGPoint(x: arrowMidX - arrowHalfWidth, y: bubbleRect.minY))
-            path.addLine(to: CGPoint(x: arrowMidX, y: bubbleRect.minY - arrowSize.height))
-            path.addLine(to: CGPoint(x: arrowMidX + arrowHalfWidth, y: bubbleRect.minY))
-            path.addLine(to: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.minY + cornerRadius),
-                radius: cornerRadius,
-                startAngle: -.pi / 2,
-                endAngle: 0,
-                clockwise: true
-            )
-            path.addLine(to: CGPoint(x: bubbleRect.maxX, y: bubbleRect.maxY - cornerRadius))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.maxX - cornerRadius, y: bubbleRect.maxY - cornerRadius),
-                radius: cornerRadius,
-                startAngle: 0,
-                endAngle: .pi / 2,
-                clockwise: true
-            )
-            path.addLine(to: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.maxY - cornerRadius),
-                radius: cornerRadius,
-                startAngle: .pi / 2,
-                endAngle: .pi,
-                clockwise: true
-            )
-            path.addLine(to: CGPoint(x: bubbleRect.minX, y: bubbleRect.minY + cornerRadius))
-            path.addArc(
-                withCenter: CGPoint(x: bubbleRect.minX + cornerRadius, y: bubbleRect.minY + cornerRadius),
-                radius: cornerRadius,
-                startAngle: .pi,
-                endAngle: -.pi / 2,
-                clockwise: true
-            )
-        }
-        path.close()
-        return path
-    }
 }
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+DataSource.swift b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+DataSource.swift
index 4e38fbf..876964d 100644
--- a/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+DataSource.swift
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+DataSource.swift
@@ -33,7 +33,22 @@ extension RDEPUBReaderController: RDReaderDataSource, RDReaderPageProvider, RDRe
                 forAbsolutePageNumber: pageNum + 1,
                 allowSynchronousLoad: false
             )
-            if let resolvedPage = runtime.pageResolver.resolvePage(absolutePageIndex: pageNum) {
+            var resolvedPage = runtime.pageResolver.resolvePage(absolutePageIndex: pageNum)
+            let shouldAllowSynchronousFallback = (
+                readerView.currentPage < 0 || readerView.currentPage == pageNum
+            ) && !readerView.isPageCurlTransitioning
+            if resolvedPage == nil, shouldAllowSynchronousFallback {
+                RDEPUBBackgroundTrace.log(
+                    "LoadingPage",
+                    "sync fallback requested page=\(pageNum + 1) currentPage=\(readerView.currentPage + 1) totalKnown=\(pageCountOfReaderView(readerView: readerView))"
+                )
+                _ = runtime.prepareOnDemandChapter(
+                    forAbsolutePageNumber: pageNum + 1,
+                    allowSynchronousLoad: true
+                )
+                resolvedPage = runtime.pageResolver.resolvePage(absolutePageIndex: pageNum)
+            }
+            if let resolvedPage {
                 let contentView = (containerView as? RDEPUBTextContentView) ?? RDEPUBTextContentView()
                 contentView.delegate = self
                 readerView.registerSelectionGestureDependenciesIfNeeded(for: contentView)
@@ -69,6 +84,10 @@ extension RDEPUBReaderController: RDReaderDataSource, RDReaderPageProvider, RDRe
                 guard let readerView, let contentView else { return }
                 readerView.updateSelectionPagingSuppression(for: contentView, isSuppressed: isSuppressed)
             }
+            RDEPUBBackgroundTrace.log(
+                "LoadingPage",
+                "configureLoading page=\(pageNum + 1) currentPage=\(readerView.currentPage + 1) totalKnown=\(pageCountOfReaderView(readerView: readerView)) hasMap=\(readerContext.bookPageMap != nil)"
+            )
             contentView.configureLoading(
                 pageNumber: pageNum + 1,
                 totalPages: pageCountOfReaderView(readerView: readerView),
@@ -341,9 +360,24 @@ extension RDEPUBReaderController: RDReaderDataSource, RDReaderPageProvider, RDRe
         guard !isRepaginating else { return }
 
         let previousCurrentPage = readerView.currentPage
+        let wasPageCurlTransitioning = readerView.isPageCurlTransitioning
         runtime.applyPendingFullPageMapIfNeeded()
+        if wasPageCurlTransitioning {
+            DispatchQueue.main.async { [weak self, weak readerView] in
+                guard let self, let readerView, !readerView.isPageCurlTransitioning else { return }
+                self.runtime.applyPendingFullPageMapIfNeeded()
+            }
+        }
         let effectivePageNum = readerView.currentPage >= 0 ? readerView.currentPage : pageNum
+        RDEPUBBackgroundTrace.log(
+            "PageEvent",
+            "pageNum callback raw=\(pageNum + 1) effective=\(effectivePageNum + 1) previousCurrent=\(previousCurrentPage + 1) readerCurrent=\(readerView.currentPage + 1) totalPages=\(pageCountOfReaderView(readerView: readerView)) display=\(readerView.currentDisplayType)"
+        )
         if previousCurrentPage != readerView.currentPage, effectivePageNum != pageNum {
+            RDEPUBBackgroundTrace.log(
+                "PageEvent",
+                "pageNum callback aborted dueToCurrentPageMutation raw=\(pageNum + 1) effective=\(effectivePageNum + 1)"
+            )
             return
         }
 
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ExternalLinks.swift b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ExternalLinks.swift
new file mode 100644
index 0000000..bdebaf4
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+ExternalLinks.swift
@@ -0,0 +1,35 @@
+
+import UIKit
+
+extension RDEPUBReaderController {
+
+    func openExternalURLIfAllowed(_ url: URL) {
+        guard shouldAllowExternalURL(url) else { return }
+        if configuration.requiresExternalLinkConfirmation {
+            presentExternalLinkConfirmation(for: url)
+        } else {
+            UIApplication.shared.open(url, options: [:], completionHandler: nil)
+        }
+    }
+
+    private func shouldAllowExternalURL(_ url: URL) -> Bool {
+        guard let scheme = url.scheme?.lowercased() else { return false }
+        if delegate?.epubReader(self, shouldOpenExternalURL: url) == false {
+            return false
+        }
+        return configuration.allowedExternalURLSchemes.contains(scheme)
+    }
+
+    private func presentExternalLinkConfirmation(for url: URL) {
+        let alert = UIAlertController(
+            title: "打开外部链接",
+            message: url.absoluteString,
+            preferredStyle: .alert
+        )
+        alert.addAction(UIAlertAction(title: "取消", style: .cancel))
+        alert.addAction(UIAlertAction(title: "打开", style: .default) { _ in
+            UIApplication.shared.open(url, options: [:], completionHandler: nil)
+        })
+        present(alert, animated: true)
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+LocationResolution.swift b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+LocationResolution.swift
new file mode 100644
index 0000000..0219671
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBReaderController+LocationResolution.swift
@@ -0,0 +1,223 @@
+
+import UIKit
+
+extension RDEPUBReaderController {
+
+    func pageNumber(for location: RDEPUBLocation) -> Int? {
+        if let publication,
+           let bookPageMap = readerContext.bookPageMap,
+           let spineIndex = readerContext.normalizedSpineIndex(for: location),
+           let entry = bookPageMap.entry(forSpineIndex: spineIndex) {
+            let normalizedLocation = publication.resourceResolver.normalizedLocation(
+                location,
+                relativeToSpineIndex: nil,
+                bookIdentifier: currentBookIdentifier
+            ) ?? location
+            let localPageIndex = resolvedLocalPageIndex(
+                for: normalizedLocation,
+                spineIndex: spineIndex,
+                fallbackEntry: entry
+            ) ?? fallbackLocalPageIndex(for: normalizedLocation, pageCount: entry.pageCount)
+            return bookPageMap.absolutePageIndex(
+                spineIndex: spineIndex,
+                localPageIndex: min(max(localPageIndex, 0), max(entry.pageCount - 1, 0))
+            ).map { $0 + 1 }
+        }
+
+        if let textBook, let publication {
+            if let anchor = location.rangeAnchor?.start {
+                if let page = textBook.indexTable.pageNumber(for: anchor, in: textBook) {
+                    return page + 1
+                }
+            }
+
+            let normalizedLocation = publication.resourceResolver.normalizedLocation(
+                location,
+                relativeToSpineIndex: nil,
+                bookIdentifier: currentBookIdentifier
+            ) ?? location
+            return textBook.pageNumber(
+                for: normalizedLocation,
+                resolver: publication.resourceResolver,
+                bookIdentifier: currentBookIdentifier
+            )
+        }
+
+        return readingSession?.queueNavigation(
+            to: location,
+            relativeToSpineIndex: nil,
+            bookIdentifier: currentBookIdentifier
+        )
+    }
+
+    func resolvedTextLocation(forPageNumber pageNumber: Int) -> RDEPUBLocation? {
+        if let resolvedPage = resolvedRuntimePage(forPageNumber: pageNumber) {
+            let startOffset = resolvedPage.page.pageStartOffset
+            let endOffset = max(startOffset, resolvedPage.page.pageEndOffset)
+            let chapterData = makeRuntimeChapterData(from: resolvedPage)
+            let location = chapterData.location(
+                for: NSRange(location: startOffset, length: max(endOffset - startOffset + 1, 1)),
+                bookIdentifier: currentBookIdentifier
+            )
+            if let publication {
+                return publication.resourceResolver.normalizedLocation(
+                    location,
+                    relativeToSpineIndex: nil,
+                    bookIdentifier: currentBookIdentifier
+                ) ?? location
+            }
+            return location
+        }
+
+        guard let textBook,
+              let page = textBook.page(at: pageNumber) else {
+            return nil
+        }
+
+        let location = textBook.chapterData(forPageNumber: pageNumber)?.location(forPage: page, bookIdentifier: currentBookIdentifier)
+            ?? textBook.location(forPageNumber: pageNumber, bookIdentifier: currentBookIdentifier)
+        guard let location else { return nil }
+
+        if let publication {
+            return publication.resourceResolver.normalizedLocation(
+                location,
+                relativeToSpineIndex: nil,
+                bookIdentifier: currentBookIdentifier
+            ) ?? location
+        }
+        return location
+    }
+
+    func synchronizeTextReadingState(pageNumber: Int, location: RDEPUBLocation) {
+        if let resolvedPage = resolvedRuntimePage(forPageNumber: pageNumber) {
+            readingSession?.updateReadingContext(
+                pageNumber: pageNumber,
+                location: location,
+                spineIndex: resolvedPage.page.spineIndex,
+                chapterIndex: resolvedPage.chapterIndex,
+                bookIdentifier: currentBookIdentifier
+            )
+            return
+        }
+
+        guard let textBook,
+              let page = textBook.page(at: pageNumber) else {
+            readingSession?.transition(to: .idle)
+            return
+        }
+
+        readingSession?.updateReadingContext(
+            pageNumber: pageNumber,
+            location: location,
+            spineIndex: page.spineIndex,
+            chapterIndex: page.chapterIndex,
+            bookIdentifier: currentBookIdentifier
+        )
+    }
+
+    func nativeTextSnapshot(from textBook: RDEPUBTextBook) -> RDEPUBNativeTextSnapshot {
+        let chapters = textBook.chapterInfos
+        let pages = textBook.pages.map {
+            EPUBPage(
+                spineIndex: $0.spineIndex,
+                chapterIndex: $0.chapterIndex,
+                pageIndexInChapter: $0.pageIndexInChapter,
+                totalPagesInChapter: $0.totalPagesInChapter,
+                chapterTitle: $0.chapterTitle,
+                fixedSpread: nil
+            )
+        }
+        return (pages, chapters)
+    }
+
+    func chapterOffset(for location: RDEPUBLocation, fallbackEntry: RDEPUBBookPageMapEntry) -> Int {
+        if let spineIndex = readerContext.normalizedSpineIndex(for: location),
+           let runtimeChapter = runtime.chapterRuntimeStore.chapterData(for: spineIndex),
+           let cfi = primaryLocationCFI(for: location),
+           let offset = runtimeChapter.chapterOffsetMap.chapterOffset(forCFI: cfi) {
+            return offset
+        }
+        if let rawCFI = primaryLocationCFI(for: location),
+           let cfi = RDEPUBCFICompatibility.parseLossy(rawCFI),
+           let cfiOffset = RDEPUBCFIResolver.resolve(cfi).chapterOffset {
+            return cfiOffset
+        }
+        if let anchor = location.rangeAnchor?.start {
+            return anchor.chapterOffset
+        }
+        if let fragment = location.fragment,
+           let offset = fallbackEntry.fragmentOffsets[fragment] {
+            return offset
+        }
+        return 0
+    }
+
+    func fallbackLocalPageIndex(for location: RDEPUBLocation, pageCount: Int) -> Int {
+        guard pageCount > 1 else { return 0 }
+        return min(
+            pageCount - 1,
+            max(0, Int(round(location.navigationProgression * Double(pageCount - 1))))
+        )
+    }
+
+    private func resolvedRuntimePage(forPageNumber pageNumber: Int) -> RDEPUBResolvedPage? {
+        runtime.pageResolver.resolvePage(absolutePageIndex: pageNumber - 1)
+    }
+
+    private func resolvedLocalPageIndex(
+        for location: RDEPUBLocation,
+        spineIndex: Int,
+        fallbackEntry: RDEPUBBookPageMapEntry
+    ) -> Int? {
+        let offset = chapterOffset(for: location, fallbackEntry: fallbackEntry)
+
+        if let runtimeChapter = runtime.chapterRuntimeStore.chapterData(for: spineIndex),
+           let pageIndex = runtimeChapter.chapterOffsetMap.pageIndex(forChapterOffset: offset) {
+            return pageIndex
+        }
+
+        if let summary = readerContext.chapterSummary(forSpineIndex: spineIndex) {
+            return summary.pageRanges.firstIndex {
+                let range = $0.nsRange
+                return offset >= range.location && offset <= max(range.location + range.length - 1, range.location)
+            }
+        }
+
+        return nil
+    }
+
+    private func primaryLocationCFI(for location: RDEPUBLocation) -> String? {
+        if let rangeCFI = RDEPUBCFICompatibility.parseRangeLossy(location.rangeCFI) {
+            return rangeCFI.start.rawValue
+        }
+        return location.cfi
+    }
+
+    private func nearestFragmentID(beforeOrAt offset: Int, fragmentOffsets: [String: Int]) -> String? {
+        var bestID: String?
+        var bestOffset = Int.min
+        for (fragmentID, fragmentOffset) in fragmentOffsets where fragmentOffset <= offset && fragmentOffset > bestOffset {
+            bestOffset = fragmentOffset
+            bestID = fragmentID
+        }
+        return bestID
+    }
+
+    private func makeRuntimeChapterData(from resolvedPage: RDEPUBResolvedPage) -> RDEPUBChapterData {
+        let textChapter = RDEPUBTextChapter(
+            chapterIndex: resolvedPage.chapterIndex,
+            spineIndex: resolvedPage.chapter.spineIndex,
+            href: resolvedPage.chapter.href,
+            title: resolvedPage.chapter.title,
+            attributedContent: resolvedPage.chapter.typesetAttributedString,
+            fragmentOffsets: resolvedPage.chapter.chapterOffsetMap.fragmentOffsets,
+            cfiMap: resolvedPage.chapter.chapterOffsetMap.cfiMap,
+            pageBreakReasons: resolvedPage.chapter.pages.map(\.metadata.breakReason),
+            pages: resolvedPage.chapter.pages
+        )
+        return RDEPUBChapterData(
+            chapter: textChapter,
+            indexTable: RDEPUBTextIndexTable(chapters: [textChapter])
+        )
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/RDEPUBReaderSearchBarView.swift b/Sources/RDReaderView/EPUBUI/RDEPUBReaderSearchBarView.swift
index fc68b6f..55b18f2 100644
--- a/Sources/RDReaderView/EPUBUI/RDEPUBReaderSearchBarView.swift
+++ b/Sources/RDReaderView/EPUBUI/RDEPUBReaderSearchBarView.swift
@@ -99,7 +99,7 @@ final class RDEPUBReaderSearchBarView: RDEPUBReaderToolView {
 
     override func apply(theme: RDEPUBReaderTheme) {
         super.apply(theme: theme)
-        let isDarkBackground = theme.contentBackgroundColor.rd_searchIsDarkBackground
+        let isDarkBackground = theme.contentBackgroundColor.rd_isDarkBackground
 
         let overlayColor = isDarkBackground
             ? UIColor(white: 0.12, alpha: 0.92)
@@ -422,21 +422,6 @@ final class RDEPUBReaderSearchBarView: RDEPUBReaderToolView {
     }
 }
 
-private extension UIColor {
-
-    var rd_searchIsDarkBackground: Bool {
-        var red: CGFloat = 0
-        var green: CGFloat = 0
-        var blue: CGFloat = 0
-        var alpha: CGFloat = 0
-        guard getRed(&red, green: &green, blue: &blue, alpha: &alpha) else {
-            return false
-        }
-        let luminance = (0.299 * red) + (0.587 * green) + (0.114 * blue)
-        return luminance < 0.5
-    }
-}
-
 extension RDEPUBReaderSearchBarView: UITableViewDataSource, UITableViewDelegate {
 
     func numberOfSections(in tableView: UITableView) -> Int {
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift
index 622621d..619ce8a 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterLoader.swift
@@ -2,10 +2,21 @@ import Foundation
 
 final class RDEPUBChapterLoader {
 
-    private unowned let context: RDEPUBReaderContext
+    private typealias LoadCompletion = (Result<RDEPUBRuntimeChapter, Error>) -> Void
+
+    private struct PendingLoad {
+        var priority: LoadPriority
+        var completions: [LoadCompletion]
+    }
+
+    private weak var context: RDEPUBReaderContext?
 
     private var summaryDiskCache: RDEPUBChapterSummaryDiskCache?
 
+    private let pendingLoadsLock = NSLock()
+
+    private var pendingLoads: [Int: PendingLoad] = [:]
+
     var onDeferredCFIMapReady: ((Int) -> Void)?
 
     init(context: RDEPUBReaderContext) {
@@ -25,31 +36,70 @@ final class RDEPUBChapterLoader {
         case prefetch
     }
 
+    private enum LoadRegistrationResult {
+        case created
+        case joined(existingPriority: LoadPriority, effectivePriority: LoadPriority)
+    }
+
     func loadChapter(
         spineIndex: Int,
         store: RDEPUBChapterRuntimeStore,
         priority: LoadPriority = .navigation,
         completion: @escaping (Result<RDEPUBRuntimeChapter, Error>) -> Void
     ) {
+        RDEPUBBackgroundTrace.log("ChapterLoader", "request spine=\(spineIndex) priority=\(priority)")
 
         if let cached = store.chapterData(for: spineIndex) {
             RDEPUBBackgroundTrace.log("ChapterLoader", "cache hit spine=\(spineIndex) priority=\(priority)")
-            scheduleDeferredCFIMapBuildIfNeeded(
-                for: cached,
-                cacheKey: makeCacheKey(spineIndex: spineIndex),
-                store: store
-            )
+            if let context {
+                scheduleDeferredCFIMapBuildIfNeeded(
+                    for: cached,
+                    cacheKey: makeCacheKey(spineIndex: spineIndex, context: context),
+                    store: store
+                )
+            }
             DispatchQueue.main.async {
                 completion(.success(cached))
             }
             return
         }
 
-        store.markBuilding(true)
+        let completionOnMain: LoadCompletion = { result in
+            DispatchQueue.main.async {
+                completion(result)
+            }
+        }
 
-        store.chapterLoadQueue.async {
-            RDEPUBBackgroundTrace.log("ChapterLoader", "queue start spine=\(spineIndex) priority=\(priority)")
-            let cacheKey = self.makeCacheKey(spineIndex: spineIndex)
+        let registration = registerPendingLoad(
+            spineIndex: spineIndex,
+            priority: priority,
+            completion: completionOnMain
+        )
+
+        switch registration {
+        case .joined(let existingPriority, let effectivePriority):
+            RDEPUBBackgroundTrace.log(
+                "ChapterLoader",
+                "dedupe spine=\(spineIndex) existingPriority=\(existingPriority) requestedPriority=\(priority) effectivePriority=\(effectivePriority)"
+            )
+            return
+        case .created:
+            break
+        }
+
+        store.markBuilding(true)
+        _ = store.beginPendingChapterLoad(for: spineIndex)
+
+        store.chapterLoadQueue.async { [self] in
+            guard let context = self.context else {
+                store.endPendingChapterLoad(for: spineIndex)
+                store.markBuilding(false)
+                self.resolvePendingLoad(spineIndex: spineIndex, result: .failure(RDEPUBChapterLoadError.missingParser))
+                return
+            }
+            let queuePriority = self.pendingPriority(for: spineIndex) ?? priority
+            RDEPUBBackgroundTrace.log("ChapterLoader", "queue start spine=\(spineIndex) priority=\(queuePriority)")
+            let cacheKey = self.makeCacheKey(spineIndex: spineIndex, context: context)
 
             let precomputedPageRanges = store.pageCount(for: cacheKey)?.pageRanges
             let diskSummary: RDEPUBChapterSummary?
@@ -71,12 +121,13 @@ final class RDEPUBChapterLoader {
 
                 let chapter = try RDEPUBBackgroundTrace.measure(
                     "ChapterLoader",
-                    "buildChapter spine=\(spineIndex) priority=\(priority) cachedRanges=\(availablePageRanges?.count ?? 0)"
+                    "buildChapter spine=\(spineIndex) priority=\(queuePriority) cachedRanges=\(availablePageRanges?.count ?? 0)"
                 ) {
                     try self.buildChapter(
                         spineIndex: spineIndex,
                         availablePageRanges: availablePageRanges,
-                        diskSummary: diskSummary
+                        diskSummary: diskSummary,
+                        context: context
                     )
                 }
                 RDEPUBBackgroundTrace.log("ChapterLoader", "buildChapter OK: spine=\(spineIndex) pages=\(chapter.pages.count)")
@@ -96,42 +147,38 @@ final class RDEPUBChapterLoader {
                     store: store
                 )
 
-                switch priority {
+                let effectivePriority = self.pendingPriority(for: spineIndex) ?? queuePriority
+                store.endPendingChapterLoad(for: spineIndex)
+                switch effectivePriority {
                 case .navigation:
 
                     let nextTarget = store.consumeNavigationTarget()
                     if let target = nextTarget, target != spineIndex {
 
                         store.markBuilding(false)
-                        self.loadChapter(spineIndex: target, store: store, priority: .navigation, completion: completion)
+                        self.resolvePendingLoad(spineIndex: spineIndex, result: .success(chapter))
+                        self.loadChapter(spineIndex: target, store: store, priority: .navigation, completion: { _ in })
                         return
                     }
                     store.markBuilding(false)
-                    DispatchQueue.main.async {
-                        completion(.success(chapter))
-                    }
+                    self.resolvePendingLoad(spineIndex: spineIndex, result: .success(chapter))
 
                 case .preview:
                     store.markBuilding(false)
-                    DispatchQueue.main.async {
-                        completion(.success(chapter))
-                    }
+                    self.resolvePendingLoad(spineIndex: spineIndex, result: .success(chapter))
 
                 case .prefetch:
 
                     store.removePrefetchTarget(spineIndex)
                     store.markBuilding(false)
-                    DispatchQueue.main.async {
-                        completion(.success(chapter))
-                    }
+                    self.resolvePendingLoad(spineIndex: spineIndex, result: .success(chapter))
                 }
             } catch {
 
                 RDEPUBBackgroundTrace.log("ChapterLoader", "buildChapter FAILED: spine=\(spineIndex) error=\(error)")
+                store.endPendingChapterLoad(for: spineIndex)
                 store.markBuilding(false)
-                DispatchQueue.main.async {
-                    completion(.failure(error))
-                }
+                self.resolvePendingLoad(spineIndex: spineIndex, result: .failure(error))
             }
         }
     }
@@ -140,11 +187,15 @@ final class RDEPUBChapterLoader {
         spineIndex: Int,
         store: RDEPUBChapterRuntimeStore?
     ) throws -> RDEPUBRuntimeChapter {
+        guard let context else {
+            throw RDEPUBChapterLoadError.missingParser
+        }
+
         if let cached = store?.chapterData(for: spineIndex) {
             if let store {
                 scheduleDeferredCFIMapBuildIfNeeded(
                     for: cached,
-                    cacheKey: makeCacheKey(spineIndex: spineIndex),
+                    cacheKey: makeCacheKey(spineIndex: spineIndex, context: context),
                     store: store
                 )
             }
@@ -155,6 +206,26 @@ final class RDEPUBChapterLoader {
             throw RDEPUBChapterLoadError.missingParser
         }
 
+        if store.hasPendingChapterLoad(for: spineIndex) {
+            var result: Result<RDEPUBRuntimeChapter, Error>?
+            let semaphore = DispatchSemaphore(value: 0)
+            let registration = registerPendingLoad(
+                spineIndex: spineIndex,
+                priority: .navigation
+            ) { pendingResult in
+                result = pendingResult
+                semaphore.signal()
+            }
+            if case .joined(let existingPriority, let effectivePriority) = registration {
+                RDEPUBBackgroundTrace.log(
+                    "ChapterLoader",
+                    "sync join spine=\(spineIndex) existingPriority=\(existingPriority) effectivePriority=\(effectivePriority)"
+                )
+                semaphore.wait()
+                return try result!.get()
+            }
+        }
+
         store.assertNotOnChapterLoadQueue()
 
         var result: Result<RDEPUBRuntimeChapter, Error>?
@@ -167,7 +238,7 @@ final class RDEPUBChapterLoader {
                     "sync buildChapter spine=\(spineIndex)"
                 ) {
                     try autoreleasepool { () -> Result<RDEPUBRuntimeChapter, Error> in
-                        let cacheKey = self.makeCacheKey(spineIndex: spineIndex)
+                        let cacheKey = self.makeCacheKey(spineIndex: spineIndex, context: context)
                         let precomputedPageRanges = store.pageCount(for: cacheKey)?.pageRanges
                         let diskSummary: RDEPUBChapterSummary?
                         if precomputedPageRanges == nil {
@@ -178,7 +249,8 @@ final class RDEPUBChapterLoader {
                         let chapter = try self.buildChapter(
                             spineIndex: spineIndex,
                             availablePageRanges: precomputedPageRanges ?? diskSummary?.pageRanges.map(\.nsRange),
-                            diskSummary: diskSummary
+                            diskSummary: diskSummary,
+                            context: context
                         )
                         store.insertChapter(chapter)
                         let pageCount = RDEPUBRuntimePageCount(
@@ -206,10 +278,48 @@ final class RDEPUBChapterLoader {
         return try result!.get()
     }
 
+    private func registerPendingLoad(
+        spineIndex: Int,
+        priority: LoadPriority,
+        completion: @escaping LoadCompletion
+    ) -> LoadRegistrationResult {
+        pendingLoadsLock.lock()
+        defer { pendingLoadsLock.unlock() }
+
+        if var pending = pendingLoads[spineIndex] {
+            let existingPriority = pending.priority
+            pending.priority = LoadPriority.higherPriority(existingPriority, priority)
+            pending.completions.append(completion)
+            pendingLoads[spineIndex] = pending
+            return .joined(existingPriority: existingPriority, effectivePriority: pending.priority)
+        }
+
+        pendingLoads[spineIndex] = PendingLoad(priority: priority, completions: [completion])
+        return .created
+    }
+
+    private func pendingPriority(for spineIndex: Int) -> LoadPriority? {
+        pendingLoadsLock.lock()
+        let priority = pendingLoads[spineIndex]?.priority
+        pendingLoadsLock.unlock()
+        return priority
+    }
+
+    private func resolvePendingLoad(spineIndex: Int, result: Result<RDEPUBRuntimeChapter, Error>) {
+        pendingLoadsLock.lock()
+        let completions = pendingLoads.removeValue(forKey: spineIndex)?.completions ?? []
+        pendingLoadsLock.unlock()
+
+        guard !completions.isEmpty else { return }
+
+        completions.forEach { $0(result) }
+    }
+
     private func buildChapter(
         spineIndex: Int,
         availablePageRanges: [NSRange]?,
-        diskSummary: RDEPUBChapterSummary? = nil
+        diskSummary: RDEPUBChapterSummary? = nil,
+        context: RDEPUBReaderContext
     ) throws -> RDEPUBRuntimeChapter {
         guard let parser = context.parser,
               let publication = context.publication else {
@@ -231,7 +341,8 @@ final class RDEPUBChapterLoader {
                 pageSize: pageSize,
                 style: style,
                 layoutConfig: layoutConfig,
-                diskSummary: diskSummary
+                diskSummary: diskSummary,
+                context: context
             )
         }
 
@@ -251,7 +362,8 @@ final class RDEPUBChapterLoader {
             from: result.chapter,
             spineIndex: spineIndex,
             pageSize: pageSize,
-            layoutConfig: layoutConfig
+            layoutConfig: layoutConfig,
+            context: context
         )
     }
 
@@ -263,7 +375,8 @@ final class RDEPUBChapterLoader {
         pageSize: CGSize,
         style: RDEPUBTextRenderStyle,
         layoutConfig: RDEPUBTextLayoutConfig,
-        diskSummary: RDEPUBChapterSummary? = nil
+        diskSummary: RDEPUBChapterSummary? = nil,
+        context: RDEPUBReaderContext
     ) throws -> RDEPUBRuntimeChapter {
         let spineItem = publication.spine[spineIndex]
         let href = spineItem.href
@@ -465,7 +578,8 @@ final class RDEPUBChapterLoader {
         from chapter: RDEPUBTextChapter,
         spineIndex: Int,
         pageSize: CGSize,
-        layoutConfig: RDEPUBTextLayoutConfig
+        layoutConfig: RDEPUBTextLayoutConfig,
+        context: RDEPUBReaderContext
     ) throws -> RDEPUBRuntimeChapter {
         let layouter = RDEPUBTextLayouter(
             attributedString: chapter.attributedContent,
@@ -482,7 +596,7 @@ final class RDEPUBChapterLoader {
         )
 
         let pageRanges = chapter.pages.map { $0.contentRange }
-        let cacheKey = makeCacheKey(spineIndex: spineIndex)
+        let cacheKey = makeCacheKey(spineIndex: spineIndex, context: context)
         summaryDiskCache?.write(summary: makeSummary(for: chapter.pages, fragmentOffsets: chapter.fragmentOffsets, offsetMap: offsetMap, cacheKey: cacheKey), for: cacheKey)
 
         return RDEPUBRuntimeChapter(
@@ -498,7 +612,7 @@ final class RDEPUBChapterLoader {
         )
     }
 
-    private func makeCacheKey(spineIndex: Int) -> RDEPUBChapterCacheKey {
+    private func makeCacheKey(spineIndex: Int, context: RDEPUBReaderContext) -> RDEPUBChapterCacheKey {
         let style = context.currentTextRenderStyle()
         let layoutConfig = context.currentTextLayoutConfig(pageSize: context.currentTextPageSize())
 
@@ -513,7 +627,7 @@ final class RDEPUBChapterLoader {
             "\(RDEPUBChapterSummary.currentSchemaVersion)"
         ].joined(separator: "|")
 
-        let contentHash = contentHashForSpineIndex(spineIndex)
+        let contentHash = contentHashForSpineIndex(spineIndex, context: context)
 
         return RDEPUBChapterCacheKey(
             bookID: context.currentBookIdentifier ?? "",
@@ -540,7 +654,7 @@ final class RDEPUBChapterLoader {
 
         store.chapterLoadQueue.async {
             defer { store.endBuildingCFIMap(for: spineIndex) }
-            guard let rawHTML = self.context.parser?.htmlString(forRelativePath: href),
+            guard let rawHTML = self.context?.parser?.htmlString(forRelativePath: href),
                   let chapterText else {
                 return
             }
@@ -586,12 +700,12 @@ final class RDEPUBChapterLoader {
         )
     }
 
-    private func contentHashForSpineIndex(_ spineIndex: Int) -> String {
+    private func contentHashForSpineIndex(_ spineIndex: Int, context: RDEPUBReaderContext) -> String {
         guard let parser = context.parser,
               let publication = context.publication else { return "" }
         let href = publication.spine[spineIndex].href
         guard let html = parser.htmlString(forRelativePath: href) else { return "" }
-        return html.sha256Hex
+        return html.rd_sha256Hex
     }
 
     private func requireHTMLString(_ parser: RDEPUBParser, href: String) throws -> String {
@@ -638,13 +752,34 @@ final class RDEPUBChapterLoader {
             markers: markers,
             recoveryMetadata: RDEPUBCFIRecoveryMetadata(
                 domFingerprint: "",
-                normalizedTextChecksum: RDEPUBCFITextNodeMapBuilder.normalizedText(from: chapterText).sha256Hex,
+                normalizedTextChecksum: RDEPUBCFITextNodeMapBuilder.normalizedText(from: chapterText).rd_sha256Hex,
                 fragmentPathMap: domPaths
             )
         )
     }
 }
 
+private extension RDEPUBChapterLoader.LoadPriority {
+
+    static func higherPriority(_ lhs: Self, _ rhs: Self) -> Self {
+        if lhs.rank >= rhs.rank {
+            return lhs
+        }
+        return rhs
+    }
+
+    var rank: Int {
+        switch self {
+        case .prefetch:
+            return 0
+        case .preview:
+            return 1
+        case .navigation:
+            return 2
+        }
+    }
+}
+
 enum RDEPUBChapterLoadError: LocalizedError {
 
     case missingParser
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterRuntimeStore.swift b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterRuntimeStore.swift
index ab27512..322ccc6 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterRuntimeStore.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterRuntimeStore.swift
@@ -32,6 +32,10 @@ final class RDEPUBChapterRuntimeStore {
 
     private let cfiMapLock = NSLock()
 
+    private var pendingChapterLoadSpineIndices: Set<Int> = []
+
+    private let pendingChapterLoadLock = NSLock()
+
     init() {
 
         imageCache.countLimit = 50
@@ -146,6 +150,25 @@ final class RDEPUBChapterRuntimeStore {
         buildingLock.unlock()
     }
 
+    func beginPendingChapterLoad(for spineIndex: Int) -> Bool {
+        pendingChapterLoadLock.lock()
+        defer { pendingChapterLoadLock.unlock() }
+        return pendingChapterLoadSpineIndices.insert(spineIndex).inserted
+    }
+
+    func endPendingChapterLoad(for spineIndex: Int) {
+        pendingChapterLoadLock.lock()
+        pendingChapterLoadSpineIndices.remove(spineIndex)
+        pendingChapterLoadLock.unlock()
+    }
+
+    func hasPendingChapterLoad(for spineIndex: Int) -> Bool {
+        pendingChapterLoadLock.lock()
+        let hasPendingLoad = pendingChapterLoadSpineIndices.contains(spineIndex)
+        pendingChapterLoadLock.unlock()
+        return hasPendingLoad
+    }
+
     func beginBuildingCFIMap(for spineIndex: Int) -> Bool {
         cfiMapLock.lock()
         defer { cfiMapLock.unlock() }
@@ -166,5 +189,8 @@ final class RDEPUBChapterRuntimeStore {
         cfiMapLock.lock()
         buildingCFIMapSpineIndices.removeAll()
         cfiMapLock.unlock()
+        pendingChapterLoadLock.lock()
+        pendingChapterLoadSpineIndices.removeAll()
+        pendingChapterLoadLock.unlock()
     }
 }
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterSummaryDiskCache.swift b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterSummaryDiskCache.swift
index 4cb2bb0..652ca93 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterSummaryDiskCache.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterSummaryDiskCache.swift
@@ -119,7 +119,7 @@ final class RDEPUBChapterSummaryDiskCache {
         let bookPrefix = Self.cacheNamespacePrefix(for: key.bookID)
         let renderPrefix = Self.cacheNamespacePrefix(for: key.renderSignature)
         let rawKey = "\(key.bookID)_\(key.spineIndex)_\(key.renderSignature)_\(key.chapterContentHash)"
-        let digest = rawKey.sha256Hex
+        let digest = rawKey.rd_sha256Hex
         return cacheDirectory.appendingPathComponent("\(bookPrefix)__\(renderPrefix)__\(digest).json")
     }
 
@@ -150,7 +150,7 @@ final class RDEPUBChapterSummaryDiskCache {
     }
 
     private static func cacheNamespacePrefix(for rawValue: String) -> String {
-        rawValue.sha256Hex.prefix(12).lowercased()
+        rawValue.rd_sha256Hex.prefix(12).lowercased()
     }
 }
 
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift
index c382515..5e0fd55 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/RDEPUBChapterWarmupOrchestrator.swift
@@ -24,6 +24,14 @@ final class RDEPUBChapterWarmupOrchestrator {
 
     private var isExtendingPartialBookPageMap = false
 
+    private let prepareRequestStateLock = NSLock()
+
+    private var pendingPreparePageNumbers: Set<Int> = []
+
+    private var recentPrepareTimestamps: [Int: CFAbsoluteTime] = [:]
+
+    private let prepareRequestDebounceInterval: CFTimeInterval = 0.15
+
     init(
         context: RDEPUBReaderContext,
         store: RDEPUBChapterRuntimeStore,
@@ -58,6 +66,16 @@ final class RDEPUBChapterWarmupOrchestrator {
         guard let spineIndex = bookPageMap.spineIndex(forAbsolutePage: absolutePageIndex) else {
             return false
         }
+        let chapterReady = store.chapterData(for: spineIndex) != nil
+
+        if let debouncedResult = debouncedPrepareResult(
+            pageNumber: pageNumber,
+            spineIndex: spineIndex,
+            chapterReady: chapterReady,
+            allowSynchronousLoad: allowSynchronousLoad
+        ) {
+            return debouncedResult
+        }
 
         store.setCurrentChapter(
             spineIndex: spineIndex,
@@ -70,7 +88,7 @@ final class RDEPUBChapterWarmupOrchestrator {
             "prepareOnDemandChapter page=\(pageNumber) absoluteIndex=\(absolutePageIndex) spine=\(spineIndex)"
         )
 
-        if store.chapterData(for: spineIndex) == nil {
+        if !chapterReady {
             guard allowSynchronousLoad else {
                 scheduleAsynchronousChapterPreparation(
                     spineIndex: spineIndex,
@@ -85,11 +103,13 @@ final class RDEPUBChapterWarmupOrchestrator {
                     store: store
                 )
             } catch {
+                clearPendingPreparePageNumber(pageNumber)
                 RDEPUBBackgroundTrace.log("Runtime", "prepareOnDemandChapter FAILED: spine=\(spineIndex) error=\(error)")
                 return false
             }
         }
 
+        markPrepareResolved(pageNumber)
         presentationRuntime.navigationStateMachine.transition(to: .presentingWindow)
         completion?(true)
         maybePrefetchUpcomingChapters(aroundAbsolutePageNumber: pageNumber, in: bookPageMap)
@@ -189,6 +209,7 @@ final class RDEPUBChapterWarmupOrchestrator {
                 appendLoadedForwardChaptersToCurrentPageMapIfPossible()
                 continue
             }
+            guard shouldSchedulePrefetch(for: spineIndex) else { continue }
 
             store.addPrefetchTarget(spineIndex)
             RDEPUBBackgroundTrace.log("Runtime", "initial open prefetch forward spine=\(spineIndex)")
@@ -226,9 +247,10 @@ final class RDEPUBChapterWarmupOrchestrator {
             return true
         }
 
-        if let pendingMap = context.pendingFullPageMap,
-           pendingMap.entry(forSpineIndex: targetSpineIndex) != nil {
-            presentationRuntime.applyPendingFullPageMapIfNeeded()
+        if context.pendingPageMapUpdates.contains(where: { update in
+            update.pageMap.entry(forSpineIndex: targetSpineIndex) != nil
+        }) {
+            presentationRuntime.commitPendingPageMapUpdateIfNeeded()
             if context.bookPageMap?.entry(forSpineIndex: targetSpineIndex) != nil {
                 if isDistantJump {
                     jumpSessionManager.createSession(
@@ -284,6 +306,10 @@ final class RDEPUBChapterWarmupOrchestrator {
         asynchronouslyPreparingSpineIndices.removeAll()
         isExtendingPartialBookPageMap = false
         asyncLoadStateLock.unlock()
+        prepareRequestStateLock.lock()
+        pendingPreparePageNumbers.removeAll()
+        recentPrepareTimestamps.removeAll()
+        prepareRequestStateLock.unlock()
     }
 
     private func applyAsyncPartialBookPageMapExtension(
@@ -337,7 +363,7 @@ final class RDEPUBChapterWarmupOrchestrator {
             "Runtime",
             "extendPartialBookPageMap applied chapters=\(newMap.totalChapters) pages=\(newMap.totalPages)"
         )
-        presentationRuntime.applyExtendedPartialPageMap(
+        presentationRuntime.queueExtendedPartialPageMap(
             newMap,
             currentPageNumber: currentPageNumber,
             currentLocation: currentLocation
@@ -349,7 +375,13 @@ final class RDEPUBChapterWarmupOrchestrator {
         triggerPageNumber: Int,
         completion: ((Bool) -> Void)?
     ) {
-        guard beginAsynchronousChapterPreparation(for: spineIndex) else { return }
+        guard beginAsynchronousChapterPreparation(for: spineIndex) else {
+            RDEPUBBackgroundTrace.log(
+                "Runtime",
+                "prepareOnDemandChapter async deduped spine=\(spineIndex) page=\(triggerPageNumber)"
+            )
+            return
+        }
         RDEPUBBackgroundTrace.log(
             "Runtime",
             "prepareOnDemandChapter async spine=\(spineIndex) page=\(triggerPageNumber)"
@@ -363,11 +395,13 @@ final class RDEPUBChapterWarmupOrchestrator {
             self.endAsynchronousChapterPreparation(for: spineIndex)
             switch result {
             case .success:
+                self.markPrepareResolved(triggerPageNumber)
                 self.presentationRuntime.navigationStateMachine.transition(to: .presentingWindow)
                 completion?(true)
                 self.appendLoadedForwardChaptersToCurrentPageMapIfPossible()
                 self.refreshVisibleContentIfNeeded(afterPreparing: spineIndex, triggerPageNumber: triggerPageNumber)
             case .failure(let error):
+                self.clearPendingPreparePageNumber(triggerPageNumber)
                 RDEPUBBackgroundTrace.log(
                     "Runtime",
                     "prepareOnDemandChapter async FAILED: spine=\(spineIndex) error=\(error)"
@@ -389,7 +423,7 @@ final class RDEPUBChapterWarmupOrchestrator {
         }
 
         for adjacentSpineIndex in store.windowSpineIndices where adjacentSpineIndex != spineIndex {
-            guard store.chapterData(for: adjacentSpineIndex) == nil else { continue }
+            guard shouldSchedulePrefetch(for: adjacentSpineIndex) else { continue }
             store.addPrefetchTarget(adjacentSpineIndex)
             RDEPUBBackgroundTrace.log(
                 "Runtime",
@@ -428,7 +462,7 @@ final class RDEPUBChapterWarmupOrchestrator {
 
         let targets = buildableIndices.dropFirst(currentPosition + 1).prefix(lookaheadChapterCount)
         for targetSpineIndex in targets {
-            guard store.chapterData(for: targetSpineIndex) == nil else { continue }
+            guard shouldSchedulePrefetch(for: targetSpineIndex) else { continue }
             store.addPrefetchTarget(targetSpineIndex)
             RDEPUBBackgroundTrace.log(
                 "Runtime",
@@ -441,7 +475,9 @@ final class RDEPUBChapterWarmupOrchestrator {
         }
     }
 
-    private func appendLoadedForwardChaptersToCurrentPageMapIfPossible() {
+    private func appendLoadedForwardChaptersToCurrentPageMapIfPossible(
+        minimumTrailingPages: Int = 2
+    ) {
         guard let publication = context.publication,
               let currentMap = context.bookPageMap,
               let readerView = context.readerView,
@@ -449,8 +485,13 @@ final class RDEPUBChapterWarmupOrchestrator {
             return
         }
 
+        let currentPageNumber = max(readerView.currentPage + 1, 1)
+        let trailingPages = currentMap.totalPages - currentPageNumber
+        guard trailingPages <= minimumTrailingPages else { return }
+
         let buildableIndices = buildableSpineIndices(in: publication)
         var appendedEntries: [RDEPUBBookPageMapEntry] = []
+        var projectedTotalPages = currentMap.totalPages
         for spineIndex in buildableIndices where spineIndex > lastKnownSpineIndex {
             guard let chapter = store.chapterData(for: spineIndex) else { break }
             appendedEntries.append(
@@ -463,6 +504,10 @@ final class RDEPUBChapterWarmupOrchestrator {
                     fragmentOffsets: chapter.chapterOffsetMap.fragmentOffsets
                 )
             )
+            projectedTotalPages += chapter.pages.count
+            if projectedTotalPages - currentPageNumber > minimumTrailingPages {
+                break
+            }
         }
 
         guard !appendedEntries.isEmpty else { return }
@@ -497,12 +542,68 @@ final class RDEPUBChapterWarmupOrchestrator {
 
         RDEPUBBackgroundTrace.log(
             "Runtime",
-            "appendLoadedForwardChapters chapters=\(newMap.totalChapters) pages=\(newMap.totalPages)"
+            "appendLoadedForwardChapters currentPage=\(currentPageNumber) trailingBefore=\(trailingPages) trailingAfter=\(newMap.totalPages - currentPageNumber) chapters=\(newMap.totalChapters) pages=\(newMap.totalPages)"
         )
 
-        context.bookPageMap = newMap
-        context.replaceActiveSnapshot(presentationRuntime.makeSnapshot(from: newMap))
-        readerView.reloadPageCountOnly()
+        presentationRuntime.queueForwardAppendedPageMap(newMap)
+    }
+
+    private func shouldSchedulePrefetch(for spineIndex: Int) -> Bool {
+        guard store.chapterData(for: spineIndex) == nil else { return false }
+        guard !store.hasPrefetchTarget(spineIndex) else { return false }
+        guard !store.hasPendingChapterLoad(for: spineIndex) else { return false }
+        return true
+    }
+
+    private func debouncedPrepareResult(
+        pageNumber: Int,
+        spineIndex: Int,
+        chapterReady: Bool,
+        allowSynchronousLoad: Bool
+    ) -> Bool? {
+        prepareRequestStateLock.lock()
+        defer { prepareRequestStateLock.unlock() }
+
+        let now = CFAbsoluteTimeGetCurrent()
+        recentPrepareTimestamps = recentPrepareTimestamps.filter { now - $0.value <= prepareRequestDebounceInterval }
+
+        if !allowSynchronousLoad && !chapterReady {
+            let inserted = pendingPreparePageNumbers.insert(pageNumber).inserted
+            if !inserted {
+                RDEPUBBackgroundTrace.log(
+                    "Runtime",
+                    "prepareOnDemandChapter page deduped page=\(pageNumber) spine=\(spineIndex) chapterReady=false"
+                )
+                return false
+            }
+            return nil
+        }
+
+        pendingPreparePageNumbers.remove(pageNumber)
+        if let lastTimestamp = recentPrepareTimestamps[pageNumber],
+           now - lastTimestamp <= prepareRequestDebounceInterval {
+            RDEPUBBackgroundTrace.log(
+                "Runtime",
+                "prepareOnDemandChapter page debounced page=\(pageNumber) spine=\(spineIndex) chapterReady=\(chapterReady)"
+            )
+            return chapterReady
+        }
+
+        recentPrepareTimestamps[pageNumber] = now
+        return nil
+    }
+
+    private func markPrepareResolved(_ pageNumber: Int) {
+        prepareRequestStateLock.lock()
+        pendingPreparePageNumbers.remove(pageNumber)
+        recentPrepareTimestamps[pageNumber] = CFAbsoluteTimeGetCurrent()
+        prepareRequestStateLock.unlock()
+    }
+
+    private func clearPendingPreparePageNumber(_ pageNumber: Int) {
+        prepareRequestStateLock.lock()
+        pendingPreparePageNumbers.remove(pageNumber)
+        prepareRequestStateLock.unlock()
     }
 
     private func refreshVisibleContentIfNeeded(afterPreparing spineIndex: Int, triggerPageNumber: Int) {
@@ -510,16 +611,41 @@ final class RDEPUBChapterWarmupOrchestrator {
               let bookPageMap = context.bookPageMap else {
             return
         }
+        if readerView.isPageCurlTransitioning {
+            RDEPUBBackgroundTrace.log(
+                "LoadingPage",
+                "defer refreshVisibleContent spine=\(spineIndex) triggerPage=\(triggerPageNumber) reason=pageCurlTransition"
+            )
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+                self?.refreshVisibleContentIfNeeded(
+                    afterPreparing: spineIndex,
+                    triggerPageNumber: triggerPageNumber
+                )
+            }
+            return
+        }
         let visiblePageNumber = readerView.currentPage + 1
         if visiblePageNumber == triggerPageNumber {
+            RDEPUBBackgroundTrace.log(
+                "LoadingPage",
+                "refreshVisibleContent matchedTrigger spine=\(spineIndex) triggerPage=\(triggerPageNumber) visiblePage=\(visiblePageNumber)"
+            )
             refreshVisibleContentPreservingLocation()
             return
         }
         guard visiblePageNumber > 0,
               let visibleSpineIndex = bookPageMap.spineIndex(forAbsolutePage: visiblePageNumber - 1),
               visibleSpineIndex == spineIndex else {
+            RDEPUBBackgroundTrace.log(
+                "LoadingPage",
+                "skip refreshVisibleContent spine=\(spineIndex) triggerPage=\(triggerPageNumber) visiblePage=\(visiblePageNumber)"
+            )
             return
         }
+        RDEPUBBackgroundTrace.log(
+            "LoadingPage",
+            "refreshVisibleContent matchedVisibleSpine spine=\(spineIndex) triggerPage=\(triggerPageNumber) visiblePage=\(visiblePageNumber)"
+        )
         refreshVisibleContentPreservingLocation()
     }
 
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/String+SHA256.swift b/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/String+SHA256.swift
deleted file mode 100644
index be051d3..0000000
--- a/Sources/RDReaderView/EPUBUI/ReaderController/ChapterRuntime/String+SHA256.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-import CryptoKit
-
-extension String {
-
-    var sha256Hex: String {
-
-        let digest = SHA256.hash(data: Data(self.utf8))
-
-        return digest.map { String(format: "%02x", $0) }.joined()
-    }
-}
\ No newline at end of file
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBMetadataParseCancellationController.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBMetadataParseCancellationController.swift
new file mode 100644
index 0000000..6408b3d
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBMetadataParseCancellationController.swift
@@ -0,0 +1,44 @@
+import Foundation
+
+final class RDEPUBMetadataParseCancellationController {
+
+    let token: UUID
+
+    private let lock = NSLock()
+
+    private weak var queue: OperationQueue?
+
+    private var cancelled = false
+
+    init(token: UUID) {
+        self.token = token
+    }
+
+    func attach(queue: OperationQueue) {
+        let shouldCancelImmediately: Bool
+        lock.lock()
+        self.queue = queue
+        shouldCancelImmediately = cancelled
+        lock.unlock()
+
+        if shouldCancelImmediately {
+            queue.cancelAllOperations()
+        }
+    }
+
+    func cancel() {
+        let queueToCancel: OperationQueue?
+        lock.lock()
+        cancelled = true
+        queueToCancel = queue
+        lock.unlock()
+        queueToCancel?.cancelAllOperations()
+    }
+
+    var isCancelled: Bool {
+        lock.lock()
+        let value = cancelled
+        lock.unlock()
+        return value
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBMetadataParseWorker.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBMetadataParseWorker.swift
new file mode 100644
index 0000000..e6791c8
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBMetadataParseWorker.swift
@@ -0,0 +1,572 @@
+import Foundation
+
+final class RDEPUBMetadataParseWorker {
+
+    private static let maxRetryCount = 3
+    private static let retryDelays: [TimeInterval] = [0.5, 2.0, 8.0]
+
+    private final class ParseState {
+
+        var summariesBySpineIndex: [Int: RDEPUBChapterSummary]
+
+        var totalResolvedCount: Int
+
+        var lastAppliedCount: Int
+
+        init(
+            summariesBySpineIndex: [Int: RDEPUBChapterSummary],
+            totalResolvedCount: Int,
+            lastAppliedCount: Int
+        ) {
+            self.summariesBySpineIndex = summariesBySpineIndex
+            self.totalResolvedCount = totalResolvedCount
+            self.lastAppliedCount = lastAppliedCount
+        }
+    }
+
+    private let backgroundInteractionCooldown: CFAbsoluteTime = 0.8
+
+    unowned let context: RDEPUBReaderContext
+
+    let cancellationController: RDEPUBMetadataParseCancellationController
+
+    let pageMapRefreshInterval: Int
+
+    private let token: UUID
+
+    private let parser: RDEPUBParser
+
+    private let publication: RDEPUBPublication
+
+    private let pageSize: CGSize
+
+    private let layoutConfig: RDEPUBTextLayoutConfig
+
+    private let style: RDEPUBTextRenderStyle
+
+    private let renderSignature: String
+
+    private let allBuildableIndices: [Int]
+
+    private let summaryDiskCache: RDEPUBChapterSummaryDiskCache?
+
+    private let workerCount: Int
+
+    private let contentHashBySpineIndex: [Int: String]
+
+    private let catalog: [(key: RDEPUBChapterCacheKey, spineIndex: Int, href: String, title: String)]
+
+    init(
+        context: RDEPUBReaderContext,
+        cancellationController: RDEPUBMetadataParseCancellationController,
+        token: UUID,
+        parser: RDEPUBParser,
+        publication: RDEPUBPublication
+    ) {
+        self.context = context
+        self.cancellationController = cancellationController
+        self.token = token
+        self.parser = parser
+        self.publication = publication
+
+        let pageSize = context.currentTextPageSize()
+        self.pageSize = pageSize
+        self.layoutConfig = context.currentTextLayoutConfig(pageSize: pageSize)
+        self.style = context.currentTextRenderStyle()
+        self.renderSignature = context.currentRenderSignature()
+        self.allBuildableIndices = publication.spine.indices.filter { index in
+            guard publication.spine.indices.contains(index) else { return false }
+            let item = publication.spine[index]
+            return item.linear && (item.mediaType.contains("html") || item.mediaType.contains("xhtml"))
+        }
+        self.summaryDiskCache = context.runtime?.summaryDiskCache
+        self.workerCount = max(1, context.configuration.metadataParsingConcurrency)
+        self.pageMapRefreshInterval = RDEPUBReaderPaginationCoordinator.pageMapRefreshInterval
+
+        var hashes: [Int: String] = [:]
+        for spineIndex in allBuildableIndices {
+            guard let href = publication.spine.indices.contains(spineIndex)
+                ? publication.spine[spineIndex].href : nil,
+                let html = parser.htmlString(forRelativePath: href) else {
+                hashes[spineIndex] = ""
+                continue
+            }
+            hashes[spineIndex] = html.rd_sha256Hex
+        }
+        self.contentHashBySpineIndex = hashes
+
+        let ctx = context
+        let spine = publication.spine
+        let sig = renderSignature
+        self.catalog = allBuildableIndices.map { spineIndex in
+            let item = spine[spineIndex]
+            return (
+                key: ctx.chapterCacheKey(
+                    forSpineIndex: spineIndex,
+                    precomputedContentHash: hashes[spineIndex] ?? "",
+                    renderSignature: sig
+                ),
+                spineIndex: spineIndex,
+                href: item.href,
+                title: item.title
+            )
+        }
+    }
+
+    func start(token: UUID, restoreLocation: RDEPUBLocation?) {
+        let context = self.context
+        let cancellationController = self.cancellationController
+
+        DispatchQueue.global(qos: .utility).async { [weak self] in
+            guard let self else { return }
+            defer { self.context.runtime?.paginationCoordinator.finishMetadataParseCancellationController(cancellationController) }
+            guard context.controller != nil,
+                  !cancellationController.isCancelled,
+                  context.paginationToken == token else { return }
+
+            if let restoredPageMap = self.restoreBookPageMapIfPossible() {
+                RDEPUBBackgroundTrace.log(
+                    "MetadataParse",
+                    "full cache restore hit chapters=\(restoredPageMap.totalChapters) pages=\(restoredPageMap.totalPages)"
+                )
+                DispatchQueue.main.async {
+                    guard context.paginationToken == token,
+                          context.controller != nil,
+                          !cancellationController.isCancelled else { return }
+                    context.runtime?.refreshBookPageMapInPlace(restoredPageMap)
+                }
+                return
+            }
+
+            let prewarmStart = CFAbsoluteTimeGetCurrent()
+            let prewarmMs = Int((CFAbsoluteTimeGetCurrent() - prewarmStart) * 1000)
+            RDEPUBBackgroundTrace.log("MetadataParse", "prewarmHashMs=\(prewarmMs) chapters=\(self.allBuildableIndices.count)")
+
+            let restored = self.summaryDiskCache?.readAll(keys: self.catalog)
+            RDEPUBBackgroundTrace.log(
+                "MetadataParse",
+                "begin token=\(token.uuidString) buildableChapters=\(self.allBuildableIndices.count) concurrency=\(self.workerCount)"
+            )
+            let cachedSummaries = restored?.summaries ?? [:]
+            let cachedSpineIndices = Set(cachedSummaries.keys)
+            let resultLock = NSLock()
+            let parseState = ParseState(
+                summariesBySpineIndex: cachedSummaries,
+                totalResolvedCount: cachedSpineIndices.count,
+                lastAppliedCount: cachedSpineIndices.count
+            )
+
+            if !cachedSpineIndices.isEmpty {
+                RDEPUBBackgroundTrace.log(
+                    "MetadataParse",
+                    "resumeFromCache cachedChapters=\(cachedSpineIndices.count) total=\(self.allBuildableIndices.count)"
+                )
+                let cachedMap = self.buildPageMap(summaries: parseState.summariesBySpineIndex)
+                DispatchQueue.main.async {
+                    guard context.paginationToken == token,
+                          context.controller != nil else { return }
+                    context.runtime?.refreshBookPageMapInPlace(cachedMap)
+                }
+            }
+
+            let prioritizedSpineIndices: [Int]
+            if let priorityManager = context.runtime?.backgroundPriorityManager {
+                let currentSpineIndex = context.runtime?.locationCoordinator.currentVisibleLocation()
+                    .flatMap { context.normalizedSpineIndex(for: $0) }
+                prioritizedSpineIndices = priorityManager.makeMetadataPriorityOrder(
+                    allBuildableIndices: self.allBuildableIndices,
+                    currentSpineIndex: currentSpineIndex,
+                    cachedSpineIndices: cachedSpineIndices
+                )
+                RDEPUBBackgroundTrace.log(
+                    "MetadataParse",
+                    "prioritized hot=\(prioritizedSpineIndices.prefix(10).count) total=\(prioritizedSpineIndices.count)"
+                )
+            } else {
+                prioritizedSpineIndices = self.allBuildableIndices.filter { !cachedSpineIndices.contains($0) }
+            }
+
+            let uncachedSpineIndices = prioritizedSpineIndices
+
+            self.waitForReadingInteractionToSettle(cancellationController: cancellationController)
+            guard !cancellationController.isCancelled,
+                  context.controller != nil,
+                  context.paginationToken == token else {
+                RDEPUBBackgroundTrace.log("MetadataParse", "abort before queue start")
+                return
+            }
+
+            let wallClockStart = CFAbsoluteTimeGetCurrent()
+            var totalRenderMs: Double = 0
+            var totalWriteMs: Double = 0
+            var totalMergeMs: Double = 0
+            var completedChapters = 0
+            var failedChapters = 0
+            let timingLock = NSLock()
+
+            let queue = OperationQueue()
+            queue.name = "com.rdreader.metadata.parse"
+            queue.qualityOfService = .utility
+            queue.maxConcurrentOperationCount = self.workerCount
+            cancellationController.attach(queue: queue)
+
+            let refreshInterval = self.pageMapRefreshInterval
+
+            for (offset, spineIndex) in uncachedSpineIndices.enumerated() {
+                let operation = BlockOperation()
+                operation.addExecutionBlock { [weak operation] in
+                    guard context.controller != nil,
+                          context.paginationToken == token,
+                          !cancellationController.isCancelled,
+                          operation?.isCancelled != true else {
+                        return
+                    }
+                    do {
+                        RDEPUBBackgroundTrace.log("MetadataParse", "正在解析 spine=\(spineIndex) \(offset + 1)/\(uncachedSpineIndices.count)")
+
+                        let renderResult: RDEPUBChapterSummary? = try autoreleasepool { () -> RDEPUBChapterSummary? in
+                            guard context.controller != nil,
+                                  context.paginationToken == token,
+                                  !cancellationController.isCancelled,
+                                  operation?.isCancelled != true else {
+                                return nil
+                            }
+                            let chapterBuilder = context.makeTextBookBuilder(layoutConfig: self.layoutConfig)
+                            let renderStart = CFAbsoluteTimeGetCurrent()
+                            guard let result = try chapterBuilder.buildChapter(
+                                parser: self.parser,
+                                publication: self.publication,
+                                spineIndex: spineIndex,
+                                pageSize: self.pageSize,
+                                style: self.style
+                            ) else {
+                                return nil
+                            }
+                            guard context.controller != nil,
+                                  context.paginationToken == token,
+                                  !cancellationController.isCancelled,
+                                  operation?.isCancelled != true else {
+                                RDEPUBBackgroundTrace.log("MetadataParse", "drop rendered chapter due to cancellation spine=\(spineIndex)")
+                                return nil
+                            }
+                            let renderElapsed = (CFAbsoluteTimeGetCurrent() - renderStart) * 1000
+
+                            let chapter = result.chapter
+                            let precomputedHash = self.contentHashBySpineIndex[spineIndex] ?? ""
+                            let cacheKey = context.chapterCacheKey(
+                                forSpineIndex: spineIndex,
+                                precomputedContentHash: precomputedHash,
+                                renderSignature: self.renderSignature
+                            )
+                            let summary = RDEPUBChapterSummary(
+                                pageRanges: chapter.pages.map { .init(location: $0.contentRange.location, length: $0.contentRange.length) },
+                                pageCount: chapter.pages.count,
+                                fragmentOffsets: chapter.fragmentOffsets,
+                                cfiMap: chapter.cfiMap,
+                                renderSignature: cacheKey.renderSignature,
+                                schemaVersion: RDEPUBChapterSummary.currentSchemaVersion,
+                                chapterContentHash: cacheKey.chapterContentHash,
+                                pageMetadataList: chapter.pages.map { .from($0.metadata) }
+                            )
+                            guard context.controller != nil,
+                                  context.paginationToken == token,
+                                  !cancellationController.isCancelled,
+                                  operation?.isCancelled != true else {
+                                RDEPUBBackgroundTrace.log("MetadataParse", "skip disk write due to cancellation spine=\(spineIndex)")
+                                return nil
+                            }
+                            let writeStart = CFAbsoluteTimeGetCurrent()
+                            self.summaryDiskCache?.write(summary: summary, for: cacheKey)
+                            let writeElapsed = (CFAbsoluteTimeGetCurrent() - writeStart) * 1000
+
+                            timingLock.lock()
+                            totalRenderMs += renderElapsed
+                            totalWriteMs += writeElapsed
+                            completedChapters += 1
+                            timingLock.unlock()
+
+                            RDEPUBBackgroundTrace.log(
+                                "MetadataParse",
+                                "spine=\(spineIndex) renderMs=\(Int(renderElapsed)) writeMs=\(Int(writeElapsed))"
+                            )
+                            return summary
+                        }
+
+                        guard let renderResult else { return }
+                        guard context.controller != nil,
+                              context.paginationToken == token,
+                              !cancellationController.isCancelled,
+                              operation?.isCancelled != true else {
+                            return
+                        }
+
+                        var snapshot: [Int: RDEPUBChapterSummary]?
+                        resultLock.lock()
+                        parseState.summariesBySpineIndex[spineIndex] = renderResult
+                        parseState.totalResolvedCount += 1
+                        if parseState.totalResolvedCount - parseState.lastAppliedCount >= refreshInterval
+                            || parseState.totalResolvedCount == self.allBuildableIndices.count {
+                            parseState.lastAppliedCount = parseState.totalResolvedCount
+                            snapshot = parseState.summariesBySpineIndex
+                        }
+                        resultLock.unlock()
+
+                        if let snapshot {
+                            let mergeStart = CFAbsoluteTimeGetCurrent()
+                            let partialMap = self.buildPageMap(summaries: snapshot)
+                            let mergeElapsed = (CFAbsoluteTimeGetCurrent() - mergeStart) * 1000
+                            timingLock.lock()
+                            totalMergeMs += mergeElapsed
+                            timingLock.unlock()
+                            DispatchQueue.main.async {
+                                guard context.paginationToken == token,
+                                      context.controller != nil,
+                                      !cancellationController.isCancelled else { return }
+                                context.runtime?.refreshBookPageMapInPlace(partialMap)
+                            }
+                        }
+                    } catch {
+                        guard !cancellationController.isCancelled,
+                              context.paginationToken == token,
+                              context.controller != nil,
+                              operation?.isCancelled != true else {
+                            return
+                        }
+                        timingLock.lock()
+                        failedChapters += 1
+                        timingLock.unlock()
+                        RDEPUBBackgroundTrace.log("MetadataParse", "buildChapter FAILED: spine=\(spineIndex) error=\(error)")
+
+                        self.scheduleRetry(
+                            spineIndex: spineIndex,
+                            retryCount: 0,
+                            resultLock: resultLock,
+                            parseState: parseState,
+                            cancellationController: cancellationController
+                        )
+                    }
+                }
+                queue.addOperation(operation)
+            }
+            queue.waitUntilAllOperationsAreFinished()
+            if !cancellationController.isCancelled,
+               context.paginationToken == token,
+               context.controller != nil {
+                self.summaryDiskCache?.flushPendingWrites()
+            }
+
+            let wallClockMs = Int((CFAbsoluteTimeGetCurrent() - wallClockStart) * 1000)
+            timingLock.lock()
+            let renderTotal = Int(totalRenderMs)
+            let writeTotal = Int(totalWriteMs)
+            let mergeTotal = Int(totalMergeMs)
+            let rendered = completedChapters
+            let failed = failedChapters
+            timingLock.unlock()
+            let avgRenderMs = rendered > 0 ? renderTotal / rendered : 0
+            RDEPUBBackgroundTrace.log(
+                "MetadataParse",
+                "timing wallClockMs=\(wallClockMs) chapters=\(rendered) failed=\(failed) " +
+                "prewarmHashMs=\(prewarmMs) renderTotalMs=\(renderTotal) writeTotalMs=\(writeTotal) " +
+                "mergeTotalMs=\(mergeTotal) avgRenderMs=\(avgRenderMs) concurrency=\(self.workerCount)"
+            )
+            context.lastMetadataParseWallClockMs = wallClockMs
+            context.lastMetadataParseConcurrency = self.workerCount
+
+            guard context.controller != nil,
+                  context.paginationToken == token,
+                  !cancellationController.isCancelled else {
+                RDEPUBBackgroundTrace.log("MetadataParse", "abort: reader dismissed or token changed")
+                return
+            }
+
+            let finalMergeStart = CFAbsoluteTimeGetCurrent()
+            let pageMap = self.buildPageMap(summaries: parseState.summariesBySpineIndex)
+            let finalMergeMs = Int((CFAbsoluteTimeGetCurrent() - finalMergeStart) * 1000)
+            RDEPUBBackgroundTrace.log(
+                "MetadataParse",
+                "complete chapters=\(pageMap.totalChapters) pages=\(pageMap.totalPages) finalMergeMs=\(finalMergeMs)"
+            )
+
+            if let coverageStore = context.runtime?.backgroundCoverageStore {
+                let resolvedSpineIndices = Set(parseState.summariesBySpineIndex.keys)
+                let lowerSpine = resolvedSpineIndices.min() ?? 0
+                let upperSpine = resolvedSpineIndices.max() ?? 0
+                let estimatedBytes = 256 + pageMap.entries.count * 96 + resolvedSpineIndices.count * 16
+
+                let segment = RDEPUBBackgroundCoverageSegment(
+                    lowerSpineIndex: lowerSpine,
+                    upperSpineIndex: upperSpine,
+                    pageMap: pageMap,
+                    resolvedSpineIndices: resolvedSpineIndices,
+                    generatedAt: CFAbsoluteTimeGetCurrent(),
+                    renderSignature: self.renderSignature,
+                    estimatedMemoryBytes: estimatedBytes
+                )
+                coverageStore.addSegment(segment)
+            }
+
+            DispatchQueue.main.async {
+                guard context.paginationToken == token,
+                      context.controller != nil else { return }
+                context.runtime?.refreshBookPageMapInPlace(pageMap)
+            }
+        }
+    }
+
+    // MARK: - Private
+
+    private func waitForReadingInteractionToSettle(
+        cancellationController: RDEPUBMetadataParseCancellationController? = nil
+    ) {
+        while context.controller != nil,
+              cancellationController?.isCancelled != true,
+              context.secondsSinceLastUserNavigation() < backgroundInteractionCooldown {
+            Thread.sleep(forTimeInterval: 0.08)
+        }
+    }
+
+    private func scheduleRetry(
+        spineIndex: Int,
+        retryCount: Int,
+        resultLock: NSLock,
+        parseState: ParseState,
+        cancellationController: RDEPUBMetadataParseCancellationController
+    ) {
+        guard retryCount < Self.maxRetryCount else {
+            RDEPUBBackgroundTrace.log(
+                "MetadataParse",
+                "spine=\(spineIndex) max retries reached, marking as deferredFailure"
+            )
+            return
+        }
+
+        let delay = Self.retryDelays[min(retryCount, Self.retryDelays.count - 1)]
+        RDEPUBBackgroundTrace.log(
+            "MetadataParse",
+            "scheduling retry for spine=\(spineIndex) attempt=\(retryCount + 1) delay=\(delay)s"
+        )
+
+        DispatchQueue.global(qos: .utility).asyncAfter(deadline: .now() + delay) { [weak self] in
+            guard let self else { return }
+            let context = self.context
+            guard context.controller != nil,
+                  context.paginationToken == self.token,
+                  !cancellationController.isCancelled else {
+                return
+            }
+
+            do {
+                let chapterBuilder = context.makeTextBookBuilder(layoutConfig: self.layoutConfig)
+                guard let result = try chapterBuilder.buildChapter(
+                    parser: self.parser,
+                    publication: self.publication,
+                    spineIndex: spineIndex,
+                    pageSize: self.pageSize,
+                    style: self.style
+                ) else {
+                    return
+                }
+                guard context.controller != nil,
+                      context.paginationToken == self.token,
+                      !cancellationController.isCancelled else {
+                    RDEPUBBackgroundTrace.log("MetadataParse", "drop retry result due to cancellation spine=\(spineIndex)")
+                    return
+                }
+
+                let chapter = result.chapter
+                let precomputedHash = self.contentHashBySpineIndex[spineIndex] ?? ""
+                let cacheKey = context.chapterCacheKey(
+                    forSpineIndex: spineIndex,
+                    precomputedContentHash: precomputedHash,
+                    renderSignature: self.renderSignature
+                )
+                let summary = RDEPUBChapterSummary(
+                    pageRanges: chapter.pages.map { .init(location: $0.contentRange.location, length: $0.contentRange.length) },
+                    pageCount: chapter.pages.count,
+                    fragmentOffsets: chapter.fragmentOffsets,
+                    cfiMap: chapter.cfiMap,
+                    renderSignature: cacheKey.renderSignature,
+                    schemaVersion: RDEPUBChapterSummary.currentSchemaVersion,
+                    chapterContentHash: cacheKey.chapterContentHash,
+                    pageMetadataList: chapter.pages.map { .from($0.metadata) }
+                )
+                guard context.controller != nil,
+                      context.paginationToken == self.token,
+                      !cancellationController.isCancelled else {
+                    RDEPUBBackgroundTrace.log("MetadataParse", "skip retry disk write due to cancellation spine=\(spineIndex)")
+                    return
+                }
+                self.summaryDiskCache?.write(summary: summary, for: cacheKey)
+
+                resultLock.lock()
+                parseState.summariesBySpineIndex[spineIndex] = summary
+                parseState.totalResolvedCount += 1
+                let shouldRefresh =
+                    parseState.totalResolvedCount - parseState.lastAppliedCount >= self.pageMapRefreshInterval
+                    || parseState.totalResolvedCount == self.allBuildableIndices.count
+                if shouldRefresh {
+                    parseState.lastAppliedCount = parseState.totalResolvedCount
+                }
+                resultLock.unlock()
+
+                if shouldRefresh {
+                    let partialMap = self.buildPageMap(summaries: parseState.summariesBySpineIndex)
+                    DispatchQueue.main.async {
+                        guard context.paginationToken == self.token,
+                              context.controller != nil,
+                              !cancellationController.isCancelled else { return }
+                        context.runtime?.refreshBookPageMapInPlace(partialMap)
+                    }
+                }
+
+                RDEPUBBackgroundTrace.log(
+                    "MetadataParse",
+                    "retry succeeded for spine=\(spineIndex) attempt=\(retryCount + 1)"
+                )
+            } catch {
+                RDEPUBBackgroundTrace.log(
+                    "MetadataParse",
+                    "retry failed for spine=\(spineIndex) attempt=\(retryCount + 1) error=\(error)"
+                )
+
+                self.scheduleRetry(
+                    spineIndex: spineIndex,
+                    retryCount: retryCount + 1,
+                    resultLock: resultLock,
+                    parseState: parseState,
+                    cancellationController: cancellationController
+                )
+            }
+        }
+    }
+
+    private func restoreBookPageMapIfPossible() -> RDEPUBBookPageMap? {
+        guard let summaryDiskCache else { return nil }
+        guard summaryDiskCache.isCacheComplete(keys: catalog.map(\.key)) else {
+            return nil
+        }
+        let restored = summaryDiskCache.readAll(keys: catalog)
+        guard restored.summaries.count == catalog.count else {
+            return nil
+        }
+        return restored.mapBuilder.build()
+    }
+
+    private func buildPageMap(
+        summaries: [Int: RDEPUBChapterSummary]
+    ) -> RDEPUBBookPageMap {
+        var builder = RDEPUBBookPageMap.Builder()
+        for item in catalog {
+            guard let summary = summaries[item.spineIndex] else { continue }
+            builder.add(
+                spineIndex: item.spineIndex,
+                href: item.href,
+                title: item.title,
+                pageCount: summary.pageCount,
+                fragmentOffsets: summary.fragmentOffsets
+            )
+        }
+        return builder.build()
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPaginationState.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPaginationState.swift
index d624c75..08619b0 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPaginationState.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPaginationState.swift
@@ -14,7 +14,7 @@ struct RDEPUBPaginationState {
 
     var activePageMap: RDEPUBBookPageMap?
 
-    var pendingFullPageMap: RDEPUBBookPageMap?
+    var pendingPageMapUpdates: [RDEPUBPendingPageMapUpdate] = []
 
     var chapterWindowSnapshot: RDEPUBChapterWindowSnapshot?
 
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift
index 9f61de0..d46c49c 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBPresentationRuntime.swift
@@ -1,5 +1,17 @@
 import UIKit
 
+enum RDEPUBPendingPageMapUpdateKind {
+    case reconcileFullMap
+    case extendPartial(currentPageNumber: Int, currentLocation: RDEPUBLocation?)
+    case appendForward
+}
+
+struct RDEPUBPendingPageMapUpdate {
+    let pageMap: RDEPUBBookPageMap
+    let source: RDEPUBPaginationStateSource
+    let kind: RDEPUBPendingPageMapUpdateKind
+}
+
 final class RDEPUBPresentationRuntime {
 
     private unowned let context: RDEPUBReaderContext
@@ -34,77 +46,63 @@ final class RDEPUBPresentationRuntime {
         navigationStateMachine.transition(to: .presentingWindow)
         context.textBook = nil
         context.bookPageMap = bookPageMap
-        context.pendingFullPageMap = nil
+        context.pendingPageMapUpdates.removeAll()
         context.replaceActiveSnapshot(makeSnapshot(from: bookPageMap))
         paginationState.activePageMap = bookPageMap
-        paginationState.pendingFullPageMap = nil
+        paginationState.pendingPageMapUpdates.removeAll()
         paginationState.source = .initialPartial
         finishPagination(restoreLocation)
     }
 
     func refreshBookPageMapInPlace(_ bookPageMap: RDEPUBBookPageMap) {
-        if let pendingMap = context.pendingFullPageMap {
-            let shouldKeepExisting =
-                pendingMap.totalChapters > bookPageMap.totalChapters ||
-                (pendingMap.totalChapters == bookPageMap.totalChapters &&
-                    pendingMap.totalPages >= bookPageMap.totalPages)
-            if shouldKeepExisting {
-                return
-            }
-        }
-
         navigationStateMachine.transition(to: .reconcilingFullMap)
-        context.pendingFullPageMap = bookPageMap
-        paginationState.pendingFullPageMap = bookPageMap
+        enqueuePendingPageMapUpdate(
+            RDEPUBPendingPageMapUpdate(
+                pageMap: bookPageMap,
+                source: .pendingFullMap,
+                kind: .reconcileFullMap
+            )
+        )
     }
 
-    func applyPendingFullPageMapIfNeeded() {
-        guard let pendingMap = context.pendingFullPageMap,
-              let readerView = context.readerView,
+    func commitPendingPageMapUpdateIfNeeded() {
+        guard let readerView = context.readerView,
               let controller = context.controller else { return }
 
         guard !controller.isRepaginating else { return }
+        guard !readerView.isPageCurlTransitioning else {
+            RDEPUBBackgroundTrace.log("PageMapCommit", "defer commit reason=pageCurlTransition")
+            return
+        }
 
-        navigationStateMachine.transition(to: .reconcilingFullMap)
-        let decision = reconciliationCoordinator.evaluateTakeover(
-            candidatePageMap: pendingMap,
-            candidateSegment: nil,
-            currentWindow: context.bookPageMap,
-            jumpSession: jumpSessionManager.activeSession
-        )
-
-        switch decision {
-        case .keepCurrentWindow:
-            RDEPUBBackgroundTrace.log("Reconciliation", "decision: keepCurrentWindow")
-
-        case .fullReplace(let newPageMap):
-            RDEPUBBackgroundTrace.log("Reconciliation", "decision: fullReplace")
-            applyFullPageMapReplacement(newPageMap, readerView: readerView, controller: controller)
-
-        case .expandWindow, .segmentReplace:
-            RDEPUBBackgroundTrace.log("Reconciliation", "decision: unexpected segment decision")
+        let rankedUpdates = rankedPendingPageMapUpdates()
+        for (index, update) in rankedUpdates {
+            if commitPendingPageMapUpdate(
+                update,
+                at: index,
+                readerView: readerView,
+                controller: controller
+            ) {
+                return
+            }
         }
     }
 
-    func applyExtendedPartialPageMap(
+    func queueExtendedPartialPageMap(
         _ bookPageMap: RDEPUBBookPageMap,
         currentPageNumber: Int,
         currentLocation: RDEPUBLocation?
     ) {
-        guard let readerView = context.readerView else { return }
-
-        navigationStateMachine.transition(to: .presentingWindow)
-        context.bookPageMap = bookPageMap
-        context.replaceActiveSnapshot(makeSnapshot(from: bookPageMap))
-        paginationState.activePageMap = bookPageMap
-        paginationState.source = .asyncExtension
-
-        readerView.reloadPageCountOnly()
-        if let currentLocation,
-           locationCoordinator.restoreReadingLocation(currentLocation, animated: false) {
-            return
-        }
-        readerView.transitionToPage(pageNum: max(currentPageNumber - 1, 0), animated: false)
+        enqueuePendingPageMapUpdate(
+            RDEPUBPendingPageMapUpdate(
+                pageMap: bookPageMap,
+                source: .asyncExtension,
+                kind: .extendPartial(
+                    currentPageNumber: currentPageNumber,
+                    currentLocation: currentLocation
+                )
+            )
+        )
     }
 
     func applySettingsPreviewPageMap(_ bookPageMap: RDEPUBBookPageMap) {
@@ -115,6 +113,16 @@ final class RDEPUBPresentationRuntime {
         paginationState.source = .settingsPreview
     }
 
+    func queueForwardAppendedPageMap(_ bookPageMap: RDEPUBBookPageMap) {
+        enqueuePendingPageMapUpdate(
+            RDEPUBPendingPageMapUpdate(
+                pageMap: bookPageMap,
+                source: .asyncExtension,
+                kind: .appendForward
+            )
+        )
+    }
+
     func clear() {
         paginationState = RDEPUBPaginationState()
         navigationStateMachine.transition(to: .idle)
@@ -150,22 +158,17 @@ final class RDEPUBPresentationRuntime {
     ) {
         let currentLocation = locationCoordinator.currentVisibleLocation()
 
-        context.pendingFullPageMap = nil
         context.textBook = nil
-        context.bookPageMap = newPageMap
-        context.replaceActiveSnapshot(makeSnapshot(from: newPageMap))
-
-        paginationState.activePageMap = newPageMap
-        paginationState.pendingFullPageMap = nil
-        paginationState.source = .fullReplacement
-        navigationStateMachine.transition(to: .presentingWindow)
+        applyPageMapToLiveModel(newPageMap, source: .fullReplacement)
 
         if let currentLocation {
-            let newPageNumber = controller.pageNumber(for: currentLocation) ?? (readerView.currentPage + 1)
-            let newPage = max(0, newPageNumber - 1)
-            readerView.reloadPageCountOnly()
-            if newPage != readerView.currentPage {
-                readerView.transitionToPage(pageNum: newPage, animated: false)
+            if rebindVisibleLocation(currentLocation, readerView: readerView, controller: controller) == false {
+                let newPageNumber = controller.pageNumber(for: currentLocation) ?? (readerView.currentPage + 1)
+                let newPage = max(0, newPageNumber - 1)
+                rebindVisiblePage(
+                    to: newPage,
+                    readerView: readerView
+                )
             }
         } else {
             readerView.reloadPageCountOnly()
@@ -181,4 +184,184 @@ final class RDEPUBPresentationRuntime {
             }
         }
     }
+
+    private func enqueuePendingPageMapUpdate(_ update: RDEPUBPendingPageMapUpdate) {
+        var updates = context.pendingPageMapUpdates
+        if let existingIndex = updates.firstIndex(where: {
+            pendingPageMapUpdateKindMatches($0.kind, update.kind)
+        }) {
+            let existing = updates[existingIndex]
+            if shouldReplacePendingPageMapUpdate(existing, with: update) {
+                updates[existingIndex] = update
+            }
+        } else {
+            updates.append(update)
+        }
+        context.pendingPageMapUpdates = updates
+        paginationState.pendingPageMapUpdates = updates
+        commitPendingPageMapUpdateIfNeeded()
+    }
+
+    private func rankedPendingPageMapUpdates() -> [(Int, RDEPUBPendingPageMapUpdate)] {
+        context.pendingPageMapUpdates.enumerated().sorted { lhs, rhs in
+            pendingPriority(for: lhs.element.kind) > pendingPriority(for: rhs.element.kind)
+        }
+    }
+
+    private func commitPendingPageMapUpdate(
+        _ update: RDEPUBPendingPageMapUpdate,
+        at index: Int,
+        readerView: RDReaderView,
+        controller: RDEPUBReaderController
+    ) -> Bool {
+        switch update.kind {
+        case .reconcileFullMap:
+            navigationStateMachine.transition(to: .reconcilingFullMap)
+            let decision = reconciliationCoordinator.evaluateTakeover(
+                candidatePageMap: update.pageMap,
+                candidateSegment: nil,
+                currentWindow: context.bookPageMap,
+                jumpSession: jumpSessionManager.activeSession
+            )
+
+            switch decision {
+            case .keepCurrentWindow:
+                RDEPUBBackgroundTrace.log("Reconciliation", "decision: keepCurrentWindow")
+                return false
+
+            case .fullReplace(let newPageMap):
+                RDEPUBBackgroundTrace.log("Reconciliation", "decision: fullReplace")
+                removePendingPageMapUpdate(at: index)
+                applyFullPageMapReplacement(newPageMap, readerView: readerView, controller: controller)
+                return true
+
+            case .expandWindow, .segmentReplace:
+                RDEPUBBackgroundTrace.log("Reconciliation", "decision: unexpected segment decision")
+                removePendingPageMapUpdate(at: index)
+                return false
+            }
+
+        case .extendPartial(let currentPageNumber, let currentLocation):
+            removePendingPageMapUpdate(at: index)
+            applyPageMapToLiveModel(update.pageMap, source: update.source)
+            if let currentLocation,
+               rebindVisibleLocation(currentLocation, readerView: readerView, controller: controller) {
+                return true
+            }
+            rebindVisiblePage(
+                to: max(currentPageNumber - 1, 0),
+                readerView: readerView
+            )
+            return true
+
+        case .appendForward:
+            removePendingPageMapUpdate(at: index)
+            applyPageMapToLiveModel(update.pageMap, source: update.source)
+            readerView.reloadPageCountOnly()
+            return true
+        }
+    }
+
+    private func rebindVisiblePage(to pageIndex: Int, readerView: RDReaderView) {
+        if readerView.currentDisplayType == .pageCurl {
+            readerView.transitionToPage(pageNum: pageIndex, animated: false)
+        } else {
+            readerView.reloadPageCountOnly()
+            if pageIndex != readerView.currentPage {
+                readerView.transitionToPage(pageNum: pageIndex, animated: false)
+            }
+        }
+    }
+
+    private func rebindVisibleLocation(
+        _ location: RDEPUBLocation,
+        readerView: RDReaderView,
+        controller: RDEPUBReaderController
+    ) -> Bool {
+        guard let targetPageNumber = controller.pageNumber(for: location) else {
+            return false
+        }
+
+        if context.bookPageMap != nil,
+           context.runtime?.prepareOnDemandChapter(
+                forAbsolutePageNumber: targetPageNumber,
+                allowSynchronousLoad: true
+           ) == false {
+            return false
+        }
+
+        rebindVisiblePage(
+            to: max(targetPageNumber - 1, 0),
+            readerView: readerView
+        )
+        return true
+    }
+
+    private func applyPageMapToLiveModel(
+        _ pageMap: RDEPUBBookPageMap,
+        source: RDEPUBPaginationStateSource
+    ) {
+        navigationStateMachine.transition(to: .presentingWindow)
+        context.bookPageMap = pageMap
+        context.replaceActiveSnapshot(makeSnapshot(from: pageMap))
+        discardSupersededPendingPageMapUpdates(afterApplying: pageMap)
+        paginationState.activePageMap = pageMap
+        paginationState.source = source
+    }
+
+    private func removePendingPageMapUpdate(at index: Int) {
+        var updates = context.pendingPageMapUpdates
+        guard updates.indices.contains(index) else { return }
+        updates.remove(at: index)
+        context.pendingPageMapUpdates = updates
+        paginationState.pendingPageMapUpdates = updates
+    }
+
+    private func discardSupersededPendingPageMapUpdates(afterApplying liveMap: RDEPUBBookPageMap) {
+        let updates = context.pendingPageMapUpdates.filter { update in
+            update.pageMap.totalChapters > liveMap.totalChapters
+                || (
+                    update.pageMap.totalChapters == liveMap.totalChapters
+                        && update.pageMap.totalPages > liveMap.totalPages
+                )
+        }
+        context.pendingPageMapUpdates = updates
+        paginationState.pendingPageMapUpdates = updates
+    }
+
+    private func pendingPriority(for kind: RDEPUBPendingPageMapUpdateKind) -> Int {
+        switch kind {
+        case .extendPartial:
+            return 3
+        case .appendForward:
+            return 2
+        case .reconcileFullMap:
+            return 1
+        }
+    }
+
+    private func pendingPageMapUpdateKindMatches(
+        _ lhs: RDEPUBPendingPageMapUpdateKind,
+        _ rhs: RDEPUBPendingPageMapUpdateKind
+    ) -> Bool {
+        switch (lhs, rhs) {
+        case (.reconcileFullMap, .reconcileFullMap),
+             (.appendForward, .appendForward),
+             (.extendPartial, .extendPartial):
+            return true
+        default:
+            return false
+        }
+    }
+
+    private func shouldReplacePendingPageMapUpdate(
+        _ existing: RDEPUBPendingPageMapUpdate,
+        with candidate: RDEPUBPendingPageMapUpdate
+    ) -> Bool {
+        candidate.pageMap.totalChapters > existing.pageMap.totalChapters
+            || (
+                candidate.pageMap.totalChapters == existing.pageMap.totalChapters
+                    && candidate.pageMap.totalPages >= existing.pageMap.totalPages
+            )
+    }
 }
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderContext.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderContext.swift
index 5b03c4a..5ce082e 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderContext.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderContext.swift
@@ -83,9 +83,9 @@ final class RDEPUBReaderContext {
         set { state.searchState = newValue }
     }
 
-    var pendingFullPageMap: RDEPUBBookPageMap? {
-        get { state.pendingFullPageMap }
-        set { state.pendingFullPageMap = newValue }
+    var pendingPageMapUpdates: [RDEPUBPendingPageMapUpdate] {
+        get { state.pendingPageMapUpdates }
+        set { state.pendingPageMapUpdates = newValue }
     }
 
     var lastTextPaginationPageSize: CGSize? {
@@ -249,7 +249,7 @@ final class RDEPUBReaderContext {
            let publication,
            publication.spine.indices.contains(spineIndex) {
             let href = publication.spine[spineIndex].href
-            contentHash = parser.htmlString(forRelativePath: href)?.sha256Hex ?? ""
+            contentHash = parser.htmlString(forRelativePath: href)?.rd_sha256Hex ?? ""
         } else {
             contentHash = ""
         }
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderPaginationCoordinator.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderPaginationCoordinator.swift
index f531aba..7be7d3f 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderPaginationCoordinator.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderPaginationCoordinator.swift
@@ -2,77 +2,13 @@ import Foundation
 
 final class RDEPUBReaderPaginationCoordinator {
 
-    private final class MetadataParseState {
-
-        var summariesBySpineIndex: [Int: RDEPUBChapterSummary]
-
-        var totalResolvedCount: Int
-
-        var lastAppliedCount: Int
-
-        init(
-            summariesBySpineIndex: [Int: RDEPUBChapterSummary],
-            totalResolvedCount: Int,
-            lastAppliedCount: Int
-        ) {
-            self.summariesBySpineIndex = summariesBySpineIndex
-            self.totalResolvedCount = totalResolvedCount
-            self.lastAppliedCount = lastAppliedCount
-        }
-    }
-
-    private final class MetadataParseCancellationController {
-
-        let token: UUID
-
-        private let lock = NSLock()
-
-        private weak var queue: OperationQueue?
-
-        private var cancelled = false
-
-        init(token: UUID) {
-            self.token = token
-        }
-
-        func attach(queue: OperationQueue) {
-            let shouldCancelImmediately: Bool
-            lock.lock()
-            self.queue = queue
-            shouldCancelImmediately = cancelled
-            lock.unlock()
-
-            if shouldCancelImmediately {
-                queue.cancelAllOperations()
-            }
-        }
-
-        func cancel() {
-            let queueToCancel: OperationQueue?
-            lock.lock()
-            cancelled = true
-            queueToCancel = queue
-            lock.unlock()
-            queueToCancel?.cancelAllOperations()
-        }
-
-        var isCancelled: Bool {
-            lock.lock()
-            let value = cancelled
-            lock.unlock()
-            return value
-        }
-    }
-
-    private let backgroundInteractionCooldown: CFAbsoluteTime = 0.8
-
     static var pageMapRefreshInterval: Int = 32
 
     private unowned let context: RDEPUBReaderContext
 
     private let metadataParseControlLock = NSLock()
 
-    private var activeMetadataParseCancellationController: MetadataParseCancellationController?
+    private var activeMetadataParseCancellationController: RDEPUBMetadataParseCancellationController?
 
     init(context: RDEPUBReaderContext) {
         self.context = context
@@ -148,7 +84,7 @@ final class RDEPUBReaderPaginationCoordinator {
         guard let controller = context.controller else { return }
         context.textBook = textBook
         context.bookPageMap = nil
-        context.pendingFullPageMap = nil
+        context.pendingPageMapUpdates.removeAll()
         let snapshot = controller.nativeTextSnapshot(from: textBook)
         context.replaceActiveSnapshot(snapshot)
 
@@ -167,7 +103,7 @@ final class RDEPUBReaderPaginationCoordinator {
         guard context.controller != nil else { return }
         context.textBook = nil
         context.bookPageMap = nil
-        context.pendingFullPageMap = nil
+        context.pendingPageMapUpdates.removeAll()
         context.replaceActiveSnapshot(snapshot)
 
         guard !snapshot.pages.isEmpty else {
@@ -206,8 +142,34 @@ final class RDEPUBReaderPaginationCoordinator {
 
     func refreshVisibleContentPreservingLocation() {
         guard let readerView = context.readerView else { return }
+        if readerView.isPageCurlTransitioning {
+            RDEPUBBackgroundTrace.log(
+                "LoadingPage",
+                "defer refreshVisibleContent currentPage=\(readerView.currentPage + 1) reason=pageCurlTransition"
+            )
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
+                self?.refreshVisibleContentPreservingLocation()
+            }
+            return
+        }
         let restoreLocation = context.currentVisibleLocation() ?? context.persistenceLocation()
-        readerView.reloadData()
+        RDEPUBBackgroundTrace.log(
+            "LoadingPage",
+            "refreshVisibleContentPreservingLocation currentPage=\(readerView.currentPage + 1) restoreHref=\(restoreLocation?.href ?? "nil") restoreCFI=\(restoreLocation?.cfi ?? "nil")"
+        )
+        if readerView.currentDisplayType == .pageCurl, readerView.currentPage >= 0 {
+            RDEPUBBackgroundTrace.log(
+                "LoadingPage",
+                "refreshVisibleContent using transitionToPage currentPage=\(readerView.currentPage + 1)"
+            )
+            readerView.transitionToPage(pageNum: readerView.currentPage, animated: false)
+        } else {
+            RDEPUBBackgroundTrace.log(
+                "LoadingPage",
+                "refreshVisibleContent using reloadData currentPage=\(readerView.currentPage + 1)"
+            )
+            readerView.reloadData()
+        }
         if let restoreLocation {
             _ = context.restoreReadingLocation(restoreLocation)
         }
@@ -275,6 +237,11 @@ final class RDEPUBReaderPaginationCoordinator {
                     "QuickOpen",
                     "ready anchorSpine=\(runtimeChapter.spineIndex) pages=\(runtimeChapter.pages.count)"
                 )
+                let initialChapters = self.loadInitialInteractiveRuntimeChapters(
+                    anchorChapter: runtimeChapter,
+                    publication: publication,
+                    runtime: runtime
+                )
 
                 DispatchQueue.main.async {
                     guard context.paginationToken == token,
@@ -284,13 +251,21 @@ final class RDEPUBReaderPaginationCoordinator {
                         totalSpineCount: publication.spine.count,
                         windowRadius: context.configuration.chapterWindowRadius
                     )
-                    let partialMap = self.makePartialPageMap(from: [runtimeChapter])
+                    let partialMap = self.makePartialPageMap(from: initialChapters)
                     runtime.applyBookPageMap(partialMap, restoreLocation: restoreLocation)
                     runtime.prefetchForwardChaptersAfterInitialOpen(
                         anchorSpineIndex: runtimeChapter.spineIndex,
                         totalSpineCount: publication.spine.count
                     )
-                    self.paginateMetadataOnly(token: token, restoreLocation: restoreLocation)
+                    let cancellationController = self.beginMetadataParseCancellationController(for: token)
+                    let worker = RDEPUBMetadataParseWorker(
+                        context: context,
+                        cancellationController: cancellationController,
+                        token: token,
+                        parser: parser,
+                        publication: publication
+                    )
+                    worker.start(token: token, restoreLocation: restoreLocation)
                 }
             } catch {
                 DispatchQueue.main.async {
@@ -321,6 +296,55 @@ final class RDEPUBReaderPaginationCoordinator {
         throw lastError ?? RDEPUBParserError.emptySpine
     }
 
+    private func loadInitialInteractiveRuntimeChapters(
+        anchorChapter: RDEPUBRuntimeChapter,
+        publication: RDEPUBPublication,
+        runtime: RDEPUBReaderRuntime
+    ) -> [RDEPUBRuntimeChapter] {
+        let minimumInteractivePageCount = 2
+        let maximumAdditionalChapters = 1
+
+        guard anchorChapter.pages.count < minimumInteractivePageCount else {
+            return [anchorChapter]
+        }
+
+        let buildableSpineIndices = publication.spine.indices.filter { isBuildableTextSpine(at: $0, in: publication) }
+        guard let anchorPosition = buildableSpineIndices.firstIndex(of: anchorChapter.spineIndex) else {
+            return [anchorChapter]
+        }
+
+        var selectedChapters: [RDEPUBRuntimeChapter] = [anchorChapter]
+
+        for offset in 1...maximumAdditionalChapters {
+            let candidatePositions = [anchorPosition + offset, anchorPosition - offset]
+            for candidatePosition in candidatePositions {
+                guard buildableSpineIndices.indices.contains(candidatePosition) else { continue }
+                let spineIndex = buildableSpineIndices[candidatePosition]
+                guard selectedChapters.contains(where: { $0.spineIndex == spineIndex }) == false else { continue }
+
+                do {
+                    let chapter = try runtime.chapterLoader.loadChapterSynchronouslyForMigration(
+                        spineIndex: spineIndex,
+                        store: runtime.chapterRuntimeStore
+                    )
+                    selectedChapters.append(chapter)
+                } catch {
+                    RDEPUBBackgroundTrace.log(
+                        "QuickOpen",
+                        "lookahead skip spine=\(spineIndex) reason=\(error)"
+                    )
+                }
+            }
+
+            let loadedPageCount = selectedChapters.reduce(0) { $0 + $1.pages.count }
+            if loadedPageCount >= minimumInteractivePageCount {
+                break
+            }
+        }
+
+        return selectedChapters
+    }
+
     private func makePartialPageMap(from chapters: [RDEPUBRuntimeChapter]) -> RDEPUBBookPageMap {
         var builder = RDEPUBBookPageMap.Builder()
         for chapter in chapters {
@@ -352,524 +376,12 @@ final class RDEPUBReaderPaginationCoordinator {
         publication.spine.indices.filter { isBuildableTextSpine(at: $0, in: publication) }
     }
 
-    private func waitForReadingInteractionToSettle(
-        using context: RDEPUBReaderContext,
-        cancellationController: MetadataParseCancellationController? = nil
-    ) {
-        while context.controller != nil,
-              cancellationController?.isCancelled != true,
-              context.secondsSinceLastUserNavigation() < backgroundInteractionCooldown {
-            Thread.sleep(forTimeInterval: 0.08)
-        }
-    }
-
     private func isBuildableTextSpine(at index: Int, in publication: RDEPUBPublication) -> Bool {
         guard publication.spine.indices.contains(index) else { return false }
         let item = publication.spine[index]
         return item.linear && (item.mediaType.contains("html") || item.mediaType.contains("xhtml"))
     }
 
-    private static let maxRetryCount = 3
-    private static let retryDelays: [TimeInterval] = [0.5, 2.0, 8.0]
-
-    func paginateMetadataOnly(token: UUID, restoreLocation: RDEPUBLocation?) {
-        let context = self.context
-        guard let parser = context.parser,
-              let publication = context.publication else { return }
-        let cancellationController = beginMetadataParseCancellationController(for: token)
-
-        let pageSize = context.currentTextPageSize()
-        let layoutConfig = context.currentTextLayoutConfig(pageSize: pageSize)
-        let style = context.currentTextRenderStyle()
-        let renderSignature = context.currentRenderSignature()
-        let allBuildableIndices = allBuildableSpineIndices(in: publication)
-        let summaryDiskCache = context.runtime?.summaryDiskCache
-        let workerCount = max(1, context.configuration.metadataParsingConcurrency)
-        let cpuCount = ProcessInfo.processInfo.activeProcessorCount
-        RDEPUBBackgroundTrace.log("MetadataParse", "config concurrency=\(workerCount) cpuCores=\(cpuCount)")
-
-        DispatchQueue.global(qos: .utility).async { [weak self] in
-            guard let self else { return }
-            defer { self.finishMetadataParseCancellationController(cancellationController) }
-            guard context.controller != nil,
-                  !cancellationController.isCancelled,
-                  context.paginationToken == token else { return }
-
-            if let restoredPageMap = self.restoreBookPageMapIfPossible(publication: publication) {
-                RDEPUBBackgroundTrace.log(
-                    "MetadataParse",
-                    "full cache restore hit chapters=\(restoredPageMap.totalChapters) pages=\(restoredPageMap.totalPages)"
-                )
-                DispatchQueue.main.async {
-                    guard context.paginationToken == token,
-                          context.controller != nil,
-                          !cancellationController.isCancelled else { return }
-                    context.runtime?.refreshBookPageMapInPlace(restoredPageMap)
-                }
-                return
-            }
-
-            let prewarmStart = CFAbsoluteTimeGetCurrent()
-            var contentHashBySpineIndex: [Int: String] = [:]
-            for spineIndex in allBuildableIndices {
-                guard !cancellationController.isCancelled,
-                      context.paginationToken == token,
-                      context.controller != nil else {
-                    RDEPUBBackgroundTrace.log("MetadataParse", "abort during content hash prewarm")
-                    return
-                }
-                guard let href = publication.spine.indices.contains(spineIndex)
-                    ? publication.spine[spineIndex].href : nil,
-                    let html = parser.htmlString(forRelativePath: href) else {
-                    contentHashBySpineIndex[spineIndex] = ""
-                    continue
-                }
-                contentHashBySpineIndex[spineIndex] = html.sha256Hex
-            }
-            let prewarmMs = Int((CFAbsoluteTimeGetCurrent() - prewarmStart) * 1000)
-            RDEPUBBackgroundTrace.log("MetadataParse", "prewarmHashMs=\(prewarmMs) chapters=\(allBuildableIndices.count)")
-
-            let catalog = allBuildableIndices.map { spineIndex in
-                let item = publication.spine[spineIndex]
-                return (
-                    key: context.chapterCacheKey(
-                        forSpineIndex: spineIndex,
-                        precomputedContentHash: contentHashBySpineIndex[spineIndex] ?? "",
-                        renderSignature: renderSignature
-                    ),
-                    spineIndex: spineIndex,
-                    href: item.href,
-                    title: item.title
-                )
-            }
-            let restored = summaryDiskCache?.readAll(keys: catalog)
-            RDEPUBBackgroundTrace.log(
-                "MetadataParse",
-                "begin token=\(token.uuidString) buildableChapters=\(allBuildableIndices.count) concurrency=\(workerCount)"
-            )
-            let cachedSummaries = restored?.summaries ?? [:]
-            let cachedSpineIndices = Set(cachedSummaries.keys)
-            let resultLock = NSLock()
-            let parseState = MetadataParseState(
-                summariesBySpineIndex: cachedSummaries,
-                totalResolvedCount: cachedSpineIndices.count,
-                lastAppliedCount: cachedSpineIndices.count
-            )
-
-            if !cachedSpineIndices.isEmpty {
-                RDEPUBBackgroundTrace.log(
-                    "MetadataParse",
-                    "resumeFromCache cachedChapters=\(cachedSpineIndices.count) total=\(allBuildableIndices.count)"
-                )
-                let cachedMap = self.buildPageMap(from: catalog, summaries: parseState.summariesBySpineIndex)
-                DispatchQueue.main.async {
-                    guard context.paginationToken == token,
-                          context.controller != nil else { return }
-                    context.runtime?.refreshBookPageMapInPlace(cachedMap)
-                }
-            }
-
-            let prioritizedSpineIndices: [Int]
-            if let priorityManager = context.runtime?.backgroundPriorityManager {
-                let currentSpineIndex = context.runtime?.locationCoordinator.currentVisibleLocation()
-                    .flatMap { context.normalizedSpineIndex(for: $0) }
-                prioritizedSpineIndices = priorityManager.makeMetadataPriorityOrder(
-                    allBuildableIndices: allBuildableIndices,
-                    currentSpineIndex: currentSpineIndex,
-                    cachedSpineIndices: cachedSpineIndices
-                )
-                RDEPUBBackgroundTrace.log(
-                    "MetadataParse",
-                    "prioritized hot=\(prioritizedSpineIndices.prefix(10).count) total=\(prioritizedSpineIndices.count)"
-                )
-            } else {
-                prioritizedSpineIndices = allBuildableIndices.filter { !cachedSpineIndices.contains($0) }
-            }
-
-            let uncachedSpineIndices = prioritizedSpineIndices
-
-            self.waitForReadingInteractionToSettle(
-                using: context,
-                cancellationController: cancellationController
-            )
-            guard !cancellationController.isCancelled,
-                  context.controller != nil,
-                  context.paginationToken == token else {
-                RDEPUBBackgroundTrace.log("MetadataParse", "abort before queue start")
-                return
-            }
-
-            let wallClockStart = CFAbsoluteTimeGetCurrent()
-            var totalRenderMs: Double = 0
-            var totalWriteMs: Double = 0
-            var totalMergeMs: Double = 0
-            var completedChapters = 0
-            var failedChapters = 0
-            let timingLock = NSLock()
-
-            let queue = OperationQueue()
-            queue.name = "com.rdreader.metadata.parse"
-            queue.qualityOfService = .utility
-            queue.maxConcurrentOperationCount = workerCount
-            cancellationController.attach(queue: queue)
-
-            let refreshInterval = RDEPUBReaderPaginationCoordinator.pageMapRefreshInterval
-
-            for (offset, spineIndex) in uncachedSpineIndices.enumerated() {
-                let operation = BlockOperation()
-                operation.addExecutionBlock { [weak operation] in
-                    guard context.controller != nil,
-                          context.paginationToken == token,
-                          !cancellationController.isCancelled,
-                          operation?.isCancelled != true else {
-                        return
-                    }
-                    do {
-                        RDEPUBBackgroundTrace.log("MetadataParse", "正在解析 spine=\(spineIndex) \(offset + 1)/\(uncachedSpineIndices.count)")
-
-                        let renderResult: RDEPUBChapterSummary? = try autoreleasepool { () -> RDEPUBChapterSummary? in
-                            guard context.controller != nil,
-                                  context.paginationToken == token,
-                                  !cancellationController.isCancelled,
-                                  operation?.isCancelled != true else {
-                                return nil
-                            }
-                            let chapterBuilder = context.makeTextBookBuilder(layoutConfig: layoutConfig)
-                            let renderStart = CFAbsoluteTimeGetCurrent()
-                            guard let result = try chapterBuilder.buildChapter(
-                                parser: parser,
-                                publication: publication,
-                                spineIndex: spineIndex,
-                                pageSize: pageSize,
-                                style: style
-                            ) else {
-                                return nil
-                            }
-                            guard context.controller != nil,
-                                  context.paginationToken == token,
-                                  !cancellationController.isCancelled,
-                                  operation?.isCancelled != true else {
-                                RDEPUBBackgroundTrace.log("MetadataParse", "drop rendered chapter due to cancellation spine=\(spineIndex)")
-                                return nil
-                            }
-                            let renderElapsed = (CFAbsoluteTimeGetCurrent() - renderStart) * 1000
-
-                            let chapter = result.chapter
-                            let precomputedHash = contentHashBySpineIndex[spineIndex] ?? ""
-                            let cacheKey = context.chapterCacheKey(
-                                forSpineIndex: spineIndex,
-                                precomputedContentHash: precomputedHash,
-                                renderSignature: renderSignature
-                            )
-                            let summary = RDEPUBChapterSummary(
-                                pageRanges: chapter.pages.map { .init(location: $0.contentRange.location, length: $0.contentRange.length) },
-                                pageCount: chapter.pages.count,
-                                fragmentOffsets: chapter.fragmentOffsets,
-                                cfiMap: chapter.cfiMap,
-                                renderSignature: cacheKey.renderSignature,
-                                schemaVersion: RDEPUBChapterSummary.currentSchemaVersion,
-                                chapterContentHash: cacheKey.chapterContentHash,
-                                pageMetadataList: chapter.pages.map { .from($0.metadata) }
-                            )
-                            guard context.controller != nil,
-                                  context.paginationToken == token,
-                                  !cancellationController.isCancelled,
-                                  operation?.isCancelled != true else {
-                                RDEPUBBackgroundTrace.log("MetadataParse", "skip disk write due to cancellation spine=\(spineIndex)")
-                                return nil
-                            }
-                            let writeStart = CFAbsoluteTimeGetCurrent()
-                            summaryDiskCache?.write(summary: summary, for: cacheKey)
-                            let writeElapsed = (CFAbsoluteTimeGetCurrent() - writeStart) * 1000
-
-                            timingLock.lock()
-                            totalRenderMs += renderElapsed
-                            totalWriteMs += writeElapsed
-                            completedChapters += 1
-                            timingLock.unlock()
-
-                            RDEPUBBackgroundTrace.log(
-                                "MetadataParse",
-                                "spine=\(spineIndex) renderMs=\(Int(renderElapsed)) writeMs=\(Int(writeElapsed))"
-                            )
-                            return summary
-                        }
-
-                        guard let renderResult else { return }
-                        guard context.controller != nil,
-                              context.paginationToken == token,
-                              !cancellationController.isCancelled,
-                              operation?.isCancelled != true else {
-                            return
-                        }
-
-                        var snapshot: [Int: RDEPUBChapterSummary]?
-                        resultLock.lock()
-                        parseState.summariesBySpineIndex[spineIndex] = renderResult
-                        parseState.totalResolvedCount += 1
-                        if parseState.totalResolvedCount - parseState.lastAppliedCount >= refreshInterval
-                            || parseState.totalResolvedCount == allBuildableIndices.count {
-                            parseState.lastAppliedCount = parseState.totalResolvedCount
-                            snapshot = parseState.summariesBySpineIndex
-                        }
-                        resultLock.unlock()
-
-                        if let snapshot {
-                            let mergeStart = CFAbsoluteTimeGetCurrent()
-                            let partialMap = self.buildPageMap(from: catalog, summaries: snapshot)
-                            let mergeElapsed = (CFAbsoluteTimeGetCurrent() - mergeStart) * 1000
-                            timingLock.lock()
-                            totalMergeMs += mergeElapsed
-                            timingLock.unlock()
-                            DispatchQueue.main.async {
-                                guard context.paginationToken == token,
-                                      context.controller != nil,
-                                      !cancellationController.isCancelled else { return }
-                                context.runtime?.refreshBookPageMapInPlace(partialMap)
-                            }
-                        }
-                    } catch {
-                        guard !cancellationController.isCancelled,
-                              context.paginationToken == token,
-                              context.controller != nil,
-                              operation?.isCancelled != true else {
-                            return
-                        }
-                        timingLock.lock()
-                        failedChapters += 1
-                        timingLock.unlock()
-                        RDEPUBBackgroundTrace.log("MetadataParse", "buildChapter FAILED: spine=\(spineIndex) error=\(error)")
-
-                        self.scheduleRetry(
-                            spineIndex: spineIndex,
-                            retryCount: 0,
-                            token: token,
-                            context: context,
-                            parser: parser,
-                            publication: publication,
-                            pageSize: pageSize,
-                            layoutConfig: layoutConfig,
-                            style: style,
-                            renderSignature: renderSignature,
-                            summaryDiskCache: summaryDiskCache,
-                            contentHashBySpineIndex: contentHashBySpineIndex,
-                            resultLock: resultLock,
-                            parseState: parseState,
-                            allBuildableIndices: allBuildableIndices,
-                            catalog: catalog,
-                            refreshInterval: refreshInterval,
-                            cancellationController: cancellationController
-                        )
-                    }
-                }
-                queue.addOperation(operation)
-            }
-            queue.waitUntilAllOperationsAreFinished()
-            if !cancellationController.isCancelled,
-               context.paginationToken == token,
-               context.controller != nil {
-                summaryDiskCache?.flushPendingWrites()
-            }
-
-            let wallClockMs = Int((CFAbsoluteTimeGetCurrent() - wallClockStart) * 1000)
-            timingLock.lock()
-            let renderTotal = Int(totalRenderMs)
-            let writeTotal = Int(totalWriteMs)
-            let mergeTotal = Int(totalMergeMs)
-            let rendered = completedChapters
-            let failed = failedChapters
-            timingLock.unlock()
-            let avgRenderMs = rendered > 0 ? renderTotal / rendered : 0
-            RDEPUBBackgroundTrace.log(
-                "MetadataParse",
-                "timing wallClockMs=\(wallClockMs) chapters=\(rendered) failed=\(failed) " +
-                "prewarmHashMs=\(prewarmMs) renderTotalMs=\(renderTotal) writeTotalMs=\(writeTotal) " +
-                "mergeTotalMs=\(mergeTotal) avgRenderMs=\(avgRenderMs) concurrency=\(workerCount)"
-            )
-            context.lastMetadataParseWallClockMs = wallClockMs
-            context.lastMetadataParseConcurrency = workerCount
-
-            guard context.controller != nil,
-                  context.paginationToken == token,
-                  !cancellationController.isCancelled else {
-                RDEPUBBackgroundTrace.log("MetadataParse", "abort: reader dismissed or token changed")
-                return
-            }
-
-            let finalMergeStart = CFAbsoluteTimeGetCurrent()
-            let pageMap = self.buildPageMap(from: catalog, summaries: parseState.summariesBySpineIndex)
-            let finalMergeMs = Int((CFAbsoluteTimeGetCurrent() - finalMergeStart) * 1000)
-            RDEPUBBackgroundTrace.log(
-                "MetadataParse",
-                "complete chapters=\(pageMap.totalChapters) pages=\(pageMap.totalPages) finalMergeMs=\(finalMergeMs)"
-            )
-
-            if let coverageStore = context.runtime?.backgroundCoverageStore {
-                let resolvedSpineIndices = Set(parseState.summariesBySpineIndex.keys)
-                let lowerSpine = resolvedSpineIndices.min() ?? 0
-                let upperSpine = resolvedSpineIndices.max() ?? 0
-                let estimatedBytes = 256 + pageMap.entries.count * 96 + resolvedSpineIndices.count * 16
-
-                let segment = RDEPUBBackgroundCoverageSegment(
-                    lowerSpineIndex: lowerSpine,
-                    upperSpineIndex: upperSpine,
-                    pageMap: pageMap,
-                    resolvedSpineIndices: resolvedSpineIndices,
-                    generatedAt: CFAbsoluteTimeGetCurrent(),
-                    renderSignature: renderSignature,
-                    estimatedMemoryBytes: estimatedBytes
-                )
-                coverageStore.addSegment(segment)
-            }
-
-            DispatchQueue.main.async {
-                guard context.paginationToken == token,
-                      context.controller != nil else { return }
-                context.runtime?.refreshBookPageMapInPlace(pageMap)
-            }
-        }
-    }
-
-    private func scheduleRetry(
-        spineIndex: Int,
-        retryCount: Int,
-        token: UUID,
-        context: RDEPUBReaderContext,
-        parser: RDEPUBParser,
-        publication: RDEPUBPublication,
-        pageSize: CGSize,
-        layoutConfig: RDEPUBTextLayoutConfig,
-        style: RDEPUBTextRenderStyle,
-        renderSignature: String,
-        summaryDiskCache: RDEPUBChapterSummaryDiskCache?,
-        contentHashBySpineIndex: [Int: String],
-        resultLock: NSLock,
-        parseState: MetadataParseState,
-        allBuildableIndices: [Int],
-        catalog: [(key: RDEPUBChapterCacheKey, spineIndex: Int, href: String, title: String)],
-        refreshInterval: Int,
-        cancellationController: MetadataParseCancellationController
-    ) {
-        guard retryCount < Self.maxRetryCount else {
-            RDEPUBBackgroundTrace.log(
-                "MetadataParse",
-                "spine=\(spineIndex) max retries reached, marking as deferredFailure"
-            )
-            return
-        }
-
-        let delay = Self.retryDelays[min(retryCount, Self.retryDelays.count - 1)]
-        RDEPUBBackgroundTrace.log(
-            "MetadataParse",
-            "scheduling retry for spine=\(spineIndex) attempt=\(retryCount + 1) delay=\(delay)s"
-        )
-
-        DispatchQueue.global(qos: .utility).asyncAfter(deadline: .now() + delay) { [weak self] in
-            guard let self else { return }
-            guard context.controller != nil,
-                  context.paginationToken == token,
-                  !cancellationController.isCancelled else {
-                return
-            }
-
-            do {
-                let chapterBuilder = context.makeTextBookBuilder(layoutConfig: layoutConfig)
-                guard let result = try chapterBuilder.buildChapter(
-                    parser: parser,
-                    publication: publication,
-                    spineIndex: spineIndex,
-                    pageSize: pageSize,
-                    style: style
-                ) else {
-                    return
-                }
-                guard context.controller != nil,
-                      context.paginationToken == token,
-                      !cancellationController.isCancelled else {
-                    RDEPUBBackgroundTrace.log("MetadataParse", "drop retry result due to cancellation spine=\(spineIndex)")
-                    return
-                }
-
-                let chapter = result.chapter
-                let precomputedHash = contentHashBySpineIndex[spineIndex] ?? ""
-                let cacheKey = context.chapterCacheKey(
-                    forSpineIndex: spineIndex,
-                    precomputedContentHash: precomputedHash,
-                    renderSignature: renderSignature
-                )
-                let summary = RDEPUBChapterSummary(
-                    pageRanges: chapter.pages.map { .init(location: $0.contentRange.location, length: $0.contentRange.length) },
-                    pageCount: chapter.pages.count,
-                    fragmentOffsets: chapter.fragmentOffsets,
-                    cfiMap: chapter.cfiMap,
-                    renderSignature: cacheKey.renderSignature,
-                    schemaVersion: RDEPUBChapterSummary.currentSchemaVersion,
-                    chapterContentHash: cacheKey.chapterContentHash,
-                    pageMetadataList: chapter.pages.map { .from($0.metadata) }
-                )
-                guard context.controller != nil,
-                      context.paginationToken == token,
-                      !cancellationController.isCancelled else {
-                    RDEPUBBackgroundTrace.log("MetadataParse", "skip retry disk write due to cancellation spine=\(spineIndex)")
-                    return
-                }
-                summaryDiskCache?.write(summary: summary, for: cacheKey)
-
-                resultLock.lock()
-                parseState.summariesBySpineIndex[spineIndex] = summary
-                parseState.totalResolvedCount += 1
-                let shouldRefresh =
-                    parseState.totalResolvedCount - parseState.lastAppliedCount >= refreshInterval
-                    || parseState.totalResolvedCount == allBuildableIndices.count
-                if shouldRefresh {
-                    parseState.lastAppliedCount = parseState.totalResolvedCount
-                }
-                resultLock.unlock()
-
-                if shouldRefresh {
-                    let partialMap = self.buildPageMap(from: catalog, summaries: parseState.summariesBySpineIndex)
-                    DispatchQueue.main.async {
-                        guard context.paginationToken == token,
-                              context.controller != nil,
-                              !cancellationController.isCancelled else { return }
-                        context.runtime?.refreshBookPageMapInPlace(partialMap)
-                    }
-                }
-
-                RDEPUBBackgroundTrace.log(
-                    "MetadataParse",
-                    "retry succeeded for spine=\(spineIndex) attempt=\(retryCount + 1)"
-                )
-            } catch {
-                RDEPUBBackgroundTrace.log(
-                    "MetadataParse",
-                    "retry failed for spine=\(spineIndex) attempt=\(retryCount + 1) error=\(error)"
-                )
-
-                self.scheduleRetry(
-                    spineIndex: spineIndex,
-                    retryCount: retryCount + 1,
-                    token: token,
-                    context: context,
-                    parser: parser,
-                    publication: publication,
-                    pageSize: pageSize,
-                    layoutConfig: layoutConfig,
-                    style: style,
-                    renderSignature: renderSignature,
-                    summaryDiskCache: summaryDiskCache,
-                    contentHashBySpineIndex: contentHashBySpineIndex,
-                    resultLock: resultLock,
-                    parseState: parseState,
-                    allBuildableIndices: allBuildableIndices,
-                    catalog: catalog,
-                    refreshInterval: refreshInterval,
-                    cancellationController: cancellationController
-                )
-            }
-        }
-    }
-
     func cancelActiveMetadataParseWork() {
         metadataParseControlLock.lock()
         let controller = activeMetadataParseCancellationController
@@ -878,17 +390,7 @@ final class RDEPUBReaderPaginationCoordinator {
         controller?.cancel()
     }
 
-    private func beginMetadataParseCancellationController(for token: UUID) -> MetadataParseCancellationController {
-        let controller = MetadataParseCancellationController(token: token)
-        metadataParseControlLock.lock()
-        let previous = activeMetadataParseCancellationController
-        activeMetadataParseCancellationController = controller
-        metadataParseControlLock.unlock()
-        previous?.cancel()
-        return controller
-    }
-
-    private func finishMetadataParseCancellationController(_ controller: MetadataParseCancellationController) {
+    func finishMetadataParseCancellationController(_ controller: RDEPUBMetadataParseCancellationController) {
         metadataParseControlLock.lock()
         if activeMetadataParseCancellationController === controller {
             activeMetadataParseCancellationController = nil
@@ -896,52 +398,13 @@ final class RDEPUBReaderPaginationCoordinator {
         metadataParseControlLock.unlock()
     }
 
-    private func restoreBookPageMapIfPossible(publication: RDEPUBPublication) -> RDEPUBBookPageMap? {
-        guard let summaryDiskCache = context.runtime?.summaryDiskCache,
-              let parser = context.parser else {
-            return nil
-        }
-        let renderSignature = context.currentRenderSignature()
-        let catalog = allBuildableSpineIndices(in: publication).map { spineIndex in
-            let item = publication.spine[spineIndex]
-            let href = item.href
-            let contentHash = parser.htmlString(forRelativePath: href)?.sha256Hex ?? ""
-            return (
-                key: context.chapterCacheKey(
-                    forSpineIndex: spineIndex,
-                    precomputedContentHash: contentHash,
-                    renderSignature: renderSignature
-                ),
-                spineIndex: spineIndex,
-                href: href,
-                title: item.title
-            )
-        }
-        guard summaryDiskCache.isCacheComplete(keys: catalog.map(\.key)) else {
-            return nil
-        }
-        let restored = summaryDiskCache.readAll(keys: catalog)
-        guard restored.summaries.count == catalog.count else {
-            return nil
-        }
-        return restored.mapBuilder.build()
-    }
-
-    private func buildPageMap(
-        from catalog: [(key: RDEPUBChapterCacheKey, spineIndex: Int, href: String, title: String)],
-        summaries: [Int: RDEPUBChapterSummary]
-    ) -> RDEPUBBookPageMap {
-        var builder = RDEPUBBookPageMap.Builder()
-        for item in catalog {
-            guard let summary = summaries[item.spineIndex] else { continue }
-            builder.add(
-                spineIndex: item.spineIndex,
-                href: item.href,
-                title: item.title,
-                pageCount: summary.pageCount,
-                fragmentOffsets: summary.fragmentOffsets
-            )
-        }
-        return builder.build()
+    private func beginMetadataParseCancellationController(for token: UUID) -> RDEPUBMetadataParseCancellationController {
+        let controller = RDEPUBMetadataParseCancellationController(token: token)
+        metadataParseControlLock.lock()
+        let previous = activeMetadataParseCancellationController
+        activeMetadataParseCancellationController = controller
+        metadataParseControlLock.unlock()
+        previous?.cancel()
+        return controller
     }
 }
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderRuntime.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderRuntime.swift
index 909f26b..dc8dc86 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderRuntime.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderRuntime.swift
@@ -105,7 +105,7 @@ final class RDEPUBReaderRuntime {
         context.readingSession = nil
         context.textBook = nil
         context.bookPageMap = nil
-        context.pendingFullPageMap = nil
+        context.pendingPageMapUpdates.removeAll()
         context.activeBookmarks = []
         context.activeHighlights = []
         context.searchState = nil
@@ -349,7 +349,7 @@ final class RDEPUBReaderRuntime {
     }
 
     func applyPendingFullPageMapIfNeeded() {
-        presentationRuntime.applyPendingFullPageMapIfNeeded()
+        presentationRuntime.commitPendingPageMapUpdateIfNeeded()
     }
 
     func finishPagination(restoreLocation: RDEPUBLocation?) {
@@ -605,7 +605,7 @@ final class RDEPUBReaderRuntime {
         paginationCoordinator.cancelActiveMetadataParseWork()
         chapterRuntimeStore.invalidateAllForSettingsChange()
         context.bookPageMap = nil
-        context.pendingFullPageMap = nil
+        context.pendingPageMapUpdates.removeAll()
         jumpSessionManager.clearSession()
         backgroundPriorityManager.reset()
         backgroundCoverageStore.clearAll()
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderServices.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderServices.swift
index 79f2f31..e49ab2d 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderServices.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderServices.swift
@@ -45,7 +45,7 @@ final class RDEPUBReaderServices {
     func makeChapterSummaryDiskCache(bookIdentifier: String?) -> RDEPUBChapterSummaryDiskCache {
         let cachesDirectory = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first
             ?? FileManager.default.temporaryDirectory
-        let bookID = (bookIdentifier ?? "default").sha256Hex
+        let bookID = (bookIdentifier ?? "default").rd_sha256Hex
         let directory = cachesDirectory
             .appendingPathComponent("RDEPUBChapterSummaryCache", isDirectory: true)
             .appendingPathComponent(bookID, isDirectory: true)
diff --git a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderState.swift b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderState.swift
index c5891e5..1c0a338 100644
--- a/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderState.swift
+++ b/Sources/RDReaderView/EPUBUI/ReaderController/RDEPUBReaderState.swift
@@ -24,7 +24,7 @@ final class RDEPUBReaderState {
 
     var searchState: RDEPUBSearchState?
 
-    var pendingFullPageMap: RDEPUBBookPageMap?
+    var pendingPageMapUpdates: [RDEPUBPendingPageMapUpdate] = []
 
     var lastTextPaginationPageSize: CGSize?
 
diff --git a/Sources/RDReaderView/EPUBUI/Settings/RDEPUBReaderTheme.swift b/Sources/RDReaderView/EPUBUI/Settings/RDEPUBReaderTheme.swift
index f1bd971..23a7085 100644
--- a/Sources/RDReaderView/EPUBUI/Settings/RDEPUBReaderTheme.swift
+++ b/Sources/RDReaderView/EPUBUI/Settings/RDEPUBReaderTheme.swift
@@ -88,10 +88,10 @@ public struct RDEPUBReaderTheme: Equatable {
 extension RDEPUBReaderTheme {
 
     var themeBackgroundColorCSS: String {
-        contentBackgroundColor.ss_cssString
+        contentBackgroundColor.rd_cssString
     }
 
     var themeTextColorCSS: String {
-        contentTextColor.ss_cssString
+        contentTextColor.rd_cssString
     }
 }
\ No newline at end of file
diff --git a/Sources/RDReaderView/EPUBUI/String+RDEPUB.swift b/Sources/RDReaderView/EPUBUI/String+RDEPUB.swift
new file mode 100644
index 0000000..fddc71a
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/String+RDEPUB.swift
@@ -0,0 +1,17 @@
+import Foundation
+import CryptoKit
+
+extension String {
+
+    /// trim 后空字符串返回 nil
+    var rd_nilIfEmpty: String? {
+        let trimmed = trimmingCharacters(in: .whitespacesAndNewlines)
+        return trimmed.isEmpty ? nil : trimmed
+    }
+
+    /// SHA256 hex 摘要
+    var rd_sha256Hex: String {
+        let digest = SHA256.hash(data: Data(self.utf8))
+        return digest.map { String(format: "%02x", $0) }.joined()
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBDarkImageAdjuster.swift b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBDarkImageAdjuster.swift
new file mode 100644
index 0000000..89b4cbc
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBDarkImageAdjuster.swift
@@ -0,0 +1,92 @@
+import UIKit
+
+#if canImport(DTCoreText)
+import DTCoreText
+#endif
+
+enum RDEPUBDarkImageAdjuster {
+
+    private static let imageCache = NSCache<NSString, UIImage>()
+
+#if canImport(DTCoreText)
+
+    static func adjustIfNeeded(
+        _ content: NSMutableAttributedString,
+        configuration: RDEPUBReaderConfiguration
+    ) -> NSMutableAttributedString {
+        guard configuration.darkImageAdjustmentEnabled,
+              configuration.darkImageBlendRatio > 0,
+              configuration.theme.contentBackgroundColor.rd_isDarkBackground else {
+            return content
+        }
+
+        let fullRange = NSRange(location: 0, length: content.length)
+        content.enumerateAttribute(.attachment, in: fullRange) { value, range, _ in
+            guard let attachment = value as? DTImageTextAttachment,
+                  !isCoverAttachment(attachment),
+                  let image = attachment.image,
+                  shouldAdjust(image) else { return }
+
+            let adjustedAttachment = DTImageTextAttachment()
+            adjustedAttachment.image = adjustedImage(
+                image,
+                backgroundColor: configuration.theme.contentBackgroundColor,
+                blendRatio: configuration.darkImageBlendRatio,
+                cacheKey: cacheKey(for: attachment, image: image, configuration: configuration)
+            )
+            adjustedAttachment.originalSize = attachment.originalSize
+            adjustedAttachment.displaySize = attachment.displaySize
+            adjustedAttachment.verticalAlignment = attachment.verticalAlignment
+            adjustedAttachment.contentURL = attachment.contentURL
+            adjustedAttachment.hyperLinkURL = attachment.hyperLinkURL
+            adjustedAttachment.hyperLinkGUID = attachment.hyperLinkGUID
+            adjustedAttachment.attributes = attachment.attributes
+            content.addAttribute(.attachment, value: adjustedAttachment, range: range)
+        }
+        return content
+    }
+
+    private static func isCoverAttachment(_ attachment: DTTextAttachment) -> Bool {
+        let lowercasedClasses = ((attachment.attributes["class"] as? String) ?? "").lowercased()
+        let lowercasedPath = attachment.contentURL?.lastPathComponent.lowercased()
+            ?? ((attachment.attributes["src"] as? String) ?? "").lowercased()
+        return lowercasedClasses.contains("rd-front-cover-image") || lowercasedPath.contains("cover")
+    }
+
+    private static func shouldAdjust(_ image: UIImage) -> Bool {
+        image.size.width >= 80 && image.size.height >= 80
+    }
+
+    private static func cacheKey(
+        for attachment: DTImageTextAttachment,
+        image: UIImage,
+        configuration: RDEPUBReaderConfiguration
+    ) -> NSString {
+        let source = attachment.contentURL?.absoluteString
+            ?? "\(Unmanaged.passUnretained(image).toOpaque())"
+        return "\(source)|\(image.size.width)x\(image.size.height)|\(configuration.theme.contentBackgroundColor.rd_cssString)|\(configuration.darkImageBlendRatio)" as NSString
+    }
+
+    private static func adjustedImage(
+        _ image: UIImage,
+        backgroundColor: UIColor,
+        blendRatio: CGFloat,
+        cacheKey: NSString
+    ) -> UIImage {
+        if let cached = imageCache.object(forKey: cacheKey) { return cached }
+        let format = UIGraphicsImageRendererFormat()
+        format.scale = image.scale
+        format.opaque = false
+        let renderer = UIGraphicsImageRenderer(size: image.size, format: format)
+        let adjusted = renderer.image { context in
+            image.draw(in: CGRect(origin: .zero, size: image.size))
+            backgroundColor.withAlphaComponent(max(0, min(0.35, blendRatio))).setFill()
+            context.cgContext.setBlendMode(.sourceAtop)
+            context.fill(CGRect(origin: .zero, size: image.size))
+        }
+        imageCache.setObject(adjusted, forKey: cacheKey)
+        return adjusted
+    }
+
+#endif
+}
diff --git a/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBSelectionLoupeView.swift b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBSelectionLoupeView.swift
new file mode 100644
index 0000000..d2d9cde
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBSelectionLoupeView.swift
@@ -0,0 +1,78 @@
+import UIKit
+
+final class RDEPUBSelectionLoupeView: UIView {
+
+    private let imageView = UIImageView()
+
+    private let magnification: CGFloat = 1.45
+
+    private let captureSize = CGSize(width: 84, height: 84)
+
+    override init(frame: CGRect) {
+        super.init(frame: CGRect(origin: .zero, size: CGSize(width: 96, height: 96)))
+        isUserInteractionEnabled = false
+        backgroundColor = .clear
+        layer.shadowColor = UIColor.black.cgColor
+        layer.shadowOpacity = 0.18
+        layer.shadowRadius = 10
+        layer.shadowOffset = CGSize(width: 0, height: 5)
+
+        imageView.frame = bounds
+        imageView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        imageView.layer.cornerRadius = bounds.width / 2
+        imageView.layer.cornerCurve = .continuous
+        imageView.layer.borderWidth = 1.5
+        imageView.layer.borderColor = UIColor(white: 0.82, alpha: 0.95).cgColor
+        imageView.clipsToBounds = true
+        addSubview(imageView)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    func present(sourceView: UIView, focusPoint: CGPoint, hostBounds: CGRect, targetPoint: CGPoint) {
+        imageView.image = snapshot(from: sourceView, focusPoint: focusPoint)
+
+        let targetCenter = CGPoint(
+            x: min(max(targetPoint.x, hostBounds.minX + bounds.width / 2), hostBounds.maxX - bounds.width / 2),
+            y: min(
+                max(hostBounds.minY + bounds.height / 2, targetPoint.y - 74),
+                hostBounds.maxY - bounds.height / 2
+            )
+        )
+
+        center = targetCenter
+        if isHidden {
+            alpha = 0
+            transform = CGAffineTransform(scaleX: 0.92, y: 0.92)
+            isHidden = false
+            UIView.animate(withDuration: 0.12) {
+                self.alpha = 1
+                self.transform = .identity
+            }
+        }
+    }
+
+    func dismiss() {
+        guard !isHidden else { return }
+        isHidden = true
+        alpha = 0
+        imageView.image = nil
+    }
+
+    private func snapshot(from sourceView: UIView, focusPoint: CGPoint) -> UIImage {
+        let renderer = UIGraphicsImageRenderer(size: captureSize)
+        return renderer.image { context in
+            let cgContext = context.cgContext
+            cgContext.setFillColor(UIColor.systemBackground.cgColor)
+            cgContext.fill(CGRect(origin: .zero, size: captureSize))
+            cgContext.translateBy(
+                x: captureSize.width / 2 - focusPoint.x * magnification,
+                y: captureSize.height / 2 - focusPoint.y * magnification
+            )
+            cgContext.scaleBy(x: magnification, y: magnification)
+            sourceView.layer.render(in: cgContext)
+        }
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentInteractionCoordinator.swift b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentInteractionCoordinator.swift
new file mode 100644
index 0000000..9d18b49
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentInteractionCoordinator.swift
@@ -0,0 +1,241 @@
+import UIKit
+
+final class RDEPUBTextContentInteractionCoordinator: NSObject {
+
+    enum SelectionInteractionState: Equatable {
+        case idle
+        case selectionPending
+        case selecting
+        case selectionActive
+        case adjustingHandle
+    }
+
+    struct Dependencies {
+        let hasRenderableContent: () -> Bool
+        let currentSelectionProvider: () -> RDEPUBSelection?
+        let isSelectionControllerSelecting: () -> Bool
+        let hasActiveSelection: () -> Bool
+        let selectionHandleAtPoint: (CGPoint) -> RDEPUBTextSelectionController.BoundaryHandle?
+        let selectionContainsPoint: (CGPoint) -> Bool
+        let renderPointForGesture: (UIGestureRecognizer) -> CGPoint
+        let renderPointForTouch: (UITouch) -> CGPoint
+        let performLongPressSelection: (UILongPressGestureRecognizer) -> Void
+        let performPanSelection: (UIPanGestureRecognizer) -> Void
+        let adjustSelection: (RDEPUBTextSelectionController.BoundaryHandle, CGPoint) -> Void
+        let presentLoupeAtPoint: (CGPoint) -> Void
+        let dismissLoupe: () -> Void
+        let showSelectionMenu: () -> Void
+        let hideSelectionMenu: () -> Void
+        let selectionTapSuppressionDidChange: (Bool) -> Void
+        let selectionPagingSuppressionDidChange: (Bool) -> Void
+    }
+
+    private let dependencies: Dependencies
+
+    private var activeSelectionHandle: RDEPUBTextSelectionController.BoundaryHandle?
+
+    private(set) var interactionState: SelectionInteractionState = .idle
+
+    var isInteractionInProgress: Bool {
+        interactionState != .idle
+    }
+
+    init(dependencies: Dependencies) {
+        self.dependencies = dependencies
+        super.init()
+    }
+
+    func handleLongPress(_ gesture: UILongPressGestureRecognizer) {
+        dependencies.performLongPressSelection(gesture)
+
+        switch gesture.state {
+        case .began:
+            activeSelectionHandle = nil
+            updateSelectionInteractionState(.selecting)
+            dependencies.hideSelectionMenu()
+            dependencies.presentLoupeAtPoint(dependencies.renderPointForGesture(gesture))
+        case .changed:
+            updateSelectionInteractionState(.selecting)
+            dependencies.presentLoupeAtPoint(dependencies.renderPointForGesture(gesture))
+        case .ended:
+            activeSelectionHandle = nil
+            dependencies.dismissLoupe()
+            dependencies.showSelectionMenu()
+        case .cancelled, .failed:
+            activeSelectionHandle = nil
+            dependencies.dismissLoupe()
+        default:
+            break
+        }
+    }
+
+    func handlePan(_ gesture: UIPanGestureRecognizer) {
+        let point = dependencies.renderPointForGesture(gesture)
+
+        if gesture.state == .began, activeSelectionHandle == nil,
+           let handle = dependencies.selectionHandleAtPoint(point) {
+            activeSelectionHandle = handle
+            updateSelectionInteractionState(.adjustingHandle)
+            dependencies.hideSelectionMenu()
+            dependencies.presentLoupeAtPoint(point)
+        }
+
+        if let activeSelectionHandle {
+            dependencies.adjustSelection(activeSelectionHandle, point)
+            dependencies.presentLoupeAtPoint(point)
+        } else {
+            dependencies.performPanSelection(gesture)
+            if dependencies.isSelectionControllerSelecting() {
+                dependencies.presentLoupeAtPoint(point)
+            }
+        }
+
+        switch gesture.state {
+        case .ended:
+            activeSelectionHandle = nil
+            updateSelectionInteractionState(
+                dependencies.currentSelectionProvider() == nil ? .idle : .selectionActive
+            )
+            dependencies.dismissLoupe()
+            dependencies.showSelectionMenu()
+        case .cancelled, .failed:
+            activeSelectionHandle = nil
+            updateSelectionInteractionState(
+                dependencies.currentSelectionProvider() == nil ? .idle : .selectionActive
+            )
+            dependencies.dismissLoupe()
+        default:
+            break
+        }
+    }
+
+    func selectionControllerStateDidChange(_ state: RDEPUBTextSelectionController.InteractionState) {
+        switch state {
+        case .idle:
+            if dependencies.currentSelectionProvider() == nil, activeSelectionHandle == nil {
+                updateSelectionInteractionState(.idle)
+            }
+        case .selecting:
+            updateSelectionInteractionState(.selecting)
+        case .selectionActive:
+            updateSelectionInteractionState(
+                dependencies.currentSelectionProvider() == nil ? .idle : .selectionActive
+            )
+        case .adjustingHandle:
+            updateSelectionInteractionState(.adjustingHandle)
+        }
+    }
+
+    func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+        guard interactionState == .idle,
+              activeSelectionHandle == nil,
+              dependencies.hasRenderableContent(),
+              let touch = touches.first else {
+            return
+        }
+
+        let point = dependencies.renderPointForTouch(touch)
+        guard dependencies.selectionHandleAtPoint(point) == nil else { return }
+        updateSelectionInteractionState(.selectionPending)
+    }
+
+    func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
+        resetSelectionPendingIfNeeded()
+    }
+
+    func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
+        resetSelectionPendingIfNeeded()
+    }
+
+    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        if gestureRecognizer is UIPanGestureRecognizer {
+            if dependencies.isSelectionControllerSelecting() {
+                return true
+            }
+            let point = dependencies.renderPointForGesture(gestureRecognizer)
+            return dependencies.selectionHandleAtPoint(point) != nil
+        }
+
+        if gestureRecognizer is UILongPressGestureRecognizer {
+            guard dependencies.hasRenderableContent() else {
+                return true
+            }
+            let point = dependencies.renderPointForGesture(gestureRecognizer)
+            if dependencies.selectionHandleAtPoint(point) != nil {
+                return false
+            }
+            if dependencies.hasActiveSelection(), dependencies.selectionContainsPoint(point) {
+                return false
+            }
+            return true
+        }
+
+        return true
+    }
+
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        guard dependencies.hasRenderableContent() else {
+            return true
+        }
+
+        let point = dependencies.renderPointForTouch(touch)
+        if let handle = dependencies.selectionHandleAtPoint(point) {
+            if gestureRecognizer is UIPanGestureRecognizer {
+                activeSelectionHandle = handle
+                updateSelectionInteractionState(.adjustingHandle)
+                dependencies.hideSelectionMenu()
+                return true
+            }
+            if gestureRecognizer is UILongPressGestureRecognizer || gestureRecognizer is UITapGestureRecognizer {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    func gestureRecognizer(
+        _ gestureRecognizer: UIGestureRecognizer,
+        shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer
+    ) -> Bool {
+        gestureRecognizer is UILongPressGestureRecognizer || gestureRecognizer is UIPanGestureRecognizer
+    }
+
+    func reset() {
+        activeSelectionHandle = nil
+        updateSelectionInteractionState(.idle)
+        dependencies.dismissLoupe()
+    }
+
+    private func resetSelectionPendingIfNeeded() {
+        guard interactionState == .selectionPending else { return }
+        if dependencies.currentSelectionProvider() != nil {
+            updateSelectionInteractionState(.selectionActive)
+        } else {
+            updateSelectionInteractionState(.idle)
+        }
+    }
+
+    private func updateSelectionInteractionState(_ state: SelectionInteractionState) {
+        let previousTapSuppressed = interactionState != .idle
+        let previousPagingSuppressed = shouldSuppressPagingInteraction(for: interactionState)
+        interactionState = state
+        let currentTapSuppressed = interactionState != .idle
+        let currentPagingSuppressed = shouldSuppressPagingInteraction(for: interactionState)
+        if previousTapSuppressed != currentTapSuppressed {
+            dependencies.selectionTapSuppressionDidChange(currentTapSuppressed)
+        }
+        if previousPagingSuppressed != currentPagingSuppressed {
+            dependencies.selectionPagingSuppressionDidChange(currentPagingSuppressed)
+        }
+    }
+
+    private func shouldSuppressPagingInteraction(for state: SelectionInteractionState) -> Bool {
+        switch state {
+        case .idle, .selectionPending, .selectionActive:
+            return false
+        case .selecting, .adjustingHandle:
+            return true
+        }
+    }
+}
diff --git a/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentView.swift b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentView.swift
index 37396aa..11c8643 100644
--- a/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentView.swift
+++ b/Sources/RDReaderView/EPUBUI/TextPage/RDEPUBTextContentView.swift
@@ -26,17 +26,7 @@ protocol RDEPUBTextContentViewDelegate: AnyObject {
     )
 }
 
-final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
-
-    enum SelectionInteractionState: Equatable {
-        case idle
-        case selectionPending
-        case selecting
-        case selectionActive
-        case adjustingHandle
-    }
-
-    private static let darkAdjustedImageCache = NSCache<NSString, UIImage>()
+final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate, RDReaderCachePolicyProviding {
 
     private var contentInsets: UIEdgeInsets = .zero
 
@@ -48,12 +38,8 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 
     private var menuSelection: RDEPUBSelection?
 
-    private var activeSelectionHandle: RDEPUBTextSelectionController.BoundaryHandle?
-
     private let selectionLoupeView = RDEPUBSelectionLoupeView()
 
-    private var selectionInteractionState: SelectionInteractionState = .idle
-
     private var currentHighlights: [RDEPUBHighlight] = []
 
     private var currentSearchState: RDEPUBSearchState?
@@ -88,12 +74,12 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         let view = RDEPUBTextPageDecorationView()
         return view
     }()
-
+    
     private let overlayView: RDEPUBTextAnnotationOverlay = {
         let view = RDEPUBTextAnnotationOverlay()
         return view
     }()
-
+    
     private let coverImageView: UIImageView = {
         let view = UIImageView()
         view.contentMode = .scaleAspectFit
@@ -123,6 +109,7 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 
     private lazy var panGestureRecognizer: UIPanGestureRecognizer = {
         let gesture = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
+        gesture.isEnabled = false
         gesture.delegate = self
         return gesture
     }()
@@ -133,6 +120,91 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         return gesture
     }()
 
+    private lazy var interactionCoordinator: RDEPUBTextContentInteractionCoordinator = {
+        RDEPUBTextContentInteractionCoordinator(
+            dependencies: .init(
+                hasRenderableContent: { [weak self] in
+                    self?.hasInteractiveTextContent ?? false
+                },
+                currentSelectionProvider: { [weak self] in self?.currentSelection },
+                isSelectionControllerSelecting: { [weak self] in
+                    self?.selectionController.isSelecting ?? false
+                },
+                hasActiveSelection: { [weak self] in
+                    self?.selectionController.hasActiveSelection ?? false
+                },
+                selectionHandleAtPoint: { [weak self] point in
+                    guard let renderView = self?.coreTextRenderView else { return nil }
+                    let handle = renderView.selectionHandle(at: point)
+                    switch handle {
+                    case .start:
+                        return .start
+                    case .end:
+                        return .end
+                    case nil:
+                        return nil
+                    }
+                },
+                selectionContainsPoint: { [weak self] point in
+                    self?.coreTextRenderView?.selectionContains(point) ?? false
+                },
+                renderPointForGesture: { [weak self] gesture in
+                    guard let self else { return .zero }
+                    return gesture.location(in: self.coreTextRenderView ?? self)
+                },
+                renderPointForTouch: { [weak self] touch in
+                    guard let self else { return .zero }
+                    return touch.location(in: self.coreTextRenderView ?? self)
+                },
+                performLongPressSelection: { [weak self] gesture in
+                    guard let self else { return }
+                    self.layoutIfNeeded()
+                    self.selectionController.handleLongPress(
+                        gesture,
+                        renderView: self.coreTextRenderView,
+                        interactionController: self.interactionController
+                    )
+                },
+                performPanSelection: { [weak self] gesture in
+                    guard let self else { return }
+                    self.layoutIfNeeded()
+                    self.selectionController.handlePan(
+                        gesture,
+                        renderView: self.coreTextRenderView,
+                        interactionController: self.interactionController
+                    )
+                },
+                adjustSelection: { [weak self] handle, point in
+                    guard let self else { return }
+                    self.selectionController.updateSelection(
+                        byAdjusting: handle,
+                        at: point,
+                        renderView: self.coreTextRenderView,
+                        interactionController: self.interactionController
+                    )
+                },
+                presentLoupeAtPoint: { [weak self] point in
+                    self?.updateSelectionLoupe(for: point)
+                },
+                dismissLoupe: { [weak self] in
+                    self?.selectionLoupeView.dismiss()
+                },
+                showSelectionMenu: { [weak self] in
+                    self?.showSelectionMenuIfNeeded()
+                },
+                hideSelectionMenu: { [weak self] in
+                    self?.hideSelectionMenu()
+                },
+                selectionTapSuppressionDidChange: { [weak self] isSuppressed in
+                    self?.selectionTapSuppressionDidChange?(isSuppressed)
+                },
+                selectionPagingSuppressionDidChange: { [weak self] isSuppressed in
+                    self?.selectionPagingSuppressionDidChange?(isSuppressed)
+                }
+            )
+        )
+    }()
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         accessibilityIdentifier = "epub.reader.content.view"
@@ -159,11 +231,16 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
             } else {
                 self.hideSelectionMenu()
             }
+            self.updateSelectionPanAvailability()
+            self.updateViewInteractionAvailability()
             self.updateAccessibilityDecorationSummary()
             self.delegate?.textContentView(self, didChangeSelection: selection)
         }
         selectionController.interactionStateDidChange = { [weak self] state in
-            self?.handleSelectionControllerStateChange(state)
+            guard let self else { return }
+            self.interactionCoordinator.selectionControllerStateDidChange(state)
+            self.updateSelectionPanAvailability()
+            self.updateViewInteractionAvailability()
         }
         selectionController.pageProvider = { [weak self] in self?.currentPage }
         selectionController.chapterCFIMapProvider = { [weak self] in self?.currentChapterCFIMap }
@@ -183,7 +260,19 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
     }
 
     var isSelectionInteractionInProgress: Bool {
-        selectionInteractionState != .idle
+        interactionCoordinator.isInteractionInProgress
+    }
+
+    var shouldAvoidReaderPageCaching: Bool {
+        currentPage == nil || loadingSpinner.isAnimating
+    }
+
+    private var hasInteractiveTextContent: Bool {
+#if canImport(DTCoreText)
+        currentPage != nil && coreTextRenderView?.isHidden == false
+#else
+        currentPage != nil
+#endif
     }
 
     override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
@@ -241,7 +330,7 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         currentChapterFragmentOffsets = chapterFragmentOffsets
         currentSelection = nil
         menuSelection = nil
-        updateSelectionInteractionState(.idle)
+        interactionCoordinator.reset()
         currentHighlights = highlights
         currentSearchState = searchState
         selectionController.clearSelection(renderView: coreTextRenderView)
@@ -257,6 +346,9 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
             coreTextDisplayContent = nil
             coreTextDisplayRange = nil
 #endif
+            updateStaticGestureAvailability()
+            updateSelectionPanAvailability()
+            updateViewInteractionAvailability()
             delegate?.textContentView(self, didChangeSelection: nil)
             setNeedsLayout()
             return
@@ -266,7 +358,7 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         coverImageView.image = nil
 
 #if canImport(DTCoreText)
-        let displayContent = darkImageAdjustedContentIfNeeded(
+        let displayContent = RDEPUBDarkImageAdjuster.adjustIfNeeded(
             normalizedPageContent(from: page),
             configuration: configuration
         )
@@ -301,6 +393,9 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 #if canImport(DTCoreText)
         backgroundOverlayView.configure(page: page, selectionColor: overlayView.selectionColor, snapshot: interactionController.snapshot)
 #endif
+        updateStaticGestureAvailability()
+        updateSelectionPanAvailability()
+        updateViewInteractionAvailability()
         updateAccessibilityDecorationSummary()
 
         delegate?.textContentView(self, didChangeSelection: nil)
@@ -317,8 +412,7 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         currentChapterFragmentOffsets = [:]
         currentSelection = nil
         menuSelection = nil
-        activeSelectionHandle = nil
-        updateSelectionInteractionState(.idle)
+        interactionCoordinator.reset()
         currentHighlights = []
         currentSearchState = nil
         selectionController.clearSelection(renderView: coreTextRenderView)
@@ -340,6 +434,9 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 
         overlayView.clearSelection()
         backgroundOverlayView.clearSelection()
+        updateStaticGestureAvailability()
+        updateSelectionPanAvailability()
+        updateViewInteractionAvailability()
         delegate?.textContentView(self, didChangeSelection: nil)
         loadingSpinner.startAnimating()
         setNeedsLayout()
@@ -349,12 +446,12 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         currentSelection = nil
         menuSelection = nil
         currentSearchState = nil
-        activeSelectionHandle = nil
-        updateSelectionInteractionState(.idle)
-        selectionLoupeView.dismiss()
+        interactionCoordinator.reset()
         selectionController.clearSelection(renderView: coreTextRenderView)
         overlayView.clearSelection()
         backgroundOverlayView.clearSelection()
+        updateSelectionPanAvailability()
+        updateViewInteractionAvailability()
         updateAccessibilityDecorationSummary()
         UIMenuController.shared.setMenuVisible(false, animated: true)
     }
@@ -411,87 +508,6 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         return nil
     }
 
-#if canImport(DTCoreText)
-
-    private func darkImageAdjustedContentIfNeeded(
-        _ content: NSMutableAttributedString,
-        configuration: RDEPUBReaderConfiguration
-    ) -> NSMutableAttributedString {
-        guard configuration.darkImageAdjustmentEnabled,
-              configuration.darkImageBlendRatio > 0,
-              configuration.theme.contentBackgroundColor.rd_isDarkReaderBackground else {
-            return content
-        }
-
-        let fullRange = NSRange(location: 0, length: content.length)
-        content.enumerateAttribute(.attachment, in: fullRange) { value, range, _ in
-            guard let attachment = value as? DTImageTextAttachment,
-                  !isCoverAttachment(attachment),
-                  let image = attachment.image,
-                  shouldAdjustDarkImage(image) else { return }
-
-            let adjustedAttachment = DTImageTextAttachment()
-            adjustedAttachment.image = adjustedImage(
-                image,
-                backgroundColor: configuration.theme.contentBackgroundColor,
-                blendRatio: configuration.darkImageBlendRatio,
-                cacheKey: darkImageCacheKey(for: attachment, image: image, configuration: configuration)
-            )
-            adjustedAttachment.originalSize = attachment.originalSize
-            adjustedAttachment.displaySize = attachment.displaySize
-            adjustedAttachment.verticalAlignment = attachment.verticalAlignment
-            adjustedAttachment.contentURL = attachment.contentURL
-            adjustedAttachment.hyperLinkURL = attachment.hyperLinkURL
-            adjustedAttachment.hyperLinkGUID = attachment.hyperLinkGUID
-            adjustedAttachment.attributes = attachment.attributes
-            content.addAttribute(.attachment, value: adjustedAttachment, range: range)
-        }
-        return content
-    }
-
-    private func isCoverAttachment(_ attachment: DTTextAttachment) -> Bool {
-        let lowercasedClasses = ((attachment.attributes["class"] as? String) ?? "").lowercased()
-        let lowercasedPath = attachment.contentURL?.lastPathComponent.lowercased()
-            ?? ((attachment.attributes["src"] as? String) ?? "").lowercased()
-        return lowercasedClasses.contains("rd-front-cover-image") || lowercasedPath.contains("cover")
-    }
-
-    private func shouldAdjustDarkImage(_ image: UIImage) -> Bool {
-        image.size.width >= 80 && image.size.height >= 80
-    }
-
-    private func darkImageCacheKey(
-        for attachment: DTImageTextAttachment,
-        image: UIImage,
-        configuration: RDEPUBReaderConfiguration
-    ) -> NSString {
-        let source = attachment.contentURL?.absoluteString
-            ?? "\(Unmanaged.passUnretained(image).toOpaque())"
-        return "\(source)|\(image.size.width)x\(image.size.height)|\(configuration.theme.contentBackgroundColor.ss_cssString)|\(configuration.darkImageBlendRatio)" as NSString
-    }
-
-    private func adjustedImage(
-        _ image: UIImage,
-        backgroundColor: UIColor,
-        blendRatio: CGFloat,
-        cacheKey: NSString
-    ) -> UIImage {
-        if let cached = Self.darkAdjustedImageCache.object(forKey: cacheKey) { return cached }
-        let format = UIGraphicsImageRendererFormat()
-        format.scale = image.scale
-        format.opaque = false
-        let renderer = UIGraphicsImageRenderer(size: image.size, format: format)
-        let adjusted = renderer.image { context in
-            image.draw(in: CGRect(origin: .zero, size: image.size))
-            backgroundColor.withAlphaComponent(max(0, min(0.35, blendRatio))).setFill()
-            context.cgContext.setBlendMode(.sourceAtop)
-            context.fill(CGRect(origin: .zero, size: image.size))
-        }
-        Self.darkAdjustedImageCache.setObject(adjusted, forKey: cacheKey)
-        return adjusted
-    }
-#endif
-
     private func applyHighlightsToContent(
         _ content: NSMutableAttributedString,
         highlights: [RDEPUBHighlight],
@@ -581,80 +597,38 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 #endif
 
     @objc private func handleLongPress(_ gesture: UILongPressGestureRecognizer) {
-#if canImport(DTCoreText)
-        layoutIfNeeded()
-        selectionController.handleLongPress(
-            gesture,
-            renderView: coreTextRenderView,
-            interactionController: interactionController
-        )
-        switch gesture.state {
-        case .began:
-            activeSelectionHandle = nil
-            updateSelectionInteractionState(.selecting)
-            hideSelectionMenu()
-            updateSelectionLoupe(for: gesture.location(in: coreTextRenderView ?? self))
-        case .changed:
-            updateSelectionInteractionState(.selecting)
-            updateSelectionLoupe(for: gesture.location(in: coreTextRenderView ?? self))
-        case .ended:
-            selectionLoupeView.dismiss()
-            showSelectionMenuIfNeeded()
-        case .cancelled, .failed:
-            activeSelectionHandle = nil
-            selectionLoupeView.dismiss()
-        default:
-            break
-        }
-#endif
+        interactionCoordinator.handleLongPress(gesture)
     }
 
     @objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
-#if canImport(DTCoreText)
-        layoutIfNeeded()
-        let point = gesture.location(in: coreTextRenderView ?? self)
-        if gesture.state == .began, activeSelectionHandle == nil {
-            if let renderView = coreTextRenderView,
-               let handle = renderView.selectionHandle(at: point) {
-                activeSelectionHandle = handle == .start ? .start : .end
-                updateSelectionInteractionState(.adjustingHandle)
-                hideSelectionMenu()
-                updateSelectionLoupe(for: point)
-            }
-        }
+        interactionCoordinator.handlePan(gesture)
+    }
 
-        if let activeSelectionHandle, let renderView = coreTextRenderView {
-            selectionController.updateSelection(
-                byAdjusting: activeSelectionHandle,
-                at: point,
-                renderView: renderView,
-                interactionController: interactionController
-            )
-            updateSelectionLoupe(for: point)
-        } else {
-            selectionController.handlePan(
-                gesture,
-                renderView: coreTextRenderView,
-                interactionController: interactionController
-            )
-            if selectionController.isSelecting {
-                updateSelectionLoupe(for: point)
-            }
-        }
-        switch gesture.state {
-        case .ended:
-            activeSelectionHandle = nil
-            updateSelectionInteractionState(currentSelection == nil ? .idle : .selectionActive)
-            selectionLoupeView.dismiss()
-            showSelectionMenuIfNeeded()
-        case .cancelled, .failed:
-            activeSelectionHandle = nil
-            updateSelectionInteractionState(currentSelection == nil ? .idle : .selectionActive)
-            selectionLoupeView.dismiss()
-        default:
-            break
-        }
-#endif
+    private func updateSelectionPanAvailability() {
+        let shouldEnablePan = selectionController.isSelecting
+            || selectionController.hasActiveSelection
+            || interactionCoordinator.interactionState == .adjustingHandle
+        guard panGestureRecognizer.isEnabled != shouldEnablePan else { return }
+        panGestureRecognizer.isEnabled = shouldEnablePan
+    }
+
+    private func updateViewInteractionAvailability() {
+        let shouldEnableInteraction = hasInteractiveTextContent
+            || selectionController.isSelecting
+            || selectionController.hasActiveSelection
+            || interactionCoordinator.interactionState != .idle
+        guard isUserInteractionEnabled != shouldEnableInteraction else { return }
+        isUserInteractionEnabled = shouldEnableInteraction
+    }
+
+    private func updateStaticGestureAvailability() {
+        let shouldEnableLongPress = hasInteractiveTextContent && loadingSpinner.isAnimating == false
+        let shouldEnableTap = hasInteractiveTextContent && loadingSpinner.isAnimating == false
+        let longPressChanged = longPressGestureRecognizer.isEnabled != shouldEnableLongPress
+        let tapChanged = tapGestureRecognizer.isEnabled != shouldEnableTap
+        guard longPressChanged || tapChanged else { return }
+        longPressGestureRecognizer.isEnabled = shouldEnableLongPress
+        tapGestureRecognizer.isEnabled = shouldEnableTap
     }
 
     @objc private func handleTap(_ gesture: UITapGestureRecognizer) {
@@ -728,44 +702,6 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 #endif
     }
 
-    private func handleSelectionControllerStateChange(_ state: RDEPUBTextSelectionController.InteractionState) {
-        switch state {
-        case .idle:
-            if currentSelection == nil, activeSelectionHandle == nil {
-                updateSelectionInteractionState(.idle)
-            }
-        case .selecting:
-            updateSelectionInteractionState(.selecting)
-        case .selectionActive:
-            updateSelectionInteractionState(currentSelection == nil ? .idle : .selectionActive)
-        case .adjustingHandle:
-            updateSelectionInteractionState(.adjustingHandle)
-        }
-    }
-
-    private func updateSelectionInteractionState(_ state: SelectionInteractionState) {
-        let previousTapSuppressed = selectionInteractionState != .idle
-        let previousPagingSuppressed = shouldSuppressPagingInteraction(for: selectionInteractionState)
-        selectionInteractionState = state
-        let currentTapSuppressed = selectionInteractionState != .idle
-        let currentPagingSuppressed = shouldSuppressPagingInteraction(for: selectionInteractionState)
-        if previousTapSuppressed != currentTapSuppressed {
-            selectionTapSuppressionDidChange?(currentTapSuppressed)
-        }
-        if previousPagingSuppressed != currentPagingSuppressed {
-            selectionPagingSuppressionDidChange?(currentPagingSuppressed)
-        }
-    }
-
-    private func shouldSuppressPagingInteraction(for state: SelectionInteractionState) -> Bool {
-        switch state {
-        case .idle, .selectionPending, .selectionActive:
-            return false
-        case .selecting, .adjustingHandle:
-            return true
-        }
-    }
-
     private var coreTextRenderView: RDEPUBTextPageRenderView? {
 #if canImport(DTCoreText)
         return coreTextContentView
@@ -784,7 +720,7 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
     }
 
     private func highlight(at point: CGPoint) -> RDEPUBHighlight? {
-        guard let page = currentPage else { return nil }
+        guard currentPage != nil else { return nil }
         let absoluteRange = backgroundOverlayView.absoluteRange(at: point) ?? overlayView.absoluteRange(at: point)
         guard let absoluteRange else { return nil }
         let matches = currentHighlights.filter { highlight in
@@ -857,7 +793,7 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 
     func shouldSuppressReaderTap(at point: CGPoint) -> Bool {
 #if canImport(DTCoreText)
-        if selectionInteractionState == .selectionPending {
+        if interactionCoordinator.interactionState == .selectionPending {
             return true
         }
 
@@ -871,7 +807,7 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
         if selectionController.hasActiveSelection, renderView.selectionContains(renderPoint) {
             return true
         }
-        switch selectionInteractionState {
+        switch interactionCoordinator.interactionState {
         case .idle:
             return false
         case .selectionPending, .selecting, .selectionActive, .adjustingHandle:
@@ -884,65 +820,20 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
 
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-#if canImport(DTCoreText)
-        guard selectionInteractionState == .idle,
-              activeSelectionHandle == nil,
-              currentPage != nil,
-              let touch = touches.first,
-              let renderView = coreTextRenderView else {
-            return
-        }
-        let point = touch.location(in: renderView)
-        guard renderView.selectionHandle(at: point) == nil else { return }
-        updateSelectionInteractionState(.selectionPending)
-#endif
+        interactionCoordinator.touchesBegan(touches, with: event)
     }
 
     override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
-        resetSelectionPendingIfNeeded()
+        interactionCoordinator.touchesEnded(touches, with: event)
     }
 
     override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesCancelled(touches, with: event)
-        resetSelectionPendingIfNeeded()
-    }
-
-    private func resetSelectionPendingIfNeeded() {
-        guard selectionInteractionState == .selectionPending else { return }
-        if currentSelection != nil {
-            updateSelectionInteractionState(.selectionActive)
-        } else {
-            updateSelectionInteractionState(.idle)
-        }
+        interactionCoordinator.touchesCancelled(touches, with: event)
     }
 
     override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        if gestureRecognizer === panGestureRecognizer {
-            if selectionController.isSelecting {
-                return true
-            }
-            guard let pan = gestureRecognizer as? UIPanGestureRecognizer,
-                  let renderView = coreTextRenderView else {
-                return false
-            }
-            let point = pan.location(in: renderView)
-            return renderView.selectionHandle(at: point) != nil
-        }
-        if gestureRecognizer === longPressGestureRecognizer {
-            guard let longPress = gestureRecognizer as? UILongPressGestureRecognizer,
-                  let renderView = coreTextRenderView else {
-                return true
-            }
-            let point = longPress.location(in: renderView)
-            if renderView.selectionHandle(at: point) != nil {
-                return false
-            }
-            if selectionController.hasActiveSelection, renderView.selectionContains(point) {
-                return false
-            }
-            return true
-        }
         if gestureRecognizer === tapGestureRecognizer {
             guard let tapGestureRecognizer = gestureRecognizer as? UITapGestureRecognizer else {
                 return false
@@ -962,123 +853,35 @@ final class RDEPUBTextContentView: UIView, UIGestureRecognizerDelegate {
             }
             return currentPage != nil
         }
-        return true
+        return interactionCoordinator.gestureRecognizerShouldBegin(gestureRecognizer)
     }
 
     func gestureRecognizer(
         _ gestureRecognizer: UIGestureRecognizer,
         shouldReceive touch: UITouch
     ) -> Bool {
-        guard let renderView = coreTextRenderView else {
-            return true
-        }
-
-        let point = touch.location(in: renderView)
-        if let handle = renderView.selectionHandle(at: point) {
-            if gestureRecognizer === panGestureRecognizer {
-                activeSelectionHandle = handle == .start ? .start : .end
-                updateSelectionInteractionState(.adjustingHandle)
-                hideSelectionMenu()
+        if gestureRecognizer === tapGestureRecognizer {
+            guard let renderView = coreTextRenderView else {
                 return true
             }
-            if gestureRecognizer === longPressGestureRecognizer || gestureRecognizer === tapGestureRecognizer {
+
+            let point = touch.location(in: renderView)
+            if renderView.selectionHandle(at: point) != nil {
                 return false
             }
         }
 
-        return true
+        return interactionCoordinator.gestureRecognizer(gestureRecognizer, shouldReceive: touch)
     }
 
     func gestureRecognizer(
         _ gestureRecognizer: UIGestureRecognizer,
         shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer
     ) -> Bool {
-        gestureRecognizer === longPressGestureRecognizer || gestureRecognizer === panGestureRecognizer
-    }
-}
-
-private final class RDEPUBSelectionLoupeView: UIView {
-
-    private let imageView = UIImageView()
-
-    private let magnification: CGFloat = 1.45
-
-    private let captureSize = CGSize(width: 84, height: 84)
-
-    override init(frame: CGRect) {
-        super.init(frame: CGRect(origin: .zero, size: CGSize(width: 96, height: 96)))
-        isUserInteractionEnabled = false
-        backgroundColor = .clear
-        layer.shadowColor = UIColor.black.cgColor
-        layer.shadowOpacity = 0.18
-        layer.shadowRadius = 10
-        layer.shadowOffset = CGSize(width: 0, height: 5)
-
-        imageView.frame = bounds
-        imageView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        imageView.layer.cornerRadius = bounds.width / 2
-        imageView.layer.cornerCurve = .continuous
-        imageView.layer.borderWidth = 1.5
-        imageView.layer.borderColor = UIColor(white: 0.82, alpha: 0.95).cgColor
-        imageView.clipsToBounds = true
-        addSubview(imageView)
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    func present(sourceView: UIView, focusPoint: CGPoint, hostBounds: CGRect, targetPoint: CGPoint) {
-        imageView.image = snapshot(from: sourceView, focusPoint: focusPoint)
-
-        let targetCenter = CGPoint(
-            x: min(max(targetPoint.x, hostBounds.minX + bounds.width / 2), hostBounds.maxX - bounds.width / 2),
-            y: min(
-                max(hostBounds.minY + bounds.height / 2, targetPoint.y - 74),
-                hostBounds.maxY - bounds.height / 2
+        gestureRecognizer === tapGestureRecognizer
+            || interactionCoordinator.gestureRecognizer(
+                gestureRecognizer,
+                shouldRecognizeSimultaneouslyWith: otherGestureRecognizer
             )
-        )
-
-        center = targetCenter
-        if isHidden {
-            alpha = 0
-            transform = CGAffineTransform(scaleX: 0.92, y: 0.92)
-            isHidden = false
-            UIView.animate(withDuration: 0.12) {
-                self.alpha = 1
-                self.transform = .identity
-            }
-        }
-    }
-
-    func dismiss() {
-        guard !isHidden else { return }
-        isHidden = true
-        alpha = 0
-        imageView.image = nil
-    }
-
-    private func snapshot(from sourceView: UIView, focusPoint: CGPoint) -> UIImage {
-        let renderer = UIGraphicsImageRenderer(size: captureSize)
-        return renderer.image { context in
-            let cgContext = context.cgContext
-            cgContext.setFillColor(UIColor.systemBackground.cgColor)
-            cgContext.fill(CGRect(origin: .zero, size: captureSize))
-            cgContext.translateBy(
-                x: captureSize.width / 2 - focusPoint.x * magnification,
-                y: captureSize.height / 2 - focusPoint.y * magnification
-            )
-            cgContext.scaleBy(x: magnification, y: magnification)
-            sourceView.layer.render(in: cgContext)
-        }
-    }
-}
-
-private extension UIColor {
-
-    var rd_isDarkReaderBackground: Bool {
-        var red: CGFloat = 0, green: CGFloat = 0, blue: CGFloat = 0, alpha: CGFloat = 0
-        guard getRed(&red, green: &green, blue: &blue, alpha: &alpha) else { return false }
-        return (0.2126 * red + 0.7152 * green + 0.0722 * blue) < 0.35
     }
 }
diff --git a/Sources/RDReaderView/EPUBUI/UIColor+RDEPUB.swift b/Sources/RDReaderView/EPUBUI/UIColor+RDEPUB.swift
new file mode 100644
index 0000000..afd465e
--- /dev/null
+++ b/Sources/RDReaderView/EPUBUI/UIColor+RDEPUB.swift
@@ -0,0 +1,31 @@
+import UIKit
+
+extension UIColor {
+
+    /// rgba CSS 字符串，如 "rgba(255, 128, 0, 1.000)"
+    var rd_cssString: String {
+        var red: CGFloat = 0
+        var green: CGFloat = 0
+        var blue: CGFloat = 0
+        var alpha: CGFloat = 0
+        getRed(&red, green: &green, blue: &blue, alpha: &alpha)
+        return String(format: "rgba(%d, %d, %d, %.3f)", Int(red * 255), Int(green * 255), Int(blue * 255), alpha)
+    }
+
+    /// #RRGGBB hex 字符串
+    var rd_hexString: String {
+        var red: CGFloat = 0
+        var green: CGFloat = 0
+        var blue: CGFloat = 0
+        var alpha: CGFloat = 0
+        getRed(&red, green: &green, blue: &blue, alpha: &alpha)
+        return String(format: "#%02X%02X%02X", Int(red * 255), Int(green * 255), Int(blue * 255))
+    }
+
+    /// 判断背景是否为暗色（BT.709 亮度 < 0.4）
+    var rd_isDarkBackground: Bool {
+        var red: CGFloat = 0, green: CGFloat = 0, blue: CGFloat = 0, alpha: CGFloat = 0
+        guard getRed(&red, green: &green, blue: &blue, alpha: &alpha) else { return false }
+        return (0.2126 * red + 0.7152 * green + 0.0722 * blue) < 0.4
+    }
+}
diff --git a/Sources/RDReaderView/ReaderView/Paging/RDReaderPreloadController.swift b/Sources/RDReaderView/ReaderView/Paging/RDReaderPreloadController.swift
index 648673d..6e9e6c8 100644
--- a/Sources/RDReaderView/ReaderView/Paging/RDReaderPreloadController.swift
+++ b/Sources/RDReaderView/ReaderView/Paging/RDReaderPreloadController.swift
@@ -1,6 +1,10 @@
 
 import UIKit
 
+protocol RDReaderCachePolicyProviding {
+    var shouldAvoidReaderPageCaching: Bool { get }
+}
+
 final class RDReaderPreloadController {
 
     var radius: Int = 2
@@ -76,7 +80,11 @@ final class RDReaderPreloadController {
     ) -> UIView {
         let reusableView = detachedReusablePageView(for: pageNum)
         let view = contentViewProvider(pageNum, reusableView) ?? reusableView ?? UIView()
-        pageCurlCachedViews[pageNum] = view
+        if shouldCache(view: view, for: pageNum, environment: environment) {
+            pageCurlCachedViews[pageNum] = view
+        } else {
+            pageCurlCachedViews.removeValue(forKey: pageNum)
+        }
         return view
     }
 
@@ -105,12 +113,20 @@ final class RDReaderPreloadController {
         for targetPage in targets {
             let existing = detachedReusablePageView(for: targetPage)
             let contentView = contentViewProvider(targetPage, existing) ?? existing ?? UIView()
-            preloadedPageViews[targetPage] = contentView
+            let shouldCacheContentView = shouldCache(view: contentView, for: targetPage, environment: environment)
+            if shouldCacheContentView {
+                preloadedPageViews[targetPage] = contentView
+            } else {
+                preloadedPageViews.removeValue(forKey: targetPage)
+            }
             if contentView.superview !== preloadHostView {
                 contentView.removeFromSuperview()
                 preloadHostView.addSubview(contentView)
             }
             contentView.frame = preloadHostView.bounds
+            if !shouldCacheContentView {
+                contentView.removeFromSuperview()
+            }
         }
     }
 
@@ -139,6 +155,14 @@ final class RDReaderPreloadController {
             && pageNum < environment.totalPages
     }
 
+    private func shouldCache(view: UIView, for pageNum: Int, environment: Environment) -> Bool {
+        guard shouldCachePage(pageNum, environment: environment) else { return false }
+        if let policyProvider = view as? RDReaderCachePolicyProviding {
+            return !policyProvider.shouldAvoidReaderPageCaching
+        }
+        return true
+    }
+
     private func isDualPage(environment: Environment) -> Bool {
         environment.landscapeDualPageEnabled
             && environment.isLandscape
diff --git a/Sources/RDReaderView/ReaderView/RDReaderView+PageCurl.swift b/Sources/RDReaderView/ReaderView/RDReaderView+PageCurl.swift
index 1f22e88..1b7eda7 100644
--- a/Sources/RDReaderView/ReaderView/RDReaderView+PageCurl.swift
+++ b/Sources/RDReaderView/ReaderView/RDReaderView+PageCurl.swift
@@ -96,6 +96,11 @@ extension RDReaderView: UIPageViewControllerDataSource, UIPageViewControllerDele
     }
 
     public func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
+        let resolvedPage = (pageViewController.viewControllers?.first as? RDReaderPageChildViewController)?.pageNum ?? -1
+        RDEPUBBackgroundTrace.log(
+            "PageCurl",
+            "didFinishAnimating finished=\(finished) completed=\(completed) resolvedPage=\(resolvedPage + 1) currentPageBeforeFinish=\(currentPage + 1)"
+        )
         if completed, let firstVC = pageViewController.viewControllers?.first as? RDReaderPageChildViewController {
             let pn = firstVC.pageNum
             if pn != RDReaderView.blankPageNum && pn != RDReaderView.blankEndPageNum {
@@ -114,8 +119,17 @@ extension RDReaderView: UIPageViewControllerDataSource, UIPageViewControllerDele
         if let target = pendingViewControllers.first as? RDReaderPageChildViewController,
            target.pageNum != RDReaderView.blankPageNum,
            target.pageNum != RDReaderView.blankEndPageNum {
+            RDEPUBBackgroundTrace.log(
+                "PageCurl",
+                "willTransitionTo targetPage=\(target.pageNum + 1) currentPage=\(currentPage + 1)"
+            )
             predictedPageDirection = target.pageNum >= currentPage
             primePageCache(around: target.pageNum, preferredForward: predictedPageDirection)
+        } else {
+            RDEPUBBackgroundTrace.log(
+                "PageCurl",
+                "willTransitionTo blank target currentPage=\(currentPage + 1)"
+            )
         }
     }
 }
diff --git a/Sources/RDReaderView/ReaderView/RDReaderView.swift b/Sources/RDReaderView/ReaderView/RDReaderView.swift
index d59c5f3..9d6c1e8 100644
--- a/Sources/RDReaderView/ReaderView/RDReaderView.swift
+++ b/Sources/RDReaderView/ReaderView/RDReaderView.swift
@@ -267,6 +267,10 @@ public class RDReaderView: UIView {
         set { pagingController.pendingTransitionRequest = newValue }
     }
 
+    var isPageCurlTransitioning: Bool {
+        currentDisplayType == .pageCurl && pagingController.isTransitioning
+    }
+
     override init(frame: CGRect) {
         super.init(frame: frame)
         accessibilityIdentifier = "epub.reader.content"
@@ -401,6 +405,8 @@ public class RDReaderView: UIView {
         if let pending = pagingController.finishPageCurlTransition() {
             transitionToPage(pageNum: pending.pageNum, animated: pending.animated)
         }
+
+        updatePagingInteractionSuppression()
     }
 
     private var preloadEnvironment: RDReaderPreloadController.Environment {
@@ -603,12 +609,24 @@ public class RDReaderView: UIView {
     }
 
     private func updatePagingInteractionSuppression() {
-        let shouldSuppress = selectionPagingSuppressedContentViews.allObjects.isEmpty == false
+        let shouldSuppress = activePagingSuppressionContentViews().isEmpty == false
         guard shouldSuppress != isPagingInteractionSuppressed else { return }
         isPagingInteractionSuppressed = shouldSuppress
         setPagingInteractionEnabled(!shouldSuppress)
     }
 
+    private func activePagingSuppressionContentViews() -> [UIView] {
+        selectionPagingSuppressedContentViews.allObjects.filter { contentView in
+            guard contentView.window != nil,
+                  contentView.isDescendant(of: self),
+                  contentView.bounds.isEmpty == false else {
+                return false
+            }
+            let frameInReader = contentView.convert(contentView.bounds, to: self)
+            return frameInReader.intersects(bounds)
+        }
+    }
+
     private func setPagingInteractionEnabled(_ isEnabled: Bool) {
         collectionView.isScrollEnabled = isEnabled
         pageViewController.gestureRecognizers.forEach { $0.isEnabled = isEnabled }
@@ -721,7 +739,13 @@ public class RDReaderView: UIView {
     }
 
     public func reloadPageCountOnly() {
-        collectionView.reloadData()
+        if currentDisplayType == .pageCurl {
+            if !isPageCurlTransitioning, currentPage >= 0, numberOfPages() > 0 {
+                transitionToPage(pageNum: currentPage, animated: false)
+            }
+        } else {
+            collectionView.reloadData()
+        }
         topToolView = resolvedTopChromeView()
         bottomToolView = resolvedBottomChromeView()
     }