Repo // Disabling pinyin-phonabet conversion in cassette mode. (#215)

- Also fix the separator conversion in handleCtrlCommandEnter().

Source/Modules/IMEStateData.swift

@@ -186,6 +186,7 @@ extension IMEStateData {
         arrOutput.append("??")
         continue
       }
+      if !PrefMgr.shared.cassetteEnabled {
         if PrefMgr.shared.showHanyuPinyinInCompositionBuffer,
           PrefMgr.shared.alwaysShowTooltipTextsHorizontally || !isVerticalTyping
         {
@@ -196,6 +197,7 @@ extension IMEStateData {
         } else {
           neta = Tekkon.cnvZhuyinChainToTextbookReading(target: neta)
         }
+      }
       arrOutput.append(neta)
     }
     return arrOutput.joined(separator: "\u{A0}")

Source/Modules/InputHandler_States.swift

@@ -291,14 +291,14 @@ extension InputHandler {
     let state = delegate.state
     guard state.type == .ofInputting else { return false }
 
-    var displayedText = compositor.keys.joined(separator: "-")
+    var displayedText = compositor.keys.joined(separator: " ")
-    if prefs.inlineDumpPinyinInLieuOfZhuyin {
+    if prefs.inlineDumpPinyinInLieuOfZhuyin, !prefs.cassetteEnabled {
       displayedText = Tekkon.restoreToneOneInZhuyinKey(target: displayedText)  // 恢復陰平標記
       displayedText = Tekkon.cnvPhonaToHanyuPinyin(target: displayedText)  // 注音轉拼音
     }
 
-    if !delegate.clientBundleIdentifier.contains("vChewingPhraseEditor") {
+    if delegate.clientBundleIdentifier.contains("vChewingPhraseEditor") {
-      displayedText = displayedText.replacingOccurrences(of: "-", with: " ")
+      displayedText = displayedText.replacingOccurrences(of: " ", with: "-")
     }
 
     delegate.switchState(IMEState.ofCommitting(textToCommit: displayedText))
@@ -318,6 +318,7 @@ extension InputHandler {
 
     for node in compositor.walkedNodes {
       var key = node.key
+      if !prefs.cassetteEnabled {
         if prefs.inlineDumpPinyinInLieuOfZhuyin {
           key = Tekkon.restoreToneOneInZhuyinKey(target: key)  // 恢復陰平標記
           key = Tekkon.cnvPhonaToHanyuPinyin(target: key)  // 注音轉拼音
@@ -326,6 +327,7 @@ extension InputHandler {
         } else {
           key = Tekkon.cnvZhuyinChainToTextbookReading(target: key, newSeparator: " ")
         }
+      }
 
       let value = node.value
       // 不要給標點符號等特殊元素加注音

Source/Modules/SessionCtl_IMKCandidatesData.swift

@@ -27,9 +27,11 @@ extension SessionCtl {
         var result = (theCandidate.1 == theConverted) ? theCandidate.1 : "\(theConverted)\u{1A}(\(theCandidate.1))"
         if arrResult.contains(result) {
           let reading: String =
-            PrefMgr.shared.showHanyuPinyinInCompositionBuffer
+            PrefMgr.shared.cassetteEnabled
+            ? theCandidate.0
+            : (PrefMgr.shared.showHanyuPinyinInCompositionBuffer
               ? Tekkon.cnvPhonaToHanyuPinyin(target: Tekkon.restoreToneOneInZhuyinKey(target: theCandidate.0))
-            : theCandidate.0
+              : theCandidate.0)
           result = "\(result)\u{17}(\(reading))"
         }
         arrResult.append(prefix + result)
@@ -85,8 +87,10 @@ extension SessionCtl {
         let theConverted = ChineseConverter.kanjiConversionIfRequired(neta.1)
         let netaShown = (neta.1 == theConverted) ? neta.1 : "\(theConverted)\u{1A}(\(neta.1))"
         let reading: String =
-          PrefMgr.shared.showHanyuPinyinInCompositionBuffer
+          PrefMgr.shared.cassetteEnabled
-          ? Tekkon.cnvPhonaToHanyuPinyin(target: Tekkon.restoreToneOneInZhuyinKey(target: neta.0)) : neta.0
+          ? neta.0
+          : (PrefMgr.shared.showHanyuPinyinInCompositionBuffer
+            ? Tekkon.cnvPhonaToHanyuPinyin(target: Tekkon.restoreToneOneInZhuyinKey(target: neta.0)) : neta.0)
         let netaShownWithPronunciation = "\(netaShown)\u{17}(\(reading))"
         if candidateString == prefix + netaShownWithPronunciation {
           indexDeducted = i