corrected some variable names within BundleManager functions, added o…

…nDemandBundle registration instead of loading all Resources at startup.
mgriebling · Sep 15, 2023 · 40a6896 · 40a6896
1 parent 2cdab9c
commit 40a6896
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/Sources/SwiftMath/MathBundle/MathFont.swift b/Sources/SwiftMath/MathBundle/MathFont.swift
@@ -126,29 +126,42 @@ private class BundleManager {
         initializedOnceAlready.toggle()
     }
 
+    private func onDemandRegistration(mathFont: MathFont) {
+        guard cgFonts[mathFont] == nil else { return }
+        do {
+            try BundleManager.manager.registerCGFont(mathFont: mathFont)
+            try BundleManager.manager.registerMathTable(mathFont: mathFont)
+
+        } catch {
+            fatalError("MTMathFonts:\(#function) ondemand loading failed, mathFont \(mathFont.rawValue), reason \(error)")
+        }
+    }
     fileprivate func obtainCGFont(font: MathFont) -> CGFont {
-        if !initializedOnceAlready { registerAllBundleResources() }
-        guard let cfFont = cgFonts[font] else {
-            fatalError("\(#function) unable to locate CTFont \(font.fontName)")
+        // if !initializedOnceAlready { registerAllBundleResources() }
+        onDemandRegistration(mathFont: font)
+        guard let cgFont = cgFonts[font] else {
+            fatalError("\(#function) unable to locate CGFont \(font.fontName)")
         }
-        return cfFont
+        return cgFont
     }
 
     fileprivate func obtainCTFont(font: MathFont, withSize size: CGFloat) -> CTFont {
-        if !initializedOnceAlready { registerAllBundleResources() }
+        // if !initializedOnceAlready { registerAllBundleResources() }
+        onDemandRegistration(mathFont: font)
         let fontPair = CTFontPair(font: font, size: size)
         guard let ctFont = ctFonts[fontPair] else {
             if let cgFont = cgFonts[font] {
                 let ctFont = CTFontCreateWithGraphicsFont(cgFont, size, nil, nil)
                 ctFonts[fontPair] = ctFont
                 return ctFont
             }
-            fatalError("\(#function) unable to locate CTFont \(font.fontName)")
+            fatalError("\(#function) unable to locate CGFont \(font.fontName), nor create CTFont")
         }
         return ctFont
     }
     fileprivate func obtainMathTable(font: MathFont) -> NSDictionary {
-        if !initializedOnceAlready { registerAllBundleResources() }
+        // if !initializedOnceAlready { registerAllBundleResources() }
+        onDemandRegistration(mathFont: font)
         guard let mathTable = mathTables[font] else {
             fatalError("\(#function) unable to locate mathTable: \(font.rawValue).plist")
         }

diff --git a/Tests/SwiftMathTests/MathFontTests.swift b/Tests/SwiftMathTests/MathFontTests.swift
@@ -37,6 +37,13 @@ final class MathFontTests: XCTestCase {
         }
         #endif
     }
+    func testOnDemandMathFontScript() throws {
+        let size = Int.random(in: 20 ... 40)
+        let mathFont = MathFont.allCases.randomElement()!
+        XCTAssertNotNil(mathFont.cgFont())
+        XCTAssertNotNil(mathFont.ctFont(withSize: CGFloat(size)))
+        XCTAssertEqual(mathFont.ctFont(withSize: CGFloat(size)).fontSize, CGFloat(size), "ctFont fontSize test")
+    }
     var fontNames: [String] {
         MathFont.allCases.map { $0.fontName }
     }