Merge pull request #156 from ut-code/remove-hinting-mplus

m-plus-rounded-1cからhintingを消したものをapp/に書き出して使う

Author: na-trium-144

.gitignore

@@ -45,3 +45,4 @@ next-env.d.ts
 
 
 /public/typescript/
+/app/m-plus-rounded-1c-nohint/

app/globals.css

@@ -129,22 +129,21 @@ mycdark:
   確実にフォントを統一するためにRoundedM+を指定することにした
   以前NotoSansJPを指定していたが、xterm.jsで全角の（）の幅がバグった
   */
-  --font-mono:
-    "Inconsolata Variable", "Rounded M+ 1c", "Rounded M+ 1p",
-    "M PLUS Rounded 1c", monospace;
+  --font-mono: "Inconsolata Variable", "M PLUS Rounded 1c NoHint", monospace;
   /*
   本家のフォント名は Rounded M+ 1c 、または1pでもいいかも
-  layout.tsxでインポートしているwebフォントが M PLUS Rounded 1c
+  layout.tsxでインポートしているwebフォントが M PLUS Rounded 1c NoHint
+  scripts/removeHinting.ts で M PLUS Rounded 1c からHintingを除去したものを使っている
+  (HintingがあるとWindowsでジャギーが発生する)
 
   それ以下はM+をダウンロードするまでの間表示されるswap用フォールバックとしてM+に見た目が近いものを指定。
   Hiragino Maru Gothic は見た目はめっちゃきれいなんだけど太字がない :cry:
-  Meiryo は日本語の形がM+に近いが、英数がダメ
   */
   --font-sans:
-    "Rounded M+ 1c", "Rounded M+ 1p", "M PLUS Rounded 1c",
-    /* 以下fallback */ "M+ 1c", "MigMix 1c", "Migu 1c",
-    "Hiragino Maru Gothic ProN", "Noto Sans", "Arial", "Liberation Sans",
-    "Meiryo", sans-serif,
+    "M PLUS Rounded 1c NoHint", /* 以下fallback */ "Rounded M+ 1c",
+    "Rounded M+ 1p", "M+ 1c", "MigMix 1c", "Migu 1c",
+    "Hiragino Maru Gothic ProN", "Segoe UI", "Noto Sans", "Arial",
+    "Liberation Sans", "BIZ UDゴシック", "Meiryo", sans-serif,
     /* TailwindCSSでデフォルトで指定されていた絵文字フォントは一応残しておく */
       "Apple Color Emoji",
     "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";

app/layout.tsx

@@ -1,7 +1,9 @@
 import type { Metadata } from "next";
 import "@fontsource-variable/inconsolata";
-import "@fontsource/m-plus-rounded-1c/400.css";
-import "@fontsource/m-plus-rounded-1c/700.css";
+// import "@fontsource/m-plus-rounded-1c/400.css";
+// import "@fontsource/m-plus-rounded-1c/700.css";
+import "@/m-plus-rounded-1c-nohint/400.css";
+import "@/m-plus-rounded-1c-nohint/700.css";
 import "./globals.css";
 import { Navbar } from "./navbar";
 import { Sidebar } from "./sidebar";

app/lib/auth.ts

@@ -69,7 +69,7 @@ export async function getAuthServer(
         },
         font: {
           defaultFamily:
-            "'Rounded M+ 1c', 'Rounded M+ 1p', 'M PLUS Rounded 1c', 'M+ 1c', 'MigMix 1c', 'Migu 1c', 'Hiragino Maru Gothic ProN', 'Noto Sans', 'Arial', 'Liberation Sans', sans-serif",
+            "'M PLUS Rounded 1c NoHint', 'Rounded M+ 1c', 'Rounded M+ 1p', 'M+ 1c', 'MigMix 1c', 'Migu 1c', 'Hiragino Maru Gothic ProN', 'Segoe UI', 'Noto Sans', 'Arial', 'Liberation Sans', 'BIZ UDゴシック', 'Meiryo', sans-serif",
           monoFamily: "Inconsolata, monospace",
         },
         disableTitleBorder: true,

app/terminal/terminal.tsx

@@ -134,7 +134,7 @@ export function useTerminal(props: TerminalProps) {
             lineHeight: 1.2,
             letterSpacing: 0,
             fontFamily:
-              "'Inconsolata Variable', 'Rounded M+ 1c', 'Rounded M+ 1p', 'M PLUS Rounded 1c', monospace",
+              "'Inconsolata Variable', 'M PLUS Rounded 1c NoHint', monospace",
             theme: computeTerminalTheme(),
           });
           terminalInstanceRef.current = term;

package-lock.json

@@ -4,13 +4,14 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "npm run cf-typegen && npm run copyAllDTSFiles && next dev",
-    "build": "npm run cf-typegen && npm run copyAllDTSFiles && next build",
+    "dev": "npm run cf-typegen && npm run copyAllDTSFiles && npm run removeHinting && next dev",
+    "build": "npm run cf-typegen && npm run copyAllDTSFiles && npm run removeHinting && next build",
     "start": "next start",
     "lint": "npm run cf-typegen && next lint",
     "tsc": "npm run cf-typegen && tsc",
     "format": "prettier --write app/",
-    "copyAllDTSFiles": "tsx ./copyAllDTSFiles.ts",
+    "copyAllDTSFiles": "tsx ./scripts/copyAllDTSFiles.ts",
+    "removeHinting": "tsx ./scripts/removeHinting.ts",
     "cf-preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview --port 3000",
     "cf-deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
     "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts"
@@ -57,6 +58,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^20",
     "@types/object-inspect": "^1.13.0",
+    "@types/pako": "^2.0.4",
     "@types/pg": "^8.15.5",
     "@types/prismjs": "^1.26.5",
     "@types/react": "^19",
@@ -66,6 +68,8 @@
     "drizzle-kit": "^0.31.5",
     "eslint": "^9",
     "eslint-config-next": "~15.4.10",
+    "fonteditor-core": "^2.6.3",
+    "pako": "^2.1.0",
     "prettier": "^3.6.2",
     "prisma": "^6.18.0",
     "tailwindcss": "^4",