Skip to content

Commit 352430a

Browse files
committed
Fix end breath + update C# lang version
1 parent ae21338 commit 352430a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,6 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
524524
} else {
525525
TNLconsonant = "ss";
526526
}
527-
528527
}
529528

530529
if ((TCLfinal == "K") && (TNLconsonant == "r") || (TCLfinal == "P") && (TNLconsonant == "r") || (TCLfinal == "T") && (TNLconsonant == "r")) {
@@ -1059,6 +1058,9 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
10591058
if (prevExist && TPLfinal == "" && vowEnd.Contains(currentLyric)) {
10601059
endBreath = $"{TPLplainvowel} {vowEnd}";
10611060
prevIsBreath = true; // to prevent this→→ case→→, for example... "[사, -, 사 (=notes)]" should be "[- sa, a -, - sa(=phonemes)]", but it becomes [sa, a -, 사(=phonemes)] in phonemizer, so '사' note becomes *no sound.
1061+
} else if (prevExist && TPLfinal != "" && vowEnd.Contains(currentLyric)) {
1062+
endBreath = $"{TPLplainfinal} {vowEnd}";
1063+
prevIsBreath = true; // to prevent this→→ case→→, for example... "[사, -, 사 (=notes)]" should be "[- sa, a -, - sa(=phonemes)]", but it becomes [sa, a -, 사(=phonemes)] in phonemizer, so '사' note becomes *no sound.
10621064
}
10631065

10641066
if (singer.TryGetMappedOto(endBreath, note.tone + attr0.toneShift, attr0.voiceColor, out var oto)) {
@@ -1202,7 +1204,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
12021204
consonant = "y";
12031205
} else if (nextLyric.StartsWith("w")) {
12041206
consonant = "w";
1205-
} else if (nextExist && nextHangeul && nextLyric.StartsWith("ㄹ")) {
1207+
} else if (nextExist && nextHangeul && nextLyric.StartsWith("ㄹ")) {
12061208
TNLconsonant = "l";
12071209
consonant = TNLconsonant;
12081210
} else if (nextExist && nextHangeul && nextLyric.StartsWith("1") && TNLconsonant == "p") {
@@ -1314,4 +1316,4 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
13141316
};
13151317
}
13161318
}
1317-
}
1319+
}

KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<RootNamespace>KoreanCVVCPlusPhonemizer</RootNamespace>
1111
<AssemblyName>KoreanCVVCPlusPhonemizer</AssemblyName>
1212
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
13+
<LangVersion>preview</LangVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<Deterministic>true</Deterministic>
1516
</PropertyGroup>

0 commit comments

Comments
 (0)