Skip to content

Fix fundamental mistakes in handling dynamic layouts. #33

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
ShikiSuen merged 1 commit into from
Apr 12, 2023
Merged

Fix fundamental mistakes in handling dynamic layouts. #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Tekkon.Tests/Tekkon.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<ReleaseVersion>1.4.0</ReleaseVersion>
<ReleaseVersion>1.4.1</ReleaseVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Tekkon.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ Global
$0.DotNetNamingPolicy = $4
$4.DirectoryNamespaceAssociation = PrefixedHierarchical
$0.StandardHeader = $5
version = 1.4.0
version = 1.4.1
EndGlobalSection
EndGlobal
107 changes: 76 additions & 31 deletions Tekkon/Composer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,54 @@ public void UpdateRomajiBuffer() {
Semivowel.Value + Vowel.Value);
}

/// <summary>
/// 自我變換單個注音資料值。
/// </summary>
/// <param name="strOf">要取代的內容。</param>
/// <param name="strWith">要取代成的內容。</param>
private void FixValue(string strOf, string strWith) {
Phonabet theOld = new(strOf);
if (!string.IsNullOrEmpty(strOf)) {
switch (theOld.Type) {
case PhoneType.Consonant when Consonant.Value == theOld.Value:
Consonant.Clear();
break;
case PhoneType.Semivowel when Semivowel.Value == theOld.Value:
Semivowel.Clear();
break;
case PhoneType.Vowel when Vowel.Value == theOld.Value:
Vowel.Clear();
break;
case PhoneType.Intonation when Intonation.Value == theOld.Value:
Intonation.Clear();
break;
case PhoneType.Null:
return;
default:
return;
}
}
Phonabet theNew = new(strWith);
switch (theNew.Type) {
case PhoneType.Consonant:
Consonant = theNew;
break;
case PhoneType.Semivowel:
Semivowel = theNew;
break;
case PhoneType.Vowel:
Vowel = theNew;
break;
case PhoneType.Intonation:
Intonation = theNew;
break;
case PhoneType.Null:
return;
default:
return;
}
}

/// <summary>
/// 接受傳入的按鍵訊號時的處理，處理對象為 String。<br />
/// 另有同名函式可處理 UniChar 訊號。<br />
Expand Down Expand Up @@ -616,7 +664,7 @@ private string HandleETen26(string key = "") {
Vowel = new("ㄡ");
break;
case true:
Vowel = new("ㄆ");
Consonant = new("ㄆ");
break;
default:
Vowel = new("ㄡ");
Expand All @@ -630,12 +678,12 @@ private string HandleETen26(string key = "") {

if ("dfjk ".Contains(key) && !Consonant.IsEmpty && Semivowel.IsEmpty &&
Vowel.IsEmpty) {
Consonant.SelfReplace("ㄆ", "ㄡ");
Consonant.SelfReplace("ㄇ", "ㄢ");
Consonant.SelfReplace("ㄊ", "ㄤ");
Consonant.SelfReplace("ㄋ", "ㄣ");
Consonant.SelfReplace("ㄌ", "ㄥ");
Consonant.SelfReplace("ㄏ", "ㄦ");
FixValue("ㄆ", "ㄡ");
FixValue("ㄇ", "ㄢ");
FixValue("ㄊ", "ㄤ");
FixValue("ㄋ", "ㄣ");
FixValue("ㄌ", "ㄥ");
FixValue("ㄏ", "ㄦ");
}

// 後置修正
Expand Down Expand Up @@ -773,26 +821,23 @@ private string HandleHsu(string key = "") {

if ("dfjs ".Contains(key)) {
if (!Consonant.IsEmpty && Semivowel.IsEmpty && Vowel.IsEmpty) {
Consonant.SelfReplace("ㄍ", "ㄜ");
Consonant.SelfReplace("ㄋ", "ㄣ");
Consonant.SelfReplace("ㄌ", "ㄦ");
Consonant.SelfReplace("ㄎ", "ㄤ");
Consonant.SelfReplace("ㄇ", "ㄢ");
}
if (!Consonant.IsEmpty && Vowel.IsEmpty) {
Consonant.SelfReplace("ㄧ", "ㄝ");
FixValue("ㄍ", "ㄜ");
FixValue("ㄋ", "ㄣ");
FixValue("ㄌ", "ㄦ");
FixValue("ㄎ", "ㄤ");
FixValue("ㄇ", "ㄢ");
}
if (!Vowel.IsEmpty && "ㄢㄣㄤㄥ".Contains(Vowel.Value) &&
Semivowel.IsEmpty) {
Consonant.SelfReplace("ㄐ", "ㄓ");
Consonant.SelfReplace("ㄑ", "ㄔ");
Consonant.SelfReplace("ㄒ", "ㄕ");
FixValue("ㄐ", "ㄓ");
FixValue("ㄑ", "ㄔ");
FixValue("ㄒ", "ㄕ");
}
if (!Consonant.IsEmpty && "ㄐㄑㄒ".Contains(Consonant.Value) &&
Semivowel.IsEmpty) {
Consonant.SelfReplace("ㄐ", "ㄓ");
Consonant.SelfReplace("ㄑ", "ㄔ");
Consonant.SelfReplace("ㄒ", "ㄕ");
FixValue("ㄐ", "ㄓ");
FixValue("ㄑ", "ㄔ");
FixValue("ㄒ", "ㄕ");
}
if (Consonant.Value == "ㄏ" && Semivowel.IsEmpty && Vowel.IsEmpty) {
Consonant.Clear();
Expand Down Expand Up @@ -847,13 +892,13 @@ private string HandleStarlight(string key = "") {

if ("67890 ".Contains(key)) {
if (!Consonant.IsEmpty && Semivowel.IsEmpty && Vowel.IsEmpty) {
Consonant.SelfReplace("ㄈ", "ㄠ");
Consonant.SelfReplace("ㄍ", "ㄥ");
Consonant.SelfReplace("ㄎ", "ㄤ");
Consonant.SelfReplace("ㄌ", "ㄦ");
Consonant.SelfReplace("ㄇ", "ㄢ");
Consonant.SelfReplace("ㄋ", "ㄣ");
Consonant.SelfReplace("ㄊ", "ㄟ");
FixValue("ㄈ", "ㄠ");
FixValue("ㄍ", "ㄥ");
FixValue("ㄎ", "ㄤ");
FixValue("ㄌ", "ㄦ");
FixValue("ㄇ", "ㄢ");
FixValue("ㄋ", "ㄣ");
FixValue("ㄊ", "ㄟ");
}
}

Expand Down Expand Up @@ -1037,9 +1082,9 @@ private void CommonFixWhenHandlingDynamicArrangeInputs(
break;
case PhoneType.Vowel:
if (Semivowel.IsEmpty && !Consonant.IsEmpty) {
Consonant.SelfReplace("ㄐ", "ㄓ");
Consonant.SelfReplace("ㄑ", "ㄔ");
Consonant.SelfReplace("ㄒ", "ㄕ");
FixValue("ㄐ", "ㄓ");
FixValue("ㄑ", "ㄔ");
FixValue("ㄒ", "ㄕ");
}
break;
case PhoneType.Null:
Expand Down
8 changes: 4 additions & 4 deletions Tekkon/Tekkon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<CodePage>65001</CodePage>
<ReleaseVersion>1.4.0</ReleaseVersion>
<ReleaseVersion>1.4.1</ReleaseVersion>
<PackageId>vChewing.Tekkon</PackageId>
<Authors>Shiki Suen</Authors>
<Company>Atelier Inmu</Company>
<Copyright>(c) 2022 and onwards The vChewing Project (MIT-NTL License).</Copyright>
<RepositoryUrl>https://github.com/ShikiSuen/TekkonNT</RepositoryUrl>
<NeutralLanguage>zh-TW</NeutralLanguage>
<AssemblyVersion>1.4.0</AssemblyVersion>
<FileVersion>1.4.0</FileVersion>
<Version>1.4.0</Version>
<AssemblyVersion>1.4.1</AssemblyVersion>
<FileVersion>1.4.1</FileVersion>
<Version>1.4.1</Version>
<Product>Tekkon</Product>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down