From 72d14cce5cc88b81879d26f59f854983ecdd5ab8 Mon Sep 17 00:00:00 2001
From: Maiko <maiko3tattun@gmail.com>
Date: Sun, 26 Nov 2023 12:49:29 +0900
Subject: [PATCH 01/35] Fix creation of empty Oto from blank line in otoini

---
 OpenUtau.Core/Classic/VoicebankLoader.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenUtau.Core/Classic/VoicebankLoader.cs b/OpenUtau.Core/Classic/VoicebankLoader.cs
index 79e6d98e6..bb8614fe5 100644
--- a/OpenUtau.Core/Classic/VoicebankLoader.cs
+++ b/OpenUtau.Core/Classic/VoicebankLoader.cs
@@ -335,6 +335,10 @@ public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encodi
                 };
                 while (!reader.EndOfStream) {
                     var line = reader.ReadLine().Trim();
+                    if (string.IsNullOrWhiteSpace(line) ) {
+                        trace.lineNumber++;
+                        continue;
+                    }
                     trace.line = line;
                     try {
                         Oto oto = ParseOto(line, trace);

From f571c5030546c549ecf2aca8bdf89ad76f4922f4 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 02:28:03 +0100
Subject: [PATCH 02/35] Add Cantonese Syo Phonemizer

---
 .../CantoneseSyoPhonemizer.cs                 | 362 ++++++++++++++++++
 1 file changed, 362 insertions(+)
 create mode 100644 OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
new file mode 100644
index 000000000..7e2e066c4
--- /dev/null
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -0,0 +1,362 @@
+using OpenUtau.Api;
+using OpenUtau.Core.G2p;
+using OpenUtau.Core.Ustx;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenUtau.Plugin.Builtin {
+    /// <summary>
+    /// Cantonese phonemizer for Syo-style banks.
+    /// Supports both full jyutping syllables as well as syllable fallbacks without a final consonant or falling diphthong.
+    /// Supports hanzi and jyutping input.
+    /// </summary>
+    [Phonemizer("Cantonese Syo-Style Phonemizer", "ZH-YUE SYO", "Lotte V", language: "ZH-YUE")]
+    public class CantoneseSyoPhonemizer : Phonemizer {
+
+        /// <summary>
+        ///  The consonant table.
+        /// </summary>
+        static readonly string consonants = "b,p,m,f,d,t,n,l,g,k,ng,h,gw,kw,w,z,c,s,j";
+
+        /// <summary>
+        /// The vowel split table.
+        /// </summary>
+        static readonly string vowels = "aap=aa p,aat=aa t,aak=aa k,aam=aa m,aan=aa n,aang=aa ng,aai=aa i,aau=aa u,ap=a p,at=a t,ak=a k,am=a m,an=a n,ang=a ng,ai=a i,au=a u,ok=o k,om=o m,on=o n,ong=o ng,oi=o i,ou=o u,oet=oe t,oek=oe k,oeng=oe ng,oei=oe i,eot=eo t,eon=eo n,eoi=eo i,ep=e p,et=e t,ek=e k,em=e m,en=e n,eng=e ng,ei=e i,eu=e u,up=u p,ut=u t,uk=uu k,um=um,un=u n,ung=uu ng,ui=u i,yut=yu t,yun=yu n,ip=i p,it=i t,ik=ii k,im=i m,in=i n,ing=ii ng,iu=i u";
+
+        /// <summary>
+        /// Check for vowel substitutes.
+        /// </summary>
+        static readonly string[] substitution = new string[] {
+            "aap,aat,aak,aam,aan,aang,aai,aau=aa", "ap,at,ak,am,an,ang,ai,au=a", "op,ot,ok,om,on,ong,oi,ou=o", "oet,oek,oen,oeng,oei=oe", "eot,eon,eoi=eo","ep,et,ek,em,en,eng,ei,eu=e", "uk,ung=uu", "up,ut,um,un,ui=u", "yut,yun=yu","ik,ing=ii", "ip,it,im,in,iu=i"
+        };
+
+        /// <summary>
+        /// Check for substitutes for finals.
+        /// </summary>
+        static readonly string[] finalSub = new string[] {
+            "ii ng=i ng", "ii k=i k", "uu k=u k", "uu ng=u ng", "oe t=eo t", "oe i=eo i"
+        };
+
+        static HashSet<string> cSet;
+        static Dictionary<string, string> vDict;
+        static readonly Dictionary<string, string> substituteLookup;
+        static readonly Dictionary<string, string> finalSubLookup;
+
+        static CantoneseSyoPhonemizer() {
+            cSet = new HashSet<string>(consonants.Split(','));
+            vDict = vowels.Split(',')
+                .Select(s => s.Split('='))
+                .ToDictionary(a => a[0], a => a[1]);
+            substituteLookup = substitution.ToList()
+                .SelectMany(line => {
+                    var parts = line.Split('=');
+                    return parts[0].Split(',').Select(orig => (orig, parts[1]));
+                })
+                .ToDictionary(t => t.Item1, t => t.Item2);
+            finalSubLookup = finalSub.ToList()
+                .SelectMany(line => {
+                    var parts = line.Split('=');
+                    return parts[0].Split(',').Select(orig => (orig, parts[1]));
+                })
+                .ToDictionary(t => t.Item1, t => t.Item2);
+        }
+
+        private USinger singer;
+
+        // Simply stores the singer in a field.
+        public override void SetSinger(USinger singer) => this.singer = singer;
+
+        /// <summary>
+        /// Converts hanzi notes to jyutping phonemes.
+        /// </summary>
+        /// <param name="groups"></param>
+        public override void SetUp(Note[][] groups) {
+            JyutpingConversion.RomanizeNotes(groups);
+        }
+        public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevNeighbour, Note? nextNeighbour, Note[] prevNeighbours) {
+            // The overall logic is:
+            // 1. Remove consonant: "jyut" -> "yut".
+            // 2. Lookup the trailing sound in vowel table: "yut" -> "yu t".
+            // 3. Split the total duration and returns "jyut"/"jyu" and "yu t".
+            var note = notes[0];
+            var lyric = note.lyric;
+            string consonant = string.Empty;
+            string vowel = string.Empty;
+
+            if (lyric.Length > 2 && cSet.Contains(lyric.Substring(0, 2))) {
+                // First try to find consonant "gw", "kw", "ng", and extract vowel.
+                consonant = lyric.Substring(0, 2);
+                vowel = lyric.Substring(2);
+            } else if (lyric.Length > 1 && cSet.Contains(lyric.Substring(0, 1)) && lyric != "ng") {
+                // Then try to find single character consonants, and extract vowel.
+                consonant = lyric.Substring(0, 1);
+                vowel = lyric.Substring(1);
+            } else {
+                // Otherwise the lyric is a vowel.
+                vowel = lyric;
+            }
+
+            string phoneme0 = lyric;
+
+            // Get color
+            string color = string.Empty;
+            int toneShift = 0;
+            int? alt = 0;
+            if (note.phonemeAttributes != null) {
+                var attr = note.phonemeAttributes.FirstOrDefault(attr0 => attr0.index == 0);
+                color = attr.voiceColor;
+                toneShift = attr.toneShift;
+                alt = attr.alternate;
+            }
+
+            string fin = $"{vowel} -";
+            // We will need to split the total duration for phonemes, so we compute it here.
+            int totalDuration = notes.Sum(n => n.duration);
+            // Lookup the vowel split table. For example, "yut" will match "yu t".
+            if (vDict.TryGetValue(vowel, out var phoneme1) && !string.IsNullOrEmpty(phoneme1)) {
+                // Now phoneme0="jyu" and phoneme1="yu t",
+                // try to give "yu t" 120 ticks, but no more than half of the total duration.
+                int length1 = 120;
+
+                if (length1 > totalDuration / 2) {
+                    length1 = totalDuration / 2;
+                }
+                var lyrics = new List<string> { lyric };
+                // find potential substitute symbol
+                if (substituteLookup.TryGetValue(vowel ?? string.Empty, out var sub)) {
+                    if (!string.IsNullOrEmpty(consonant)) {
+                        lyrics.Add($"{consonant}{sub}");
+                    } else {
+                        lyrics.Add(sub);
+                    }
+                }
+
+                // Try initial and then a plain lyric
+                if (prevNeighbour == null) {
+                    var initial = $"- {lyric}";
+                    var initial2 = $"- {lyrics[1]}";
+                    var tests = new List<string> { initial, initial2, lyric, lyrics[1] };
+                    if (checkOtoUntilHit(tests, note, out var otoInit)) {
+                        phoneme0 = otoInit.Alias;
+                    }
+                } else { // nothing special necessary
+                    if (checkOtoUntilHit(lyrics, note, out var otoLyric)) {
+                        phoneme0 = otoLyric.Alias;
+                    } else {
+                        return MakeSimpleResult(phoneme0);
+                    }
+                }
+
+                var tails = new List<string> { phoneme1 };
+                if (!string.IsNullOrEmpty(phoneme1)) {
+                    // find potential substitute symbol
+                    if (finalSubLookup.TryGetValue(phoneme1 ?? string.Empty, out var finSub)) {
+                        tails.Add(finSub);
+                    }
+                    if (checkOtoUntilHitFinal(tails, note, out var otoTail)) {
+                        phoneme1 = otoTail.Alias;
+                    } else {
+                        // Check for vowel ending if final does not exist and there's no next neighbor
+                        if (nextNeighbour == null && !string.IsNullOrEmpty(fin)) {
+                            // Vowel ending is minimum 60 ticks, maximum half of note
+                            int length2 = 60;
+
+                            if (length2 > totalDuration / 2) {
+                                length2 = totalDuration / 2;
+                            }
+
+                            var finals = new List<string> { fin };
+                            if (checkOtoUntilHitFinal(finals, note, out var otoFin)) {
+                                phoneme1 = otoFin.Alias;
+                            } else {
+                                return MakeSimpleResult(phoneme0);
+                            }
+                            return new Result {
+                                phonemes = new Phoneme[] {
+                                new Phoneme() {
+                                    phoneme = phoneme0,
+                                },
+                                new Phoneme() {
+                                    phoneme = phoneme1,
+                                    position = totalDuration - length2,
+                                }
+                                },
+                            };
+                        } else {
+                            return MakeSimpleResult(phoneme0);
+                        }
+                    }
+                }
+
+                return new Result {
+                    phonemes = new Phoneme[] {
+                        new Phoneme() {
+                            phoneme = phoneme0,
+                        },
+                        new Phoneme() {
+                            phoneme = phoneme1,
+                            position = totalDuration - length1,
+                        }
+                    },
+                };
+            }
+
+            // Check for vowel ending on open syllables.
+            // If a vowel ending does not exist, it will not be inserted.
+            if (nextNeighbour == null && string.IsNullOrEmpty(phoneme1) && !string.IsNullOrEmpty(fin)) {
+                // Vowel ending is minimum 60 ticks, maximum half of note
+                int length1 = 60;
+
+                if (length1 > totalDuration / 2) {
+                    length1 = totalDuration / 2;
+                }
+                // Try initial and then a plain lyric
+                var lyrics = new List<string> { lyric };
+                if (prevNeighbour == null) {
+                    var initial = $"- {lyric}";
+                    var tests = new List<string> { initial, lyric };
+                    if (checkOtoUntilHit(tests, note, out var otoInit)) {
+                        phoneme0 = otoInit.Alias;
+                    }
+                } else { // nothing special necessary
+                    if (checkOtoUntilHit(lyrics, note, out var otoLyric)) {
+                        phoneme0 = otoLyric.Alias;
+                    } else {
+                        return MakeSimpleResult(phoneme0);
+                    }
+                }
+
+                // Map vowel ending
+                var tails = new List<string> { fin };
+                if (checkOtoUntilHitFinal(tails, note, out var otoTail)) {
+                    fin = otoTail.Alias;
+                } else {
+                    return MakeSimpleResult(phoneme0);
+                }
+
+                return new Result {
+                    phonemes = new Phoneme[] {
+                        new Phoneme() {
+                            phoneme = phoneme0,
+                        },
+                        new Phoneme() {
+                            phoneme = fin,
+                            position = totalDuration - length1,
+                        }
+                    },
+                };
+            }
+
+            // Try initial and then a plain lyric
+            if (prevNeighbour == null) {
+                var simpleInitial = $"- {lyric}";
+                var tests = new List<string> { simpleInitial, lyric };
+                if (checkOtoUntilHit(tests, note, out var otoInit)) {
+                    phoneme0 = otoInit.Alias;
+                } else {
+                    return MakeSimpleResult(phoneme0);
+                }
+            } else { // nothing special necessary
+                var tests = new List<string> { lyric };
+                if (checkOtoUntilHit(tests, note, out var otoLyric)) {
+                    phoneme0 = otoLyric.Alias;
+                } else {
+                    return MakeSimpleResult(phoneme0);
+                }
+            }
+            // Not spliting is needed. Return as is.
+            return new Result {
+                phonemes = new Phoneme[] {
+                    new Phoneme() {
+                        phoneme = phoneme0,
+                    }
+                },
+            };
+
+        }
+
+        /// <summary>
+        /// Converts hanzi to jyutping, based on G2P.
+        /// </summary>
+        public class JyutpingConversion {
+            public static Note[] ChangeLyric(Note[] group, string lyric) {
+                var oldNote = group[0];
+                group[0] = new Note {
+                    lyric = lyric,
+                    phoneticHint = oldNote.phoneticHint,
+                    tone = oldNote.tone,
+                    position = oldNote.position,
+                    duration = oldNote.duration,
+                    phonemeAttributes = oldNote.phonemeAttributes,
+                };
+                return group;
+            }
+
+            public static string[] Romanize(IEnumerable<string> lyrics) {
+                return ZhG2p.CantoneseInstance.Convert(lyrics.ToList(), false, true).Split(' ');
+            }
+
+            public static void RomanizeNotes(Note[][] groups) {
+                var ResultLyrics = Romanize(groups.Select(group => group[0].lyric));
+                Enumerable.Zip(groups, ResultLyrics, ChangeLyric).Last();
+            }
+
+            public void SetUp(Note[][] groups) {
+                RomanizeNotes(groups);
+            }
+        }
+
+        // make it quicker to check multiple oto occurrences at once rather than spamming if else if
+        private bool checkOtoUntilHit(List<string> input, Note note, out UOto oto) {
+            oto = default;
+            var attr = note.phonemeAttributes?.FirstOrDefault(attrCheck => attrCheck.index == 0) ?? default;
+
+            var otos = new List<UOto>();
+            foreach (string test in input) {
+                if (singer.TryGetMappedOto(test + attr.alternate, note.tone + attr.toneShift, attr.voiceColor, out var otoAlt)) {
+                    otos.Add(otoAlt);
+                } else if (singer.TryGetMappedOto(test, note.tone + attr.toneShift, attr.voiceColor, out var otoCandidacy)) {
+                    otos.Add(otoCandidacy);
+                }
+            }
+
+            string color = attr.voiceColor ?? "";
+            if (otos.Count > 0) {
+                if (otos.Any(otoCheck => (otoCheck.Color ?? string.Empty) == color)) {
+                    oto = otos.Find(otoCheck => (otoCheck.Color ?? string.Empty) == color);
+                    return true;
+                } else {
+                    oto = otos.First();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        // Check for final consonant or vowel ending
+        private bool checkOtoUntilHitFinal(List<string> input, Note note, out UOto oto) {
+            oto = default;
+            var attr = note.phonemeAttributes?.FirstOrDefault(attrCheck => attrCheck.index == 1) ?? default;
+
+            var otos = new List<UOto>();
+            foreach (string test in input) {
+                if (singer.TryGetMappedOto(test + attr.alternate, note.tone + attr.toneShift, attr.voiceColor, out var otoAlt)) {
+                    otos.Add(otoAlt);
+                } else if (singer.TryGetMappedOto(test, note.tone + attr.toneShift, attr.voiceColor, out var otoCandidacy)) {
+                    otos.Add(otoCandidacy);
+                }
+            }
+
+            string color = attr.voiceColor ?? "";
+            if (otos.Count > 0) {
+                if (otos.Any(otoCheck => (otoCheck.Color ?? string.Empty) == color)) {
+                    oto = otos.Find(otoCheck => (otoCheck.Color ?? string.Empty) == color);
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            return false;
+        }
+    }
+}

From 72154367e79d7fc66d597e02f3c5e90baa2ce5bf Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 02:48:55 +0100
Subject: [PATCH 03/35] Small fix

---
 OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
index 7e2e066c4..7d6e6d5fa 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -142,8 +142,6 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 } else { // nothing special necessary
                     if (checkOtoUntilHit(lyrics, note, out var otoLyric)) {
                         phoneme0 = otoLyric.Alias;
-                    } else {
-                        return MakeSimpleResult(phoneme0);
                     }
                 }
 

From eac046741737ca85a2c733cf54f2b6c0c6d164c2 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 03:05:28 +0100
Subject: [PATCH 04/35] Forgot a few endings

---
 OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
index 7d6e6d5fa..144c28dfc 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -21,7 +21,7 @@ public class CantoneseSyoPhonemizer : Phonemizer {
         /// <summary>
         /// The vowel split table.
         /// </summary>
-        static readonly string vowels = "aap=aa p,aat=aa t,aak=aa k,aam=aa m,aan=aa n,aang=aa ng,aai=aa i,aau=aa u,ap=a p,at=a t,ak=a k,am=a m,an=a n,ang=a ng,ai=a i,au=a u,ok=o k,om=o m,on=o n,ong=o ng,oi=o i,ou=o u,oet=oe t,oek=oe k,oeng=oe ng,oei=oe i,eot=eo t,eon=eo n,eoi=eo i,ep=e p,et=e t,ek=e k,em=e m,en=e n,eng=e ng,ei=e i,eu=e u,up=u p,ut=u t,uk=uu k,um=um,un=u n,ung=uu ng,ui=u i,yut=yu t,yun=yu n,ip=i p,it=i t,ik=ii k,im=i m,in=i n,ing=ii ng,iu=i u";
+        static readonly string vowels = "aap=aa p,aat=aa t,aak=aa k,aam=aa m,aan=aa n,aang=aa ng,aai=aa i,aau=aa u,ap=a p,at=a t,ak=a k,am=a m,an=a n,ang=a ng,ai=a i,au=a u,op=o p,ot=o kok=o k,om=o m,on=o n,ong=o ng,oi=o i,ou=o u,oet=oe t,oek=oe k,oeng=oe ng,oei=oe i,eot=eo t,eon=eo n,eoi=eo i,ep=e p,et=e t,ek=e k,em=e m,en=e n,eng=e ng,ei=e i,eu=e u,up=u p,ut=u t,uk=uu k,um=um,un=u n,ung=uu ng,ui=u i,yut=yu t,yun=yu n,ip=i p,it=i t,ik=ii k,im=i m,in=i n,ing=ii ng,iu=i u";
 
         /// <summary>
         /// Check for vowel substitutes.

From 3a0672612149d7386c97471552873bad8a578ebb Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 13:29:35 +0100
Subject: [PATCH 05/35] Use initial when end stop is used on previous note

---
 OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
index 144c28dfc..2498dd3d1 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -132,7 +132,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 }
 
                 // Try initial and then a plain lyric
-                if (prevNeighbour == null) {
+                if (prevNeighbour == null || (prevNeighbour != null && (prevNeighbour.Value.lyric.EndsWith("p") || prevNeighbour.Value.lyric.EndsWith("t") || prevNeighbour.Value.lyric.EndsWith("k")))) {
                     var initial = $"- {lyric}";
                     var initial2 = $"- {lyrics[1]}";
                     var tests = new List<string> { initial, initial2, lyric, lyrics[1] };
@@ -210,7 +210,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 }
                 // Try initial and then a plain lyric
                 var lyrics = new List<string> { lyric };
-                if (prevNeighbour == null) {
+                if (prevNeighbour == null || (prevNeighbour != null && (prevNeighbour.Value.lyric.EndsWith("p") || prevNeighbour.Value.lyric.EndsWith("t") || prevNeighbour.Value.lyric.EndsWith("k")))) {
                     var initial = $"- {lyric}";
                     var tests = new List<string> { initial, lyric };
                     if (checkOtoUntilHit(tests, note, out var otoInit)) {
@@ -246,7 +246,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             }
 
             // Try initial and then a plain lyric
-            if (prevNeighbour == null) {
+            if (prevNeighbour == null || (prevNeighbour != null && (prevNeighbour.Value.lyric.EndsWith("p") || prevNeighbour.Value.lyric.EndsWith("t") || prevNeighbour.Value.lyric.EndsWith("k")))) {
                 var simpleInitial = $"- {lyric}";
                 var tests = new List<string> { simpleInitial, lyric };
                 if (checkOtoUntilHit(tests, note, out var otoInit)) {

From c8d4aaa98a961eba2076213e3132968d3c3f4f41 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 13:34:51 +0100
Subject: [PATCH 06/35] Improve jyutping conversion

---
 .../CantoneseSyoPhonemizer.cs                   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
index 2498dd3d1..90deba2b1 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -291,7 +291,22 @@ public static Note[] ChangeLyric(Note[] group, string lyric) {
             }
 
             public static string[] Romanize(IEnumerable<string> lyrics) {
-                return ZhG2p.CantoneseInstance.Convert(lyrics.ToList(), false, true).Split(' ');
+                var lyricsArray = lyrics.ToArray();
+                var hanziLyrics = lyricsArray
+                    .Where(ZhG2p.CantoneseInstance.IsHanzi)
+                    .ToList();
+                var pinyinResult = ZhG2p.CantoneseInstance.Convert(hanziLyrics, false, false).ToLower().Split();
+                if (pinyinResult == null) {
+                    return lyricsArray;
+                }
+                var pinyinIndex = 0;
+                for (int i = 0; i < lyricsArray.Length; i++) {
+                    if (lyricsArray[i].Length == 1 && ZhG2p.CantoneseInstance.IsHanzi(lyricsArray[i])) {
+                        lyricsArray[i] = pinyinResult[pinyinIndex];
+                        pinyinIndex++;
+                    }
+                }
+                return lyricsArray;
             }
 
             public static void RomanizeNotes(Note[][] groups) {

From 140da21db906a1919af6237cafa3f8f74b1ec651 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 18:53:33 +0100
Subject: [PATCH 07/35] Refinement

---
 OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
index 90deba2b1..7b8ddc221 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -21,7 +21,7 @@ public class CantoneseSyoPhonemizer : Phonemizer {
         /// <summary>
         /// The vowel split table.
         /// </summary>
-        static readonly string vowels = "aap=aa p,aat=aa t,aak=aa k,aam=aa m,aan=aa n,aang=aa ng,aai=aa i,aau=aa u,ap=a p,at=a t,ak=a k,am=a m,an=a n,ang=a ng,ai=a i,au=a u,op=o p,ot=o kok=o k,om=o m,on=o n,ong=o ng,oi=o i,ou=o u,oet=oe t,oek=oe k,oeng=oe ng,oei=oe i,eot=eo t,eon=eo n,eoi=eo i,ep=e p,et=e t,ek=e k,em=e m,en=e n,eng=e ng,ei=e i,eu=e u,up=u p,ut=u t,uk=uu k,um=um,un=u n,ung=uu ng,ui=u i,yut=yu t,yun=yu n,ip=i p,it=i t,ik=ii k,im=i m,in=i n,ing=ii ng,iu=i u";
+        static readonly string vowels = "aap=aa p,aat=aa t,aak=aa k,aam=aa m,aan=aa n,aang=aa ng,aai=aa i,aau=aa u,ap=a p,at=a t,ak=a k,am=a m,an=a n,ang=a ng,ai=a i,au=a u,op=o p,ot=o t,ok=o k,om=o m,on=o n,ong=o ng,oi=o i,ou=o u,oet=oe t,oek=oe k,oeng=oe ng,oei=oe i,eot=eo t,eon=eo n,eoi=eo i,ep=e p,et=e t,ek=e k,em=e m,en=e n,eng=e ng,ei=e i,eu=e u,up=u p,ut=u t,uk=uu k,um=um,un=u n,ung=uu ng,ui=u i,yut=yu t,yun=yu n,ip=i p,it=i t,ik=ii k,im=i m,in=i n,ing=ii ng,iu=i u";
 
         /// <summary>
         /// Check for vowel substitutes.
@@ -295,15 +295,15 @@ public static string[] Romanize(IEnumerable<string> lyrics) {
                 var hanziLyrics = lyricsArray
                     .Where(ZhG2p.CantoneseInstance.IsHanzi)
                     .ToList();
-                var pinyinResult = ZhG2p.CantoneseInstance.Convert(hanziLyrics, false, false).ToLower().Split();
-                if (pinyinResult == null) {
+                var jyutpingResult = ZhG2p.CantoneseInstance.Convert(hanziLyrics, false, false).ToLower().Split();
+                if (jyutpingResult == null) {
                     return lyricsArray;
                 }
-                var pinyinIndex = 0;
+                var jyutpingIndex = 0;
                 for (int i = 0; i < lyricsArray.Length; i++) {
                     if (lyricsArray[i].Length == 1 && ZhG2p.CantoneseInstance.IsHanzi(lyricsArray[i])) {
-                        lyricsArray[i] = pinyinResult[pinyinIndex];
-                        pinyinIndex++;
+                        lyricsArray[i] = jyutpingResult[jyutpingIndex];
+                        jyutpingIndex++;
                     }
                 }
                 return lyricsArray;

From 9ad4752feb8fb91af5ce43071f227d8f353d9ba8 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 19:27:24 +0100
Subject: [PATCH 08/35] Add Cantonese CVVC Phonemizer

---
 .../CantoneseCVVCPhonemizer.cs                | 186 ++++++++++++++++++
 1 file changed, 186 insertions(+)
 create mode 100644 OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs

diff --git a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
new file mode 100644
index 000000000..847f707e0
--- /dev/null
+++ b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
@@ -0,0 +1,186 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using OpenUtau.Api;
+using OpenUtau.Classic;
+using OpenUtau.Core.G2p;
+using OpenUtau.Core.Ustx;
+using Serilog;
+
+namespace OpenUtau.Plugin.Builtin {
+    /// <summary>
+    /// Cantonese CVVC phonemizer.
+    /// It works similarly to the Chinese CVVC phonemizer, including presamp.ini requirement.
+    /// The big difference is that it converts hanzi to jyutping instead of pinyin.
+    /// </summary>
+    [Phonemizer("Cantonese CVVC Phonemizer", "ZH-YUE CVVC", language: "ZH-YUE")]
+    public class CantoneseCVVCPhonemizer : Phonemizer {
+        private Dictionary<string, string> vowels = new Dictionary<string, string>();
+        private Dictionary<string, string> consonants = new Dictionary<string, string>();
+        private USinger singer;
+        public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevNeighbour, Note? nextNeighbour, Note[] prevNeighbours) {
+            var lyric = notes[0].lyric;
+            string consonant = consonants.TryGetValue(lyric, out consonant) ? consonant : lyric;
+            string prevVowel = "-";
+            if (prevNeighbour != null) {
+                var prevLyric = prevNeighbour.Value.lyric;
+                if (vowels.TryGetValue(prevLyric, out var vowel)) {
+                    prevVowel = vowel;
+                }
+            };
+            var attr0 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 0) ?? default;
+            var attr1 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 1) ?? default;
+            if (lyric == "-" || lyric.ToLowerInvariant() == "r") {
+                if (singer.TryGetMappedOto($"{prevVowel} R", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto1)) {
+                    return MakeSimpleResult(oto1.Alias);
+                }
+                return MakeSimpleResult($"{prevVowel} R");
+            }
+            if (singer.TryGetMappedOto($"{prevVowel} {lyric}", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto)) {
+                return MakeSimpleResult(oto.Alias);
+            }
+            int vcLen = 120;
+            if (singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out var cvOto)) {
+                vcLen = MsToTick(cvOto.Preutter);
+                if (cvOto.Overlap == 0 && vcLen < 120) {
+                    vcLen = Math.Min(120, vcLen * 2); // explosive consonant with short preutter.
+                }
+                if (cvOto.Overlap < 0) {
+                    vcLen = MsToTick(cvOto.Preutter - cvOto.Overlap);
+                }
+            }
+            var vcPhoneme = $"{prevVowel} {consonant}";
+            if (prevNeighbour != null) {
+                if (singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out oto)) {
+                    vcPhoneme = oto.Alias;
+                }
+                // totalDuration calculated on basis of previous note length
+                int totalDuration = prevNeighbour.Value.duration;
+                // vcLength depends on the Vel of the current base note
+                vcLen = Convert.ToInt32(Math.Min(totalDuration / 1.5, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
+            } else {
+                if (singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out oto)) {
+                    vcPhoneme = oto.Alias;
+                }
+                // no previous note, so length can be minimum velocity regardless of oto
+                vcLen = Convert.ToInt32(Math.Min(vcLen * 2, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
+            }
+
+            if (singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out oto)) {
+                return new Result {
+                    phonemes = new Phoneme[] {
+                        new Phoneme() {
+                            phoneme = vcPhoneme,
+                            position = -vcLen,
+                        },
+                        new Phoneme() {
+                            phoneme = cvOto?.Alias ?? lyric,
+                        },
+                    },
+                };
+            }
+            return MakeSimpleResult(cvOto?.Alias ?? lyric);
+        }
+
+        public override void SetSinger(USinger singer) {
+            if (this.singer == singer) {
+                return;
+            }
+            this.singer = singer;
+            vowels.Clear();
+            consonants.Clear();
+            if (this.singer == null) {
+                return;
+            }
+            try {
+                string file = Path.Combine(singer.Location, "presamp.ini");
+                using (var reader = new StreamReader(file, singer.TextFileEncoding)) {
+                    var blocks = Ini.ReadBlocks(reader, file, @"\[\w+\]");
+                    var vowelLines = blocks.Find(block => block.header == "[VOWEL]").lines;
+                    foreach (var iniLine in vowelLines) {
+                        var parts = iniLine.line.Split('=');
+                        if (parts.Length >= 3) {
+                            string vowelLower = parts[0];
+                            string vowelUpper = parts[1];
+                            string[] sounds = parts[2].Split(',');
+                            foreach (var sound in sounds) {
+                                vowels[sound] = vowelLower;
+                            }
+                        }
+                    }
+                    var consonantLines = blocks.Find(block => block.header == "[CONSONANT]").lines;
+                    foreach (var iniLine in consonantLines) {
+                        var parts = iniLine.line.Split('=');
+                        if (parts.Length >= 3) {
+                            string consonant = parts[0];
+                            string[] sounds = parts[1].Split(',');
+                            foreach (var sound in sounds) {
+                                consonants[sound] = consonant;
+                            }
+                        }
+                    }
+                    var priority = blocks.Find(block => block.header == "PRIORITY");
+                    var replace = blocks.Find(block => block.header == "REPLACE");
+                    var alias = blocks.Find(block => block.header == "ALIAS");
+                }
+            } catch (Exception e) {
+                Log.Error(e, "failed to load presamp.ini");
+            }
+        }
+
+        /// <summary>
+        /// Converts hanzi notes to jyutping phonemes.
+        /// </summary>
+        /// <param name="groups"></param>
+        public override void SetUp(Note[][] groups) {
+            JyutpingConversion.RomanizeNotes(groups);
+        }
+
+        /// <summary>
+        /// Converts hanzi to jyutping, based on G2P.
+        /// </summary>
+        public class JyutpingConversion {
+            public static Note[] ChangeLyric(Note[] group, string lyric) {
+                var oldNote = group[0];
+                group[0] = new Note {
+                    lyric = lyric,
+                    phoneticHint = oldNote.phoneticHint,
+                    tone = oldNote.tone,
+                    position = oldNote.position,
+                    duration = oldNote.duration,
+                    phonemeAttributes = oldNote.phonemeAttributes,
+                };
+                return group;
+            }
+
+            public static string[] Romanize(IEnumerable<string> lyrics) {
+                var lyricsArray = lyrics.ToArray();
+                var hanziLyrics = lyricsArray
+                    .Where(ZhG2p.CantoneseInstance.IsHanzi)
+                    .ToList();
+                var jyutpingResult = ZhG2p.CantoneseInstance.Convert(hanziLyrics, false, false).ToLower().Split();
+                if (jyutpingResult == null) {
+                    return lyricsArray;
+                }
+                var jyutpingIndex = 0;
+                for (int i = 0; i < lyricsArray.Length; i++) {
+                    if (lyricsArray[i].Length == 1 && ZhG2p.CantoneseInstance.IsHanzi(lyricsArray[i])) {
+                        lyricsArray[i] = jyutpingResult[jyutpingIndex];
+                        jyutpingIndex++;
+                    }
+                }
+                return lyricsArray;
+            }
+
+            public static void RomanizeNotes(Note[][] groups) {
+                var ResultLyrics = Romanize(groups.Select(group => group[0].lyric));
+                Enumerable.Zip(groups, ResultLyrics, ChangeLyric).Last();
+            }
+
+            public void SetUp(Note[][] groups) {
+                RomanizeNotes(groups);
+            }
+        }
+    }
+}

From aae2fa04248826e0b160bf04bb2756c31609fa10 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 30 Nov 2023 19:38:54 +0100
Subject: [PATCH 09/35] Add contributor credit

---
 OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
index 847f707e0..33624caad 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
@@ -14,7 +14,7 @@ namespace OpenUtau.Plugin.Builtin {
     /// It works similarly to the Chinese CVVC phonemizer, including presamp.ini requirement.
     /// The big difference is that it converts hanzi to jyutping instead of pinyin.
     /// </summary>
-    [Phonemizer("Cantonese CVVC Phonemizer", "ZH-YUE CVVC", language: "ZH-YUE")]
+    [Phonemizer("Cantonese CVVC Phonemizer", "ZH-YUE CVVC", "Lotte V", language: "ZH-YUE")]
     public class CantoneseCVVCPhonemizer : Phonemizer {
         private Dictionary<string, string> vowels = new Dictionary<string, string>();
         private Dictionary<string, string> consonants = new Dictionary<string, string>();

From 14037e405bb5bb7dbf2914f5108bab26d50205bc Mon Sep 17 00:00:00 2001
From: SoulMelody <SoulMelody@users.noreply.github.com>
Date: Fri, 1 Dec 2023 12:20:59 +0800
Subject: [PATCH 10/35] Fix default font family name on linux for CJK locales

---
 OpenUtau/Program.cs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/OpenUtau/Program.cs b/OpenUtau/Program.cs
index 717cc7efb..d81148fc8 100644
--- a/OpenUtau/Program.cs
+++ b/OpenUtau/Program.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Media;
 using Avalonia.ReactiveUI;
 using OpenUtau.App.ViewModels;
 using OpenUtau.Core;
@@ -50,11 +51,26 @@ public static void Main(string[] args) {
         }
 
         // Avalonia configuration, don't remove; also used by visual designer.
-        public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
+        public static AppBuilder BuildAvaloniaApp() {
+            FontManagerOptions fontOptions = new();
+            if (OS.IsLinux()) {
+                using Process process = Process.Start(new ProcessStartInfo("/usr/bin/fc-match", "--format %{family}")
+                {
+                    RedirectStandardOutput = true
+                })!;
+                process.WaitForExit();
+
+                string fontFamily = process.StandardOutput.ReadToEnd();
+                if (!string.IsNullOrEmpty(fontFamily)) {
+                    fontOptions.DefaultFamilyName = fontFamily;
+                }
+            }
+            return AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .LogToTrace()
-                .UseReactiveUI();
+                .UseReactiveUI()
+                .With(fontOptions);
+        }
 
         public static void Run(string[] args)
             => BuildAvaloniaApp()

From 8851a5f1a3c60a66aa57aed02f67ea90b57e803f Mon Sep 17 00:00:00 2001
From: SoulMelody <SoulMelody@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:49:08 +0800
Subject: [PATCH 11/35] specify ArgumentList

---
 OpenUtau/Program.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenUtau/Program.cs b/OpenUtau/Program.cs
index d81148fc8..39c1ba7d0 100644
--- a/OpenUtau/Program.cs
+++ b/OpenUtau/Program.cs
@@ -54,8 +54,9 @@ public static void Main(string[] args) {
         public static AppBuilder BuildAvaloniaApp() {
             FontManagerOptions fontOptions = new();
             if (OS.IsLinux()) {
-                using Process process = Process.Start(new ProcessStartInfo("/usr/bin/fc-match", "--format %{family}")
+                using Process process = Process.Start(new ProcessStartInfo("/usr/bin/fc-match")
                 {
+                    ArgumentList = { "-f", "%{family}" },
                     RedirectStandardOutput = true
                 })!;
                 process.WaitForExit();

From 82976973d12340dbe24b24e7f207c3f58745c571 Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Fri, 1 Dec 2023 14:16:43 +0800
Subject: [PATCH 12/35] windows file case check

---
 .../Classic/VoicebankErrorChecker.cs          | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/OpenUtau.Core/Classic/VoicebankErrorChecker.cs b/OpenUtau.Core/Classic/VoicebankErrorChecker.cs
index 9b003057b..39d3d6b93 100644
--- a/OpenUtau.Core/Classic/VoicebankErrorChecker.cs
+++ b/OpenUtau.Core/Classic/VoicebankErrorChecker.cs
@@ -101,6 +101,20 @@ public void Check() {
                     message = $"There are duplicate aliases.{message}"
                 });
             }
+            //Cross platform check
+            //Windows path is case insensitive, while MacOS path and Linux path are case sensitive.
+            //On Windows, check if the wave filename in oto.ini is the same as the filename in the file system.
+            if(OS.IsWindows()){
+                foreach(var otoSet in voicebank.OtoSets) {
+                    WindowsCaseCheck(otoSet);
+                }
+                WindowsCaseCheck(voicebank.BasePath, new string[]{
+                    "chatacter.txt", 
+                    "character.yaml", 
+                    "prefix.map",
+                    });
+            }
+            //TODO: On MacOS and Linux, check if there are files that have the same name but different case.
         }
 
         bool TryGetFileDuration(string filePath, Oto oto, out double fileDuration) {
@@ -240,5 +254,41 @@ bool FindDuplication(out List<Oto> duplicates) {
 
             return duplicates.Count > 0;
         }
+    
+        /// <summary>
+        /// Check if the file names in the oto.ini are the same as the file names in the file system.
+        /// </summary>
+        /// <param name="otoSet">otoSet to be checked</param>
+        /// <returns></returns>
+        bool WindowsCaseCheck(OtoSet otoSet) {
+            return WindowsCaseCheck(
+                Directory.GetParent(otoSet.File).FullName, 
+                otoSet.Otos
+                    .Select(oto => oto.Wav)
+                    .Append(otoSet.File)//oto.ini itself
+                    .ToHashSet());
+        }
+
+        bool WindowsCaseCheck(string folder, IEnumerable<string> correctFileNames){
+            bool valid = true;
+            Dictionary<string, string> fileNamesLowerToActual = Directory.GetFiles(folder)
+                .Select(Path.GetFileName)
+                .ToDictionary(x => x.ToLower(), x => x);
+            foreach(string fileName in correctFileNames) {
+                if(!fileNamesLowerToActual.ContainsKey(fileName.ToLower())) {
+                    continue;
+                }
+                if (fileNamesLowerToActual[fileName.ToLower()] != fileName) {
+                    valid = false;
+                    Infos.Add(new VoicebankError() {
+                        message = $"Wrong case in file name: \n"
+                            + $"expected: {Path.Join(folder,fileName)}\n"
+                            + $"Actual: {Path.Join(folder,fileNamesLowerToActual[fileName.ToLower()])}\n"
+                            + $"voicebank may not work on another OS."
+                    });
+                }
+            }
+            return valid;
+        }
     }
 }

From d5dbb1bce7b4afd4209a61d2269a41c39a35b39e Mon Sep 17 00:00:00 2001
From: Sugita Akira <akira3weet@gmail.com>
Date: Sat, 2 Dec 2023 01:55:39 -0800
Subject: [PATCH 13/35] tweaks note params visual

---
 OpenUtau/Controls/NotePropertiesControl.axaml |  25 ++---
 OpenUtau/Styles/Styles.axaml                  |  16 ++-
 OpenUtau/Views/PianoRollWindow.axaml          | 105 ++++++++++--------
 3 files changed, 79 insertions(+), 67 deletions(-)

diff --git a/OpenUtau/Controls/NotePropertiesControl.axaml b/OpenUtau/Controls/NotePropertiesControl.axaml
index 29593262e..d2f3dba01 100644
--- a/OpenUtau/Controls/NotePropertiesControl.axaml
+++ b/OpenUtau/Controls/NotePropertiesControl.axaml
@@ -18,11 +18,10 @@
   </UserControl.Styles>
 
   <Grid>
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
-      <StackPanel Margin="10">
-        <TextBlock Text="{Binding Title}" HorizontalAlignment="Center" Margin="0,0,0,10"/>
-
-        <Expander Header="{DynamicResource noteproperty.basic}" HorizontalAlignment="Stretch" Margin="5">
+    <TextBlock Text="{Binding Title}" Height="24" Padding="4" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+    <ScrollViewer Margin="0,48,0,0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible" AllowAutoHide="False">
+      <StackPanel Margin="0,0,16,0">
+        <Expander Header="{DynamicResource noteproperty.basic}" HorizontalAlignment="Stretch" Margin="0,0,4,2">
           <StackPanel IsEnabled="{Binding IsNoteSelected}">
             <Grid ColumnDefinitions="143,*">
               <Label Content="{DynamicResource notedefaults.lyric}" Grid.Column="0"/>
@@ -30,16 +29,16 @@
             </Grid>
             <Grid ColumnDefinitions="143,*">
               <Label Content="{DynamicResource noteproperty.tone}" Grid.Column="0"/>
-              <TextBox Text="{Binding Tone, Mode=OneWay}" Grid.Column="1" Tag="Tone"/>
+              <TextBox Text="{Binding Tone, Mode=OneWay}" Grid.Column="1" Tag="Tone" Margin="0"/>
             </Grid>
           </StackPanel>
         </Expander>
 
-        <Expander Header="{DynamicResource notedefaults.portamento}" HorizontalAlignment="Stretch" Margin="5">
+        <Expander Header="{DynamicResource notedefaults.portamento}" HorizontalAlignment="Stretch" Margin="0,2,4,2">
           <StackPanel IsEnabled="{Binding IsNoteSelected}">
             <Grid ColumnDefinitions="123,20,*">
               <Label Content="{DynamicResource notedefaults.preset}"/>
-              <ComboBox Grid.Column="2" ItemsSource="{Binding PortamentoPresets}"
+              <ComboBox Grid.Column="2" ItemsSource="{Binding PortamentoPresets}" Margin="0"
                 SelectedItem="{Binding ApplyPortamentoPreset}" HorizontalAlignment="Stretch"/>
             </Grid>
             <Grid ColumnDefinitions="123,20,*,20,*">
@@ -59,7 +58,7 @@
             </Grid>
             <Grid ColumnDefinitions="130,20,50,20,*">
               <Label Content="{DynamicResource notedefaults.portamento.start}"/>
-              <TextBox Grid.Column="2" Text="{Binding PortamentoStart}" Tag="PortamentoStart"/>
+              <TextBox Grid.Column="2" Text="{Binding PortamentoStart}" Tag="PortamentoStart" Margin="0"/>
               <Slider Grid.Column="4" Classes="fader" Value="{Binding PortamentoStart}" Minimum="-200" Maximum="200"
                       TickPlacement="BottomRight" TickFrequency="1" IsSnapToTickEnabled="true"
                       Tag="PortamentoStart"/>
@@ -67,13 +66,13 @@
           </StackPanel>
         </Expander>
 
-        <Expander Header="{DynamicResource notedefaults.vibrato}" HorizontalAlignment="Stretch" Margin="5">
+        <Expander Header="{DynamicResource notedefaults.vibrato}" HorizontalAlignment="Stretch" Margin="0,2,4,2">
           <StackPanel IsEnabled="{Binding IsNoteSelected}">
             <ToggleSwitch IsChecked="{Binding VibratoEnable, Mode=OneWay}" OnContent="{DynamicResource prefs.on}" OffContent="{DynamicResource prefs.off}"
                           Click="VibratoEnableClicked"/>
             <Grid ColumnDefinitions="123,20,*">
               <Label Content="{DynamicResource notedefaults.preset}"/>
-              <ComboBox Grid.Column="2" ItemsSource="{Binding VibratoPresets}"
+              <ComboBox Grid.Column="2" ItemsSource="{Binding VibratoPresets}" Margin="0"
                 SelectedItem="{Binding ApplyVibratoPreset}" HorizontalAlignment="Stretch" />
             </Grid>
             <Grid ColumnDefinitions="123,20,*,20,*">
@@ -146,14 +145,14 @@
             </Grid>
             <Grid ColumnDefinitions="180,20,50,20,*">
               <Label Content="{DynamicResource notedefaults.vibrato.autominlength}"/>
-              <TextBox Grid.Column="2" IsEnabled="{Binding AutoVibratoToggle}" Text="{Binding AutoVibratoNoteLength}" />
+              <TextBox Grid.Column="2" IsEnabled="{Binding AutoVibratoToggle}" Text="{Binding AutoVibratoNoteLength}" Margin="0" />
               <Slider Grid.Column="4" Classes="fader" IsEnabled="{Binding AutoVibratoToggle}" Value="{Binding AutoVibratoNoteLength}" Minimum="10" Maximum="1920"
                       TickPlacement="BottomRight" TickFrequency="1" IsSnapToTickEnabled="true" />
             </Grid>
           </StackPanel>
         </Expander>
 
-        <Expander Header="{DynamicResource exps.caption}" HorizontalAlignment="Stretch" Margin="5">
+        <Expander Header="{DynamicResource exps.caption}" HorizontalAlignment="Stretch" Margin="0,2,4,0">
           <StackPanel Name="ExpressionsPanel" />
         </Expander>
 
diff --git a/OpenUtau/Styles/Styles.axaml b/OpenUtau/Styles/Styles.axaml
index 2c36efe5f..ad7b47fe6 100644
--- a/OpenUtau/Styles/Styles.axaml
+++ b/OpenUtau/Styles/Styles.axaml
@@ -431,14 +431,20 @@
   </Style>
 
   <Style Selector="Expander" >
-    <Setter Property="CornerRadius" Value="5" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="{StaticResource SystemControlForegroundBaseMediumBrush}"/>
-    <Setter Property="Padding" Value="10" />
+    <Setter Property="Margin" Value="4,2" />
+    <Setter Property="Padding" Value="4" />
     <Setter Property="IsExpanded" Value="True" />
+    <Setter Property="MinHeight" Value="32" />
 
     <Style Selector="^:down /template/ ToggleButton#ExpanderHeader">
-      <Setter Property="BorderBrush" Value="{StaticResource SystemControlForegroundBaseMediumBrush}"/>
+      <Setter Property="Height" Value="32"/>
+      <Setter Property="MinHeight" Value="32"/>
+    </Style>
+    <Style Selector="^:down /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
+      <Setter Property="Height" Value="20"/>
+    </Style>
+    <Style Selector="^:down /template/ ToggleButton#ExpanderHeader /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Margin" Value="7,0,0,0"/>
     </Style>
   </Style>
 </Styles>
diff --git a/OpenUtau/Views/PianoRollWindow.axaml b/OpenUtau/Views/PianoRollWindow.axaml
index 5e2815b0f..84d300720 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml
+++ b/OpenUtau/Views/PianoRollWindow.axaml
@@ -164,10 +164,17 @@
                    Fill="{DynamicResource TickLineBrushLow}" ZIndex="1000"
                    IsHitTestVisible="False" IsVisible="False"/>
       </Canvas>
-      <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top"
-                  Orientation="Horizontal">
-        <Border>
-          <Menu Grid.Column="1" Grid.Row="0" Height="20" Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
+      <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Margin="2"
+            HorizontalAlignment="Stretch" VerticalAlignment="Top">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto"/>
+          <ColumnDefinition Width="12"/>
+          <ColumnDefinition Width="Auto"/>
+          <ColumnDefinition Width="*"/>
+          <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Border Grid.Column="0">
+          <Menu Height="20" Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
                 Closed="OnMenuClosed" PointerExited="OnMenuPointerLeave">
             <Menu.Styles>
               <Style Selector="CheckBox">
@@ -282,10 +289,17 @@
             <MenuItem Header="{DynamicResource pianoroll.menu.notedefaults}" Click="OnMenuNoteDefaults"/>
           </Menu>
         </Border>
-        <Border Width="24" Height="20"/>
-        <Border>
+        <Border Grid.Column="2">
           <StackPanel Orientation="Horizontal">
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" CornerRadius="2,0,0,2"
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowTips}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.tips}">
+              <Grid Width="18" Height="18">
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="?" FontWeight="Bold"
+                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+              </Grid>
+            </ToggleButton>
+            <Border Width="12"/>
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20"
                           IsChecked="{Binding NotesViewModel.CursorTool, Mode=OneWay}"
                           Command="{Binding NotesViewModel.SelectToolCommand}" CommandParameter="1"
                           ToolTip.Tip="{DynamicResource pianoroll.tool.selectionv2}">
@@ -354,7 +368,7 @@
                   <Path.RenderTransform>
                     <TransformGroup>
                       <ScaleTransform ScaleX=".7" ScaleY=".7" />
-                      <TranslateTransform X="-1" Y="-2"/>
+                      <TranslateTransform X="-2" Y="-2"/>
                     </TransformGroup>
                   </Path.RenderTransform>
                 </Path>
@@ -369,24 +383,13 @@
                   <Path.RenderTransform>
                     <TransformGroup>
                       <ScaleTransform ScaleX=".6" ScaleY=".6" />
-                      <TranslateTransform X="-1" Y="-2"/>
+                      <TranslateTransform X="-2" Y="-2"/>
                     </TransformGroup>
                   </Path.RenderTransform>
                 </Path>
               </Grid>
             </ToggleButton>
-          </StackPanel>
-        </Border>
-        <Border Width="24" Height="20"/>
-        <Border>
-          <StackPanel Orientation="Horizontal">
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" CornerRadius="2,0,0,2" IsChecked="{Binding NotesViewModel.ShowTips}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.tips}">
-              <Grid Width="18" Height="18">
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="?" FontWeight="Bold"
-                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-              </Grid>
-            </ToggleButton>
+            <Border Width="12"/>
             <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.PlayTone}"
                           ToolTip.Tip="{DynamicResource pianoroll.toggle.tone}">
               <Grid Width="18" Height="18">
@@ -443,19 +446,6 @@
                 <Path Classes="stroked" Data="M 3 13 L 6 5.5 L 12 5.5 L 15 13"/>
               </Grid>
             </ToggleButton>
-            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowNoteParams}"
-                          ToolTip.Tip="{DynamicResource pianoroll.toggle.noteparams}">
-              <Grid Width="18" Height="18">
-                <Path Classes="filled" Data="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z">
-                  <Path.RenderTransform>
-                    <TransformGroup>
-                      <ScaleTransform ScaleX=".65" ScaleY=".65" />
-                      <TranslateTransform X="-2" Y="-2"/>
-                    </TransformGroup>
-                  </Path.RenderTransform>
-                </Path>
-              </Grid>
-            </ToggleButton>
             <ToggleButton Name="SnapToggle" Classes="toolbar" Margin="0" Padding="1" Height="20" IsChecked="{Binding NotesViewModel.IsSnapOn}"
                           ToolTip.Tip="{DynamicResource pianoroll.toggle.snap}">
               <Border Width="18" Height="18">
@@ -477,22 +467,39 @@
               </Button.ContextMenu>
             </Button>
             <Button Margin="0" Padding="0,1" Height="20" Width="40" Background="Transparent" Click="OnKeyMenuButton">
-                <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.KeyText}"
-                           TextAlignment="Right" FontSize="10" FontFamily="monospace"
-                           Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-                <Button.ContextMenu>
-                  <ContextMenu Name="KeyMenu" PlacementMode="Bottom" ItemsSource="{Binding NotesViewModel.Keys}" KeyDown="OnKeyKeyDown">
-                    <ContextMenu.DataTemplates>
-                      <DataTemplate DataType="vm:MenuItemViewModel">
-                        <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
-                      </DataTemplate>
-                    </ContextMenu.DataTemplates>
-                  </ContextMenu>
-                </Button.ContextMenu>
-              </Button>
+              <TextBlock Grid.Column="0" Text="{Binding NotesViewModel.KeyText}"
+                          TextAlignment="Right" FontSize="10" FontFamily="monospace"
+                          Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
+              <Button.ContextMenu>
+                <ContextMenu Name="KeyMenu" PlacementMode="Bottom" ItemsSource="{Binding NotesViewModel.Keys}" KeyDown="OnKeyKeyDown">
+                  <ContextMenu.DataTemplates>
+                    <DataTemplate DataType="vm:MenuItemViewModel">
+                      <MenuItem Header="{Binding Header}" Command="{Binding Command, FallbackValue={x:Null}}" CommandParameter="{Binding CommandParameter}"/>
+                    </DataTemplate>
+                  </ContextMenu.DataTemplates>
+                </ContextMenu>
+              </Button.ContextMenu>
+            </Button>
           </StackPanel>
         </Border>
-      </StackPanel>
+        <Border Grid.Column="4">
+          <StackPanel Orientation="Horizontal">
+            <ToggleButton Classes="toolbar" Margin="0" Padding="1" Height="20" Width="20" IsChecked="{Binding NotesViewModel.ShowNoteParams}"
+                          ToolTip.Tip="{DynamicResource pianoroll.toggle.noteparams}">
+              <Grid Width="18" Height="18">
+                <Path Classes="filled" Data="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z">
+                  <Path.RenderTransform>
+                    <TransformGroup>
+                      <ScaleTransform ScaleX=".65" ScaleY=".65" />
+                      <TranslateTransform X="-2" Y="-2"/>
+                    </TransformGroup>
+                  </Path.RenderTransform>
+                </Path>
+              </Grid>
+            </ToggleButton>
+          </StackPanel>
+        </Border>
+      </Grid>
       <StackPanel Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Bottom"
                   Margin="12,12,12,70" Orientation="Horizontal">
         <Border>
@@ -549,7 +556,7 @@
                  IsHitTestVisible="False" VerticalAlignment="Bottom" Margin="10,5"
                  IsVisible="{Binding NotesViewModel.PrimaryKeyNotSupported}"
                  Text="{DynamicResource tip.exps.notsupported}"/>
-      <Border Grid.Column="3" Grid.Row="1" Grid.RowSpan="5"
+      <Border Grid.Column="3" Grid.Row="0" Grid.RowSpan="6"
               IsEnabled="{Binding NotesViewModel.ShowNoteParams}"
               IsVisible="{Binding NotesViewModel.ShowNoteParams}"
               Background="{DynamicResource SystemRegionBrush}" Padding="0">

From 46c2c92d7b2ed593d4a5939874bb19508233e559 Mon Sep 17 00:00:00 2001
From: Sugita Akira <akira3weet@gmail.com>
Date: Sat, 2 Dec 2023 02:01:01 -0800
Subject: [PATCH 14/35] fix test

---
 OpenUtau.Test/Classic/VoicebankLoaderTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenUtau.Test/Classic/VoicebankLoaderTest.cs b/OpenUtau.Test/Classic/VoicebankLoaderTest.cs
index a4db6548c..42f6f51b3 100644
--- a/OpenUtau.Test/Classic/VoicebankLoaderTest.cs
+++ b/OpenUtau.Test/Classic/VoicebankLoaderTest.cs
@@ -30,7 +30,6 @@ public void OtoSetRoundTrip() {
 a.wav=a R,500,,,,
 !@#$!@#$
 aoieu.wav=- a,,,,,
-
 aoieu.wav=a o,,,,,
 aoieu.wav=o i,,,,,
 aoieu.wav=i e,,100,150,,

From 334356bf3c3663694cb997c548ced8a164480814 Mon Sep 17 00:00:00 2001
From: Sugita Akira <akira3weet@gmail.com>
Date: Sat, 2 Dec 2023 02:49:43 -0800
Subject: [PATCH 15/35] tweak note params style again

---
 OpenUtau/Styles/Styles.axaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenUtau/Styles/Styles.axaml b/OpenUtau/Styles/Styles.axaml
index ad7b47fe6..8efb37461 100644
--- a/OpenUtau/Styles/Styles.axaml
+++ b/OpenUtau/Styles/Styles.axaml
@@ -435,10 +435,12 @@
     <Setter Property="Padding" Value="4" />
     <Setter Property="IsExpanded" Value="True" />
     <Setter Property="MinHeight" Value="32" />
+    <Setter Property="Background" Value="Transparent" />
 
     <Style Selector="^:down /template/ ToggleButton#ExpanderHeader">
       <Setter Property="Height" Value="32"/>
       <Setter Property="MinHeight" Value="32"/>
+      <Setter Property="FontWeight" Value="Bold"/>
     </Style>
     <Style Selector="^:down /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
       <Setter Property="Height" Value="20"/>

From d5eff8dd48994e862d38f61452969826f3f6d29e Mon Sep 17 00:00:00 2001
From: Sugita Akira <akira3weet@gmail.com>
Date: Sat, 2 Dec 2023 03:00:36 -0800
Subject: [PATCH 16/35] upgrade xunit

---
 OpenUtau.Test/OpenUtau.Test.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenUtau.Test/OpenUtau.Test.csproj b/OpenUtau.Test/OpenUtau.Test.csproj
index 61ddf7bbe..2056846b6 100644
--- a/OpenUtau.Test/OpenUtau.Test.csproj
+++ b/OpenUtau.Test/OpenUtau.Test.csproj
@@ -11,11 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

From ad0bc4f9888692101d276fcf6e9540576a7c05c5 Mon Sep 17 00:00:00 2001
From: Sugita Akira <akira3weet@gmail.com>
Date: Sat, 2 Dec 2023 04:42:04 -0800
Subject: [PATCH 17/35] handle invalid oto lines the right way

---
 OpenUtau.Core/Classic/VoicebankLoader.cs     | 10 +++-------
 OpenUtau.Test/Classic/VoicebankLoaderTest.cs |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/OpenUtau.Core/Classic/VoicebankLoader.cs b/OpenUtau.Core/Classic/VoicebankLoader.cs
index 651c5ad2f..20eaa7c04 100644
--- a/OpenUtau.Core/Classic/VoicebankLoader.cs
+++ b/OpenUtau.Core/Classic/VoicebankLoader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -341,10 +341,6 @@ public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encodi
                 };
                 while (!reader.EndOfStream) {
                     var line = reader.ReadLine().Trim();
-                    if (string.IsNullOrWhiteSpace(line) ) {
-                        trace.lineNumber++;
-                        continue;
-                    }
                     trace.line = line;
                     try {
                         Oto oto = ParseOto(line, trace);
@@ -366,7 +362,7 @@ public static OtoSet ParseOtoSet(Stream stream, string filePath, Encoding encodi
 
         static void AddAliasForMissingFiles(OtoSet otoSet) {
             // Use filename as alias if not in oto.
-            var knownFiles = otoSet.Otos.Select(oto => oto.Wav).ToHashSet();
+            var knownFiles = otoSet.Otos.Where(oto => oto.IsValid).Select(oto => oto.Wav).ToHashSet();
             var dir = Path.GetDirectoryName(otoSet.File);
             foreach (var wav in Directory.EnumerateFiles(dir, "*.wav", SearchOption.TopDirectoryOnly)) {
                 var file = Path.GetFileName(wav);
@@ -383,7 +379,7 @@ static void AddAliasForMissingFiles(OtoSet otoSet) {
         }
 
         static void CheckWavExist(OtoSet otoSet) {
-            var wavGroups = otoSet.Otos.GroupBy(oto => oto.Wav);
+            var wavGroups = otoSet.Otos.Where(oto => oto.IsValid).GroupBy(oto => oto.Wav);
             foreach (var group in wavGroups) {
                 string path = Path.Combine(Path.GetDirectoryName(otoSet.File), group.Key);
                 if (!File.Exists(path)) {
diff --git a/OpenUtau.Test/Classic/VoicebankLoaderTest.cs b/OpenUtau.Test/Classic/VoicebankLoaderTest.cs
index 42f6f51b3..a4db6548c 100644
--- a/OpenUtau.Test/Classic/VoicebankLoaderTest.cs
+++ b/OpenUtau.Test/Classic/VoicebankLoaderTest.cs
@@ -30,6 +30,7 @@ public void OtoSetRoundTrip() {
 a.wav=a R,500,,,,
 !@#$!@#$
 aoieu.wav=- a,,,,,
+
 aoieu.wav=a o,,,,,
 aoieu.wav=o i,,,,,
 aoieu.wav=i e,,100,150,,

From 0545449e99646265700b4770f84a5b8e4aaab0d1 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 7 Dec 2023 23:15:21 +0100
Subject: [PATCH 18/35] Automatically add ending if present

---
 .../ChineseCVVCPhonemizer.cs                  | 61 +++++++++++++++++--
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
index 5bf66a02e..9a43a5ff9 100644
--- a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
@@ -14,7 +14,6 @@ public class ChineseCVVCPhonemizer : BaseChinesePhonemizer {
         private Dictionary<string, string> vowels = new Dictionary<string, string>();
         private Dictionary<string, string> consonants = new Dictionary<string, string>();
         private USinger singer;
-
         public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevNeighbour, Note? nextNeighbour, Note[] prevNeighbours) {
             var lyric = notes[0].lyric;
             string consonant = consonants.TryGetValue(lyric, out consonant) ? consonant : lyric;
@@ -27,13 +26,31 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             };
             var attr0 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 0) ?? default;
             var attr1 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 1) ?? default;
+            var attr2 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 2) ?? default;
             if (lyric == "-" || lyric.ToLowerInvariant() == "r") {
                 if (singer.TryGetMappedOto($"{prevVowel} R", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto1)) {
                     return MakeSimpleResult(oto1.Alias);
                 }
                 return MakeSimpleResult($"{prevVowel} R");
             }
+            string currVowel = vowels.TryGetValue(lyric, out currVowel) ? currVowel : lyric;
+            int totalDuration = notes.Sum(n => n.duration); // totalDuration of current note
+
             if (singer.TryGetMappedOto($"{prevVowel} {lyric}", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto)) {
+                if (nextNeighbour == null && singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var oto1)) {
+                    // automatically add ending if present
+                    return new Result {
+                        phonemes = new Phoneme[] {
+                                new Phoneme() {
+                                    phoneme = oto.Alias,
+                                },
+                                new Phoneme() {
+                                    phoneme = oto1.Alias,
+                                    position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                    };
+                }
                 return MakeSimpleResult(oto.Alias);
             }
             int vcLen = 120;
@@ -51,10 +68,10 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 if (singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out oto)) {
                     vcPhoneme = oto.Alias;
                 }
-                // totalDuration calculated on basis of previous note length
-                int totalDuration = prevNeighbour.Value.duration;
+                // prevDuration calculated on basis of previous note length
+                int prevDuration = prevNeighbour.Value.duration;
                 // vcLength depends on the Vel of the current base note
-                vcLen = Convert.ToInt32(Math.Min(totalDuration / 1.5, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
+                vcLen = Convert.ToInt32(Math.Min(prevDuration / 1.5, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
             } else {
                 if (singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out oto)) {
                     vcPhoneme = oto.Alias;
@@ -63,6 +80,42 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 vcLen = Convert.ToInt32(Math.Min(vcLen * 2, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
             }
 
+            if (nextNeighbour == null) { // automatically add ending if present
+                if (!string.IsNullOrEmpty(vcPhoneme)) {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var oto1)) {
+                        return new Result {
+                            phonemes = new Phoneme[] {
+                                new Phoneme() {
+                                    phoneme = vcPhoneme,
+                                    position = -vcLen,
+                                },
+                                new Phoneme() {
+                                    phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                new Phoneme() {
+                                    phoneme = oto1.Alias,
+                                    position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                        };
+                    }
+                } else {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var oto1)) {
+                        return new Result {
+                            phonemes = new Phoneme[] {
+                                new Phoneme() {
+                                    phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                new Phoneme() {
+                                    phoneme = oto1.Alias,
+                                    position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                        };
+                    }
+                }
+            }
+
             if (singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out oto)) {
                 return new Result {
                     phonemes = new Phoneme[] {

From 71d4afc7d5ebaebe96a28b2a09636a38277e3eea Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 7 Dec 2023 23:22:30 +0100
Subject: [PATCH 19/35] Automatic vowel ending

---
 .../CantoneseCVVCPhonemizer.cs                | 60 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
index 33624caad..9f79f5d8b 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
@@ -31,13 +31,31 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             };
             var attr0 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 0) ?? default;
             var attr1 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 1) ?? default;
+            var attr2 = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == 2) ?? default;
             if (lyric == "-" || lyric.ToLowerInvariant() == "r") {
                 if (singer.TryGetMappedOto($"{prevVowel} R", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto1)) {
                     return MakeSimpleResult(oto1.Alias);
                 }
                 return MakeSimpleResult($"{prevVowel} R");
             }
+            string currVowel = vowels.TryGetValue(lyric, out currVowel) ? currVowel : lyric;
+            int totalDuration = notes.Sum(n => n.duration); // totalDuration of current note
+
             if (singer.TryGetMappedOto($"{prevVowel} {lyric}", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto)) {
+                if (nextNeighbour == null && singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var oto1)) {
+                    // automatically add ending if present
+                    return new Result {
+                        phonemes = new Phoneme[] {
+                                new Phoneme() {
+                                    phoneme = oto.Alias,
+                                },
+                                new Phoneme() {
+                                    phoneme = oto1.Alias,
+                                    position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                    };
+                }
                 return MakeSimpleResult(oto.Alias);
             }
             int vcLen = 120;
@@ -55,10 +73,10 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 if (singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out oto)) {
                     vcPhoneme = oto.Alias;
                 }
-                // totalDuration calculated on basis of previous note length
-                int totalDuration = prevNeighbour.Value.duration;
+                // prevDuration calculated on basis of previous note length
+                int prevDuration = prevNeighbour.Value.duration;
                 // vcLength depends on the Vel of the current base note
-                vcLen = Convert.ToInt32(Math.Min(totalDuration / 1.5, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
+                vcLen = Convert.ToInt32(Math.Min(prevDuration / 1.5, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
             } else {
                 if (singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out oto)) {
                     vcPhoneme = oto.Alias;
@@ -67,6 +85,42 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 vcLen = Convert.ToInt32(Math.Min(vcLen * 2, Math.Max(30, vcLen * (attr1.consonantStretchRatio ?? 1))));
             }
 
+            if (nextNeighbour == null) { // automatically add ending if present
+                if (!string.IsNullOrEmpty(vcPhoneme)) {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var oto1)) {
+                        return new Result {
+                            phonemes = new Phoneme[] {
+                                new Phoneme() {
+                                    phoneme = vcPhoneme,
+                                    position = -vcLen,
+                                },
+                                new Phoneme() {
+                                    phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                new Phoneme() {
+                                    phoneme = oto1.Alias,
+                                    position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                        };
+                    }
+                } else {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var oto1)) {
+                        return new Result {
+                            phonemes = new Phoneme[] {
+                                new Phoneme() {
+                                    phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                new Phoneme() {
+                                    phoneme = oto1.Alias,
+                                    position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                        };
+                    }
+                }
+            }
+
             if (singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out oto)) {
                 return new Result {
                     phonemes = new Phoneme[] {

From 916c1f75dc0e8889e789b3b46c1d5b6ae86b31b3 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 7 Dec 2023 23:30:11 +0100
Subject: [PATCH 20/35] Rerun tests


From ebf1c885eb47b6640d8d4ab09d175af1de433b7d Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Thu, 7 Dec 2023 23:31:52 +0100
Subject: [PATCH 21/35] Rerun tests


From 8eec8ba6cb30bc6fe6daca0e4a4435becfa3924f Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 00:43:33 +0100
Subject: [PATCH 22/35] Start fix

---
 .../ChineseCVVCPhonemizer.cs                  | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
index 9a43a5ff9..a212da0d2 100644
--- a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
@@ -81,33 +81,54 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             }
 
             if (nextNeighbour == null) { // automatically add ending if present
-                if (!string.IsNullOrEmpty(vcPhoneme)) {
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var oto1)) {
+                if (singer.TryGetMappedOto($"{prevVowel} {lyric}", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto0)) {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var otoEnd)) {
+                        // automatically add ending if present
                         return new Result {
                             phonemes = new Phoneme[] {
                                 new Phoneme() {
-                                    phoneme = vcPhoneme,
-                                    position = -vcLen,
+                                    phoneme = oto0.Alias,
                                 },
                                 new Phoneme() {
-                                    phoneme = cvOto?.Alias ?? lyric,
-                                },
-                                new Phoneme() {
-                                    phoneme = oto1.Alias,
+                                    phoneme = otoEnd.Alias,
                                     position = totalDuration - (totalDuration / 6),
                                 },
                             },
                         };
                     }
                 } else {
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var oto1)) {
+                    // use vc if present
+                    if (prevNeighbour == null && singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out var vcOto1)) {
+                        vcPhoneme = vcOto1.Alias;
+                    } else if (prevNeighbour != null && singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out var vcOto2)) {
+                        vcPhoneme = vcOto2.Alias;
+                    }
+                    // automatically add ending if present
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out cvOto)) {
+                        return new Result {
+                            phonemes = new Phoneme[] {
+                                    new Phoneme() {
+                                        phoneme = vcPhoneme,
+                                        position = -vcLen,
+                                },
+                                    new Phoneme() {
+                                        phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                    new Phoneme() {
+                                        phoneme = otoEnd.Alias,
+                                        position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                        };
+                    } // just base note and ending
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var otoEnd1)) {
                         return new Result {
                             phonemes = new Phoneme[] {
                                 new Phoneme() {
                                     phoneme = cvOto?.Alias ?? lyric,
                                 },
                                 new Phoneme() {
-                                    phoneme = oto1.Alias,
+                                    phoneme = otoEnd1.Alias,
                                     position = totalDuration - (totalDuration / 6),
                                 },
                             },

From be0ba960ca02d9fd9b86484f985272292a222a45 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 00:45:00 +0100
Subject: [PATCH 23/35] Start fix

---
 .../CantoneseCVVCPhonemizer.cs                | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
index 9f79f5d8b..f05ab6273 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
@@ -86,33 +86,54 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             }
 
             if (nextNeighbour == null) { // automatically add ending if present
-                if (!string.IsNullOrEmpty(vcPhoneme)) {
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var oto1)) {
+                if (singer.TryGetMappedOto($"{prevVowel} {lyric}", notes[0].tone + attr0.toneShift, attr0.voiceColor, out var oto0)) {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var otoEnd)) {
+                        // automatically add ending if present
                         return new Result {
                             phonemes = new Phoneme[] {
                                 new Phoneme() {
-                                    phoneme = vcPhoneme,
-                                    position = -vcLen,
+                                    phoneme = oto0.Alias,
                                 },
                                 new Phoneme() {
-                                    phoneme = cvOto?.Alias ?? lyric,
-                                },
-                                new Phoneme() {
-                                    phoneme = oto1.Alias,
+                                    phoneme = otoEnd.Alias,
                                     position = totalDuration - (totalDuration / 6),
                                 },
                             },
                         };
                     }
                 } else {
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var oto1)) {
+                    // use vc if present
+                    if (prevNeighbour == null && singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out var vcOto1)) {
+                        vcPhoneme = vcOto1.Alias;
+                    } else if (prevNeighbour != null && singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out var vcOto2)) {
+                        vcPhoneme = vcOto2.Alias;
+                    }
+                    // automatically add ending if present
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out cvOto)) {
+                        return new Result {
+                            phonemes = new Phoneme[] {
+                                    new Phoneme() {
+                                        phoneme = vcPhoneme,
+                                        position = -vcLen,
+                                },
+                                    new Phoneme() {
+                                        phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                    new Phoneme() {
+                                        phoneme = otoEnd.Alias,
+                                        position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                        };
+                    } // just base note and ending
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var otoEnd1)) {
                         return new Result {
                             phonemes = new Phoneme[] {
                                 new Phoneme() {
                                     phoneme = cvOto?.Alias ?? lyric,
                                 },
                                 new Phoneme() {
-                                    phoneme = oto1.Alias,
+                                    phoneme = otoEnd1.Alias,
                                     position = totalDuration - (totalDuration / 6),
                                 },
                             },

From f914aa3e5ab6c54e95cf57d4c498c0c9ab17518f Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 01:12:41 +0100
Subject: [PATCH 24/35] Rerun checks


From 34862d840983b3143d8cc5233ad83aa090a0becd Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 02:00:33 +0100
Subject: [PATCH 25/35] Fix simple CV

---
 OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
index a212da0d2..b8dbfdd80 100644
--- a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
@@ -63,6 +63,11 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     vcLen = MsToTick(cvOto.Preutter - cvOto.Overlap);
                 }
             }
+
+            if (singer.TryGetMappedOto(lyric, notes[0].tone + attr0.toneShift, attr0.voiceColor, out var cvOtoSimple)) {
+                lyric = cvOtoSimple.Alias;
+            }
+
             var vcPhoneme = $"{prevVowel} {consonant}";
             if (prevNeighbour != null) {
                 if (singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out oto)) {
@@ -104,7 +109,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                         vcPhoneme = vcOto2.Alias;
                     }
                     // automatically add ending if present
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out cvOto)) {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out var cvOto1)) {
                         return new Result {
                             phonemes = new Phoneme[] {
                                     new Phoneme() {
@@ -112,7 +117,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                                         position = -vcLen,
                                 },
                                     new Phoneme() {
-                                        phoneme = cvOto?.Alias ?? lyric,
+                                        phoneme = cvOto1?.Alias ?? lyric,
                                 },
                                     new Phoneme() {
                                         phoneme = otoEnd.Alias,
@@ -125,7 +130,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                         return new Result {
                             phonemes = new Phoneme[] {
                                 new Phoneme() {
-                                    phoneme = cvOto?.Alias ?? lyric,
+                                    phoneme = cvOtoSimple?.Alias ?? lyric,
                                 },
                                 new Phoneme() {
                                     phoneme = otoEnd1.Alias,
@@ -150,7 +155,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     },
                 };
             }
-            return MakeSimpleResult(cvOto?.Alias ?? lyric);
+            return MakeSimpleResult(cvOtoSimple?.Alias ?? lyric);
         }
 
         public override void SetSinger(USinger singer) {

From bd5ff862ac41143224682c5dd43c0b6bbe2f2c5a Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 02:01:23 +0100
Subject: [PATCH 26/35] Simple CV fix

---
 OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
index f05ab6273..a94c1258c 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
@@ -68,6 +68,11 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     vcLen = MsToTick(cvOto.Preutter - cvOto.Overlap);
                 }
             }
+
+            if (singer.TryGetMappedOto(lyric, notes[0].tone + attr0.toneShift, attr0.voiceColor, out var cvOtoSimple)) {
+                lyric = cvOtoSimple.Alias;
+            }
+
             var vcPhoneme = $"{prevVowel} {consonant}";
             if (prevNeighbour != null) {
                 if (singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out oto)) {
@@ -109,7 +114,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                         vcPhoneme = vcOto2.Alias;
                     }
                     // automatically add ending if present
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out cvOto)) {
+                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out var cvOto1)) {
                         return new Result {
                             phonemes = new Phoneme[] {
                                     new Phoneme() {
@@ -117,7 +122,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                                         position = -vcLen,
                                 },
                                     new Phoneme() {
-                                        phoneme = cvOto?.Alias ?? lyric,
+                                        phoneme = cvOto1?.Alias ?? lyric,
                                 },
                                     new Phoneme() {
                                         phoneme = otoEnd.Alias,
@@ -130,7 +135,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                         return new Result {
                             phonemes = new Phoneme[] {
                                 new Phoneme() {
-                                    phoneme = cvOto?.Alias ?? lyric,
+                                    phoneme = cvOtoSimple?.Alias ?? lyric,
                                 },
                                 new Phoneme() {
                                     phoneme = otoEnd1.Alias,
@@ -155,7 +160,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     },
                 };
             }
-            return MakeSimpleResult(cvOto?.Alias ?? lyric);
+            return MakeSimpleResult(cvOtoSimple?.Alias ?? lyric);
         }
 
         public override void SetSinger(USinger singer) {

From f9e5e96676ffc4bdbef367daf51ed91a2cb6b9c2 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 02:20:17 +0100
Subject: [PATCH 27/35] CV fix

---
 .../CantoneseCVVCPhonemizer.cs                | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
index a94c1258c..4f05191c8 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseCVVCPhonemizer.cs
@@ -110,26 +110,44 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     // use vc if present
                     if (prevNeighbour == null && singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out var vcOto1)) {
                         vcPhoneme = vcOto1.Alias;
+                        // automatically add ending if present
+                        if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd)) {
+                            return new Result {
+                                phonemes = new Phoneme[] {
+                                    new Phoneme() {
+                                        phoneme = vcPhoneme,
+                                        position = -vcLen,
+                                },
+                                    new Phoneme() {
+                                        phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                    new Phoneme() {
+                                        phoneme = otoEnd.Alias,
+                                        position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                            };
+                        }
                     } else if (prevNeighbour != null && singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out var vcOto2)) {
                         vcPhoneme = vcOto2.Alias;
-                    }
-                    // automatically add ending if present
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out var cvOto1)) {
-                        return new Result {
-                            phonemes = new Phoneme[] {
+                        // automatically add ending if present
+                        if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd)) {
+                            return new Result {
+                                phonemes = new Phoneme[] {
                                     new Phoneme() {
                                         phoneme = vcPhoneme,
                                         position = -vcLen,
                                 },
                                     new Phoneme() {
-                                        phoneme = cvOto1?.Alias ?? lyric,
+                                        phoneme = cvOto?.Alias ?? lyric,
                                 },
                                     new Phoneme() {
                                         phoneme = otoEnd.Alias,
                                         position = totalDuration - (totalDuration / 6),
                                 },
                             },
-                        };
+                            };
+                        }
                     } // just base note and ending
                     if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var otoEnd1)) {
                         return new Result {

From 1c02267b5121376bb0b7cae60936d09904b0d25c Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 02:20:59 +0100
Subject: [PATCH 28/35] CV fix

---
 .../ChineseCVVCPhonemizer.cs                  | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
index b8dbfdd80..42c8fba29 100644
--- a/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/ChineseCVVCPhonemizer.cs
@@ -105,26 +105,44 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     // use vc if present
                     if (prevNeighbour == null && singer.TryGetMappedOto(vcPhoneme, notes[0].tone + attr0.toneShift, attr0.voiceColor, out var vcOto1)) {
                         vcPhoneme = vcOto1.Alias;
+                        // automatically add ending if present
+                        if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd)) {
+                            return new Result {
+                                phonemes = new Phoneme[] {
+                                    new Phoneme() {
+                                        phoneme = vcPhoneme,
+                                        position = -vcLen,
+                                },
+                                    new Phoneme() {
+                                        phoneme = cvOto?.Alias ?? lyric,
+                                },
+                                    new Phoneme() {
+                                        phoneme = otoEnd.Alias,
+                                        position = totalDuration - (totalDuration / 6),
+                                },
+                            },
+                            };
+                        }
                     } else if (prevNeighbour != null && singer.TryGetMappedOto(vcPhoneme, prevNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out var vcOto2)) {
                         vcPhoneme = vcOto2.Alias;
-                    }
-                    // automatically add ending if present
-                    if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd) && singer.TryGetMappedOto(lyric, notes[0].tone + attr1.toneShift, attr1.voiceColor, out var cvOto1)) {
-                        return new Result {
-                            phonemes = new Phoneme[] {
+                        // automatically add ending if present
+                        if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr2.toneShift, attr2.voiceColor, out var otoEnd)) {
+                            return new Result {
+                                phonemes = new Phoneme[] {
                                     new Phoneme() {
                                         phoneme = vcPhoneme,
                                         position = -vcLen,
                                 },
                                     new Phoneme() {
-                                        phoneme = cvOto1?.Alias ?? lyric,
+                                        phoneme = cvOto?.Alias ?? lyric,
                                 },
                                     new Phoneme() {
                                         phoneme = otoEnd.Alias,
                                         position = totalDuration - (totalDuration / 6),
                                 },
                             },
-                        };
+                            };
+                        }
                     } // just base note and ending
                     if (singer.TryGetMappedOto($"{currVowel} R", notes[0].tone + attr1.toneShift, attr1.voiceColor, out var otoEnd1)) {
                         return new Result {

From df6829eb87d5d1ad75340c5f55dd11652c158a25 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Fri, 8 Dec 2023 20:02:17 +0100
Subject: [PATCH 29/35] Prioritize vowel ending when next neighbour is null

---
 .../CantoneseSyoPhonemizer.cs                 | 44 ++++++-------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
index 7b8ddc221..feb032517 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -145,8 +145,18 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     }
                 }
 
-                var tails = new List<string> { phoneme1 };
-                if (!string.IsNullOrEmpty(phoneme1)) {
+                int length2 = 60;
+                if (length2 > totalDuration / 2) {
+                    length2 = totalDuration / 2;
+                }
+                if (nextNeighbour == null && singer.TryGetMappedOto(fin, note.tone, out _)) {
+                    // Vowel ending is minimum 60 ticks, maximum half of note
+                    var finals = new List<string> { fin };
+                    if (checkOtoUntilHitFinal(finals, note, out var otoFin)) {
+                        phoneme1 = otoFin.Alias;
+                    }
+                } else {
+                    var tails = new List<string> { phoneme1 };
                     // find potential substitute symbol
                     if (finalSubLookup.TryGetValue(phoneme1 ?? string.Empty, out var finSub)) {
                         tails.Add(finSub);
@@ -154,35 +164,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     if (checkOtoUntilHitFinal(tails, note, out var otoTail)) {
                         phoneme1 = otoTail.Alias;
                     } else {
-                        // Check for vowel ending if final does not exist and there's no next neighbor
-                        if (nextNeighbour == null && !string.IsNullOrEmpty(fin)) {
-                            // Vowel ending is minimum 60 ticks, maximum half of note
-                            int length2 = 60;
-
-                            if (length2 > totalDuration / 2) {
-                                length2 = totalDuration / 2;
-                            }
-
-                            var finals = new List<string> { fin };
-                            if (checkOtoUntilHitFinal(finals, note, out var otoFin)) {
-                                phoneme1 = otoFin.Alias;
-                            } else {
-                                return MakeSimpleResult(phoneme0);
-                            }
-                            return new Result {
-                                phonemes = new Phoneme[] {
-                                new Phoneme() {
-                                    phoneme = phoneme0,
-                                },
-                                new Phoneme() {
-                                    phoneme = phoneme1,
-                                    position = totalDuration - length2,
-                                }
-                                },
-                            };
-                        } else {
-                            return MakeSimpleResult(phoneme0);
-                        }
+                        return MakeSimpleResult(phoneme0);
                     }
                 }
 

From 1b324dc6f2337700d511fc7ef7eee8bac761adfe Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Sat, 9 Dec 2023 06:27:08 +0100
Subject: [PATCH 30/35] Add mustvc option

---
 OpenUtau.Plugin.Builtin/JapanesePresampPhonemizer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenUtau.Plugin.Builtin/JapanesePresampPhonemizer.cs b/OpenUtau.Plugin.Builtin/JapanesePresampPhonemizer.cs
index 19bac5f7f..47bd632df 100644
--- a/OpenUtau.Plugin.Builtin/JapanesePresampPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/JapanesePresampPhonemizer.cs
@@ -195,7 +195,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
             // Insert 2nd phoneme (when next doesn't have hint)
             if (nextNeighbour != null && string.IsNullOrEmpty(nextNeighbour.Value.phoneticHint)) {
                 int totalDuration = notes.Sum(n => n.duration);
-                if (TickToMs(totalDuration) < 100) {
+                if (TickToMs(totalDuration) < 100 && presamp.MustVC == false) {
                     return MakeSimpleResult(currentLyric);
                 }
 

From ca9ed96c0d95a6ce0e9f390328ed9bef00334a8a Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Sat, 9 Dec 2023 23:38:17 +0800
Subject: [PATCH 31/35] fix error when opening singer view if the singer used
 in the ustx doesn't exist

---
 OpenUtau/Views/MainWindow.axaml.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/OpenUtau/Views/MainWindow.axaml.cs b/OpenUtau/Views/MainWindow.axaml.cs
index 128ac2e0c..3aa9f4c7f 100644
--- a/OpenUtau/Views/MainWindow.axaml.cs
+++ b/OpenUtau/Views/MainWindow.axaml.cs
@@ -474,6 +474,18 @@ void OnMenuSingers(object sender, RoutedEventArgs args) {
             OpenSingersWindow();
         }
 
+        /// <summary>
+        /// Check if a track has a singer and if it exists.
+        /// If the user haven't selected a singer for the track, or the singer specified in ustx project doesn't exist, return null.
+        /// Otherwise, return the singer.
+        /// </summary>
+        public USinger? TrackSingerIfFound(UTrack track){
+            if(track.Singer?.Found ?? false){
+                return track.Singer;
+            }
+            return null;
+        }
+
         public void OpenSingersWindow() {
             var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
             if (lifetime == null) {
@@ -486,10 +498,10 @@ public void OpenSingersWindow() {
                 if (dialog == null) {
                     USinger? singer = null;
                     if (viewModel.TracksViewModel.SelectedParts.Count > 0) {
-                        singer = viewModel.TracksViewModel.Tracks[viewModel.TracksViewModel.SelectedParts.First().trackNo].Singer;
+                        singer = TrackSingerIfFound(viewModel.TracksViewModel.Tracks[viewModel.TracksViewModel.SelectedParts.First().trackNo]);
                     }
                     if (singer == null && viewModel.TracksViewModel.Tracks.Count > 0) {
-                        singer = viewModel.TracksViewModel.Tracks.First().Singer;
+                        singer = TrackSingerIfFound(viewModel.TracksViewModel.Tracks.First());
                     }
                     var vm = new SingersViewModel();
                     if (singer != null) {

From 59a3963148b8dcd56450fdcb448424d45f8c7bc7 Mon Sep 17 00:00:00 2001
From: Mark Beltran <markmbeltran@gmail.com>
Date: Sun, 10 Dec 2023 10:00:37 +0800
Subject: [PATCH 32/35] Refactor affix assignment as protected virtual method

Allowing prefix/suffix assignment behavior to be customized by individual phonemizers
---
 .../SyllableBasedPhonemizer.cs                | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/OpenUtau.Plugin.Builtin/SyllableBasedPhonemizer.cs b/OpenUtau.Plugin.Builtin/SyllableBasedPhonemizer.cs
index f6a13f31a..72b94c289 100644
--- a/OpenUtau.Plugin.Builtin/SyllableBasedPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/SyllableBasedPhonemizer.cs
@@ -171,7 +171,12 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                 }
             }
 
-            // Assign pitch/color suffixes
+            return new Result() {
+                phonemes = AssignAllAffixes(phonemes, notes, prevNeighbours)
+            };
+        }
+
+        protected virtual Phoneme[] AssignAllAffixes(List<Phoneme> phonemes, Note[] notes, Note[] prevs) {
             int noteIndex = 0;
             for (int i = 0; i < phonemes.Count; i++) {
                 var attr = notes[0].phonemeAttributes?.FirstOrDefault(attr => attr.index == i) ?? default;
@@ -183,10 +188,10 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     noteIndex++;
                 }
                 var noteStartPosition = notes[noteIndex].position - notes[0].position;
-                int tone = (prevNeighbours != null && prevNeighbours.Length > 0 && phoneme.position < noteStartPosition) ? 
-                    prevNeighbours.Last().tone : (noteIndex > 0 && phoneme.position < noteStartPosition) ?
-                    notes[noteIndex-1].tone : notes[noteIndex].tone;
-                
+                int tone = (prevs != null && prevs.Length > 0 && phoneme.position < noteStartPosition) ?
+                    prevs.Last().tone : (noteIndex > 0 && phoneme.position < noteStartPosition) ?
+                    notes[noteIndex - 1].tone : notes[noteIndex].tone;
+
                 var validatedAlias = phoneme.phoneme;
                 if (validatedAlias != null) {
                     validatedAlias = ValidateAliasIfNeeded(validatedAlias, tone + toneShift);
@@ -200,10 +205,7 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
 
                 phonemes[i] = phoneme;
             }
-
-            return new Result() {
-                phonemes = phonemes.ToArray()
-            };
+            return phonemes.ToArray();
         }
 
         private Result HandleError() {

From 2fdacc7d6de32320478f874d097f3a6f0510e6ae Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Sun, 10 Dec 2023 11:41:29 +0800
Subject: [PATCH 33/35] When opening phonetic assistant, auto use the g2p used
 last time

---
 OpenUtau.Core/Util/Preferences.cs                 | 1 +
 OpenUtau/ViewModels/PhoneticAssistantViewModel.cs | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
index a6a94bedb..ef5f2e9a9 100644
--- a/OpenUtau.Core/Util/Preferences.cs
+++ b/OpenUtau.Core/Util/Preferences.cs
@@ -178,6 +178,7 @@ public class SerializablePreferences {
             public bool RememberMid = false;
             public bool RememberUst = true;
             public bool RememberVsqx = true;
+            public string PhoneticAssistant = string.Empty;
         }
     }
 }
diff --git a/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs b/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs
index bc3851199..c4a7de779 100644
--- a/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs
+++ b/OpenUtau/ViewModels/PhoneticAssistantViewModel.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reactive.Linq;
 using OpenUtau.Core.G2p;
+using OpenUtau.Core.Util;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
@@ -35,6 +37,7 @@ public G2pOption(Type klass) {
         private Api.G2pPack? g2p;
 
         public PhoneticAssistantViewModel() {
+            G2p = g2ps.FirstOrDefault(x=>x.name == Preferences.Default.PhoneticAssistant) ?? g2ps.First();
             Grapheme = string.Empty;
             Phonemes = string.Empty;
             this.WhenAnyValue(x => x.G2p)
@@ -42,6 +45,8 @@ public PhoneticAssistantViewModel() {
                     g2p = null;
                     if (option != null) {
                         g2p = Activator.CreateInstance(option.klass) as Api.G2pPack;
+                        Preferences.Default.PhoneticAssistant = option.name;
+                        Preferences.Save();
                         Refresh();
                     }
                 });

From ea1ceb219d17a1fdd6242b1ad1f9e349a3f6fe00 Mon Sep 17 00:00:00 2001
From: Lotte V <lottevmusic@outlook.com>
Date: Sun, 10 Dec 2023 21:05:43 +0100
Subject: [PATCH 34/35] Length fix

---
 OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
index feb032517..fdb0be122 100644
--- a/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
+++ b/OpenUtau.Plugin.Builtin/CantoneseSyoPhonemizer.cs
@@ -155,6 +155,17 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
                     if (checkOtoUntilHitFinal(finals, note, out var otoFin)) {
                         phoneme1 = otoFin.Alias;
                     }
+                    return new Result {
+                        phonemes = new Phoneme[] {
+                        new Phoneme() {
+                            phoneme = phoneme0,
+                        },
+                        new Phoneme() {
+                            phoneme = phoneme1,
+                            position = totalDuration - length2,
+                        }
+                    },
+                    };
                 } else {
                     var tails = new List<string> { phoneme1 };
                     // find potential substitute symbol

From 723e8e2b06eaa36cc2fc6a25485440a989c5e289 Mon Sep 17 00:00:00 2001
From: oxygen-dioxide <54425948+oxygen-dioxide@users.noreply.github.com>
Date: Mon, 11 Dec 2023 09:32:53 +0800
Subject: [PATCH 35/35] add an option to disable showing icon on piano roll

---
 OpenUtau.Core/Util/Preferences.cs           | 1 +
 OpenUtau/Strings/Strings.axaml              | 1 +
 OpenUtau/ViewModels/NotesViewModel.cs       | 2 +-
 OpenUtau/ViewModels/PianoRollViewModel.cs   | 1 +
 OpenUtau/ViewModels/PreferencesViewModel.cs | 8 ++++++++
 OpenUtau/Views/PianoRollWindow.axaml        | 5 +++++
 OpenUtau/Views/PianoRollWindow.axaml.cs     | 6 ++++++
 OpenUtau/Views/PreferencesDialog.axaml      | 4 ++++
 8 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/OpenUtau.Core/Util/Preferences.cs b/OpenUtau.Core/Util/Preferences.cs
index a6a94bedb..bb2a83202 100644
--- a/OpenUtau.Core/Util/Preferences.cs
+++ b/OpenUtau.Core/Util/Preferences.cs
@@ -160,6 +160,7 @@ public class SerializablePreferences {
             public int PlaybackAutoScroll = 2;
             public bool ReverseLogOrder = true;
             public bool ShowPortrait = true;
+            public bool ShowIcon = true;
             public bool ShowGhostNotes = true;
             public bool PlayTone = true;
             public bool ShowVibrato = true;
diff --git a/OpenUtau/Strings/Strings.axaml b/OpenUtau/Strings/Strings.axaml
index 60a81b2ca..855a46717 100644
--- a/OpenUtau/Strings/Strings.axaml
+++ b/OpenUtau/Strings/Strings.axaml
@@ -299,6 +299,7 @@ Warning: this option removes custom presets.</system:String>
   <system:String x:Key="prefs.appearance.degree.solfege">Solfège (do re mi fa sol la ti)</system:String>
   <system:String x:Key="prefs.appearance.lang">Language</system:String>
   <system:String x:Key="prefs.appearance.showghostnotes">Show other tracks' notes on piano roll</system:String>
+  <system:String x:Key="prefs.appearance.showicon">Show icon on piano roll</system:String>
   <system:String x:Key="prefs.appearance.showportrait">Show portrait on piano roll</system:String>
   <system:String x:Key="prefs.appearance.sortorder">Singer name display language</system:String>
   <system:String x:Key="prefs.appearance.theme">Theme</system:String>
diff --git a/OpenUtau/ViewModels/NotesViewModel.cs b/OpenUtau/ViewModels/NotesViewModel.cs
index d3bf0d20b..c7b189188 100644
--- a/OpenUtau/ViewModels/NotesViewModel.cs
+++ b/OpenUtau/ViewModels/NotesViewModel.cs
@@ -458,7 +458,7 @@ private void LoadPortrait(UPart? part, UProject? project) {
             lock (portraitLock) {
                 Avatar?.Dispose();
                 Avatar = null;
-                if (singer != null && singer.AvatarData != null) {
+                if (singer != null && singer.AvatarData != null && Preferences.Default.ShowIcon) {
                     try {
                         using (var stream = new MemoryStream(singer.AvatarData)) {
                             Avatar = new Bitmap(stream);
diff --git a/OpenUtau/ViewModels/PianoRollViewModel.cs b/OpenUtau/ViewModels/PianoRollViewModel.cs
index 8a1568347..e91af1704 100644
--- a/OpenUtau/ViewModels/PianoRollViewModel.cs
+++ b/OpenUtau/ViewModels/PianoRollViewModel.cs
@@ -49,6 +49,7 @@ public class PianoRollViewModel : ViewModelBase, ICmdSubscriber {
         [Reactive] public PlaybackViewModel? PlaybackViewModel { get; set; }
 
         public bool ShowPortrait { get => Preferences.Default.ShowPortrait; }
+        public bool ShowIcon { get => Preferences.Default.ShowIcon; }
         public bool ShowGhostNotes { get => Preferences.Default.ShowGhostNotes; }
         public bool UseTrackColor { get => Preferences.Default.UseTrackColor; }
         public bool DegreeStyle0 { get => Preferences.Default.DegreeStyle == 0 ? true : false; }
diff --git a/OpenUtau/ViewModels/PreferencesViewModel.cs b/OpenUtau/ViewModels/PreferencesViewModel.cs
index 64a60531a..d4ed0f449 100644
--- a/OpenUtau/ViewModels/PreferencesViewModel.cs
+++ b/OpenUtau/ViewModels/PreferencesViewModel.cs
@@ -46,6 +46,7 @@ public AudioOutputDevice? AudioOutputDevice {
         [Reactive] public int DegreeStyle { get; set; }
         [Reactive] public bool UseTrackColor { get; set; }
         [Reactive] public bool ShowPortrait { get; set; }
+        [Reactive] public bool ShowIcon { get; set; }
         [Reactive] public bool ShowGhostNotes { get; set; }
         [Reactive] public int OtoEditor { get; set; }
         public string VLabelerPath => Preferences.Default.VLabelerPath;
@@ -140,6 +141,7 @@ public PreferencesViewModel() {
             DegreeStyle = Preferences.Default.DegreeStyle;
             UseTrackColor = Preferences.Default.UseTrackColor;
             ShowPortrait = Preferences.Default.ShowPortrait;
+            ShowIcon = Preferences.Default.ShowIcon;
             ShowGhostNotes = Preferences.Default.ShowGhostNotes;
             Beta = Preferences.Default.Beta;
             LyricsHelper = LyricsHelpers.FirstOrDefault(option => option.klass.Equals(ActiveLyricsHelper.Inst.GetPreferred()));
@@ -227,6 +229,12 @@ public PreferencesViewModel() {
                     Preferences.Save();
                     MessageBus.Current.SendMessage(new PianorollRefreshEvent("Portrait"));
                 });
+            this.WhenAnyValue(vm => vm.ShowIcon)
+                .Subscribe(showIcon => {
+                    Preferences.Default.ShowIcon = showIcon;
+                    Preferences.Save();
+                    MessageBus.Current.SendMessage(new PianorollRefreshEvent("Portrait"));
+                });
             this.WhenAnyValue(vm => vm.ShowGhostNotes)
                 .Subscribe(showGhostNotes => {
                     Preferences.Default.ShowGhostNotes = showGhostNotes;
diff --git a/OpenUtau/Views/PianoRollWindow.axaml b/OpenUtau/Views/PianoRollWindow.axaml
index 84d300720..d36307df3 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml
+++ b/OpenUtau/Views/PianoRollWindow.axaml
@@ -200,6 +200,11 @@
                   <CheckBox IsChecked="{Binding ShowPortrait}" />
                 </MenuItem.Icon>
               </MenuItem>
+              <MenuItem Header="{DynamicResource prefs.appearance.showicon}" Click="OnMenuShowIcon">
+                <MenuItem.Icon>
+                  <CheckBox IsChecked="{Binding ShowIcon}" />
+                </MenuItem.Icon>
+              </MenuItem>
               <MenuItem Header="{DynamicResource prefs.appearance.showghostnotes}" Click="OnMenuShowGhostNotes">
                 <MenuItem.Icon>
                   <CheckBox IsChecked="{Binding ShowGhostNotes}" />
diff --git a/OpenUtau/Views/PianoRollWindow.axaml.cs b/OpenUtau/Views/PianoRollWindow.axaml.cs
index a7c5b8453..e82870b8f 100644
--- a/OpenUtau/Views/PianoRollWindow.axaml.cs
+++ b/OpenUtau/Views/PianoRollWindow.axaml.cs
@@ -87,6 +87,12 @@ void OnMenuShowPortrait(object sender, RoutedEventArgs args) {
             ViewModel.RaisePropertyChanged(nameof(ViewModel.ShowPortrait));
             MessageBus.Current.SendMessage(new PianorollRefreshEvent("Portrait"));
         }
+        void OnMenuShowIcon(object sender, RoutedEventArgs args) {
+            Preferences.Default.ShowIcon = !Preferences.Default.ShowIcon;
+            Preferences.Save();
+            ViewModel.RaisePropertyChanged(nameof(ViewModel.ShowIcon));
+            MessageBus.Current.SendMessage(new PianorollRefreshEvent("Portrait"));
+        }
         void OnMenuShowGhostNotes(object sender, RoutedEventArgs args) {
             Preferences.Default.ShowGhostNotes = !Preferences.Default.ShowGhostNotes;
             Preferences.Save();
diff --git a/OpenUtau/Views/PreferencesDialog.axaml b/OpenUtau/Views/PreferencesDialog.axaml
index b0e5bc99a..0423cacda 100644
--- a/OpenUtau/Views/PreferencesDialog.axaml
+++ b/OpenUtau/Views/PreferencesDialog.axaml
@@ -181,6 +181,10 @@
               <TextBlock Text="{DynamicResource prefs.appearance.showportrait}" HorizontalAlignment="Left"/>
               <ToggleSwitch IsChecked="{Binding ShowPortrait}"/>
             </Grid>
+            <Grid Margin="0,5,0,0">
+              <TextBlock Text="{DynamicResource prefs.appearance.showicon}" HorizontalAlignment="Left"/>
+              <ToggleSwitch IsChecked="{Binding ShowIcon}"/>
+            </Grid>
             <Grid>
               <TextBlock Text="{DynamicResource prefs.appearance.showghostnotes}" HorizontalAlignment="Left"/>
               <ToggleSwitch IsChecked="{Binding ShowGhostNotes}"/>