From 76793de436ee29836eb1013470681656322505af Mon Sep 17 00:00:00 2001 From: multipleof4 Date: Wed, 19 Nov 2025 08:06:57 -0800 Subject: [PATCH] Refactor S/s: Balanced spine curves --- src/glyphs/S.js | 80 ++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 65 deletions(-) diff --git a/src/glyphs/S.js b/src/glyphs/S.js index 9f08763..68608ad 100644 --- a/src/glyphs/S.js +++ b/src/glyphs/S.js @@ -1,65 +1,15 @@ -const makeGlyph = (opentype, name, unicode, cmds, adv) => - new opentype.Glyph({ - name, - unicode, - advanceWidth: adv, - path: cmds(new opentype.Path()) - }); - -export const glyphS = (opentype, adv) => - makeGlyph( - opentype, - "S", - "S".codePointAt(0), - (p) => { - p.moveTo(300, -10); - p.curveTo(170, -10, 80, 50, 60, 150); - p.lineTo(120, 170); - p.curveTo(140, 90, 210, 50, 300, 50); - p.curveTo(390, 50, 450, 90, 450, 160); - p.curveTo(450, 220, 410, 250, 320, 280); - p.lineTo(260, 300); - p.curveTo(150, 340, 90, 390, 90, 480); - p.curveTo(90, 600, 180, 710, 320, 710); - p.curveTo(440, 710, 520, 650, 540, 560); - p.lineTo(480, 540); - p.curveTo(460, 610, 400, 650, 320, 650); - p.curveTo(220, 650, 150, 600, 150, 520); - p.curveTo(150, 460, 190, 430, 280, 400); - p.lineTo(340, 380); - p.curveTo(450, 340, 510, 290, 510, 200); - p.curveTo(510, 70, 420, -10, 300, -10); - p.close(); - return p; - }, - adv - ); - -export const glyphs = (opentype, adv) => - makeGlyph( - opentype, - "s", - "s".codePointAt(0), - (p) => { - p.moveTo(280, -10); - p.curveTo(170, -10, 90, 40, 70, 120); - p.lineTo(130, 150); - p.curveTo(150, 90, 200, 50, 280, 50); - p.curveTo(360, 50, 410, 90, 410, 150); - p.curveTo(410, 200, 380, 230, 300, 260); - p.lineTo(260, 280); - p.curveTo(160, 320, 110, 360, 110, 430); - p.curveTo(110, 490, 170, 540, 280, 540); - p.curveTo(380, 540, 450, 500, 470, 430); - p.lineTo(410, 400); - p.curveTo(390, 450, 350, 480, 280, 480); - p.curveTo(210, 480, 170, 450, 170, 400); - p.curveTo(170, 360, 200, 330, 280, 300); - p.lineTo(320, 280); - p.curveTo(420, 240, 470, 200, 470, 130); - p.curveTo(470, 50, 390, -10, 280, -10); - 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 glyphS=(o,w)=>mk(o,"S",83,p=>{ + p.moveTo(500,580);p.lineTo(420,540);p.curveTo(400,620,300,620,300,620);p.curveTo(180,620,180,520,300,500); + p.lineTo(360,490);p.curveTo(520,460,520,240,300,240);p.curveTo(140,240,100,340,100,340); + p.lineTo(180,380);p.curveTo(200,320,300,320,300,320);p.curveTo(420,320,420,400,300,420); + p.lineTo(240,430);p.curveTo(80,460,80,700,300,700);p.curveTo(460,700,500,580,500,580);p.close(); + return p; +},w); +export const glyphs=(o,w)=>mk(o,"s",115,p=>{ + p.moveTo(460,380);p.lineTo(380,360);p.curveTo(360,420,300,420,300,420);p.curveTo(200,420,200,340,300,320); + p.lineTo(340,310);p.curveTo(460,280,460,100,300,100);p.curveTo(140,100,120,200,120,200); + p.lineTo(200,220);p.curveTo(220,180,300,180,300,180);p.curveTo(380,180,380,240,300,260); + p.lineTo(260,270);p.curveTo(120,300,120,490,300,490);p.curveTo(440,490,460,380,460,380);p.close(); + return p; +},w);