From 0bb68ae5543a6de15485a665143f75c0300a7607 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sat, 29 Nov 2025 13:22:13 +0800
Subject: [PATCH] [F] Space between English words

---
 src/lib/types.ts                       |  1 +
 src/lib/ui/player/IMEHelper.ts         |  4 +++-
 src/lib/ui/player/Lyrics.svelte        | 12 ++++++++++--
 src/routes/song/[id]/play/+page.svelte |  8 ++++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/lib/types.ts b/src/lib/types.ts
index 740e45a..fcc77c1 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -88,6 +88,7 @@ export const typingSettingsDefault = {
   showRomaji: false,
   showRomajiOnError: true,
   hideRepeated: false,
+  ignoreEnglish: false,
 };
 
 export type TypingSettings = typeof typingSettingsDefault;
diff --git a/src/lib/ui/player/IMEHelper.ts b/src/lib/ui/player/IMEHelper.ts
index e978c4e..94b6b99 100644
--- a/src/lib/ui/player/IMEHelper.ts
+++ b/src/lib/ui/player/IMEHelper.ts
@@ -49,4 +49,6 @@ export function dedupLines(lrc: LyricLine[], hide: boolean) {
     seen.add(key);
     return true;
   });
-}
\ No newline at end of file
+}
+
+export const isEnglish = (str: string | undefined) => str && /^[a-zA-Z\s.,'!?]+$/.test(str)
\ No newline at end of file
diff --git a/src/lib/ui/player/Lyrics.svelte b/src/lib/ui/player/Lyrics.svelte
index debf27d..033abaa 100644
--- a/src/lib/ui/player/Lyrics.svelte
+++ b/src/lib/ui/player/Lyrics.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { tick } from "svelte"
   import { isKana, isKanji, toKatakana, toRomaji } from "wanakana"
-  import type { ProcLrcLine, ProcLrcSeg } from "./IMEHelper"
+  import { isEnglish, type ProcLrcLine, type ProcLrcSeg } from "./IMEHelper"
   import type { TypingSettings } from "$lib/types"
   import { animateCaret } from "./animation"
 
@@ -31,8 +31,11 @@
   const _preprocessKana = (kana: string) => settings.allKata ? toKatakana(kana) : kana
   const preprocessKana = (kana: string, state?: string) => (settings.showRomaji || (settings.showRomajiOnError && state === 'wrong')) ? `<ruby>${_preprocessKana(kana)}<rt>${toRomaji(kana)}</rt></ruby>` : _preprocessKana(kana)
 
+
+
   const allStates = (l: number, seg: ProcLrcSeg) => states[l]?.slice(seg.swi, seg.swi + seg.kana.length) ?? []
   const getKanjiState = (l: number, seg: ProcLrcSeg) => {
+    if (settings.ignoreEnglish && isEnglish(seg.kanji)) return 'ignored'
     let sts = allStates(l, seg)
     if (sts.every(s => s === 'right')) return 'right'
     if (sts.some(s => s === 'wrong')) return 'wrong'
@@ -73,7 +76,7 @@
       <div class="lrc p-content text-center m3-font-body-large" class:active={l === currentLineIndex} role="button" tabindex="0"
         onclick={() => onLineClick?.()} 
         onkeydown={(e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onLineClick?.() } }}>
-        {#each line.parts as seg}
+        {#each line.parts as seg, i}
           {#if !seg.kanji}
             {#each seg.kana as char, c}
               <span class="{states[l]?.[seg.swi + c] ?? ''}" class:here={l === currentLineIndex && currentWordIndex === seg.swi + c}
@@ -90,6 +93,9 @@
               </rt>{/if}
             </ruby>
           {/if}
+          {#if line.parts[i+1] && (isEnglish(seg.kanji ?? seg.kana) || isEnglish(line.parts[i+1].kanji ?? line.parts[i+1].kana))}
+            &nbsp;
+          {/if}
         {/each}
       </div>
     {/each}
@@ -125,4 +131,6 @@
     color: #7b78c2
   .punctuation
     opacity: 0.5
+  .ignored
+    opacity: 0.5
 </style>
diff --git a/src/routes/song/[id]/play/+page.svelte b/src/routes/song/[id]/play/+page.svelte
index 5d75ea9..dbb0128 100644
--- a/src/routes/song/[id]/play/+page.svelte
+++ b/src/routes/song/[id]/play/+page.svelte
@@ -4,7 +4,7 @@
   import { onMount } from "svelte"
   import { typingSettingsDefault } from "$lib/types.ts"
   import { isKana, isKanji, toHiragana } from "wanakana"
-  import { composeList, fuzzyEquals, processLrcLine, dedupLines, type ProcLrcLine } from "$lib/ui/player/IMEHelper.ts"
+  import { composeList, fuzzyEquals, processLrcLine, dedupLines, isEnglish, type ProcLrcLine } from "$lib/ui/player/IMEHelper.ts"
   import "$lib/ext.ts"
   import { API } from "$lib/client.ts"
   import { goto } from '$app/navigation'
@@ -129,7 +129,11 @@
     }
 
     // Check next expected character, if it's neither kana nor kanji, skip it
-    while (findLoc().let(({ exp, cLine }) => !isKana(exp) && !isKanji(exp) && incr(cLine))) {}
+    while (findLoc().let(({ exp, cLine, cSeg }) => {
+      const isPunctuation = !isKana(exp) && !isKanji(exp)
+      const isIgnoredEnglish = ud.settings.ignoreEnglish && isEnglish(cSeg.kanji)
+      return (isPunctuation || isIgnoredEnglish) && incr(cLine)
+    })) {}
   }
   $effect(() => inputChanged(inp, false))