From 612fa898dd178e4f3dca4094928e3fc5b87b7f30 Mon Sep 17 00:00:00 2001
From: Lotte V <61566058+lottev1991@users.noreply.github.com>
Date: Tue, 11 Jul 2023 19:49:38 +0200
Subject: [PATCH] CC + ValidateAlias refinement

---
 OpenUtau.Plugin.Builtin/ENDeltaPhonemizer.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/ENDeltaPhonemizer.cs b/OpenUtau.Plugin.Builtin/ENDeltaPhonemizer.cs
index b235dc48f..a69dee48f 100644
--- 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 ");