行頭行末ルビがあると行頭行末タグを消してしまうバグ修正

Juna-Idler · Jul 11, 2021 · 72300a0 · 72300a0 · Juna-Idler · Jul 11, 2021
1 parent f922e31
commit 72300a0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/js/RKLyrics.js b/js/RKLyrics.js
@@ -355,9 +355,16 @@ class RubyKaraokeLyricsLine
 
 
         const array = KaraokeUnit.Parse(textline);
-        this.start_time =  (array[0].start_time >= 0 && array[0].text === "") ? array[0].start_time : -1;
-        this.end_time = (array.length > 1 && array[array.length-1].text === "" && array[array.length-2].text === "") ?
-                        array[array.length-1].start_time : -1;
+        if (array[0].start_time >= 0 && (array[0].text === "" || array[0].text.indexOf(atTag.ruby_parent) == 0))
+            this.start_time = array[0].start_time;
+        else
+            this.start_time = -1;
+
+        if (array.length > 1 && array[array.length-1].text === "" &&
+            (array[array.length-2].text === "" || array[array.length-2].text.lastIndexOf(atTag.ruby_end) == (array[array.length-2].text.length - atTag.ruby_end.length)))
+            this.end_time = array[array.length-1].start_time;
+        else
+            this.end_time = -1;
         this.start_option = this.start_time >= 0 ? array[0].option : "";
         this.end_option = this.end_time >= 0 ? array[array.length-1].option : "";