Skip to content
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

Add Support for VV Split Fallback for Xsampa vb's especially to Delta 5 vbs #1077

Merged
merged 1 commit into from
Mar 28, 2024
Merged

Add Support for VV Split Fallback for Xsampa vb's especially to Delta 5 vbs #1077

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
70 changes: 63 additions & 7 deletions OpenUtau.Plugin.Builtin/EnXSampaPhonemizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
Expand Down Expand Up @@ -99,6 +99,42 @@ public class EnXSampaPhonemizer : SyllableBasedPhonemizer {

private bool isVelarNasalFallback = false;

private readonly Dictionary<string, string> vvExceptions =
new Dictionary<string, string>() {
{"aI","j"},
{"eI","j"},
{"OI","j"},
{"aU","w"},
{"oU","w"},
{"VI","j"},
{"VU","w"},
{"@U","w"},
{"ai","j"},
{"Oi","j"},
{"au","w"},
{"ou","w"},
{"Ou","w"},
{"@u","w"},
{"3", "r"}
};
private readonly Dictionary<string, string> Delta5vvExceptions =
new Dictionary<string, string>() {
{"aI","I"},
{"eI","I"},
{"OI","I"},
{"aU","U"},
{"oU","U"},
{"VI","I"},
{"VU","U"},
{"@U","U"},
{"ai","i"},
{"Oi","i"},
{"au","u"},
{"ou","u"},
{"Ou","u"},
{"@u","u"},
{"3", "r"}
};
protected override string[] GetVowels() => vowels;
protected override string[] GetConsonants() => consonants;
protected override string GetDictionaryName() => "cmudict-0_7b.txt";
Expand Down Expand Up @@ -209,15 +245,35 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
basePhoneme = v;
}
} else if (syllable.IsVV) {
var vv = $"{prevV} {v}";
if (!CanMakeAliasExtension(syllable)) {
if (HasOto(vv, syllable.vowelTone) || HasOto(ValidateAlias(vv), syllable.vowelTone)) {
basePhoneme = vv;
} else {
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) {
// VV splits to [V C][CV] or [V][V]
var delta5vc = $"{Delta5vvExceptions[prevV]}";
bool CV = false;
if (!HasOto(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)) {
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;
}
}
}
} else {
// the previous alias will be extended
// Previous alias will extend
basePhoneme = null;
}
} else if (syllable.IsStartingCVWithOneConsonant) {
Expand Down