Merge pull request #1101 from lottev1991/EnXSampaVowelFix

[EN X-SAMPA] Vowel fallback bug fixes
stakira · Apr 20, 2024 · 26a32e6 · 26a32e6
2 parents 3ecb771 + 8ece5df
commit 26a32e6
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/OpenUtau.Plugin.Builtin/EnXSampaPhonemizer.cs b/OpenUtau.Plugin.Builtin/EnXSampaPhonemizer.cs
@@ -214,7 +214,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
                 isVocaSampa = true;
             }
 
-            if (!HasOto($"- V", syllable.vowelTone) && !HasOto($"V", syllable.vowelTone)) {
+            if (!HasOto($"- V", syllable.vowelTone) && !HasOto($"V", syllable.vowelTone) || (!HasOto($"- bV", syllable.vowelTone) && !HasOto($"bV", syllable.vowelTone))) {
                 isSimpleDelta = true;
             }
 
@@ -230,7 +230,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
                 isTrueXSampa = true;
             }
 
-            if ((!HasOto($"- 3", syllable.tone) && !HasOto($"3", syllable.tone)) || (!HasOto($"- @`", syllable.tone) && !HasOto($"@`", syllable.tone))) {
+            if (!HasOto($"- 3", syllable.tone) && !HasOto($"3", syllable.tone) && !HasOto($"- @`", syllable.tone) && !HasOto($"@`", syllable.tone)) {
                 isSalemList = true;
             }
 
@@ -245,31 +245,30 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
                     basePhoneme = v;
                 }
             } else if (syllable.IsVV) {
-                if (!CanMakeAliasExtension(syllable) || !AreTonesFromTheSameSubbank(syllable.tone, syllable.vowelTone)) {
-                    basePhoneme = $"{prevV} {v}";
-                    if (!HasOto(basePhoneme, syllable.vowelTone) && vvExceptions.ContainsKey(prevV) && prevV != v || Delta5vvExceptions.ContainsKey(prevV) && prevV != v) {
+                if (!CanMakeAliasExtension(syllable)) {
+                    var vv = $"{prevV} {v}";
+                    basePhoneme = vv;
+                    if (!HasOto(vv, syllable.vowelTone) && !HasOto(ValidateAlias(vv), syllable.vowelTone) && (vvExceptions.ContainsKey(prevV) && prevV != v || Delta5vvExceptions.ContainsKey(prevV) && prevV != v)) {
                         // VV splits to [V C][CV] or [V][V]
                         var delta5vc = $"{Delta5vvExceptions[prevV]}";
                         bool CV = false;
-                        if (!HasOto(delta5vc, syllable.vowelTone)) {
+                        if ((!HasOto(delta5vc, syllable.vowelTone) && !HasOto(ValidateAlias(delta5vc), syllable.vowelTone))) {
                             delta5vc = $"{prevV} {vvExceptions[prevV]}";
                             CV = true;
                         }
                         phonemes.Add(delta5vc);
                         // if delta5 vc is not available, turn v to cv
                         var cv = $"{vvExceptions[prevV]}{v}";
                         basePhoneme = v;
-                        if (CV && HasOto(cv, syllable.vowelTone)) {
+                        if (CV && (HasOto(cv, syllable.vowelTone) || HasOto(ValidateAlias(cv), syllable.vowelTone))) {
                             basePhoneme = cv;
                         }
                     } else {
-                        {
-                            // VV to V
-                            if (HasOto($"{prevV} {v}", syllable.vowelTone) || HasOto(ValidateAlias($"{prevV} {v}"), syllable.vowelTone)) {
-                                basePhoneme = $"{prevV} {v}";
-                            } else if (HasOto(v, syllable.vowelTone) || HasOto(ValidateAlias(v), syllable.vowelTone)) {
-                                basePhoneme = v;
-                            }
+                        // VV to V
+                        if (HasOto(vv, syllable.vowelTone) || HasOto(ValidateAlias(vv), syllable.vowelTone)) {
+                            basePhoneme = vv;
+                        } else if (HasOto(v, syllable.vowelTone) || HasOto(ValidateAlias(v), syllable.vowelTone)) {
+                            basePhoneme = v;
                         }
                     }
                 } else {
@@ -357,8 +356,9 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
                     basePhoneme = vccv;
                     lastC = 0;
                 } else {
-                    basePhoneme = cc.Last() + v;
-                    if (!HasOto(cc.Last() + v, syllable.vowelTone) && (HasOto(crv, syllable.vowelTone) || HasOto(ValidateAlias(crv), syllable.vowelTone))) {
+                    var cv = cc.Last() + v;
+                    basePhoneme = cv;
+                    if ((!HasOto(cv, syllable.vowelTone) && !HasOto(ValidateAlias(cv), syllable.vowelTone)) && (HasOto(crv, syllable.vowelTone) || HasOto(ValidateAlias(crv), syllable.vowelTone))) {
                         basePhoneme = crv;
                     }
                     // try CCV