From 7af1fe699941eaf2fa8dbf784ae7e9d3b2ec663b Mon Sep 17 00:00:00 2001 From: Frank Lin Date: Mon, 6 Jul 2026 18:38:17 -0700 Subject: [PATCH] =?UTF-8?q?Fix=20=E6=89=98/=E8=A8=97=20candidate=20priorit?= =?UTF-8?q?y=20so=20=E6=89=98=20stays=20unconverted=20in=20s2t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 托 was defaulting to 託 for every unmatched occurrence, which is wrong for its "support/hold" and name-transliteration senses; swap the candidate order and backfill the phrase entries that keep the "entrust" sense of 託 working correctly. Detailed Changes: - **STCharacters.txt**: Swap the s2t candidate order for 托 from `託 托` to `托 託` so the character defaults to 托 (e.g. 托着, 茶托, 酒托, 狄托, 托津) instead of 託. - **STPhrases.txt**: Expand 托儿所 to `托兒所 託兒所`, and add the missing entrust-sense entries 托之空言 -> 託之空言 and 托物寓兴 -> 託物寓興 so they still convert to 託 despite the character-level default change. - **testcases.json**: Add BYVoid_OpenCC_Issue_1397 covering mixed 托/託 usages (names, 茶托, 托着) across s2t/s2tw/s2twp/s2hk, and BYVoid_OpenCC_Issue_1397_tuo_entrust_words covering 23 common entrust-sense 託 compounds. --- data/dictionary/STCharacters.txt | 2 +- data/dictionary/STPhrases.txt | 4 +++- test/testcases/testcases.json | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/data/dictionary/STCharacters.txt b/data/dictionary/STCharacters.txt index a1a95afb4..8ca05f317 100644 --- a/data/dictionary/STCharacters.txt +++ b/data/dictionary/STCharacters.txt @@ -729,7 +729,7 @@ 才 才 纔 扎 扎 紮 扑 撲 -托 託 托 +托 托 託 扣 扣 釦 执 執 扩 擴 diff --git a/data/dictionary/STPhrases.txt b/data/dictionary/STPhrases.txt index b90776ac8..9687c4af4 100644 --- a/data/dictionary/STPhrases.txt +++ b/data/dictionary/STPhrases.txt @@ -24260,6 +24260,7 @@ 扔回去 扔回去 扔回来 扔回來 扔在脑后 扔在腦後 +托之空言 託之空言 托买 託買 托了 託了 托事 託事 @@ -24270,7 +24271,7 @@ 托付 託付 托住 托住 托儿 托兒 -托儿所 託兒所 +托儿所 托兒所 託兒所 托克 托克 托克托 托克托 托克托县 托克托縣 @@ -24325,6 +24326,7 @@ 托洛茨基 托洛茨基 托派 託派 托熟 托熟 +托物寓兴 託物寓興 托特 托特 托瑞丝 托瑞絲 托瑞赛 托瑞賽 diff --git a/test/testcases/testcases.json b/test/testcases/testcases.json index 5bbc59bb8..5f8ba3714 100755 --- a/test/testcases/testcases.json +++ b/test/testcases/testcases.json @@ -1684,6 +1684,26 @@ "expected": { "s2twp": "晶片面積" } + }, + { + "id": "BYVoid_OpenCC_Issue_1397", + "input": "狄托、托津、大肃托、酒托、酒托儿、药托、药托儿，他的左手托着腮，右手托着茶托，思考着这些名字有什么共同之处", + "expected": { + "s2t": "狄托、托津、大肅托、酒托、酒托兒、藥托、藥托兒，他的左手托着腮，右手托着茶托，思考着這些名字有什麼共同之處", + "s2tw": "狄托、托津、大肅托、酒托、酒托兒、藥托、藥托兒，他的左手托著腮，右手托著茶托，思考著這些名字有什麼共同之處", + "s2twp": "狄托、托津、大肅托、酒托、酒托兒、藥托、藥托兒，他的左手托著腮，右手托著茶托，思考著這些名字有什麼共同之處", + "s2hk": "狄托、托津、大肅托、酒托、酒托兒、藥托、藥托兒，他的左手托着腮，右手托着茶托，思考着這些名字有什麼共同之處" + } + }, + { + "id": "BYVoid_OpenCC_Issue_1397_tuo_entrust_words", + "input": "信托、请托、属托、嘱托、交托、委托、托辞、托词、托之空言、受托、受人之托、所托非人、寄托、委托行、委托书、托物寓兴、依托、拜托、徒托空言、托梦、托附、托付、托管", + "expected": { + "s2t": "信託、請託、屬託、囑託、交託、委託、託辭、託詞、託之空言、受託、受人之託、所託非人、寄託、委託行、委託書、託物寓興、依託、拜託、徒託空言、託夢、託附、託付、託管", + "s2tw": "信託、請託、屬託、囑託、交託、委託、託辭、託詞、託之空言、受託、受人之託、所託非人、寄託、委託行、委託書、託物寓興、依託、拜託、徒託空言、託夢、託附、託付、託管", + "s2twp": "信託、請託、屬託、囑託、交託、委託、託辭、託詞、託之空言、受託、受人之託、所託非人、寄託、委託行、委託書、託物寓興、依託、拜託、徒託空言、託夢、託附、託付、託管", + "s2hk": "信託、請託、屬託、囑託、交託、委託、託辭、託詞、託之空言、受託、受人之託、所託非人、寄託、委託行、委託書、託物寓興、依託、拜託、徒託空言、託夢、託附、託付、託管" + } } ] }