Refactor M/m: Corrected widths and vertices

2026-01-14 16:47:57 +00:00 · 2025-11-19 08:06:44 -08:00
parent 289a030e23
commit 313bb67655
1 changed files with 15 additions and 63 deletions
--- a/src/glyphs/M.js
+++ b/src/glyphs/M.js
@@ -1,63 +1,15 @@
-const makeGlyph = (opentype, name, unicode, cmds, adv) =>
-  new opentype.Glyph({
-    name,
-    unicode,
-    advanceWidth: adv,
-    path: cmds(new opentype.Path())
-  });
-
-export const glyphM = (opentype, adv) =>
-  makeGlyph(
-    opentype,
-    "M",
-    "M".codePointAt(0),
-    (p) => {
-      p.moveTo(100, 0);
-      p.lineTo(100, 700);
-      p.lineTo(160, 700);
-      p.lineTo(370, 140);
-      p.lineTo(580, 700);
-      p.lineTo(640, 700);
-      p.lineTo(640, 0);
-      p.lineTo(580, 0);
-      p.lineTo(580, 580);
-      p.lineTo(390, 60);
-      p.lineTo(350, 60);
-      p.lineTo(160, 580);
-      p.lineTo(160, 0);
-      p.close();
-      return p;
-    },
-    740
-  );
-
-export const glyphm = (opentype, adv) =>
-  makeGlyph(
-    opentype,
-    "m",
-    "m".codePointAt(0),
-    (p) => {
-      p.moveTo(80, 0);
-      p.lineTo(80, 480);
-      p.lineTo(140, 480);
-      p.lineTo(140, 440);
-      p.curveTo(170, 470, 210, 490, 260, 490);
-      p.curveTo(320, 490, 360, 460, 380, 410);
-      p.curveTo(410, 460, 460, 490, 520, 490);
-      p.curveTo(610, 490, 660, 440, 660, 330);
-      p.lineTo(660, 0);
-      p.lineTo(600, 0);
-      p.lineTo(600, 330);
-      p.curveTo(600, 400, 570, 430, 520, 430);
-      p.curveTo(460, 430, 420, 390, 420, 310);
-      p.lineTo(420, 0);
-      p.lineTo(360, 0);
-      p.lineTo(360, 310);
-      p.curveTo(360, 390, 320, 430, 260, 430);
-      p.curveTo(200, 430, 140, 390, 140, 300);
-      p.lineTo(140, 0);
-      p.close();
-      return p;
-    },
-    740
-  );
+const mk=(o,n,u,d,w)=>new o.Glyph({name:n,unicode:u,advanceWidth:w,path:d(new o.Path())});
+export const glyphM=(o,w)=>mk(o,"M",77,p=>{
+  p.moveTo(80,0);p.lineTo(80,700);p.lineTo(160,700);p.lineTo(400,150);p.lineTo(640,700);
+  p.lineTo(720,700);p.lineTo(720,0);p.lineTo(640,0);p.lineTo(640,550);p.lineTo(440,80);
+  p.lineTo(360,80);p.lineTo(160,550);p.lineTo(160,0);p.close();
+  return p;
+},800);
+export const glyphm=(o,w)=>mk(o,"m",109,p=>{
+  p.moveTo(80,0);p.lineTo(80,480);p.lineTo(160,480);p.lineTo(160,300);p.curveTo(160,480,380,480,380,300);
+  p.lineTo(380,0);p.lineTo(300,0);p.lineTo(300,300);p.curveTo(300,400,220,400,220,300);
+  p.lineTo(220,0);p.close();
+  p.moveTo(380,300);p.curveTo(380,480,600,480,600,300);p.lineTo(600,0);p.lineTo(520,0);
+  p.lineTo(520,300);p.curveTo(520,400,440,400,440,300);p.lineTo(440,0);p.lineTo(380,0);p.close();
+  return p;
+},740);