Skip to content

F1: mixed Chinese/English typing without switching (rule-based) #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmanchu merged 4 commits into from
Sep 11, 2026
Merged

F1: mixed Chinese/English typing without switching (rule-based) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3e1e5e
feat(engine): add P1 zh/en mixed-typing rule engine (MixedScript)
Sep 9, 2026
bbf4c33
fix(mixedscript): make P1 zh/en mixed typing safe to daily-drive
Sep 10, 2026
aa37763
perf(mixedscript): do not load the Latin word lists unless the featur…
Sep 10, 2026
18a80a1
fix(mixedscript): gate on the standard layout; Tab over a rule-A run …
Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ACKNOWLEDGEMENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,11 @@
專案的[國字讀音整理檔](https://github.com/ButTaiwan/bpmfvs/tree/master/phonetic)，
該專案作者為 But Ko，採 Apache License v2.0 發布。

`Source/Data/latin-words.txt`（P1 中英混打詞典，見
`tools/lexicon/build_lexicon.py`）由 macOS 內建 `/usr/share/dict/words`
（symlink 至 `web2`）過濾產生。該檔案源自 Webster's Second International
Dictionary（1934 年版權已過期／公有領域，依 FreeBSD 隨附之
`/usr/share/dict/README` 所載），並由 FreeBSD 專案整理維護、隨 macOS base
system 附帶散布。`Source/Data/latin-tech-seed.txt` 為本專案原創整理的科技
詞彙補充清單，非衍生自任何第三方詞庫。

44 changes: 44 additions & 0 deletions McBopomofo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
D427F7C127908EFC004A2160 /* OpenCCBridge in Frameworks */ = {isa = PBXBuildFile; productRef = D427F7C027908EFC004A2160 /* OpenCCBridge */; };
D4314F0D2ED3690F0071DD71 /* NumberInputHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4314F0C2ED369090071DD71 /* NumberInputHelper.swift */; };
D436E23F2CD20BA700C6155D /* AssociatedPhrasesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D436E23E2CD20B9E00C6155D /* AssociatedPhrasesTests.swift */; };
D4E5C211AAA0020000000000 /* MixedScriptKeyHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4E5C211AAA0010000000000 /* MixedScriptKeyHandlerTests.swift */; };
D43737C92DF9C35800D9707C /* InputMethodController+KeyHandlerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43737C82DF9C35100D9707C /* InputMethodController+KeyHandlerDelegate.swift */; };
D43737CB2DF9C48300D9707C /* InputMethodController+CandidateControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43737CA2DF9C48200D9707C /* InputMethodController+CandidateControllerDelegate.swift */; };
D43FC40B2B23788400ED5A1C /* InputMacro.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43FC40A2B23788400ED5A1C /* InputMacro.swift */; };
Expand Down Expand Up @@ -100,6 +101,12 @@
D4F0BBE1279AF8B30071253C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4F0BBE0279AF8B30071253C /* AppDelegate.swift */; };
D4F0BBE4279B08900071253C /* BundleTranslocate.m in Sources */ = {isa = PBXBuildFile; fileRef = D4F0BBE3279B08900071253C /* BundleTranslocate.m */; };
D4F0BBE7279B14C20071253C /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = D4F0BBE9279B14C20071253C /* Credits.rtf */; };
63E0D55ACD1FA28E9F64F49B /* latin_lexicon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CC90804EAA7641938DC3B83D /* latin_lexicon.cpp */; };
D6FD5B282916AFE2667A8046 /* bopomofo_shape_tracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B80DBD7D5BD6BCE90ECA6C1 /* bopomofo_shape_tracker.cpp */; };
A27610A3C99B9E85AB623D3D /* mixed_script_tracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEBD03585016BECC3AB3FE4C /* mixed_script_tracker.cpp */; };
62A50DF1D7969D7D9E2FFE08 /* latin_passthrough_lm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB8B7ABAF7655B19CA15138 /* latin_passthrough_lm.cpp */; };
B9A05B79F74F515885326229 /* latin-words.txt in Resources */ = {isa = PBXBuildFile; fileRef = 36256C4C1622EACA909EB7DF /* latin-words.txt */; };
FB8203330A53BD667A2C127B /* latin-tech-seed.txt in Resources */ = {isa = PBXBuildFile; fileRef = 55A87E7319502E1CCA2FBE66 /* latin-tech-seed.txt */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -210,6 +217,7 @@
D427F7BF27908EAC004A2160 /* OpenCCBridge */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OpenCCBridge; path = Packages/OpenCCBridge; sourceTree = "<group>"; };
D4314F0C2ED369090071DD71 /* NumberInputHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberInputHelper.swift; sourceTree = "<group>"; };
D436E23E2CD20B9E00C6155D /* AssociatedPhrasesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssociatedPhrasesTests.swift; sourceTree = "<group>"; };
D4E5C211AAA0010000000000 /* MixedScriptKeyHandlerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixedScriptKeyHandlerTests.swift; sourceTree = "<group>"; };
D43737C82DF9C35100D9707C /* InputMethodController+KeyHandlerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "InputMethodController+KeyHandlerDelegate.swift"; sourceTree = "<group>"; };
D43737CA2DF9C48200D9707C /* InputMethodController+CandidateControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "InputMethodController+CandidateControllerDelegate.swift"; sourceTree = "<group>"; };
D43FC40A2B23788400ED5A1C /* InputMacro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputMacro.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -258,6 +266,16 @@
D4F0BBE8279B14C20071253C /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Base; path = Base.lproj/Credits.rtf; sourceTree = "<group>"; };
D4F0BBEA279B14CB0071253C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
D4F0BBEB279B14D00071253C /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "zh-Hant"; path = "zh-Hant.lproj/Credits.rtf"; sourceTree = "<group>"; };
2C006DFDF78FCBAF1BAF9FBF /* latin_lexicon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = latin_lexicon.h; sourceTree = "<group>"; };
CC90804EAA7641938DC3B83D /* latin_lexicon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = latin_lexicon.cpp; sourceTree = "<group>"; };
1C6C43C26CB979A81AA2EC85 /* bopomofo_shape_tracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bopomofo_shape_tracker.h; sourceTree = "<group>"; };
8B80DBD7D5BD6BCE90ECA6C1 /* bopomofo_shape_tracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = bopomofo_shape_tracker.cpp; sourceTree = "<group>"; };
043D7A68C6A4B5B2C6A49895 /* mixed_script_tracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mixed_script_tracker.h; sourceTree = "<group>"; };
CEBD03585016BECC3AB3FE4C /* mixed_script_tracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = mixed_script_tracker.cpp; sourceTree = "<group>"; };
D7678006783A3BCA47FDFDA4 /* latin_passthrough_lm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = latin_passthrough_lm.h; sourceTree = "<group>"; };
9BB8B7ABAF7655B19CA15138 /* latin_passthrough_lm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = latin_passthrough_lm.cpp; sourceTree = "<group>"; };
36256C4C1622EACA909EB7DF /* latin-words.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "latin-words.txt"; sourceTree = "<group>"; };
55A87E7319502E1CCA2FBE66 /* latin-tech-seed.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "latin-tech-seed.txt"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -370,6 +388,7 @@
children = (
6A4F5F8F2879E838008C4307 /* gramambular2 */,
6A0D4F1F15FC0EB100ABF4B3 /* Mandarin */,
549AED0136D2742DC96882C4 /* MixedScript */,
6ADF5B132BA513E000577D98 /* AssociatedPhrasesV2.cpp */,
6ADF5B182BA513E000577D98 /* AssociatedPhrasesV2.h */,
6A660A6F2EAF371000D53D7B /* ByteBlockBackedDictionary.cpp */,
Expand Down Expand Up @@ -431,10 +450,27 @@
6A833E4B2F0A0F7F0086AD0C /* bpmfvs-variants.txt */,
6A38BBF615FC117A00A8A51F /* data.txt */,
6AD7CBC715FE555000691B5B /* data-plain-bpmf.txt */,
36256C4C1622EACA909EB7DF /* latin-words.txt */,
55A87E7319502E1CCA2FBE66 /* latin-tech-seed.txt */,
);
path = Data;
sourceTree = "<group>";
};
549AED0136D2742DC96882C4 /* MixedScript */ = {
isa = PBXGroup;
children = (
1C6C43C26CB979A81AA2EC85 /* bopomofo_shape_tracker.h */,
8B80DBD7D5BD6BCE90ECA6C1 /* bopomofo_shape_tracker.cpp */,
2C006DFDF78FCBAF1BAF9FBF /* latin_lexicon.h */,
CC90804EAA7641938DC3B83D /* latin_lexicon.cpp */,
D7678006783A3BCA47FDFDA4 /* latin_passthrough_lm.h */,
9BB8B7ABAF7655B19CA15138 /* latin_passthrough_lm.cpp */,
043D7A68C6A4B5B2C6A49895 /* mixed_script_tracker.h */,
CEBD03585016BECC3AB3FE4C /* mixed_script_tracker.cpp */,
);
path = MixedScript;
sourceTree = "<group>";
};
6A4F5F8F2879E838008C4307 /* gramambular2 */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -516,6 +552,7 @@
isa = PBXGroup;
children = (
D436E23E2CD20B9E00C6155D /* AssociatedPhrasesTests.swift */,
D4E5C211AAA0010000000000 /* MixedScriptKeyHandlerTests.swift */,
D47D73A327A5D43900255A50 /* KeyHandlerBopomofoTests.swift */,
D4A8E43527A9E982002F7A07 /* KeyHandlerPlainBopomofoTests.swift */,
D485D3B82796A8A000657FF3 /* PreferencesTests.swift */,
Expand Down Expand Up @@ -695,6 +732,8 @@
6AD7CBC815FE555000691B5B /* data-plain-bpmf.txt in Resources */,
6A187E2616004C5900466B2E /* MainMenu.xib in Resources */,
D47D73A827A6C84F00255A50 /* associated-phrases-v2.txt in Resources */,
B9A05B79F74F515885326229 /* latin-words.txt in Resources */,
FB8203330A53BD667A2C127B /* latin-tech-seed.txt in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -764,6 +803,10 @@
6ADF5B192BA513E000577D98 /* AssociatedPhrasesV2.cpp in Sources */,
6ADF5B1B2BA513E000577D98 /* UTF8Helper.cpp in Sources */,
D41355D8278D74B5005E5CBD /* LanguageModelManager.mm in Sources */,
63E0D55ACD1FA28E9F64F49B /* latin_lexicon.cpp in Sources */,
D6FD5B282916AFE2667A8046 /* bopomofo_shape_tracker.cpp in Sources */,
A27610A3C99B9E85AB623D3D /* mixed_script_tracker.cpp in Sources */,
62A50DF1D7969D7D9E2FFE08 /* latin_passthrough_lm.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -783,6 +826,7 @@
files = (
D4A8E43627A9E982002F7A07 /* KeyHandlerPlainBopomofoTests.swift in Sources */,
D436E23F2CD20BA700C6155D /* AssociatedPhrasesTests.swift in Sources */,
D4E5C211AAA0020000000000 /* MixedScriptKeyHandlerTests.swift in Sources */,
D449AD5F2B393C00000C5812 /* InputMacroTests.swift in Sources */,
D4C2A9872B4309D700113711 /* UTF8HelperTest.mm in Sources */,
D47D73A427A5D43900255A50 /* KeyHandlerBopomofoTests.swift in Sources */,
Expand Down
Loading
Loading