Revert "Merge pull request #1122 from EX3exp/update-ko-cvvc-phonemizer"

This reverts commit 1d5478a, reversing changes made to 9f91b54.
stakira · May 10, 2024 · 1d4cf31 · 1d4cf31
1 parent 6b71882
commit 1d4cf31
Show file tree

Hide file tree

Showing 2 changed files with 506 additions and 440 deletions.
diff --git a/OpenUtau.Plugin.Builtin/BaseKoreanPhonemizer.cs b/OpenUtau.Plugin.Builtin/BaseKoreanPhonemizer.cs
@@ -23,11 +23,6 @@ public abstract class BaseKoreanPhonemizer : Phonemizer {
         protected static readonly string[] PLAIN_VOWELS = new string[]{"ㅏ", "ㅣ", "ㅜ", "ㅔ", "ㅗ", "ㅡ", "ㅓ", "ㅢ"};
         protected static readonly string[] SOFT_BATCHIMS = new string[]{"ㄴ", "ㄹ", "ㅇ"};
         protected static readonly string[] HARD_BATCHIMS = new string[]{"ㄱ", "ㄷ", "ㅂ", "ㅁ"};
-
-        // this phonemizer will call ConvertPhonemes() when lyric is hanguel or additionalTest is true . (override to use)
-        protected virtual bool additionalTest(string lyric) {
-            return false;
-        } 
         public override void SetSinger(USinger singer) => this.singer = singer;
         public static string? FindInOto(USinger singer, string phoneme, Note note, bool nullIfNotFound = false) {
             // 음소와 노트를 입력받고, 다음계 및 보이스컬러 에일리어스를 적용한다. 
@@ -130,7 +125,6 @@ public abstract class BaseKoreanPhonemizer : Phonemizer {
                     position = totalDuration - totalDuration / totalDurationDivider},
                 }
             };
-
         }
 
         /// <summary>
@@ -298,15 +292,14 @@ public abstract class BaseKoreanPhonemizer : Phonemizer {
                     phonemes = phonemes
                 };
             } 
-            else if (KoreanPhonemizerUtil.IsHangeul(lyric) || !KoreanPhonemizerUtil.IsHangeul(lyric) && additionalTest(lyric)) {
+            else if (KoreanPhonemizerUtil.IsHangeul(lyric)) {
                 return ConvertPhonemes(notes, prev, next, prevNeighbour, nextNeighbour, prevNeighbours);
             } 
             else {
                 return GenerateEndSound(notes, prev, next, prevNeighbour, nextNeighbour, prevNeighbours);
             }
         }
 
-
         /// <summary>
         /// abstract class for Ini Management
         /// To use, child phonemizer should implement this class(BaseIniManager) with its own setting values!