From 3fbf694819f3aaf700282e672c7d6d0d45be9cc1 Mon Sep 17 00:00:00 2001
From: weixi <sunshiwei418@126.com>
Date: Fri, 5 Dec 2025 11:23:22 +0800
Subject: [PATCH 1/2] Use CoreText run font fallback for glyph paths

---
 SwiftDraw/Sources/Utilities/CGPath+Segment.swift | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/SwiftDraw/Sources/Utilities/CGPath+Segment.swift b/SwiftDraw/Sources/Utilities/CGPath+Segment.swift
index a200e3cb..3da65eec 100644
--- a/SwiftDraw/Sources/Utilities/CGPath+Segment.swift
+++ b/SwiftDraw/Sources/Utilities/CGPath+Segment.swift
@@ -134,6 +134,8 @@ extension String {
     for idx in 0..<CFArrayGetCount(glyphRuns) {
       let val = CFArrayGetValueAtIndex(glyphRuns, idx)
       let run = unsafeBitCast(val, to: CTRun.self)
+      let attributes = CTRunGetAttributes(run) as NSDictionary
+      let runFont = resolveRunFont(attributes: attributes, fallback: font)
 
       for idx in 0..<CTRunGetGlyphCount(run) {
         let glyphRange = CFRange(location: idx, length: 1)
@@ -142,7 +144,7 @@ extension String {
         CTRunGetGlyphs(run, glyphRange, &glyph)
         CTRunGetPositions(run, glyphRange, &position)
         var t = CGAffineTransform.identity
-        if let glyphPath = CTFontCreatePathForGlyph(font, glyph, &t) {
+        if let glyphPath = CTFontCreatePathForGlyph(runFont, glyph, &t) {
           let t = CGAffineTransform(a: 1, b: 0, c: 0, d: -1, tx: position.x, ty: baseline)
           let t1 = t.translatedBy(x: 0, y: baseline)
           path.addPath(glyphPath, transform: t1)
@@ -152,6 +154,18 @@ extension String {
 
     return path
   }
+
+  // Use the font CoreText resolved for this run, else fall back to the requested font.
+  private func resolveRunFont(attributes: NSDictionary, fallback: CTFont) -> CTFont {
+    guard let value = attributes[kCTFontAttributeName] else {
+      return fallback
+    }
+    // CoreFoundation type bridging: ensure it's a CTFont before use.
+    if CFGetTypeID(value as CFTypeRef) == CTFontGetTypeID() {
+      return unsafeDowncast(value as AnyObject, to: CTFont.self)
+    }
+    return fallback
+  }
 }
 
 #endif

From 14535c51c557f782851e4e0c2657b78d3eee02cb Mon Sep 17 00:00:00 2001
From: weixi <sunshiwei418@126.com>
Date: Mon, 8 Dec 2025 11:25:53 +0800
Subject: [PATCH 2/2] Add CJK fallback sample SVG

---
 Samples.bundle/cjk-fallback.svg | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Samples.bundle/cjk-fallback.svg

diff --git a/Samples.bundle/cjk-fallback.svg b/Samples.bundle/cjk-fallback.svg
new file mode 100644
index 00000000..8b2adfbc
--- /dev/null
+++ b/Samples.bundle/cjk-fallback.svg
@@ -0,0 +1,6 @@
+<svg width="360" height="160" xmlns="http://www.w3.org/2000/svg">
+  <!-- Mixed CJK samples using a font that typically lacks CJK glyphs -->
+  <text x="10" y="30" font-family="Helvetica" font-size="18">敏捷的棕色狐狸跳过懒狗，窗前明月光照桌上旧书</text>
+  <text x="10" y="70" font-family="Helvetica" font-size="18">いろはにほへとちりぬるを　わかよたれそ　つねならむ</text>
+  <text x="10" y="110" font-family="Helvetica" font-size="18">다람쥐 헌 쳇바퀴에 타고파, 한글도 잘 보이나요?</text>
+</svg>