Patch cnvHanyuPinyinToPhona.

Author: ShikiSuen

Sources/Tekkon/Tekkon_Utilities.swift

@@ -64,8 +64,9 @@ extension Tekkon {
     newToneOne: String = ""
   )
     -> String {
-    /// 如果當前內容有任何除了半形英數內容以外的內容的話，就直接放棄轉換。
-    if targetJoined.contains("_") || !targetJoined.isNotPureAlphanumerical { return targetJoined }
+    /// 如果當前內容含有底線或包含任何不在允許列表中的字元（英數、空白、Tab、連字號），則放棄轉換。
+    if targetJoined.contains("_") || targetJoined
+      .isNotAllowedCharOfPinyinChain { return targetJoined }
     var result = targetJoined
     for key in Tekkon.mapHanyuPinyin.keys.sorted(by: { $0.count > $1.count }) {
       guard let value = Tekkon.mapHanyuPinyin[key] else { continue }
@@ -81,23 +82,31 @@ extension Tekkon {
 
 /// 檢測字串是否包含半形英數內容
 extension String {
-  fileprivate var isNotPureAlphanumerical: Bool {
+  fileprivate var isNotAllowedCharOfPinyinChain: Bool {
     let x = unicodeScalars.map(\.value).filter {
+      // allowed: 0-9, A-Z, a-z, space(32), tab(9), dash(45)
       if $0 >= 48, $0 <= 57 { return false }
       if $0 >= 65, $0 <= 90 { return false }
       if $0 >= 97, $0 <= 122 { return false }
+      if $0 == 32 { return false } // space
+      if $0 == 9 { return false } // tab
+      if $0 == 45 { return false } // -
       return true
     }
     return !x.isEmpty
   }
 }
 
 extension Character {
-  fileprivate var isNotPureAlphanumerical: Bool {
+  fileprivate var isNotAllowedCharOfPinyinChain: Bool {
     let x = unicodeScalars.map(\.value).filter {
+      // allowed: 0-9, A-Z, a-z, space(32), tab(9), dash(45)
       if $0 >= 48, $0 <= 57 { return false }
       if $0 >= 65, $0 <= 90 { return false }
       if $0 >= 97, $0 <= 122 { return false }
+      if $0 == 32 { return false } // space
+      if $0 == 9 { return false } // tab
+      if $0 == 45 { return false } // -
       return true
     }
     return !x.isEmpty

Tests/TekkonTests/TekkonTests_Basic.swift

@@ -201,6 +201,7 @@ final class TekkonTestsBasic: XCTestCase {
     XCTAssertEqual(Tekkon.cnvPhonaToTextbookStyle(target: "ㄓㄜ˙"), "˙ㄓㄜ")
     XCTAssertEqual(Tekkon.cnvPhonaToHanyuPinyin(targetJoined: "ㄍㄢˋ"), "gan4")
     XCTAssertEqual(Tekkon.cnvHanyuPinyinToTextbookStyle(targetJoined: "起(qi3)居(ju1)"), "起(qǐ)居(jū)")
+    XCTAssertEqual(Tekkon.cnvHanyuPinyinToPhona(targetJoined: "bian4"), "ㄅㄧㄢˋ")
     XCTAssertEqual(Tekkon.cnvHanyuPinyinToPhona(targetJoined: "bian4-le5-tian1"), "ㄅㄧㄢˋ-ㄌㄜ˙-ㄊㄧㄢ")
     // 測試這種情形：「如果傳入的字串不包含任何半形英數內容的話，那麼應該直接將傳入的字串原樣返回」。
     XCTAssertEqual(Tekkon.cnvHanyuPinyinToPhona(targetJoined: "ㄅㄧㄢˋ-˙ㄌㄜ-ㄊㄧㄢ"), "ㄅㄧㄢˋ-˙ㄌㄜ-ㄊㄧㄢ")