Skip to content

[pull] master from BYVoid:master#154

Merged
pull[bot] merged 2 commits into
backup999:masterfrom
BYVoid:master
Jun 12, 2026
Merged

[pull] master from BYVoid:master#154
pull[bot] merged 2 commits into
backup999:masterfrom
BYVoid:master

Conversation

@pull

@pull pull Bot commented Jun 12, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

frankslin and others added 2 commits June 11, 2026 12:30
…figs, with limited behavior cleanup (#1302)

* Refactor Japanese Shinjitai dictionaries on latest JP base

Merge the character-level Japanese variant data into JPShinjitaiCharacters.txt and remove the legacy JPVariants.txt source file. The reverse t2jp dictionary is now generated from JPShinjitaiCharacters.txt at build time, so CMake, Bazel, and GYP only maintain one authoritative character mapping source.

Replay this refactor on top of upstream master after 2de1f38, which imported the JPVariants.txt and JPShinjitaiCharacters.txt updates from danny0838's #494. The new upstream mappings are preserved by folding them into JPShinjitaiCharacters.txt in the jp2t direction, including the 常用漢字 and 人名用漢字 additions such as 併/倂, 挙/擧, 渋/澁, 闘/鬭, 鶏/鷄, and 麺/麵.

Keep the ambiguity fixes from the original refactor: remove the 両 -> 輛 candidate, keep 弁 to 辨/辯/瓣, and do not regenerate the 庄 -> 莊 or 棱 -> 棱 jp2t entries. This leaves 莊 and 棱 to reverse to the preferred 荘 and 稜 candidates when t2jp is generated.

Behavior was checked with scripts/compile_to_inline_config.py against the latest upstream base: t2jp has zero inline entry and conversion diffs, while jp2t only intentionally differs for 庄 (莊 -> 庄) plus the behavior-neutral removal of the 棱 self-mapping.

* Update CLI config descriptions for t2jp.json and jp2t.json
* 轉換更多日文新字體

* Fix test case (Is it a bad change?)

---------

Co-authored-by: Frank Lin <github@linshuang.info>
@pull pull Bot locked and limited conversation to collaborators Jun 12, 2026
@pull pull Bot added the ⤵️ pull label Jun 12, 2026
@pull pull Bot merged commit 7aecceb into backup999:master Jun 12, 2026
31 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants