Improve Space output layout and CJK chart fonts

app.py

@@ -16,6 +16,7 @@ import numpy as np
 import torch
 
 from softchart.generate import generate_song, generate_song_slot, load_hf
+from softchart.fonts import cjk_font_path
 from softchart.grid import debias_to_grid, fit_grid_fixed_bpm, fit_grid_piecewise
 from softchart.hf import SoftChartPlanner
 from softchart.rhythm import snap_chart
@@ -207,8 +208,15 @@ def write_tja(gen, bpm, title, course, level, wave, downbeats=None, grid_fit=Non
 def render_audio_plan(mel, title, course, plan=None):
     import matplotlib
     matplotlib.use("Agg")
+    from matplotlib import font_manager
     import matplotlib.pyplot as plt
 
+    font_path = cjk_font_path()
+    if font_path is not None:
+        font_manager.fontManager.addfont(font_path)
+        matplotlib.rcParams["font.family"] = font_manager.FontProperties(fname=font_path).get_name()
+    matplotlib.rcParams["axes.unicode_minus"] = False
+
     dur = mel.shape[1] / FPS
     fig = plt.figure(figsize=(13, 4.4 if plan else 3.2))
     gs = fig.add_gridspec(2 if plan else 1, 1,
@@ -341,7 +349,7 @@ def generate(audio, course, level, bpm_override, auto_plan_on, use_beat, use_pla
         grid_info = ""
     info = (f"BPM {bpm:.1f} · {len(g['hits'])} notes · {len(g['spans'])} spans" + grid_info
             + (f" · plan: {sum(1 for b in plan if b[3]==1)} gaps, {sum(1 for b in plan if b[3]==2)} climax" if plan else ""))
-    return audio_plan_img, tja_img, tja_path, info
+    return tja_path, info, tja_img, audio_plan_img
 
 
 with gr.Blocks(title="SoftChart — AI Taiko chart generator") as demo:
@@ -366,12 +374,12 @@ with gr.Blocks(title="SoftChart — AI Taiko chart generator") as demo:
                 sampling = gr.Checkbox(label="Sampling (diverse) vs greedy (best)", value=False)
             btn = gr.Button("Generate chart", variant="primary")
         with gr.Column():
-            out_img = gr.Image(label="Full-song mel + plan")
-            out_chart = gr.Image(label="TJA chart")
-            out_info = gr.Textbox(label="Result", interactive=False)
             out_tja = gr.File(label="Download .tja")
+            out_info = gr.Textbox(label="Result", interactive=False)
+            out_chart = gr.Image(label="TJA chart")
+            out_img = gr.Image(label="Full-song mel + plan")
     btn.click(generate, [audio, course, level, bpm, auto_plan_on, use_beat, use_planner, sampling],
-              [out_img, out_chart, out_tja, out_info])
+              [out_tja, out_info, out_chart, out_img])
 
 if __name__ == "__main__":
     # show_api=False avoids a gradio_client schema-introspection bug

packages.txt

@@ -0,0 +1 @@
+fonts-noto-cjk

softchart/fonts.py

@@ -0,0 +1,35 @@
+"""Font helpers for generated preview images."""
+
+from __future__ import annotations
+
+import os
+
+
+def cjk_font_path(bold: bool = False) -> str | None:
+    names = (
+        (
+            "/usr/share/fonts/opentype/noto/NotoSansCJK-Bold.ttc",
+            "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
+        ),
+        (
+            "/usr/share/fonts/opentype/noto/NotoSansCJKjp-Bold.otf",
+            "/usr/share/fonts/opentype/noto/NotoSansCJKjp-Regular.otf",
+        ),
+        (
+            "/usr/share/fonts/truetype/noto/NotoSansCJK-Bold.ttc",
+            "/usr/share/fonts/truetype/noto/NotoSansCJK-Regular.ttc",
+        ),
+        (
+            "/System/Library/Fonts/ヒラギノ角ゴシック W6.ttc",
+            "/System/Library/Fonts/ヒラギノ角ゴシック W3.ttc",
+        ),
+        (
+            "/System/Library/Fonts/Supplemental/Arial Unicode.ttf",
+            "/System/Library/Fonts/Supplemental/Arial Unicode.ttf",
+        ),
+    )
+    for bold_path, regular_path in names:
+        path = bold_path if bold else regular_path
+        if os.path.exists(path):
+            return path
+    return None

softchart/tja_image.py

@@ -16,6 +16,8 @@ from dataclasses import dataclass
 
 from PIL import Image, ImageDraw, ImageFont
 
+from .fonts import cjk_font_path
+
 
 _NOTE_CHARS = set("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ")
 _COURSE_NAME = {
@@ -35,7 +37,9 @@ class ParsedTJA:
 
 
 def _font(size: int, bold: bool = False) -> ImageFont.FreeTypeFont | ImageFont.ImageFont:
+    cjk_path = cjk_font_path(bold=bold)
     names = (
+        cjk_path,
         "DejaVuSans-Bold.ttf" if bold else "DejaVuSans.ttf",
         "/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf" if bold else
         "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
@@ -45,6 +49,8 @@ def _font(size: int, bold: bool = False) -> ImageFont.FreeTypeFont | ImageFont.I
         "/System/Library/Fonts/Supplemental/Helvetica.ttf",
     )
     for name in names:
+        if name is None:
+            continue
         try:
             return ImageFont.truetype(name, size=size)
         except OSError:
@@ -186,14 +192,14 @@ def _draw_note(draw: ImageDraw.ImageDraw, x: int, y: int, symbol: str,
     else:
         fill = "#8d96a0"
 
-    radius = 16 if symbol in {"3", "4", "6", "A", "B"} else 12
+    radius = 14 if symbol in {"3", "4", "6", "A", "B"} else 10
     if symbol == "8":
         draw.rectangle((x - 5, y - 12, x + 5, y + 12), fill=fill)
         return
 
     draw.ellipse((x - radius, y - radius, x + radius, y + radius),
                  fill=fill, outline="#202020", width=2)
-    draw.ellipse((x - radius + 4, y - radius + 4, x - radius + 9, y - radius + 9),
+    draw.ellipse((x - radius + 3, y - radius + 3, x - radius + 8, y - radius + 8),
                  fill="#ffffff")
     label = "B" if symbol in {"3", "4", "6", "A", "B"} else ("R" if symbol in {"5", "6"} else ("P" if symbol in {"7", "9"} else ""))
     if label: