From ae462faa04aaf8f551cc4142587c060b29927253 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Sun, 6 Feb 2022 19:35:50 +0800 Subject: [PATCH] Reset // +KangXi Conversion support for SwiftOpenCC. --- .../SwiftyOpenCC/Sources/OpenCC/ChineseConverter.swift | 6 ++++++ Packages/SwiftyOpenCC/Sources/OpenCC/DictionaryName.swift | 8 ++++++++ Source/Modules/IMEModules/OpenCCBridge.swift | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Packages/SwiftyOpenCC/Sources/OpenCC/ChineseConverter.swift b/Packages/SwiftyOpenCC/Sources/OpenCC/ChineseConverter.swift index 18574bc9..259ed968 100644 --- a/Packages/SwiftyOpenCC/Sources/OpenCC/ChineseConverter.swift +++ b/Packages/SwiftyOpenCC/Sources/OpenCC/ChineseConverter.swift @@ -44,6 +44,12 @@ public class ChineseConverter { /// Use HongKong standard. public static let hkStandard = Options(rawValue: 1 << 6) + /// Cancel Taiwan standard. + public static let twStandardRev = Options(rawValue: 1 << 15) + + /// Cancel HongKong standard. + public static let hkStandardRev = Options(rawValue: 1 << 16) + /// Taiwanese idiom conversion. public static let twIdiom = Options(rawValue: 1 << 10) } diff --git a/Packages/SwiftyOpenCC/Sources/OpenCC/DictionaryName.swift b/Packages/SwiftyOpenCC/Sources/OpenCC/DictionaryName.swift index c64b95c1..6e7f2e4d 100644 --- a/Packages/SwiftyOpenCC/Sources/OpenCC/DictionaryName.swift +++ b/Packages/SwiftyOpenCC/Sources/OpenCC/DictionaryName.swift @@ -56,6 +56,10 @@ extension ChineseConverter.Options { return .hkVariants } else if contains(.twStandard) { return .twVariants + } else if contains(.hkStandardRev) { + return .hkVariantsRev + } else if contains(.twStandardRev) { + return .twVariantsRev } else { return .stPhrases } @@ -88,6 +92,10 @@ extension ChineseConverter.Options { result.append([.hkVariants]) } else if contains(.twStandard) { result.append([.twVariants]) + } else if contains(.hkStandardRev) { + result.append([.hkVariantsRev]) + } else if contains(.twStandardRev) { + result.append([.twVariantsRev]) } } if result.isEmpty { diff --git a/Source/Modules/IMEModules/OpenCCBridge.swift b/Source/Modules/IMEModules/OpenCCBridge.swift index b77cc295..949e00d3 100644 --- a/Source/Modules/IMEModules/OpenCCBridge.swift +++ b/Source/Modules/IMEModules/OpenCCBridge.swift @@ -11,14 +11,14 @@ public class OpenCCBridge: NSObject { private var converter: ChineseConverter? private override init() { - try? converter = ChineseConverter(options: .simplify) + try? converter = ChineseConverter(options: .twStandardRev) super.init() } /// Converts to Simplified Chinese. /// /// - Parameter string: Text in Traditional Chinese. - /// - Returns: Text in Simplified Chinese. + /// - Returns: Text in KangXi Chinese. @objc public static func convertToKangXi(_ string: String) -> String? { shared.converter?.convert(string) }