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

Added support for Chinese characters

Browse Source
This commit is contained in:
Michael Griebling
2024-10-05 10:20:08 -04:00
parent 42f3d2ea78
commit cfc0e75715
1 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Sources/SwiftMath/MathRender/MTMathAtomFactory.swift
View File

@@ -62,7 +62,6 @@ public class MTMathAtomFactory {
"rfloor" : "\u{230B}" "rfloor" : "\u{230B}"
] ]
private static let delimValueLock = NSLock()
static var _delimValueToName = [String: String]() static var _delimValueToName = [String: String]()
public static var delimValueToName: [String: String] { public static var delimValueToName: [String: String] {
if _delimValueToName.isEmpty { if _delimValueToName.isEmpty {
@@ -79,12 +78,8 @@ public class MTMathAtomFactory {
} }
output[value] = key output[value] = key
} }
delimValueLock.lock()
defer { delimValueLock.unlock() }
if _delimValueToName.isEmpty {
_delimValueToName = output _delimValueToName = output
} }
}
return _delimValueToName return _delimValueToName
} }
@@ -103,7 +98,6 @@ public class MTMathAtomFactory {
"widetilde" : "\u{0303}" "widetilde" : "\u{0303}"
] ]
private static let accentValueLock = NSLock()
static var _accentValueToName: [String: String]? = nil static var _accentValueToName: [String: String]? = nil
public static var accentValueToName: [String: String] { public static var accentValueToName: [String: String] {
if _accentValueToName == nil { if _accentValueToName == nil {
@@ -121,12 +115,8 @@ public class MTMathAtomFactory {
} }
output[value] = key output[value] = key
} }
accentValueLock.lock()
defer { accentValueLock.unlock() }
if _accentValueToName == nil {
_accentValueToName = output _accentValueToName = output
} }
}
return _accentValueToName! return _accentValueToName!
} }
@@ -380,7 +370,6 @@ public class MTMathAtomFactory {
"cdots" : MTMathAtom(type: .ordinary, value: "\u{22EF}"), "cdots" : MTMathAtom(type: .ordinary, value: "\u{22EF}"),
"ddots" : MTMathAtom(type: .ordinary, value: "\u{22F1}"), "ddots" : MTMathAtom(type: .ordinary, value: "\u{22F1}"),
"triangle" : MTMathAtom(type: .ordinary, value: "\u{25B3}"), "triangle" : MTMathAtom(type: .ordinary, value: "\u{25B3}"),
"diamond" : MTMathAtom(type: .ordinary, value: "\u{2662}"),
"imath" : MTMathAtom(type: .ordinary, value: "\u{0001D6A4}"), "imath" : MTMathAtom(type: .ordinary, value: "\u{0001D6A4}"),
"jmath" : MTMathAtom(type: .ordinary, value: "\u{0001D6A5}"), "jmath" : MTMathAtom(type: .ordinary, value: "\u{0001D6A5}"),
"upquote" : MTMathAtom(type: .ordinary, value: "\u{0027}"), "upquote" : MTMathAtom(type: .ordinary, value: "\u{0027}"),
@@ -401,7 +390,6 @@ public class MTMathAtomFactory {
"scriptscriptstyle" : MTMathStyle(style: .scriptOfScript), "scriptscriptstyle" : MTMathStyle(style: .scriptOfScript),
] ]
private static let textToLatexLock = NSLock()
static var _textToLatexSymbolName: [String: String]? = nil static var _textToLatexSymbolName: [String: String]? = nil
public static var textToLatexSymbolName: [String: String] { public static var textToLatexSymbolName: [String: String] {
get { get {
@@ -425,17 +413,13 @@ public class MTMathAtomFactory {
} }
output[atom.nucleus] = key output[atom.nucleus] = key
} }
textToLatexLock.lock()
defer { textToLatexLock.unlock() }
if self._textToLatexSymbolName == nil {
self._textToLatexSymbolName = output self._textToLatexSymbolName = output
} }
}
return self._textToLatexSymbolName! return self._textToLatexSymbolName!
} }
// set { set {
// self._textToLatexSymbolName = newValue self._textToLatexSymbolName = newValue
// } }
} }
// public static let sharedInstance = MTMathAtomFactory() // public static let sharedInstance = MTMathAtomFactory()
@@ -544,6 +528,11 @@ public class MTMathAtomFactory {
case "\u{0410}"..."\u{044F}": case "\u{0410}"..."\u{044F}":
return MTMathAtom(type: .ordinary, value: chStr) return MTMathAtom(type: .ordinary, value: chStr)
case _ where ch.utf32Char < 0x0021 || ch.utf32Char > 0x007E: case _ where ch.utf32Char < 0x0021 || ch.utf32Char > 0x007E:
// allow Chinese characters for testing
if ((ch.utf32Char >= 0x4E00) && (ch.utf32Char <= 0x9FFF)) {
// CJK support. But xits-math-cn font only has Chinese characters support.
return MTMathAtom(type:.ordinary, value:chStr)
}
return nil return nil
case "$", "%", "#", "&", "~", "\'", "^", "_", "{", "}", "\\": case "$", "%", "#", "&", "~", "\'", "^", "_", "{", "}", "\\":
return nil return nil
@@ -619,13 +608,8 @@ public class MTMathAtomFactory {
e.g. to define a symbol for "lcm" one can call: e.g. to define a symbol for "lcm" one can call:
`MTMathAtomFactory.add(latexSymbol:"lcm", value:MTMathAtomFactory.operatorWithName("lcm", limits: false))` */ `MTMathAtomFactory.add(latexSymbol:"lcm", value:MTMathAtomFactory.operatorWithName("lcm", limits: false))` */
public static func add(latexSymbol name: String, value: MTMathAtom) { public static func add(latexSymbol name: String, value: MTMathAtom) {
let _ = Self.textToLatexSymbolName
// above force textToLatexSymbolName to instantiate first, _textToLatexSymbolName also initialized.
textToLatexLock.lock()
defer { textToLatexLock.unlock() }
supportedLatexSymbols[name] = value supportedLatexSymbols[name] = value
// below update the underlying dictionary entry. Self.textToLatexSymbolName[value.nucleus] = name
Self._textToLatexSymbolName?[value.nucleus] = name
} }
/** Returns a large opertor for the given name. If limits is true, limits are set up on /** Returns a large opertor for the given name. If limits is true, limits are set up on