Refactor Q/q: Tail details

2026-01-14 00:27:55 +00:00 · 2025-11-19 08:06:53 -08:00
parent 34541b4a76
commit 0f60d1427c
1 changed files with 13 additions and 68 deletions
--- a/src/glyphs/Q.js
+++ b/src/glyphs/Q.js
@@ -1,68 +1,13 @@
-const makeGlyph=(opentype,name,unicode,cmds,adv)=>
-  new opentype.Glyph({
-    name,
-    unicode,
-    advanceWidth:adv,
-    path:cmds(new opentype.Path())
-  });
-
-export const glyphQ=(opentype,adv)=>
-  makeGlyph(
-    opentype,
-    "Q",
-    "Q".codePointAt(0),
-    p=>{
-      p.moveTo(300,-10);
-      p.curveTo(160,-10,60,100,60,280);
-      p.lineTo(60,420);
-      p.curveTo(60,600,160,710,300,710);
-      p.curveTo(440,710,540,600,540,420);
-      p.lineTo(540,280);
-      p.curveTo(540,140,470,40,360,10);
-      p.lineTo(480,-80);
-      p.lineTo(440,-120);
-      p.lineTo(300,0);
-      p.curveTo(290,0,280,0,270,0);
-      p.lineTo(270,60);
-      p.curveTo(280,60,290,60,300,60);
-      p.lineTo(340,60);
-      p.lineTo(380,20);
-      p.curveTo(450,50,480,140,480,280);
-      p.lineTo(480,420);
-      p.curveTo(480,570,410,650,300,650);
-      p.curveTo(190,650,120,570,120,420);
-      p.lineTo(120,280);
-      p.curveTo(120,130,190,50,300,50);
-      p.close();
-      return p;
-    },
-    adv
-  );
-
-export const glyphq=(opentype,adv)=>
-  makeGlyph(
-    opentype,
-    "q",
-    "q".codePointAt(0),
-    p=>{
-      p.moveTo(290,-10);
-      p.curveTo(170,-10,90,70,90,200);
-      p.curveTo(90,330,170,410,290,410);
-      p.curveTo(340,410,380,390,410,360);
-      p.lineTo(410,480);
-      p.lineTo(470,480);
-      p.lineTo(470,-150);
-      p.lineTo(410,-150);
-      p.lineTo(410,40);
-      p.curveTo(380,10,340,-10,290,-10);
-      p.close();
-      p.moveTo(290,50);
-      p.curveTo(370,50,410,110,410,200);
-      p.curveTo(410,290,370,350,290,350);
-      p.curveTo(210,350,150,290,150,200);
-      p.curveTo(150,110,210,50,290,50);
-      p.close();
-      return p;
-    },
-    adv
-  );
+const mk=(o,n,u,d,w)=>new o.Glyph({name:n,unicode:u,advanceWidth:w,path:d(new o.Path())});
+export const glyphQ=(o,w)=>mk(o,"Q",81,p=>{
+  p.moveTo(300,710);p.curveTo(60,710,60,-10,300,-10);p.curveTo(540,-10,540,710,300,710);p.close();
+  p.moveTo(300,630);p.curveTo(460,630,460,70,300,70);p.curveTo(140,70,140,630,300,630);p.close();
+  p.moveTo(320,140);p.lineTo(480,-80);p.lineTo(400,-80);p.lineTo(260,100);p.close();
+  return p;
+},w);
+export const glyphq=(o,w)=>mk(o,"q",113,p=>{
+  p.moveTo(440,-200);p.lineTo(440,480);p.lineTo(200,480);p.curveTo(-20,480,-20,0,200,0);
+  p.lineTo(360,0);p.lineTo(360,-200);p.close();
+  p.moveTo(360,400);p.lineTo(200,400);p.curveTo(60,400,60,80,200,80);p.lineTo(360,80);p.close();
+  return p;
+},w);