From 0d157c2d322de39428c0363401491697490c50e6 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Thu, 30 Jun 2022 20:49:36 +0800
Subject: [PATCH] KeyHandler // Simplify handleCtrlOptionCommandEnter().

---
 Source/Modules/ControllerModules/KeyHandler_States.swift | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Source/Modules/ControllerModules/KeyHandler_States.swift b/Source/Modules/ControllerModules/KeyHandler_States.swift
index 2696b2d6..49dacb0e 100644
--- a/Source/Modules/ControllerModules/KeyHandler_States.swift
+++ b/Source/Modules/ControllerModules/KeyHandler_States.swift
@@ -399,7 +399,7 @@ extension KeyHandler {
 
     for theAnchor in walkedAnchors {
       if let node = theAnchor.node {
-        var key = node.currentKeyValue.key
+        var key = node.key
         if mgrPrefs.inlineDumpPinyinInLieuOfZhuyin {
           key = restoreToneOneInZhuyinKey(target: key)  // 恢復陰平標記
           key = Tekkon.cnvPhonaToHanyuPinyin(target: key)  // 注音轉拼音
@@ -410,11 +410,8 @@ extension KeyHandler {
         }
 
         let value = node.currentKeyValue.value
-        if key.contains("_") {  // 不要給標點符號等特殊元素加注音
-          composed += value
-        } else {
-          composed += "<ruby>\(value)<rp>(</rp><rt>\(key)</rt><rp>)</rp></ruby>"
-        }
+        // 不要給標點符號等特殊元素加注音
+        composed += key.contains("_") ? value : "<ruby>\(value)<rp>(</rp><rt>\(key)</rt><rp>)</rp></ruby>"
       }
     }