edwardkim · edwardkim · May 17, 2026 · May 11, 2026 · May 11, 2026 · May 11, 2026
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ Cargo.lock
 
 # Output (렌더링 결과물)
 /output/
+/dist/swift/
 
 # Docker
 .docker/
@@ -89,3 +90,4 @@ rhwp-firefox/*.zip
 rhwp-safari/dist/
 rhwp-safari/HWP Viewer/
 rhwp-safari/.DS_Store
+samples/issue836/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,42 @@
 
 이 프로젝트의 주요 변경 사항을 기록합니다.
 
+## [0.7.12] — 2026-05-18
+
+> v0.7.11 후속 patch 사이클 (5/12~18) — 외부 기여자 다수 PR 19건 머지 + 본 사이클 @jangster77 PR 시리즈 7건 (#956~#968). 416 files / +64383 / -3323.
+
+### 핵심 변경
+
+- **원 Issue #952 (1 통합 → 5 분리 결함) 완결** — @jangster77 진단 방법론 (부분 해결 + 명확한 분리, archive/task936 "9회 시도 + 5회 revert" 대조 교훈):
+  - Issue 1 (#956): 쪽 테두리 paper-based outline 강제 — `#920` 비트 해석 회귀 정정 (5+ samples 한컴 viewer 실측 정합)
+  - Issue 2 (#958, #957): sample16 page 18 빈 caption phantom advance 정정 (RHWP_DEBUG_TAC_CURSOR)
+  - Issue 3 (#961, #959): 시험지 page 1 문9 — horz_rel_to=Column picture column 외부 emit advance skip
+  - Issue 4 (#963, #960): 시험지 page 2 cases formula off-by-one — has_line_break line 마지막 run end-position TAC 포함
+  - Issue 5 (#964, #962): 시험지 page 2 보기 textbox inline equation duplicate emit 차단
+- **WMF SetTextAlign vertical bits 정정** (#966, #965): `mode & VTA_TOP(=0)` 항상-true 버그 → WMF [MS-WMF] 2.1.2.18 spec 정합 (PR #918 거대 PR Stage 33-A root cause ~60 lines 단독 포팅)
+- **HWP3 sample18 페이지 수 +2 inflate 정정** (#968, #967): 빈 paragraph + [쪽나누기] + overflow case 단독 page 차단 (v2 정밀화 — aift.hwp snapshot 회귀 해소)
+- **release 빌드 LTO + codegen-units=1 + strip** (#818, #790): rhwp CLI -28% (14→10 MB) / WASM -6.5% (4.6→4.3 MB)
+- **rhwp-studio 신규 기능** (5/12~18): F5 본문 블록 선택 + F3 영역 확장 (#811/#220) + 메뉴 hotkey 인프라 (#810/#792) + 쪽 새 번호로 시작 (#809/#791) + searchAllText API + rhwpDev.goto (#814/#692) + Task #571 문서 비교·이력 분리 PR 1/3 (#799/#571)
+- **HWP3/WMF/EMF 렌더링 정정** (5/12~18): EMF/WMF image 콘텐츠 렌더 (#860/#864) + HWP3 ch=9 탭 spec §10.5 (#934/#929) + 다수 외부 PR cherry-pick (#933/#939/#941/#947/#953/#954 등)
+
+### 외부 PR (19 머지 + @jangster77 시리즈 7)
+
+5/12~18 누적 외부 기여자 PR 19건 cherry-pick + 본 세션 @jangster77 7 PR (#956~#968) — 각 PR cargo test 1288 + 광범위 sweep 169 페이지 회귀 0 + 작업지시자 시각 판정 일관 검증.
+
+### 잔존
+
+- HWPX sample18-hwp5.hwpx +7 inflate (별도 task)
+- `samples/hwp3-sample18.hwp` fixture 별도 추가 권장 (#968 회귀 가드)
+
+## [0.7.11] — 2026-05-11
+
+> v0.7.10 후속 patch 사이클 (5/10 + 5/11) — 외부 기여자 다수 PR 30+ 머지. (CHANGELOG.md 소급 보강 — v0.7.11 릴리즈 시 누락분)
+
+- **Skia native raster 단계적 진전** (Issue #536): P8 (#761) Layer IR contract hardening + P9 (#769) text replay parity + P11 (#797) Text IR v2 compatibility contract
+- **HWP3 native 렌더링** (#753): hwp3-sample10.hwp Oracle 763 페이지 8 단계 정정 + Git LFS pdf-large/ 격리
+- **rhwp-studio 인터랙션** (#781/#786~#818): scrollbar drag + chord 키 Ctrl+N→Ctrl+M (Chrome reserved shortcut 회피) + 한글 IME chord e.code 판별 + 표 셀 pattern_type 가드 + Alt/Option+Arrow 단어 이동 (#794) + 표 셀 드래그 셀 컨텍스트 (#795) + 줄 끝/문서 끝 커서 (#807/#808)
+- **rhwp-studio editor 신규 기능**: 표 편집 Undo/Redo + 표 크기 조절 SnapshotCommand + 셀 편집 다수 + 다단/새 번호 dialog + Ctrl/Cmd+Arrow / Ctrl+E 단축키
+
 ## [0.7.10] — 2026-05-06
 
 > v0.7.9 후속 patch 사이클 — 외부 기여자 7명 흡수 (PR 13건 cherry-pick) + AI 파이프라인 / VLM 연동 도입 + CLI 바이너리 릴리즈 파이프라인 (Issue #608/#612).

diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md
@@ -4,6 +4,31 @@ This document records the major changes of the rhwp project.
 
 > 한국어 버전은 [CHANGELOG.md](CHANGELOG.md) 를 참조하세요.
 
+## [0.7.12] — 2026-05-18
+
+> Patch cycle following v0.7.11 (May 12–18) — 19 external contributor PRs merged + @jangster77 PR series of 7 (#956–#968). 416 files / +64383 / -3323.
+
+### Key Changes
+
+- **Original Issue #952 (1 umbrella → 5 separated defects) completed** — @jangster77 diagnostic methodology (partial fix + clear separation):
+  - Issue 1 (#956): force paper-based page border outline — fixes `#920` bit-interpretation regression (verified against 5+ samples in Hancom viewer)
+  - Issue 2 (#958, #957): sample16 page 18 empty caption phantom advance fix
+  - Issue 3 (#961, #959): exam page 1 Q9 — horz_rel_to=Column picture out-of-column emit advance skip
+  - Issue 4 (#963, #960): exam page 2 cases formula off-by-one — include end-position TAC in last run of has_line_break line
+  - Issue 5 (#964, #962): exam page 2 example textbox inline equation duplicate emit block
+- **WMF SetTextAlign vertical bits fix** (#966, #965): `mode & VTA_TOP(=0)` always-true bug → WMF [MS-WMF] 2.1.2.18 spec compliance (ported root cause ~60 lines from large PR #918 Stage 33-A)
+- **HWP3 sample18 page count +2 inflate fix** (#968, #967): block standalone page for empty paragraph + [page break] + overflow case (v2 refinement — resolves aift.hwp snapshot regression)
+- **Release build LTO + codegen-units=1 + strip** (#818, #790): rhwp CLI -28% (14→10 MB) / WASM -6.5% (4.6→4.3 MB)
+- **rhwp-studio new features** (May 12–18): F5 block selection + F3 expand (#811) + menu hotkey infra (#810) + start with new page number (#809) + searchAllText API + rhwpDev.goto (#814) + Task #571 document compare/history split PR 1/3 (#799)
+
+## [0.7.11] — 2026-05-11
+
+> Patch cycle following v0.7.10 (May 10–11) — 30+ external contributor PRs merged. (CHANGELOG_EN.md retroactive supplement — omitted at v0.7.11 release)
+
+- **Skia native raster incremental progress** (Issue #536): P8 (#761) Layer IR contract hardening + P9 (#769) text replay parity + P11 (#797) Text IR v2 compatibility contract
+- **HWP3 native rendering** (#753): hwp3-sample10.hwp Oracle 763-page 8-stage fix + Git LFS pdf-large/ isolation
+- **rhwp-studio interactions** (#781/#786–#818): scrollbar drag + chord key Ctrl+N→Ctrl+M + Korean IME chord e.code detection + Alt/Option+Arrow word navigation (#794) + table cell drag context (#795)
+
 ## [0.7.10] — 2026-05-06
 
 > Post-v0.7.9 patch cycle — Absorbed 7 external contributors (13 PR cherry-picks) + introduced AI pipeline / VLM integration + CLI binary release pipeline (Issues #608/#612).

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "rhwp"
-version = "0.7.11"
+version = "0.7.12"
 edition = "2021"
 description = "HWP file viewer and editor written in Rust, targeting WebAssembly"
 license = "MIT"
-repository = "https://github.com/pureink-studio/rhwp"
+repository = "https://github.com/edwardkim/rhwp"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -49,11 +49,11 @@ native-skia = ["dep:resvg", "dep:skia-safe"]
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 svg2pdf = "0.13"
 usvg = "0.45"
-resvg = { version = "0.45", optional = true }
+resvg = { version = "0.47", optional = true }
 pdf-writer = "0.12"
 subsetter = "0.2"
 ttf-parser = "0.25"
-skia-safe = { version = "0.93.1", optional = true, default-features = false, features = ["binary-cache", "embed-icudtl", "pdf", "textlayout"] }
+skia-safe = { version = "0.97.0", optional = true, default-features = false, features = ["binary-cache", "embed-icudtl", "pdf", "textlayout"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = { version = "0.3", features = [
@@ -150,3 +150,8 @@ unexpected_cfgs = { level = "allow", check-cfg = ['cfg(feature, values("tracing"
 [[example]]
 name = "pr599_png_gateway"
 required-features = ["native-skia"]
+
+[profile.release]
+lto = true
+codegen-units = 1
+strip = "debuginfo"
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM rust:latest
 # wasm 타겟 및 wasm-pack 설치
 RUN rustup target add wasm32-unknown-unknown \
     && rustup component add clippy \
-    && cargo install wasm-pack
+    && cargo install wasm-pack@0.15.0
 
 # 호스트 사용자 UID/GID로 실행 (빌드 산출물 소유권 문제 방지)
 ARG UID=1000

diff --git a/README.md b/README.md
@@ -207,7 +207,7 @@ v0.7.x 배포 주기 누적 외부 기여자: [@ahnbu](https://github.com/ahnbu)
 ### Multi-Renderer Backends (멀티 렌더러 백엔드)
 - `PageRenderTree` can be lowered into a `PageLayerTree` paint IR before backend replay.
 - P1 public surfaces are Rust native `DocumentCore::build_page_layer_tree(page)` and WASM `getPageLayerTree(page)`.
-- Layer JSON starts at `schemaVersion: 1`, uses `unit: "px"`, and uses `coordinateSystem: "page-top-left"` to match the existing page render coordinates.
+- Layer JSON starts at `schemaVersion: 1`, uses additive `schemaMinorVersion` / `resourceTableMinorVersion`, `unit: "px"`, and `coordinateSystem: "page-top-left-y-down"` to match the existing page render coordinates.
 - Compatible schema changes should be additive; incompatible JSON shape changes require a schema version bump.
 - **Legacy SVG** remains the default compatibility output.
 - **Layered SVG** can be exercised with `RHWP_RENDER_PATH=layer-svg`.
@@ -220,10 +220,14 @@ v0.7.x 배포 주기 누적 외부 기여자: [@ahnbu](https://github.com/ahnbu)
 - P5 adds native Skia equation replay from `EquationNode.layout_box`, so equations are no longer placeholder boxes in the PNG path.
 - P5 replays the existing equation layout tree directly; it does not add CanvasKit equation replay or native form replay.
 - P6 adds native Skia `RawSvg` fragment rasterization through `resvg`, with external file href loading disabled.
+- P11 adds the Text IR v2 compatibility contract: `textSources`, per-`TextRun` source spans, paint style metadata, run placement/clusters, feature arrays, and explicit special text visual ops. `TextRun` remains the fallback replay path.
+- P12 adds guarded `GlyphRun` sidecar variants, font blob/face identity metadata, and a shape-lowering API. Canvas2D/layered SVG still use `TextRun` fallback; native Skia also keeps the fallback until exact blob-backed typeface replay is wired. Normal lowering does not emit glyph ids until a shaping pass explicitly inserts them.
+- P14 adds guarded `GlyphOutline` sidecar variants and backend text variant selection diagnostics. Existing renderers still keep the `TextRun` fallback path.
+- P15 adds diagnostics-only CanvasKit replay policy planning through `getCanvasKitReplayPlan(page, mode)`. `default` mode forbids hidden Canvas2D overlays, while `compat` mode reports transition overlays explicitly.
 - CI covers the native Skia path with `cargo test --features native-skia skia --lib`; the feature is not available on `wasm32` targets.
-- The initial native Skia path is a PNG raster backend with core image/equation/raw-svg replay; CanvasKit, resource interning/cache, complex text shaping, advanced image parity, and native form replay stay as follow-up work.
+- The initial native Skia path is a PNG raster backend with core image/equation/raw-svg replay; CanvasKit glyph replay, exact native glyph replay, real font blob extraction, complex text shaping, advanced image parity, and native form replay stay as follow-up work.
 - C ABI export is intentionally left for a later PR.
-- `ResourceArena` is reserved in `PageLayerTree`; binary resource interning is not implemented yet.
+- `ResourceArena` now reserves font blob storage and font resource identity for glyph replay; document image/SVG interning stays as follow-up work.
 - This phase establishes the frontend/backend boundary for later CanvasKit and fuller native Skia backends.
 
 ### Web Editor (웹 에디터)
@@ -540,6 +544,7 @@ graph TB
 - [HWP LINE_SEG vpos 이해](https://github.com/edwardkim/rhwp/wiki/HWP-LINE_SEG-vpos-이해) — 줄 분할 vpos 이해
 - [HWP Tab Leader Rendering](https://github.com/edwardkim/rhwp/wiki/HWP-Tab-Leader-Rendering) — Tab leader 렌더링
 - [Export API 사용 가이드](https://github.com/edwardkim/rhwp/wiki/Export-API-사용-가이드) — exportHwp / exportHwpx API
+- [HWPX2HWP Probe 추적 온보딩](https://github.com/edwardkim/rhwp/wiki/HWPX2HWP-Probe-%EC%B6%94%EC%A0%81-%EC%98%A8%EB%B3%B4%EB%94%A9) — HWPX→IR→HWP 저장 손상/한컴 호환성 probe 추적법
 - [Cloudflared 로 rhwp-studio 외부 HTTPS 접근](https://github.com/edwardkim/rhwp/wiki/Cloudflared-로-rhwp-studio-외부-HTTPS-접근)
 - [Hyper-Waterfall 문서 체계 가이드](https://github.com/edwardkim/rhwp/wiki/Hyper‐Waterfall-문서-체계-가이드)
 - [Investigation PR 가이드](https://github.com/edwardkim/rhwp/wiki/Investigation-PR-가이드)

diff --git a/bindings/Native/Cargo.toml b/bindings/Native/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [lib]
 name = "rhwp_native_ffi"
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 rhwp_core = { package = "rhwp", path = "../.." }
diff --git a/bindings/Native/src/lib.rs b/bindings/Native/src/lib.rs
@@ -47,6 +47,14 @@ pub extern "C" fn rhwp_export_markdown(
     })
 }
 
+#[no_mangle]
+pub extern "C" fn rhwp_read_text(input_path: *const c_char, page: i32) -> *mut c_char {
+    ffi_result(|| {
+        let input_path = read_utf8(input_path, "input_path")?;
+        read_text(Path::new(&input_path), normalize_page(page)?)
+    })
+}
+
 #[no_mangle]
 pub extern "C" fn rhwp_string_free(ptr: *mut c_char) {
     if ptr.is_null() {
@@ -94,6 +102,25 @@ fn export_text_to_dir(
     Ok(success_json(page_count, &written, None))
 }
 
+fn read_text(input_path: &Path, target_page: Option<u32>) -> Result<String, String> {
+    let data = fs::read(input_path)
+        .map_err(|e| format!("파일을 읽을 수 없습니다 - {}: {}", input_path.display(), e))?;
+    let doc = HwpDocument::from_bytes(&data).map_err(|e| format!("HWP 파싱 실패 - {}", e))?;
+    let page_count = doc.page_count();
+    let pages = select_pages(page_count, target_page)?;
+
+    let mut extracted = Vec::new();
+    for page_num in pages {
+        let mut text = doc
+            .extract_page_text_native(page_num)
+            .map_err(|e| format!("페이지 {} 텍스트 추출 실패 - {:?}", page_num, e))?;
+        ensure_trailing_newline(&mut text);
+        extracted.push((page_num, text));
+    }
+
+    Ok(text_json(page_count, &extracted))
+}
+
 fn export_markdown_to_dir(
     input_path: &Path,
     output_dir: &Path,
@@ -313,6 +340,25 @@ fn error_json(error: &str) -> String {
     format!("{{\"ok\":false,\"error\":\"{}\"}}", json_escape(error))
 }
 
+fn text_json(page_count: u32, pages: &[(u32, String)]) -> String {
+    let pages_json = pages
+        .iter()
+        .map(|(index, text)| {
+            format!(
+                "{{\"index\":{},\"text\":\"{}\"}}",
+                index,
+                json_escape(text)
+            )
+        })
+        .collect::<Vec<_>>()
+        .join(",");
+
+    format!(
+        "{{\"ok\":true,\"pageCount\":{},\"pages\":[{}]}}",
+        page_count, pages_json
+    )
+}
+
 fn json_escape(s: &str) -> String {
     let mut out = String::with_capacity(s.len());
     for ch in s.chars() {

diff --git a/bindings/README.md b/bindings/README.md
@@ -4,5 +4,6 @@ This directory separates the shared native ABI from language-specific bindings.
 
 - `Native/`: Rust `cdylib` crate that exposes the C ABI used by bindings.
 - `csharp/`: C# P/Invoke wrapper over the shared native library.
+- `swift/`: Swift Package wrapper over the shared native library.
 
 Add new language bindings as sibling folders under `bindings/`.
diff --git a/bindings/swift/.gitignore b/bindings/swift/.gitignore
@@ -0,0 +1,2 @@
+.build/
+DerivedData/
diff --git a/bindings/swift/Package.swift b/bindings/swift/Package.swift
@@ -0,0 +1,31 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+    name: "Rhwp",
+    platforms: [
+        .macOS(.v12),
+        .iOS(.v13),
+    ],
+    products: [
+        .library(
+            name: "Rhwp",
+            targets: ["Rhwp"]
+        ),
+    ],
+    targets: [
+        .systemLibrary(
+            name: "CRhwpNative",
+            path: "Sources/CRhwpNative"
+        ),
+        .target(
+            name: "Rhwp",
+            dependencies: ["CRhwpNative"]
+        ),
+        .testTarget(
+            name: "RhwpTests",
+            dependencies: ["Rhwp"]
+        ),
+    ]
+)
diff --git a/bindings/swift/README.md b/bindings/swift/README.md
@@ -0,0 +1,59 @@
+# RHWP Swift Binding
+
+Swift wrapper for the shared native ABI in `bindings/Native`.
+
+The package exposes:
+
+- `Rhwp.readText(inputFile:page:)`
+- `Rhwp.exportText(inputFile:outputDirectory:page:)`
+- `Rhwp.exportMarkdown(inputFile:outputDirectory:page:)`
+- `RhwpDocumentTextView(inputFile:page:)` for SwiftUI text display
+
+The export methods return `RhwpExportResult`; direct reads return
+`RhwpDocumentText`. All methods throw `RhwpError` when the native call fails.
+
+## SwiftUI Display
+
+```swift
+import Rhwp
+import SwiftUI
+
+struct DocumentScreen: View {
+    let fileURL: URL
+
+    var body: some View {
+        RhwpDocumentTextView(inputFile: fileURL)
+    }
+}
+```
+
+## Build the Native Library
+
+From the repository root:
+
+```sh
+cargo build --manifest-path bindings/Native/Cargo.toml
+```
+
+The Swift module links against `rhwp_native_ffi`, so the built dynamic library
+must be discoverable by the app or test host at link/runtime.
+
+For local SwiftPM tests on macOS:
+
+```sh
+cd bindings/swift
+swift test -Xlinker -L../../bindings/Native/target/debug
+```
+
+For app integration, package the native library as an `XCFramework` from the
+repository root:
+
+```sh
+./scripts/package-swift-xcframework.sh
+```
+
+The archive is written under `dist/swift/` and contains
+`RhwpNative.xcframework`, `LICENSE`, and this README.
+
+By default, the iOS simulator slice includes Apple Silicon (`arm64`). Set
+`INCLUDE_IOS_SIM_X86_64=1` when an Intel simulator slice is also required.
diff --git a/bindings/swift/Sources/CRhwpNative/module.modulemap b/bindings/swift/Sources/CRhwpNative/module.modulemap
@@ -0,0 +1,5 @@
+module CRhwpNative [system] {
+  header "rhwp_native_ffi.h"
+  link "rhwp_native_ffi"
+  export *
+}
diff --git a/bindings/swift/Sources/CRhwpNative/rhwp_native_ffi.h b/bindings/swift/Sources/CRhwpNative/rhwp_native_ffi.h
@@ -0,0 +1,17 @@
+#ifndef RHWP_NATIVE_FFI_H
+#define RHWP_NATIVE_FFI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char *rhwp_export_text(const char *input_path, const char *output_dir, int page);
+char *rhwp_export_markdown(const char *input_path, const char *output_dir, int page);
+char *rhwp_read_text(const char *input_path, int page);
+void rhwp_string_free(char *value);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif