Skip to content

[EN ARPA+] & [FIL VCV & CVVC] CCV fix #1837

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

Open
Cadlaxa wants to merge 36 commits into
base: master
Choose a base branch
from
Open

[EN ARPA+] & [FIL VCV & CVVC] CCV fix #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1d60a9a
replacement supports merging and splitting phonemes
Cadlaxa May 14, 2025
9e64dbb
fixes to de vccv test file
Cadlaxa May 14, 2025
308a171
en arpa+ cc fix
Cadlaxa May 16, 2025
85cdc29
update vccv dictionary
Cadlaxa May 19, 2025
2e9b3b1
fix
Cadlaxa May 19, 2025
820ef5c
ending fix
Cadlaxa May 19, 2025
0aa600a
Update njokis phonemizer
Cadlaxa May 20, 2025
8b4fd1b
[EN ARPA+] fixes to ending vc's with one/more cons
Cadlaxa May 31, 2025
803b7b4
[EN ARPA+] more ending cc variations
Cadlaxa May 31, 2025
1f9782a
[EN ARPA+] minor cons timing adjustment
Cadlaxa Jun 1, 2025
223c5f1
[EN XSAMPA] fix phoneme conflicts to the default template
Cadlaxa Jul 15, 2025
258780d
ReplacePhoneme will validate phonemes first before replacing
Cadlaxa Jul 15, 2025
7ae7db7
Merge branch 'master' of https://github.com/stakira/OpenUtau into sbp…
Cadlaxa Aug 4, 2025
fe483eb
[EN ARPA+ & EN XSAMPA] fixes to cc's
Cadlaxa Aug 5, 2025
fe49cc3
[EN XSAMPA] exceptions to single consonant affricates
Cadlaxa Aug 6, 2025
9b79334
[EN C+V] add a way to define diphthong vowels and customize them
Cadlaxa Aug 8, 2025
59ae184
[EN C+V] fix VCC endings and proper AliasFormat for diphthongs
Cadlaxa Aug 8, 2025
fe4aa0b
[EN XSAMPA] make vowel endings ends with 0.5 ms
Cadlaxa Aug 9, 2025
a2c06fe
Add support for trailing vc- and cc-
Cadlaxa Aug 15, 2025
1cfef51
update to en vccv template
Cadlaxa Aug 17, 2025
aa8dbf3
[EN XSAMPA] support vowel stationaries
Cadlaxa Aug 29, 2025
8caef47
[ARPA+] add ValidateAlias on starting C's
Cadlaxa Aug 31, 2025
7438831
[ARPA+] more validation
Cadlaxa Sep 1, 2025
80d0c8b
[ARPA+] small fixes
Cadlaxa Sep 1, 2025
b730d69
[EN ARPA+] starting C validation fix
Cadlaxa Sep 6, 2025
e99e804
Yaml versioning for new template
Cadlaxa Sep 7, 2025
d7c2148
fix log error clogs log file
Cadlaxa Sep 7, 2025
ca93de7
[EN VCCV] yaml template fix
Cadlaxa Sep 7, 2025
45c9157
[EN C+V] Tempate fixes
Cadlaxa Sep 22, 2025
53d4893
[EN C+V] trailing ending fix
Cadlaxa Sep 27, 2025
3ead721
Reworked phoneme timings
Cadlaxa Sep 27, 2025
2d6c491
Merge branch 'master' of https://github.com/stakira/OpenUtau into sbp…
Cadlaxa Sep 27, 2025
8886e9d
load tails from yaml file
Cadlaxa Oct 23, 2025
986d51c
Merge branch 'master' of https://github.com/stakira/OpenUtau into sbp…
Cadlaxa Nov 20, 2025
fce739c
[EN ARPA+] & [FIL VCV & CVVC] CCV fix
Cadlaxa Nov 20, 2025
9da694f
fixes to consonant fallbacks
Cadlaxa Nov 22, 2025
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
17 changes: 12 additions & 5 deletions OpenUtau.Plugin.Builtin/ArpasingPlusPhonemizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ArpasingPlusPhonemizer : SyllableBasedPhonemizer {
"aam", "am", "axm", "aem", "ahm", "aom", "om", "awm", "aum", "aym", "aim", "ehm", "em", "eym", "eim", "ihm", "iym", "im", "owm", "oum", "oym", "oim", "uhm", "uwm", "um", "oh",
"eu", "oe", "yw", "yx", "wx", "ox", "ex", "ea", "ia", "oa", "ua", "ean", "eam", "eang"
};
private readonly string[] consonants = "b,ch,d,dh,dr,dx,f,g,hh,jh,k,l,m,n,nx,ng,p,q,r,s,sh,t,th,tr,v,w,y,z,zh".Split(',');
private string[] consonants = "".Split(',');
private static string[] affricate = "".Split(',');
private static string[] fricative = "".Split(',');
private static string[] aspirate = "".Split(',');
Expand Down Expand Up @@ -58,7 +58,7 @@ public class ArpasingPlusPhonemizer : SyllableBasedPhonemizer {
private bool isMissingVPhonemes = false;

// For banks with missing custom consonants
private readonly Dictionary<string, string> missingCphonemes = "nx=n,tx=t,dx=d,zh=sh,z=s,ng=n,cl=q,vf=q,dd=d,lx=l".Split(',')
private readonly Dictionary<string, string> missingCphonemes = "nx=n,tx=t,dx=d,zh=sh,z=s,cl=q,vf=q,dd=d,lx=l".Split(',')
.Select(entry => entry.Split('='))
.Where(parts => parts.Length == 2)
.Where(parts => parts[0] != parts[1])
Expand Down Expand Up @@ -385,6 +385,13 @@ public override void SetSinger(USinger singer) {
stop = stops.Distinct().ToArray();
tap = taps.Distinct().ToArray();
affricate = affricates.Distinct().ToArray();
consonants = fricative.Concat(aspirate)
.Concat(semivowel)
.Concat(liquid)
.Concat(nasal)
.Concat(stop)
.Concat(tap)
.Concat(affricate).Distinct().ToArray();

// Load replacements
try {
Expand Down Expand Up @@ -623,7 +630,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
/// CCV and CV
if (HasOto(ccv, syllable.vowelTone) || HasOto(ValidateAlias(ccv), syllable.vowelTone) || HasOto(ccv1, syllable.vowelTone) || HasOto(ValidateAlias(ccv1), syllable.vowelTone) && !ccvException.Contains(cc[0])) {
basePhoneme = AliasFormat($"{string.Join("", cc)} {v}", "dynMid", syllable.vowelTone, "");
//lastC = 0;
lastC = 0;
} else if (HasOto(crv, syllable.vowelTone) || HasOto(ValidateAlias(crv), syllable.vowelTone) || HasOto(crv1, syllable.vowelTone) || HasOto(ValidateAlias(crv1), syllable.vowelTone)) {
basePhoneme = AliasFormat($"{cc.Last()} {v}", "dynMid", syllable.vowelTone, "");
} else {
Expand Down Expand Up @@ -657,7 +664,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
var ccv = $"{string.Join("", cc)} {v}";
var ccv1 = $"{string.Join("", cc)}{v}";
/// CCV
if (CurrentWordCc.Length >= 2 && !ccvException.Contains(cc[i])) {
if (CurrentWordCc.Length >= 2) {
if (HasOto(ccv, syllable.vowelTone) || HasOto(ValidateAlias(ccv), syllable.vowelTone) || HasOto(ccv1, syllable.vowelTone) || HasOto(ValidateAlias(ccv1), syllable.vowelTone)) {
basePhoneme = AliasFormat($"{string.Join("", cc)} {v}", "dynMid", syllable.vowelTone, "");
lastC = i;
Expand Down Expand Up @@ -722,7 +729,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
var vc = $"{prevV} {cc[0]}";
// Boolean Triggers
bool CCV = false;
if (CurrentWordCc.Length >= 2 && !ccvException.Contains(cc[0])) {
if (CurrentWordCc.Length >= 2) {
if (HasOto(AliasFormat($"{string.Join("", cc)} {v}", "dynMid", syllable.vowelTone, ""), syllable.vowelTone)) {
CCV = true;
}
Expand Down
13 changes: 10 additions & 3 deletions OpenUtau.Plugin.Builtin/FilipinoPhonemizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class FilipinoPhonemizer : SyllableBasedPhonemizer {
private string[] vowels = {
"a", "e", "i", "o", "u", "ay", "ey", "oy", "uy", "aw", "ew", "ow", "iw"
};
private readonly string[] consonants = "b,ch,d,dh,f,g,hh,jh,k,l,m,n,ng,p,q,r,s,sh,t,th,v,w,y,z,zh".Split(',');
private string[] consonants = "".Split(',');
private static string[] affricate = "".Split(',');
private static string[] fricative = "".Split(',');
private static string[] aspirate = "".Split(',');
Expand Down Expand Up @@ -350,6 +350,13 @@ public override void SetSinger(USinger singer) {
stop = stops.Distinct().ToArray();
tap = taps.Distinct().ToArray();
affricate = affricates.Distinct().ToArray();
consonants = fricative.Concat(aspirate)
.Concat(semivowel)
.Concat(liquid)
.Concat(nasal)
.Concat(stop)
.Concat(tap)
.Concat(affricate).Distinct().ToArray();
// Load replacements
try {
if (data?.replacements != null && data.replacements.Any() == true) {
Expand Down Expand Up @@ -571,7 +578,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
/// CCV and CV
if (HasOto(ccv, syllable.vowelTone) || HasOto(ValidateAlias(ccv), syllable.vowelTone) || HasOto(ccv1, syllable.vowelTone) || HasOto(ValidateAlias(ccv1), syllable.vowelTone) && !ccvException.Contains(cc[0])) {
basePhoneme = AliasFormat($"{string.Join("", cc)} {v}", "dynMid", syllable.vowelTone, "");
//lastC = 0;
lastC = 0;
} else if (HasOto(crv, syllable.vowelTone) || HasOto(ValidateAlias(crv), syllable.vowelTone) || HasOto(crv1, syllable.vowelTone) || HasOto(ValidateAlias(crv1), syllable.vowelTone)) {
basePhoneme = AliasFormat($"{cc.Last()} {v}", "dynMid", syllable.vowelTone, "");
} else {
Expand Down Expand Up @@ -647,7 +654,7 @@ protected override List<string> ProcessSyllable(Syllable syllable) {
var ccv = $"{string.Join("", cc)} {v}";
var ccv1 = $"{string.Join("", cc)}{v}";
/// CCV
if (CurrentWordCc.Length >= 2 && !ccvException.Contains(cc[i])) {
if (CurrentWordCc.Length >= 2) {
if (HasOto(ccv, syllable.vowelTone) || HasOto(ValidateAlias(ccv), syllable.vowelTone) || HasOto(ccv1, syllable.vowelTone) || HasOto(ValidateAlias(ccv1), syllable.vowelTone)) {
basePhoneme = AliasFormat($"{string.Join("", cc)} {v}", "dynMid", syllable.vowelTone, "");
lastC = i;
Expand Down
Loading