SBP Update and Fixes

OpenUtau.Plugin.Builtin/BrazilianPortugueseCVCPhonemizer.cs

@@ -108,7 +108,14 @@ protected override List<string> ProcessEnding(Ending ending) {
 
         // change rh V -> r V
         // since rh is a VC only alias, r is used as their natural approximant to make CV connections, if it happens
-        protected override string ValidateAlias(string alias) {
+        protected override string ValidateAlias(string alias, int tone = 0) {
+            string baseResolved = base.ValidateAlias(alias, tone);
+            if (!string.IsNullOrEmpty(baseResolved) && baseResolved != alias) {
+                if (HasOto(baseResolved, tone)) {
+                    return baseResolved;
+                }
+                alias = baseResolved;
+            }
             foreach (var vowel in vowels) {
                 alias = alias.Replace("rh" + " " + vowel, "r" + " " + vowel);
             }

OpenUtau.Plugin.Builtin/ENtoJAPhonemizer.cs

@@ -460,5 +460,39 @@ private string ToHiragana(string romaji) {
             hiragana = hiragana.Replace("ゔ", "ヴ");
             return hiragana;
         }
+
+        // Endings has 50 ticks gap
+        protected override bool NoGap => true;
+
+        protected override double GetTransitionBasicLengthMs(string alias, int tone, PhonemeAttributes attr) {
+            double otoLength = GetTransitionBasicLengthMsByOto(alias, tone, attr);
+
+            var parts = alias.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            bool isVcv = false;
+
+            if (parts.Length == 2) {
+                var startingVowels = new[] { "a", "i", "u", "e", "o", "n", "N", "-" }; 
+                var endingVowels = vowels;
+
+                // First part must be a vowel (or a rest)
+                if (startingVowels.Contains(parts[0])) {
+                    string cv = parts[1];
+
+                    // Second part must end in a vowel (Romaji CV) OR be Japanese (Hiragana/Katakana)
+                    bool isRomajiVcv = endingVowels.Contains(cv.Last().ToString());
+                    bool isJapaneseVcv = cv.Any(c => c > 0xFF);
+
+                    if (isRomajiVcv || isJapaneseVcv) {
+                        isVcv = true;
+                    }
+                }
+            }
+
+            if (isVcv) {
+                return GetTransitionBasicLengthMsByConstant() * 1.0;
+            }
+
+            return otoLength;
+        }
     }
 }

OpenUtau.Plugin.Builtin/EStoJAPhonemizer.cs

@@ -669,5 +669,39 @@ private string ToHiragana(string romaji) {
             hiragana = hiragana.Replace("ゔ", "ヴ");
             return hiragana;
         }
+
+        // Endings has 50 ticks gap
+        protected override bool NoGap => true;
+
+        protected override double GetTransitionBasicLengthMs(string alias, int tone, PhonemeAttributes attr) {
+            double otoLength = GetTransitionBasicLengthMsByOto(alias, tone, attr);
+
+            var parts = alias.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            bool isVcv = false;
+
+            if (parts.Length == 2) {
+                var startingVowels = new[] { "a", "i", "u", "e", "o", "n", "N", "-" }; 
+                var endingVowels = vowels;
+
+                // First part must be a vowel (or a rest)
+                if (startingVowels.Contains(parts[0])) {
+                    string cv = parts[1];
+
+                    // Second part must end in a vowel (Romaji CV) OR be Japanese (Hiragana/Katakana)
+                    bool isRomajiVcv = endingVowels.Contains(cv.Last().ToString());
+                    bool isJapaneseVcv = cv.Any(c => c > 0xFF);
+
+                    if (isRomajiVcv || isJapaneseVcv) {
+                        isVcv = true;
+                    }
+                }
+            }
+
+            if (isVcv) {
+                return GetTransitionBasicLengthMsByConstant() * 1.0;
+            }
+
+            return otoLength;
+        }
     }
 }