wesley/swiftui-math
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated all resource names separate from fontName, fontFamilyName.

Browse Source
This commit is contained in:
Peter Tang
2023-09-12 18:40:01 +08:00
parent 6049e93c07
commit 4d922a5638
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/SwiftMath/MathBundle/MathFont.swift
View File

@@ -104,7 +104,7 @@ private class BundleManager {
guard CTFontManagerRegisterGraphicsFont(defaultCGFont, &errorRef) else {
throw FontError.registerFailed
}
print("mathFonts bundle: \(mathFont.rawValue) registered.")
print("mathFonts bundle resource: \(mathFont.rawValue), font: \(defaultCGFont.fullName) registered.")
}
private func registerMathTable(mathFont: MathFont) throws {
@@ -119,6 +119,7 @@ private class BundleManager {
}
//FIXME: mathTable = MTFontMathTable(withFont:self, mathTable:rawMathTable)
mathTables[mathFont] = rawMathTable
print("mathFonts bundle resource: \(mathFont.rawValue).plist registered.")
}
private func registerAllBundleResources() {
@@ -128,7 +129,7 @@ private class BundleManager {
try BundleManager.manager.registerCGFont(mathFont: font)
try BundleManager.manager.registerMathTable(mathFont: font)
} catch {
fatalError("MTMathFonts:\(#function) Couldn't load math fonts \(font.rawValue), reason \(error)")
fatalError("MTMathFonts:\(#function) Couldn't load mathFont resource \(font.rawValue), reason \(error)")
}
}
initializedOnceAlready.toggle()

2
Sources/SwiftMath/MathBundle/MathTable.swift
View File

@@ -244,7 +244,7 @@ internal struct MathTable {
// If no top accent is defined then it is the center of the advance width.
var advances = CGSize.zero
guard let ctFont = font.ctFont(withSize: fontSize) else {
fatalError("\(#function) unable to obtain ctFont \(font.rawValue) with size \(fontSize)")
fatalError("\(#function) unable to obtain ctFont resource name: \(font.rawValue) with size \(fontSize)")
}
CTFontGetAdvancesForGlyphs(ctFont, .horizontal, &glyph, &advances, 1)
return advances.width/2