Allow specifying converted tone1 in cnvHanyuPinyinToPhona(). (#56)

vChewing · Jul 22, 2022 · 4eb6d89 · 4eb6d89
1 parent 988ff6b
commit 4eb6d89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Sources/Tekkon/TekkonSyllableComposer.swift b/Sources/Tekkon/TekkonSyllableComposer.swift
@@ -895,9 +895,11 @@ public struct Tekkon {
   }
 
   /// 該函式用來將漢語拼音轉為注音。
-  /// - Parameter target: 要轉換的漢語拼音內容，要求必須帶有 12345 數字標調。
+  /// - Parameters:
+  ///   - target: 要轉換的漢語拼音內容，要求必須帶有 12345 數字標調。
+  ///   - newToneOne: 對陰平指定新的標記。預設情況下該標記為空字串。
   /// - Returns: 轉換結果。
-  static func cnvHanyuPinyinToPhona(target: String) -> String {
+  static func cnvHanyuPinyinToPhona(target: String, newToneOne: String = "") -> String {
     if target.contains("_") { return target }
     var result = target
     for key in Tekkon.mapHanyuPinyin.keys.sorted(by: { $0.count > $1.count }) {
@@ -906,7 +908,7 @@ public struct Tekkon {
     }
     for key in Tekkon.mapArayuruPinyinIntonation.keys.sorted(by: { $0.count > $1.count }) {
       guard let value = Tekkon.mapArayuruPinyinIntonation[key] else { continue }
-      result = result.replacingOccurrences(of: key, with: value)
+      result = result.replacingOccurrences(of: key, with: (key == "1") ? newToneOne : value)
     }
     return result
   }

diff --git a/Tests/TekkonTests/TekkonTests.swift b/Tests/TekkonTests/TekkonTests.swift
@@ -167,7 +167,7 @@ final class TekkonTests: XCTestCase {
     // Testing tool functions
     XCTAssertEqual(Tekkon.restoreToneOneInZhuyinKey(target: "ㄉㄧㄠ"), "ㄉㄧㄠ1")
     XCTAssertEqual(Tekkon.cnvZhuyinChainToTextbookReading(target: "ㄊㄧㄥ-ㄓㄜ˙"), "ㄊㄧㄥ-˙ㄓㄜ")
-    XCTAssertEqual(Tekkon.cnvHanyuPinyinToPhona(target: "jing3-gao4"), "ㄐㄧㄥˇ-ㄍㄠˋ")
+    XCTAssertEqual(Tekkon.cnvHanyuPinyinToPhona(target: "bian4-le5-tian1"), "ㄅㄧㄢˋ-ㄌㄜ˙-ㄊㄧㄢ")
   }
 
   func testHanyuinyinKeyReceivingAndCompositions() throws {