Pre Merge pull request !80 from ShikiSuen/upd/1.9.1sp1

Source/Data

@@ -1 +1 @@
-Subproject commit 1d1224ee392d757526dc8aab6550e9d41dd3d784
+Subproject commit 1daf4d576a248373889889213bea4bd3cbb4b5d4

Source/Modules/ControllerModules/KeyHandler_HandleInput.swift

@@ -372,7 +372,6 @@ extension KeyHandler {
 
     // MARK: 摁住 Shift+字母鍵 的處理 (Shift+Letter Processing)
 
-    // 這裡不使用小麥注音 2.2 版的組字區處理方式，而是直接由詞庫負責。
     if input.isUpperCaseASCIILetterKey, !input.isCommandHold, !input.isControlHold {
       if input.isShiftHold {  // 這裡先不要判斷 isOptionHold。
         switch mgrPrefs.upperCaseLetterKeyBehavior {

Source/Modules/ControllerModules/SyllableComposer.swift

@@ -922,7 +922,8 @@ public struct Tekkon {
   ///   - newToneOne: 對陰平指定新的標記。預設情況下該標記為空字串。
   /// - Returns: 轉換結果。
   static func cnvHanyuPinyinToPhona(target: String, newToneOne: String = "") -> String {
-    if target.contains("_") { return target }
+    /// 如果當前內容有任何除了半形英數內容以外的內容的話，就直接放棄轉換。
+    if target.contains("_") || !target.isNotPureAlphanumerical { return target }
     var result = target
     for key in Tekkon.mapHanyuPinyin.keys.sorted(by: { $0.count > $1.count }) {
       guard let value = Tekkon.mapHanyuPinyin[key] else { continue }
@@ -1446,3 +1447,12 @@ public struct Tekkon {
     "s": "ㄙ", "t": "ㄊ", "u": "ㄡ", "v": "ㄩ", "w": "ㄨ", "x": "ㄒ", "y": "ㄧ", "z": "ㄗ", " ": " ",
   ]
 }
+
+/// 檢測字串是否包含半形英數內容
+extension String {
+  fileprivate var isNotPureAlphanumerical: Bool {
+    let regex = ".*[^A-Za-z0-9].*"
+    let testString = NSPredicate(format: "SELF MATCHES %@", regex)
+    return testString.evaluate(with: self)
+  }
+}

Source/Modules/ControllerModules/ctlInputMethod_Core.swift

@@ -187,7 +187,8 @@ class ctlInputMethod: IMKInputController {
   @objc(handleEvent:client:) override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {
     _ = sender  // 防止格式整理工具毀掉與此對應的參數。
 
-    // 用 Shift 開關半形英數模式。
+    // 用 Shift 開關半形英數模式，僅對 macOS 10.15 及之後的 macOS 有效。
+    if #available(macOS 10.15, *) {
       if ShiftKeyUpChecker.check(event) {
         if !rencentKeyHandledByKeyHandler {
           NotifierController.notify(
@@ -202,6 +203,7 @@ class ctlInputMethod: IMKInputController {
         rencentKeyHandledByKeyHandler = false
         return false
       }
+    }
 
     /// 這裡仍舊需要判斷 flags。之前使輸入法狀態卡住無法敲漢字的問題已在 KeyHandler 內修復。
     /// 這裡不判斷 flags 的話，用方向鍵前後定位光標之後，再次試圖觸發組字區時、反而會在首次按鍵時失敗。

Source/Modules/ControllerModules/ctlInputMethod_HandleDisplay.swift

@@ -83,8 +83,23 @@ extension ctlInputMethod {
       return NSFont.systemFont(ofSize: size)
     }
 
+    /// FB10978412: Since macOS 11 Big Sur, CTFontCreateUIFontForLanguage cannot
+    /// distinguish zh-Hans and zh-Hant with correct adoptation of proper PingFang SC/TC variants.
+    ///
+    /// Instructions for Apple Developer relations to reveal this bug:
+    ///
+    /// 1) Remove the usage of ".languageIdentifier" from ctlCandidateUniversal.swift (already done).
+    /// 2) Run "make update" in the project folder to download the latest git-submodule of dictionary file.
+    /// 3) Compile the target "vChewingInstaller", run it. It will install the input method into
+    ///    "~/Library/Input Methods/" folder. Remember to ENABLE BOTH "vChewing-CHS"
+    ///    and "vChewing-CHT" input sources in System Preferences / Settings.
+    /// 4) Type Zhuyin "ej3" (ㄍㄨˇ) (or "gu3" in Pinyin if you enabled Pinyin typing in vChewing preferences.)
+    ///    using both "vChewing-CHS" and "vChewing-CHT", and check the candidate window by pressing SPACE key.
+    /// 5) Do NOT enable either KangXi conversion mode nor JIS conversion mode. They are disabled by default.
+    /// 6) Expecting the glyph differences of the candidate "骨" between PingFang SC and PingFang TC when rendering
+    ///    the candidate window in different "vChewing-CHS" and "vChewing-CHT" input modes.
     func candidateFont(name: String?, size: CGFloat) -> NSFont {
-      var finalReturnFont: NSFont =
+      let finalReturnFont: NSFont =
         {
           switch IME.currentInputMode {
             case InputMode.imeModeCHS:
@@ -98,9 +113,6 @@ extension ctlInputMethod {
           }
         }()
         ?? NSFont.systemFont(ofSize: size)
-      // 上述方法對 macOS 10.11-10.15 有效，但對 macOS 12 Monterey 無效（懷疑是 Bug）。
-      // macOS 12 Monterey 開始就用系統內建的函式來處理，相關流程直接寫在 ctlCandidateUniversal 內。
-      if #available(macOS 12.0, *) { finalReturnFont = NSFont.systemFont(ofSize: size) }
       if let name = name {
         return NSFont(name: name, size: size) ?? finalReturnFont
       }

Source/Modules/IMEModules/IME.swift

@@ -77,8 +77,15 @@ public enum IME {
     // mgrLangModel 的 loadUserPhrases 等函式在自動讀取 dataFolderPath 時，
     // 如果發現自訂目錄不可用，則會自動抹去自訂目錄設定、改採預設目錄。
     // 所以這裡不需要特別處理。
+    if mgrPrefs.associatedPhrasesEnabled {
       mgrLangModel.loadUserAssociatesData()
+    }
+    if mgrPrefs.phraseReplacementEnabled {
       mgrLangModel.loadUserPhraseReplacement()
+    }
+    if mgrPrefs.useSCPCTypingMode {
+      mgrLangModel.loadUserSCPCSequencesData()
+    }
     mgrLangModel.loadUserPhrasesData()
     if !userOnly {
       // mgrLangModel.loadDataModels()

Source/Modules/IMEModules/mgrPrefs.swift

@@ -388,15 +388,6 @@ public enum mgrPrefs {
     mgrPrefs.allowBoostingSingleKanjiAsUserPhrase ? 1 : 2
   }
 
-  @UserDefault(key: UserDef.kUseSCPCTypingMode.rawValue, defaultValue: false)
-  static var useSCPCTypingMode: Bool
-
-  static func toggleSCPCTypingModeEnabled() -> Bool {
-    useSCPCTypingMode = !useSCPCTypingMode
-    UserDefaults.standard.set(useSCPCTypingMode, forKey: UserDef.kUseSCPCTypingMode.rawValue)
-    return useSCPCTypingMode
-  }
-
   @UserDefault(key: UserDef.kMaxCandidateLength.rawValue, defaultValue: 10)
   static var maxCandidateLength: Int
 
@@ -564,8 +555,29 @@ public enum mgrPrefs {
     }
   }
 
+  @UserDefault(key: UserDef.kUseSCPCTypingMode.rawValue, defaultValue: false)
+  static var useSCPCTypingMode: Bool {
+    willSet {
+      DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()) {
+        mgrLangModel.loadUserSCPCSequencesData()
+      }
+    }
+  }
+
+  static func toggleSCPCTypingModeEnabled() -> Bool {
+    useSCPCTypingMode = !useSCPCTypingMode
+    UserDefaults.standard.set(useSCPCTypingMode, forKey: UserDef.kUseSCPCTypingMode.rawValue)
+    return useSCPCTypingMode
+  }
+
   @UserDefault(key: UserDef.kPhraseReplacementEnabled.rawValue, defaultValue: false)
-  static var phraseReplacementEnabled: Bool
+  static var phraseReplacementEnabled: Bool {
+    willSet {
+      DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()) {
+        mgrLangModel.loadUserPhraseReplacement()
+      }
+    }
+  }
 
   static func togglePhraseReplacementEnabled() -> Bool {
     phraseReplacementEnabled = !phraseReplacementEnabled
@@ -575,7 +587,13 @@ public enum mgrPrefs {
   }
 
   @UserDefault(key: UserDef.kAssociatedPhrasesEnabled.rawValue, defaultValue: false)
-  static var associatedPhrasesEnabled: Bool
+  static var associatedPhrasesEnabled: Bool {
+    willSet {
+      DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()) {
+        mgrLangModel.loadUserAssociatesData()
+      }
+    }
+  }
 
   static func toggleAssociatedPhrasesEnabled() -> Bool {
     associatedPhrasesEnabled = !associatedPhrasesEnabled

Source/Modules/LangModelRelated/LMInstantiator.swift

@@ -76,6 +76,7 @@ extension vChewing {
     )
     var lmReplacements = LMReplacments()
     var lmAssociates = LMAssociates()
+    var lmPlainBopomofo = LMPlainBopomofo()
 
     // MARK: - 工具函式
 
@@ -166,6 +167,16 @@ extension vChewing {
       }
     }
 
+    public func loadUserSCPCSequencesData(path: String) {
+      if FileManager.default.isReadableFile(atPath: path) {
+        lmPlainBopomofo.close()
+        lmPlainBopomofo.open(path)
+        IME.prtDebugIntel("lmPlainBopomofo: \(lmPlainBopomofo.count) entries of data loaded from: \(path)")
+      } else {
+        IME.prtDebugIntel("lmPlainBopomofo: File access failure: \(path)")
+      }
+    }
+
     // MARK: - 核心函式（對外）
 
     /// 威注音輸入法目前尚未具備對雙元圖的處理能力，故停用該函式。
@@ -181,6 +192,11 @@ extension vChewing {
       /// 準備不同的語言模組容器，開始逐漸往容器陣列內塞入資料。
       var rawAllUnigrams: [Megrez.Unigram] = []
 
+      // 如果有檢測到使用者自訂逐字選字語料庫內的相關資料的話，在這裡先插入。
+      if mgrPrefs.useSCPCTypingMode {
+        rawAllUnigrams += lmPlainBopomofo.valuesFor(key: key).map { Megrez.Unigram.init(value: $0, score: 0) }
+      }
+
       // 用 reversed 指令讓使用者語彙檔案內的詞條優先順序隨著行數增加而逐漸增高。
       // 這樣一來就可以在就地新增語彙時徹底複寫優先權。
       // 將兩句差分也是為了讓 rawUserUnigrams 的類型不受可能的影響。

Source/Modules/LangModelRelated/SubLMs/lmAssociates.swift

@@ -32,7 +32,7 @@ extension vChewing {
       }
       let arrTarget = target.dropLast().dropFirst().split(separator: ",")
       guard arrTarget.count == 2 else { return target }
-      return "(\(Tekkon.cnvHanyuPinyinToPhona(target: String(arrTarget[0]))),\(arrTarget[1]))"
+      return "(\(Tekkon.cnvHanyuPinyinToPhona(target: String(arrTarget[0]).lowercased())),\(arrTarget[1]))"
     }
 
     @discardableResult public mutating func open(_ path: String) -> Bool {

Source/Modules/LangModelRelated/SubLMs/lmCoreEX.swift

@@ -77,7 +77,7 @@ extension vChewing {
             if !neta[0].isEmpty, !neta[1].isEmpty {
               let theKey = shouldReverse ? String(neta[1]) : String(neta[0])
               let theValue = $0
-              rangeMap[Tekkon.cnvHanyuPinyinToPhona(target: theKey), default: []].append(theValue)
+              rangeMap[Tekkon.cnvHanyuPinyinToPhona(target: theKey.lowercased()), default: []].append(theValue)
             }
           }
         }

Source/Modules/LangModelRelated/SubLMs/lmPlainBopomofo.swift

@@ -0,0 +1,83 @@
+// Copyright (c) 2021 and onwards The vChewing Project (MIT-NTL License).
+// StringView Ranges extension by (c) 2022 and onwards Isaac Xen (MIT License).
+// ====================
+// This code is released under the MIT license (SPDX-License-Identifier: MIT)
+// ... with NTL restriction stating that:
+// No trademark license is granted to use the trade names, trademarks, service
+// marks, or product names of Contributor, except as required to fulfill notice
+// requirements defined in MIT License.
+
+import Foundation
+
+extension vChewing {
+  @frozen public struct LMPlainBopomofo {
+    var rangeMap: [String: String] = [:]
+
+    public var count: Int {
+      rangeMap.count
+    }
+
+    public init() {
+      rangeMap = [:]
+    }
+
+    public func isLoaded() -> Bool {
+      !rangeMap.isEmpty
+    }
+
+    @discardableResult public mutating func open(_ path: String) -> Bool {
+      if isLoaded() {
+        return false
+      }
+
+      do {
+        let rawData = try Data(contentsOf: URL(fileURLWithPath: path))
+        let rawPlist: [String: String] =
+          try PropertyListSerialization.propertyList(from: rawData, format: nil) as? [String: String] ?? .init()
+        rangeMap = rawPlist
+      } catch {
+        IME.prtDebugIntel("\(error)")
+        IME.prtDebugIntel("↑ Exception happened when reading data at: \(path).")
+        return false
+      }
+
+      return true
+    }
+
+    public mutating func close() {
+      if isLoaded() {
+        rangeMap.removeAll()
+      }
+    }
+
+    public func dump() {
+      // We remove this function in order to reduce out maintenance workload.
+      // This function will be implemented only if further hard-necessity comes.
+    }
+
+    public func valuesFor(key: String) -> [String] {
+      var pairs: [String] = []
+      if let arrRangeRecords: String = rangeMap[key] {
+        pairs.append(contentsOf: arrRangeRecords.map({ String($0) }))
+      }
+      var set = Set<String>()
+      return pairs.filter { set.insert($0).inserted }
+    }
+
+    public func hasValuesFor(key: String) -> Bool { rangeMap.keys.contains(key) }
+  }
+}
+
+// MARK: - StringView Ranges Extension (by Isaac Xen)
+
+extension String {
+  fileprivate func ranges(splitBy separator: Element) -> [Range<String.Index>] {
+    var startIndex = startIndex
+    return split(separator: separator).reduce(into: []) { ranges, substring in
+      _ = range(of: substring, range: startIndex..<endIndex).map { range in
+        ranges.append(range)
+        startIndex = range.upperBound
+      }
+    }
+  }
+}

Source/Modules/LangModelRelated/mgrLangModel.swift

@@ -175,6 +175,15 @@ enum mgrLangModel {
     )
   }
 
+  public static func loadUserSCPCSequencesData() {
+    gLangModelCHT.loadUserSCPCSequencesData(
+      path: mgrLangModel.userSCPCSequencesURL(InputMode.imeModeCHT).path
+    )
+    gLangModelCHS.loadUserSCPCSequencesData(
+      path: mgrLangModel.userSCPCSequencesURL(InputMode.imeModeCHS).path
+    )
+  }
+
   public static func checkIfUserPhraseExist(
     userPhrase: String,
     mode: InputMode,
@@ -256,6 +265,14 @@ enum mgrLangModel {
     return URL(fileURLWithPath: dataFolderPath(isDefaultFolder: false)).appendingPathComponent(fileName)
   }
 
+  /// 使用者逐字選字模式候選字詞順序資料路徑。
+  /// - Parameter mode: 簡繁體輸入模式。
+  /// - Returns: 資料路徑（URL）。
+  static func userSCPCSequencesURL(_ mode: InputMode) -> URL {
+    let fileName = (mode == InputMode.imeModeCHT) ? "data-plain-bpmf-cht.plist" : "data-plain-bpmf-chs.plist"
+    return URL(fileURLWithPath: dataFolderPath(isDefaultFolder: false)).appendingPathComponent(fileName)
+  }
+
   /// 使用者波浪符號選單資料路徑。
   /// - Returns: 資料路徑（URL）。
   static func userSymbolNodeDataURL() -> URL {
@@ -311,6 +328,7 @@ enum mgrLangModel {
         userAssociatesDataURL(mode),
         populateWithTemplate: mode == .imeModeCHS ? kTemplateNameUserAssociatesCHS : kTemplateNameUserAssociatesCHT
       )
+      || !ensureFileExists(userSCPCSequencesURL(mode))
       || !ensureFileExists(userFilteredDataURL(mode), populateWithTemplate: kTemplateNameUserExclusions)
       || !ensureFileExists(userReplacementsDataURL(mode), populateWithTemplate: kTemplateNameUserReplacements)
       || !ensureFileExists(userSymbolDataURL(mode), populateWithTemplate: kTemplateNameUserSymbolPhrases)

Source/Modules/LanguageParsers/Megrez/4_Span.swift

@@ -79,12 +79,8 @@ extension Megrez.Compositor {
     // 再獲取以當前位置結尾或開頭的節點。
     let begin: Int = location - min(location, Megrez.Compositor.maxSpanLength - 1)
     for theLocation in begin..<location {
-      let (A, B): (Int, Int) = {
+      let (A, B): (Int, Int) = (location - theLocation + 1, spans[theLocation].maxLength)
-        (
+      guard A <= B else { continue }
-          min(location - theLocation + 1, spans[theLocation].maxLength),
-          max(location - theLocation + 1, spans[theLocation].maxLength)
-        )
-      }()
       for theLength in A...B {
         guard let node = spans[theLocation].nodeOf(length: theLength) else { continue }
         results.append(.init(node: node, spanIndex: theLocation))

Source/Resources/Base.lproj/Localizable.strings

@@ -150,7 +150,7 @@
 "Keyboard" = "Keyboard";
 "Misc Settings:" = "Misc Settings:";
 "MiTAC" = "MiTAC";
-"Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only." = "Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only.";
+"Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only." = "Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only.";
 "Output Hanyu-Pinyin in lieu of Zhuyin when Ctrl(+Alt)+CMD+Enter" = "Output Hanyu-Pinyin in lieu of Zhuyin when Ctrl(+Alt)+CMD+Enter";
 "Output Settings:" = "Output Settings:";
 "Phonetic Parser:" = "Phonetic Parser:";

Source/Resources/en.lproj/Localizable.strings

@@ -150,7 +150,7 @@
 "Keyboard" = "Keyboard";
 "Misc Settings:" = "Misc Settings:";
 "MiTAC" = "MiTAC";
-"Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only." = "Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only.";
+"Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only." = "Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only.";
 "Output Hanyu-Pinyin in lieu of Zhuyin when Ctrl(+Alt)+CMD+Enter" = "Output Hanyu-Pinyin in lieu of Zhuyin when Ctrl(+Alt)+CMD+Enter";
 "Output Settings:" = "Output Settings:";
 "Phonetic Parser:" = "Phonetic Parser:";

Source/Resources/ja.lproj/Localizable.strings

@@ -150,7 +150,7 @@
 "Keyboard" = "配列設定";
 "Misc Settings:" = "他の設定:";
 "MiTAC" = "神通配列";
-"Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only." = "QWERTY 以外の英数キーボードは漢語弁音以外の配列に不適用。";
+"Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only." = "QWERTY 以外の英数キーボードは漢語弁音以外の配列に不適用。";
 "Output Hanyu-Pinyin in lieu of Zhuyin when Ctrl(+Alt)+CMD+Enter" = "Ctrl(+Alt)+CMD+Enter で出すのを漢語弁音と変換";
 "Output Settings:" = "出力設定:";
 "Phonetic Parser:" = "注音配列:";

Source/Resources/zh-Hans.lproj/Localizable.strings

@@ -151,7 +151,7 @@
 "Keyboard" = "键盘";
 "Misc Settings:" = "杂项:";
 "MiTAC" = "神通排列";
-"Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only." = "QWERTY 以外的英数布局是为了汉语拼音排列使用者而准备的。";
+"Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only." = "QWERTY 以外的英数布局是为了汉语拼音排列使用者而准备的。";
 "Output Hanyu-Pinyin in lieu of Zhuyin when Ctrl(+Alt)+CMD+Enter" = "Ctrl(+Alt)+CMD+Enter 输出汉语拼音而非注音";
 "Output Settings:" = "输出设定:";
 "Phonetic Parser:" = "注音排列:";

Source/Resources/zh-Hant.lproj/Localizable.strings

@@ -150,7 +150,7 @@
 "Keyboard" = "鍵盤";
 "Misc Settings:" = "雜項:";
 "MiTAC" = "神通排列";
-"Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only." = "QWERTY 以外的英數佈局是為了漢語拼音排列使用者而準備的。";
+"Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only." = "QWERTY 以外的英數佈局是為了漢語拼音排列使用者而準備的。";
 "Output Hanyu-Pinyin in lieu of Zhuyin when Ctrl(+Alt)+CMD+Enter" = "Ctrl(+Alt)+CMD+Enter 輸出漢語拼音而非注音";
 "Output Settings:" = "輸出設定:";
 "Phonetic Parser:" = "注音排列:";

Source/UI/CandidateUI/ctlCandidateUniversal.swift

@@ -190,20 +190,6 @@ private class vwrCandidateUniversal: NSView {
           } else {
             NSColor.controlBackgroundColor.setFill()
           }
-          switch IME.currentInputMode {
-            case InputMode.imeModeCHS:
-              if #available(macOS 12.0, *) {
-                activeCandidateAttr[.languageIdentifier] = "zh-Hans" as AnyObject
-              }
-            case InputMode.imeModeCHT:
-              if #available(macOS 12.0, *) {
-                activeCandidateAttr[.languageIdentifier] =
-                  (mgrPrefs.shiftJISShinjitaiOutputEnabled || mgrPrefs.chineseConversionEnabled)
-                  ? "ja" as AnyObject : "zh-Hant" as AnyObject
-              }
-            default:
-              break
-          }
           NSBezierPath.fill(rctCandidateArea)
           (keyLabels[index] as NSString).draw(
             in: rctLabel, withAttributes: activeCandidateIndexAttr
@@ -260,20 +246,6 @@ private class vwrCandidateUniversal: NSView {
           } else {
             NSColor.controlBackgroundColor.setFill()
           }
-          switch IME.currentInputMode {
-            case InputMode.imeModeCHS:
-              if #available(macOS 12.0, *) {
-                activeCandidateAttr[.languageIdentifier] = "zh-Hans" as AnyObject
-              }
-            case InputMode.imeModeCHT:
-              if #available(macOS 12.0, *) {
-                activeCandidateAttr[.languageIdentifier] =
-                  (mgrPrefs.shiftJISShinjitaiOutputEnabled || mgrPrefs.chineseConversionEnabled)
-                  ? "ja" as AnyObject : "zh-Hant" as AnyObject
-              }
-            default:
-              break
-          }
           NSBezierPath.fill(rctCandidateArea)
           (keyLabels[index] as NSString).draw(
             in: rctLabel, withAttributes: activeCandidateIndexAttr

Source/UI/PrefUI/suiPrefPaneExperience.swift

@@ -11,9 +11,7 @@ import SwiftUI
 
 @available(macOS 11.0, *)
 struct suiPrefPaneExperience: View {
-  @State private var selSelectionKeysList = mgrPrefs.suggestedCandidateKeys
+
-  @State private var selSelectionKeys =
-    (UserDefaults.standard.string(forKey: UserDef.kCandidateKeys.rawValue) ?? mgrPrefs.defaultCandidateKeys) as String
   @State private var selCursorPosition =
     UserDefaults.standard.bool(
       forKey: UserDef.kUseRearCursorMode.rawValue) ? 1 : 0
@@ -54,34 +52,6 @@ struct suiPrefPaneExperience: View {
 
   var body: some View {
     Preferences.Container(contentWidth: contentWidth) {
-      Preferences.Section(label: { Text(LocalizedStringKey("Selection Keys:")) }) {
-        ComboBox(items: mgrPrefs.suggestedCandidateKeys, text: $selSelectionKeys).frame(width: 180).onChange(
-          of: selSelectionKeys
-        ) { value in
-          let keys: String = value.trimmingCharacters(in: .whitespacesAndNewlines).deduplicate
-          do {
-            try mgrPrefs.validate(candidateKeys: keys)
-            mgrPrefs.candidateKeys = keys
-            selSelectionKeys = mgrPrefs.candidateKeys
-          } catch mgrPrefs.CandidateKeyError.empty {
-            selSelectionKeys = mgrPrefs.candidateKeys
-          } catch {
-            if let window = ctlPrefUI.shared.controller.window {
-              let alert = NSAlert(error: error)
-              alert.beginSheetModal(for: window) { _ in
-                selSelectionKeys = mgrPrefs.candidateKeys
-              }
-              clsSFX.beep()
-            }
-          }
-        }
-        Text(
-          LocalizedStringKey(
-            "Choose or hit Enter to confim your prefered keys for selecting candidates."
-          )
-        )
-        .preferenceDescription()
-      }
       Preferences.Section(label: { Text(LocalizedStringKey("Cursor Selection:")) }) {
         Picker("", selection: $selCursorPosition) {
           Text(LocalizedStringKey("in front of the phrase (like macOS built-in Zhuyin IME)")).tag(0)

Source/UI/PrefUI/suiPrefPaneKeyboard.swift

@@ -10,6 +10,9 @@ import SwiftUI
 
 @available(macOS 11.0, *)
 struct suiPrefPaneKeyboard: View {
+  @State private var selSelectionKeysList = mgrPrefs.suggestedCandidateKeys
+  @State private var selSelectionKeys =
+    UserDefaults.standard.string(forKey: UserDef.kCandidateKeys.rawValue) ?? mgrPrefs.defaultCandidateKeys
   @State private var selMandarinParser = UserDefaults.standard.integer(forKey: UserDef.kMandarinParser.rawValue)
   @State private var selBasicKeyboardLayout: String =
     UserDefaults.standard.string(forKey: UserDef.kBasicKeyboardLayout.rawValue) ?? mgrPrefs.basicKeyboardLayout
@@ -40,6 +43,34 @@ struct suiPrefPaneKeyboard: View {
 
   var body: some View {
     Preferences.Container(contentWidth: contentWidth) {
+      Preferences.Section(label: { Text(LocalizedStringKey("Selection Keys:")) }) {
+        ComboBox(items: mgrPrefs.suggestedCandidateKeys, text: $selSelectionKeys).frame(width: 180).onChange(
+          of: selSelectionKeys
+        ) { value in
+          let keys: String = value.trimmingCharacters(in: .whitespacesAndNewlines).deduplicate
+          do {
+            try mgrPrefs.validate(candidateKeys: keys)
+            mgrPrefs.candidateKeys = keys
+            selSelectionKeys = mgrPrefs.candidateKeys
+          } catch mgrPrefs.CandidateKeyError.empty {
+            selSelectionKeys = mgrPrefs.candidateKeys
+          } catch {
+            if let window = ctlPrefUI.shared.controller.window {
+              let alert = NSAlert(error: error)
+              alert.beginSheetModal(for: window) { _ in
+                selSelectionKeys = mgrPrefs.candidateKeys
+              }
+              clsSFX.beep()
+            }
+          }
+        }
+        Text(
+          LocalizedStringKey(
+            "Choose or hit Enter to confim your prefered keys for selecting candidates."
+          )
+        )
+        .preferenceDescription()
+      }
       Preferences.Section(label: { Text(LocalizedStringKey("Phonetic Parser:")) }) {
         HStack {
           Picker("", selection: $selMandarinParser) {
@@ -181,7 +212,7 @@ struct suiPrefPaneKeyboard: View {
         VStack(alignment: .leading, spacing: 10) {
           Text(
             LocalizedStringKey(
-              "Non-QWERTY alphanumeral keyboard layouts are for Hanyu Pinyin parser only."
+              "Non-QWERTY alphanumerical keyboard layouts are for Hanyu Pinyin parser only."
             )
           )
           .preferenceDescription()

Source/WindowControllers/ctlPrefWindow.swift

@@ -375,7 +375,7 @@ extension ctlPrefWindow: NSToolbarDelegate {
             systemSymbolName: "wrench.and.screwdriver.fill", accessibilityDescription: "General Preferences"
           )
         } else {
-          item.image = NSImage(named: NSImage.homeTemplateName)
+          item.image = NSImage(named: "PrefToolbar-General")
         }
         item.action = #selector(showGeneralView(_:))
 
@@ -387,7 +387,7 @@ extension ctlPrefWindow: NSToolbarDelegate {
             systemSymbolName: "person.fill.questionmark", accessibilityDescription: "Experiences Preferences"
           )
         } else {
-          item.image = NSImage(named: NSImage.flowViewTemplateName)
+          item.image = NSImage(named: "PrefToolbar-Experiences")
         }
         item.action = #selector(showExperienceView(_:))
 
@@ -399,7 +399,7 @@ extension ctlPrefWindow: NSToolbarDelegate {
             systemSymbolName: "character.book.closed.fill", accessibilityDescription: "Dictionary Preferences"
           )
         } else {
-          item.image = NSImage(named: NSImage.bookmarksTemplateName)
+          item.image = NSImage(named: "PrefToolbar-Dictionary")
         }
         item.action = #selector(showDictionaryView(_:))
 
@@ -409,7 +409,7 @@ extension ctlPrefWindow: NSToolbarDelegate {
         if #available(macOS 11.0, *) {
           item.image = NSImage(systemSymbolName: "keyboard.macwindow", accessibilityDescription: "Keyboard Preferences")
         } else {
-          item.image = NSImage(named: NSImage.slideshowTemplateName)
+          item.image = NSImage(named: "PrefToolbar-Keyboard")
         }
         item.action = #selector(showKeyboardView(_:))
 

Update-Info.plist

@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.0</string>
+	<string>1.9.1</string>
 	<key>CFBundleVersion</key>
-	<string>1990</string>
+	<string>1991</string>
 	<key>UpdateInfoEndpoint</key>
 	<string>https://gitee.com/vchewing/vChewing-macOS/raw/main/Update-Info.plist</string>
 	<key>UpdateInfoSite</key>

vChewing.pkgproj

@@ -726,7 +726,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.9.0</string>
+				<string>1.9.1</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>

vChewing.xcodeproj/project.pbxproj

@@ -117,6 +117,7 @@
 		5BF9DA2A28840E6200DBD48E /* template-replacements.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5BF9DA2528840E6200DBD48E /* template-replacements.txt */; };
 		5BF9DA2B28840E6200DBD48E /* template-userphrases.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5BF9DA2628840E6200DBD48E /* template-userphrases.txt */; };
 		5BF9DA2D288427E000DBD48E /* template-associatedPhrases-cht.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5BF9DA2C2884247800DBD48E /* template-associatedPhrases-cht.txt */; };
+		5BF9EC1628A2BFC600333639 /* lmPlainBopomofo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF9EC1528A2BFC600333639 /* lmPlainBopomofo.swift */; };
 		5BFDF011289635C100417BBC /* ctlCandidateIMK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFDF010289635C100417BBC /* ctlCandidateIMK.swift */; };
 		6A187E2616004C5900466B2E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A187E2816004C5900466B2E /* MainMenu.xib */; };
 		6A225A1F23679F2600F685C6 /* NotarizedArchives in Resources */ = {isa = PBXBuildFile; fileRef = 6A225A1E23679F2600F685C6 /* NotarizedArchives */; };
@@ -333,6 +334,7 @@
 		5BF9DA2528840E6200DBD48E /* template-replacements.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; path = "template-replacements.txt"; sourceTree = "<group>"; usesTabs = 0; };
 		5BF9DA2628840E6200DBD48E /* template-userphrases.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; path = "template-userphrases.txt"; sourceTree = "<group>"; usesTabs = 0; };
 		5BF9DA2C2884247800DBD48E /* template-associatedPhrases-cht.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; lineEnding = 0; name = "template-associatedPhrases-cht.txt"; path = "../Data/components/cht/template-associatedPhrases-cht.txt"; sourceTree = "<group>"; };
+		5BF9EC1528A2BFC600333639 /* lmPlainBopomofo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = lmPlainBopomofo.swift; sourceTree = "<group>"; };
 		5BFDF010289635C100417BBC /* ctlCandidateIMK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ctlCandidateIMK.swift; sourceTree = "<group>"; };
 		5BFDF48C27B51867009523B6 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = "<group>"; };
 		6A0D4EA215FC0D2D00ABF4B3 /* vChewing.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = vChewing.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -432,6 +434,7 @@
 				5B407309281672610023DFFF /* lmAssociates.swift */,
 				5B887F2F2826AEA400B6651E /* lmCoreEX.swift */,
 				5B54E742283A7D89001ECBDC /* lmCoreNS.swift */,
+				5BF9EC1528A2BFC600333639 /* lmPlainBopomofo.swift */,
 				5B40730A281672610023DFFF /* lmReplacements.swift */,
 				5BA0DF2E2817857D009E73BB /* lmUserOverride.swift */,
 			);
@@ -1177,6 +1180,7 @@
 				5BA9FD1027FEDB6B002DE248 /* suiPrefPaneKeyboard.swift in Sources */,
 				5B3133BF280B229700A4A505 /* KeyHandler_States.swift in Sources */,
 				5B2170E1289FACAD00BE7304 /* 0_Megrez.swift in Sources */,
+				5BF9EC1628A2BFC600333639 /* lmPlainBopomofo.swift in Sources */,
 				5B3A87BC28597CDB0090E163 /* LMSymbolNode.swift in Sources */,
 				5BA9FD4327FEF3C8002DE248 /* Preferences.swift in Sources */,
 				5BA9FD4427FEF3C8002DE248 /* SegmentedControlStyleViewController.swift in Sources */,
@@ -1409,7 +1413,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1419,7 +1423,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.atelierInmu.vChewingTests;
@@ -1448,13 +1452,13 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.atelierInmu.vChewingTests;
@@ -1485,7 +1489,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				DEAD_CODE_STRIPPING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1506,7 +1510,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.atelierInmu.vChewing.vChewingPhraseEditor;
@@ -1535,7 +1539,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1552,7 +1556,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.atelierInmu.vChewing.vChewingPhraseEditor;
@@ -1666,7 +1670,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
@@ -1694,7 +1698,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = org.atelierInmu.inputmethod.vChewing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1721,7 +1725,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
@@ -1743,7 +1747,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.atelierInmu.inputmethod.vChewing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1765,7 +1769,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1785,7 +1789,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.atelierInmu.vChewing.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1807,7 +1811,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1990;
+				CURRENT_PROJECT_VERSION = 1991;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1821,7 +1825,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.9.0;
+				MARKETING_VERSION = 1.9.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.atelierInmu.vChewing.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";