Merge pull request #773 from lottev1991/patch-37

[EN DELTA] Starting CC + ValidateAlias refinement
stakira · Jul 28, 2023 · 1fe180e · 1fe180e
2 parents 3fd2f8a + 612fa89
commit 1fe180e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/OpenUtau.Plugin.Builtin/ENDeltaPhonemizer.cs b/OpenUtau.Plugin.Builtin/ENDeltaPhonemizer.cs
@@ -150,7 +150,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
                     // try RCC
                     for (var i = cc.Length; i > 1; i--) {
                         if (TryAddPhoneme(phonemes, syllable.tone, $"- {string.Join("", cc.Take(i))}")) {
-                            firstC = i;
+                            firstC = i - 1;
                             break;
                         }
                     }
@@ -551,12 +551,12 @@ protected override string ValidateAlias(string alias) {
             }
             foreach (var consonant in new[] { "b" }) {
                 foreach (var vowel in new[] { "V" } ) {
-                    alias = alias.Replace(consonant + vowel, consonant + "A");
+                    alias = alias.Replace(consonant + vowel, consonant + "@");
                 }
             }
-            foreach (var vowel in new[] { "V " }) {
+            foreach (var vowel in new[] { "@ " }) {
                 foreach (var consonant in new[] { "b" } ) {
-                    alias = alias.Replace("V " + consonant, "A " + consonant);
+                    alias = alias.Replace("@ " + consonant, "@ " + consonant);
                 }
             }
             foreach (var vowel in new[] { "a" }) {
@@ -618,7 +618,7 @@ protected override string ValidateAlias(string alias) {
                 alias = alias.Replace(consonant, "3 ");
             }
             foreach (var vowel in new[] { "V" }) {
-                alias = alias.Replace(vowel, "A");
+                alias = alias.Replace(vowel, "@");
             }
             foreach (var CC in new[] { "T " }) {
                 alias = alias.Replace(CC, "f ");