diff --git a/src/glyphs/G.js b/src/glyphs/G.js index 740e831..b2db498 100644 --- a/src/glyphs/G.js +++ b/src/glyphs/G.js @@ -1,64 +1,67 @@ -const makeGlyph=(opentype,name,unicode,cmds,adv)=> - new opentype.Glyph({name,unicode,advanceWidth:adv,path:cmds(new opentype.Path())}); +const makeGlyph = (opentype, name, unicode, cmds, adv) => + new opentype.Glyph({ + name, + unicode, + advanceWidth: adv, + path: cmds(new opentype.Path()) + }); -export const glyphG=(opentype,adv)=> +export const glyphG = (opentype, adv) => makeGlyph( opentype, "G", "G".codePointAt(0), - p=>{ - const cx=320,ro=270,ri=200,midY=320; - p.moveTo(cx,50); - p.curveTo(cx-160,50,120,150,120,280); - p.lineTo(120,420); - p.curveTo(120,580,220,680,340,680); - p.curveTo(440,680,510,640,550,560); - p.lineTo(500,530); - p.curveTo(470,590,420,620,340,620); - p.curveTo(240,620,180,550,180,420); - p.lineTo(180,280); - p.curveTo(180,160,250,90,340,90); - p.curveTo(430,90,500,140,500,240); - p.lineTo(380,240); - p.lineTo(380,300); - p.lineTo(560,300); - p.lineTo(560,220); - p.curveTo(560,100,460,50,340,50); + (p) => { + p.moveTo(350, -10); + p.curveTo(190, -10, 80, 100, 80, 280); + p.lineTo(80, 420); + p.curveTo(80, 600, 190, 710, 350, 710); + p.curveTo(460, 710, 540, 660, 580, 570); + p.lineTo(520, 540); + p.curveTo(490, 610, 430, 650, 350, 650); + p.curveTo(220, 650, 140, 570, 140, 420); + p.lineTo(140, 280); + p.curveTo(140, 130, 220, 50, 350, 50); + p.curveTo(450, 50, 520, 100, 540, 190); + p.lineTo(340, 190); + p.lineTo(340, 250); + p.lineTo(600, 250); + p.lineTo(600, 220); + p.curveTo(600, 70, 500, -10, 350, -10); p.close(); return p; }, adv ); -export const glyphg=(opentype,adv)=> +export const glyphg = (opentype, adv) => makeGlyph( opentype, "g", "g".codePointAt(0), - p=>{ - const cx=300; - p.moveTo(cx,-160); - p.curveTo(180,-160,110,-110,100,-40); - p.lineTo(160,-20); - p.curveTo(170,-70,210,-100,280,-100); - p.curveTo(380,-100,430,-50,430,40); - p.lineTo(430,70); - p.curveTo(400,20,350,-10,280,-10); - p.curveTo(180,-10,100,70,100,210); - p.curveTo(100,350,180,430,280,430); - p.curveTo(350,430,400,400,430,350); - p.lineTo(430,480); - p.lineTo(490,480); - p.lineTo(490,40); - p.curveTo(490,-90,410,-160,300,-160); - p.close(); - p.moveTo(280,50); - p.curveTo(360,50,430,120,430,210); - p.curveTo(430,300,360,370,280,370); - p.curveTo(200,370,160,300,160,210); - p.curveTo(160,120,200,50,280,50); + (p) => { + p.moveTo(310, -10); + p.curveTo(250, -10, 200, 10, 160, 40); + p.lineTo(160, 0); + p.lineTo(100, 0); + p.lineTo(100, 480); + p.lineTo(160, 480); + p.lineTo(160, 440); + p.curveTo(200, 470, 250, 490, 310, 490); + p.curveTo(430, 490, 520, 400, 520, 240); + p.lineTo(520, 180); + p.curveTo(520, 20, 430, -70, 310, -70); + p.curveTo(220, -70, 150, -30, 110, 40); + p.lineTo(160, 70); + p.curveTo(190, 20, 240, -10, 310, -10); + p.curveTo(400, -10, 460, 50, 460, 180); + p.lineTo(460, 240); + p.curveTo(460, 370, 400, 430, 310, 430); + p.curveTo(220, 430, 160, 370, 160, 240); + p.curveTo(160, 110, 220, 50, 310, 50); p.close(); return p; }, adv ); +