Change algorithm to let romaji more understandable.

karaoke-dev · Dec 21, 2020 · e982879 · e982879
1 parent f849aa6
commit e982879
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/RomajiTags/Ja/JaRomajiTagGeneratorTest.cs b/osu.Game.Rulesets.Karaoke.Tests/Edit/Generator/RomajiTags/Ja/JaRomajiTagGeneratorTest.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Karaoke.Edit.Generator.RomajiTags.Ja;
 using osu.Game.Rulesets.Karaoke.Objects;
@@ -14,6 +13,7 @@ public class JaRomajiTagGeneratorTest
     {
         [TestCase("花火大会", new[] { "[0,2]:hanabi", "[2,4]:taikai" })]
         [TestCase("はなび", new string[] { "[0,3]:hanabi" })]
+        [TestCase("枯れた世界に輝く", new[] { "[0,3]:kareta", "[3,6]:sekaini", "[6,8]:kagayaku" })]
         public void TestCreateRomajiTags(string text, string[] actualRomaji)
         {
             var config = generatorConfig(null);

diff --git a/osu.Game.Rulesets.Karaoke/Edit/Generator/RomajiTags/Ja/JaRomajiTagGenerator.cs b/osu.Game.Rulesets.Karaoke/Edit/Generator/RomajiTags/Ja/JaRomajiTagGenerator.cs
@@ -85,8 +85,7 @@ public override RomajiTag[] CreateRomajiTags(Lyric lyric)
                 // conbine romajies of they are not from kanji.
                 var previousProcessingTag = processingTags.GetPrevious(processingTag);
                 var fromKanji = processingTag.FromKanji;
-                var previousFromKanji = previousProcessingTag?.FromKanji ?? true;
-                if (!fromKanji && !previousFromKanji)
+                if (previousProcessingTag != null && !fromKanji)
                 {
                     var combinedRomajiTag = TextTagsUtils.Combine(previousProcessingTag.RomajiTag, processingTag.RomajiTag);
                     romajiTags.Remove(previousProcessingTag.RomajiTag);