resolve conflicts, move diffsinger phonemizers into a subfolder

OpenUtau.Core/DiffSinger/DiffSingerItalianPhonemizer.cs → OpenUtau.Core/DiffSinger/Phonemizers/DiffSingerItalianPhonemizer.cs

@@ -1,18 +1,18 @@
-using OpenUtau.Api;
-using OpenUtau.Core.G2p;
-
-namespace OpenUtau.Core.DiffSinger {
-    [Phonemizer("DiffSinger Italian Phonemizer", "DIFFS IT", language: "IT")]
-    public class DiffSingerItalianPhonemizer : DiffSingerG2pPhonemizer {
-        protected override string GetDictionaryName() => "dsdict-it.yaml";
-        protected override IG2p LoadBaseG2p() => new ItalianG2p();
-        protected override string[] GetBaseG2pVowels() => new string[] {
-            "a", "a1", "e", "e1", "EE", "i", "i1", "o", "o1", "OO", "u", "u1"
-        };
-
-        protected override string[] GetBaseG2pConsonants() => new string[] {
-            "b", "d", "dz", "dZZ", "f", "g", "JJ", "k", "l", "LL", "m", "n",
-            "nf", "ng", "p", "r", "rr", "s", "SS", "t", "ts", "tSS", "v", "w", "y", "z"
-        };
-    }
-}
+using OpenUtau.Api;
+using OpenUtau.Core.G2p;
+
+namespace OpenUtau.Core.DiffSinger {
+    [Phonemizer("DiffSinger Italian Phonemizer", "DIFFS IT", language: "IT")]
+    public class DiffSingerItalianPhonemizer : DiffSingerG2pPhonemizer {
+        protected override string GetDictionaryName() => "dsdict-it.yaml";
+        protected override IG2p LoadBaseG2p() => new ItalianG2p();
+        protected override string[] GetBaseG2pVowels() => new string[] {
+            "a", "a1", "e", "e1", "EE", "i", "i1", "o", "o1", "OO", "u", "u1"
+        };
+
+        protected override string[] GetBaseG2pConsonants() => new string[] {
+            "b", "d", "dz", "dZZ", "f", "g", "JJ", "k", "l", "LL", "m", "n",
+            "nf", "ng", "p", "r", "rr", "s", "SS", "t", "ts", "tSS", "v", "w", "y", "z"
+        };
+    }
+}

OpenUtau.Core/DiffSinger/DiffSingerJyutpingPhonemizer.cs → OpenUtau.Core/DiffSinger/Phonemizers/DiffSingerJyutpingPhonemizer.cs

@@ -6,6 +6,7 @@
 namespace OpenUtau.Core.DiffSinger {
     [Phonemizer("DiffSinger Jyutping Phonemizer", "DIFFS ZH-YUE", language: "ZH-YUE")]
     public class DiffSingerJyutpingPhonemizer : DiffSingerBasePhonemizer {
+        protected override string GetDictionaryName() => "dsdict-zh-yue.yaml";
         protected override string[] Romanize(IEnumerable<string> lyrics) {
             return ZhG2p.CantoneseInstance.Convert(lyrics.ToList(), false, true).Split(" ");
         }