Fix end breath + update C# lang version

lottev1991 · Oct 20, 2023 · 352430a · 352430a
1 parent ae21338
commit 352430a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.cs b/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.cs
@@ -524,7 +524,6 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                             } else {
                                 TNLconsonant = "ss";
                             }
-
                         }
 
                         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
                 if (prevExist && TPLfinal == "" && vowEnd.Contains(currentLyric)) {
                     endBreath = $"{TPLplainvowel} {vowEnd}";
                     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.
+                } else if (prevExist && TPLfinal != "" && vowEnd.Contains(currentLyric)) {
+                    endBreath = $"{TPLplainfinal} {vowEnd}";
+                    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.
                 }
 
                 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
                     consonant = "y";
                 } else if (nextLyric.StartsWith("w")) {
                     consonant = "w";
-                } else if (nextExist && nextHangeul && nextLyric.StartsWith("ㄹ")) { 
+                } else if (nextExist && nextHangeul && nextLyric.StartsWith("ㄹ")) {
                     TNLconsonant = "l";
                     consonant = TNLconsonant;
                 } 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
             };
         }
     }
-}
+}
diff --git a/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.csproj b/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.csproj
@@ -10,6 +10,7 @@
     <RootNamespace>KoreanCVVCPlusPhonemizer</RootNamespace>
     <AssemblyName>KoreanCVVCPlusPhonemizer</AssemblyName>
     <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <LangVersion>preview</LangVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>