Semivowel bug fix

lottev1991 · Jun 21, 2023 · 00834fe · 00834fe
1 parent 9f16e32
commit 00834fe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 .vs/
 KoreanCVVCPlusPhonemizer/obj/Debug/
-KoreanCVVCPlusPhonemizer/obj/Debug/
+KoreanCVVCPlusPhonemizer/bin/Debug/
diff --git a/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.cs b/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.cs
@@ -270,7 +270,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 TCLvowel = TCLtemp[1];
                 TCLplainvowel = naPlainVowels[CLvowel];
 
-                if (TCLvowel.StartsWith("y") || (TCLvowel == "i")) { TCLsemivowel = 1; } else if (TCLvowel.StartsWith("w") || (TCLvowel == "o") || (TCLvowel == "u")) { TCLsemivowel = 2; } else {
+                if (TCLvowel.StartsWith("y") || (TCLvowel == "i" && TCLconsonant != "")) { TCLsemivowel = 1; } else if (TCLvowel.StartsWith("w") || ((TCLvowel == "o" && TCLconsonant != "") || (TCLvowel == "u" && TCLconsonant != ""))) { TCLsemivowel = 2; } else {
                     TCLsemivowel = 0;
                 }
 
@@ -333,7 +333,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     TNLvowel = TNLtemp[1];
                     TNLplainvowel = naPlainVowels[NLvowel];
 
-                    if (TNLvowel.StartsWith("y") || TNLvowel == "i") { TNLsemivowel = 1; } else if (TNLvowel.StartsWith("w") || TNLvowel == "o" || TNLvowel == "u") { TNLsemivowel = 2; }
+                    if (TNLvowel.StartsWith("y") || TNLvowel == "i" && TNLconsonant != "") { TNLsemivowel = 1; } else if (TNLvowel.StartsWith("w") || TNLvowel == "o" && TNLconsonant != "" || TNLvowel == "u" && TNLconsonant != "") { TNLsemivowel = 2; }
 
                     TNLtemp = naFinals[NLfinal].Split(':');
                     TNLfinal = TNLtemp[1];

diff --git a/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.csproj b/KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.csproj
@@ -32,10 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenUtau.Core">
-      <HintPath>..\..\..\..\OpenUtau-master\OpenUtau\OpenUtau.Test\bin\Debug\net6.0-windows\OpenUtau.Core.dll</HintPath>
+      <HintPath>..\..\..\..\OpenUtau-master\OpenUtau.Test\bin\Debug\net6.0-windows\OpenUtau.Core.dll</HintPath>
     </Reference>
     <Reference Include="OpenUtau.Plugin.Builtin">
-      <HintPath>..\..\..\..\OpenUtau-master\OpenUtau\OpenUtau.Test\bin\Debug\net6.0-windows\OpenUtau.Plugin.Builtin.dll</HintPath>
+      <HintPath>..\..\..\..\OpenUtau-master\OpenUtau.Test\bin\Debug\net6.0-windows\OpenUtau.Plugin.Builtin.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />