From b5babaf6fd84792796bb3ca6fce3ae9eb8bd7010 Mon Sep 17 00:00:00 2001 From: Belleve Invis Date: Mon, 20 Jul 2015 19:06:03 +0800 Subject: [PATCH] Added italic shape for e. --- font.js | 638 +++++++++++++++++++++------------------ font.patel | 2 +- glyphs/latin-lower.patel | 39 ++- support/stroke.js | 2 +- support/stroke.patel | 2 +- 5 files changed, 378 insertions(+), 305 deletions(-) diff --git a/font.js b/font.js index 22573fa..0046ffb 100644 --- a/font.js +++ b/font.js @@ -1,5 +1,5 @@ { - var r0_font, r0_glyphList, r0_glyphs, r0_Glyph, r0_Stroke, r0_para_regular, r0_para_bold, r0_para_italic, r0_para_bolditalic, r0_variantSelector, r0_globalTransform, r0_ITALICCOR, r0_UPWARD, r0_DOWNWARD, r0_RIGHTWARD, r0_LEFTWARD, r0_DESCENDER, r0_WIDTH, r0_CAP, r0_XH, r0_O, r0_OXHOOK, r0_SB, r0_HOOK, r0_AHOOK, r0_SHOOK, r0_SMOOTH, r0_SMALLSMOOTH, r0_STROKE, r0_DOTSIZE, r0_BARPOS, r0_GBARPOS, r0_LONGSERIF, r0_ACCENT, r0_XO, r0_CAPO, r0_HALFSTROKE, r0_RIGHTSB, r0_MIDDLE, r0_CAPMIDDLE, r0_CAP_SMOOTH, r0_DOTRADIUS, r0_SMOOTHA, r0_SMOOTHB, r0_SMALLSMOOTHA, r0_SMALLSMOOTHB, r0_ITALICCORS, r0_KAPPA, r0_COKAPPA, r0_BKAPPA, r0_COBKAPPA, r0_KAPPA_HOOK, r0_KAPPA_AHOOK, r0_TAILADJX, r0_TAILADJY, r0_TAILADJKAPPA, r0_ILBALANCE, r0_JBALANCE, r0_BASE, r0_MARK, r0_MARKBASE, r0_tm, r0_markAboveLower, r0_markAboveCap, r0_markBelowLower, r0_markBelowZero, r0_capitalMarks, r0_bMarks, r0_eMarks, r0_pMarks, r0_Ring, r0_ORing, r0_leftwardTopSerif, r0_leftwardBottomSerif, r0_rightwardTopSerif, r0_rightwardBottomSerif, r0_xn$createglyph$7Hrq, r0_para, _r0_t0, _r0_t1, _r0_t2, _r0_t3, _r0_t4, _r0_t5, _r0_t6, _r0_t7, _r0_t8, _r0_t9, _r0_t10, _r0_t11, _r0_t12, _r0_t13, _r0_t14, _r0_t15, _r0_t16, _r0_t17, _r0_t18, _r0_t19, _r0_t20, _r0_t21, _r0_t22, _r0_t23, _r0_t24, _r0_t25, _r0_t26, _r0_t27, _r0_t28, _r0_t29, _r0_t30, _r0_t31, _r0_t32, _r0_t33, _r0_t34, _r0_t35, _r0_t36, _r0_t37, _r0_t38, _r0_t39, _r0_t40, _r0_t41, _r0_t42, _r0_t43, _r0_t44, _r0_t45, _r0_t46, _r0_t47, _r0_t48, _r0_t49, _r0_t50, _r0_t51, _r0_t52, _r0_t53, _r0_t54, _r0_t55, _r0_t56, _r0_t57, _r0_t58, _r0_t59, _r0_t60, _r0_t61, _r0_t62, _r0_t63, _r0_t64, _r0_t65, _r0_t66, _r0_t67, _r0_t68, _r0_t69, _r0_t70, _r0_t71, _r0_t72, _r0_t73, _r0_t74, _r0_t75, _r0_t76, _r0_t77, _r0_t78, _r0_t79, _r0_t80, _r0_t81; + var r0_font, r0_glyphList, r0_glyphs, r0_Glyph, r0_Stroke, r0_para_regular, r0_para_bold, r0_para_italic, r0_para_bolditalic, r0_variantSelector, r0_globalTransform, r0_ITALICCOR, r0_UPWARD, r0_DOWNWARD, r0_RIGHTWARD, r0_LEFTWARD, r0_DESCENDER, r0_WIDTH, r0_CAP, r0_XH, r0_O, r0_OXHOOK, r0_SB, r0_HOOK, r0_AHOOK, r0_SHOOK, r0_SMOOTH, r0_SMALLSMOOTH, r0_STROKE, r0_DOTSIZE, r0_BARPOS, r0_GBARPOS, r0_LONGSERIF, r0_ACCENT, r0_XO, r0_CAPO, r0_HALFSTROKE, r0_RIGHTSB, r0_MIDDLE, r0_CAPMIDDLE, r0_CAP_SMOOTH, r0_DOTRADIUS, r0_SMOOTHA, r0_SMOOTHB, r0_SMALLSMOOTHA, r0_SMALLSMOOTHB, r0_ITALICCORS, r0_KAPPA, r0_COKAPPA, r0_BKAPPA, r0_COBKAPPA, r0_KAPPA_HOOK, r0_KAPPA_AHOOK, r0_TAILADJX, r0_TAILADJY, r0_TAILADJKAPPA, r0_ILBALANCE, r0_JBALANCE, r0_BASE, r0_MARK, r0_MARKBASE, r0_tm, r0_markAboveLower, r0_markAboveCap, r0_markBelowLower, r0_markBelowZero, r0_capitalMarks, r0_bMarks, r0_eMarks, r0_pMarks, r0_Ring, r0_ORing, r0_leftwardTopSerif, r0_leftwardBottomSerif, r0_rightwardTopSerif, r0_rightwardBottomSerif, r0_xn$createglyph$7Hrq, r0_para, _r0_t0, _r0_t1, _r0_t2, _r0_t3, _r0_t4, _r0_t5, _r0_t6, _r0_t7, _r0_t8, _r0_t9, _r0_t10, _r0_t11, _r0_t12, _r0_t13, _r0_t14, _r0_t15, _r0_t16, _r0_t17, _r0_t18, _r0_t19, _r0_t20, _r0_t21, _r0_t22, _r0_t23, _r0_t24, _r0_t25, _r0_t26, _r0_t27, _r0_t28, _r0_t29, _r0_t30, _r0_t31, _r0_t32, _r0_t33, _r0_t34, _r0_t35, _r0_t36, _r0_t37, _r0_t38, _r0_t39, _r0_t40, _r0_t41, _r0_t42, _r0_t43, _r0_t44, _r0_t45, _r0_t46, _r0_t47, _r0_t48, _r0_t49, _r0_t50, _r0_t51, _r0_t52, _r0_t53, _r0_t54, _r0_t55, _r0_t56, _r0_t57, _r0_t58, _r0_t59, _r0_t60, _r0_t61, _r0_t62, _r0_t63, _r0_t64, _r0_t65, _r0_t66, _r0_t67, _r0_t68, _r0_t69, _r0_t70, _r0_t71, _r0_t72, _r0_t73, _r0_t74, _r0_t75, _r0_t76, _r0_t77, _r0_t78, _r0_t79, _r0_t80, _r0_t81, _r0_t82, _r0_t83; r0_font = require('./empty.json'); exports['font'] = r0_font; r0_glyphList = r0_font['glyf']; @@ -43,7 +43,7 @@ r0_para_italic['italicangle'] = 10; r0_para_bolditalic = Object['create'](r0_para_bold); r0_para_bolditalic['italicangle'] = 10; - r0_para = r0_para_bold; + r0_para = r0_para_bolditalic; r0_variantSelector = { 'zero': 'slashed' }; r0_globalTransform = { 'xx': 1, @@ -1343,7 +1343,7 @@ r100_xn$putshapes$9Jrj(r100_outline['form-stroke'](r0_STROKE, 0)); return void 0; }); - r0_xn$createglyph$7Hrq('e', function _r0_t52() { + r0_xn$createglyph$7Hrq('e.upright', function _r0_t52() { var r102_xn$setwidth$9Jrj, r102_xn$assignunicode$7Hrq, r102_xn$startfrom$1aao, r102_xn$lineto$5sIl, r102_xn$curveto$1aao, r102_xn$cubicto$1aao, r102_xn$putshapes$9Jrj, r102_xn$reverselast$3qIs, r102_include, r102_xn$createstroke$7Hrq, r102_xn$setanchor$9Jrj, r102_barbottom, r102_outline, r102_bar, _r102_t0; _r102_t0 = this; r102_xn$setwidth$9Jrj = _r102_t0['set-width']['bind'](_r102_t0); @@ -1360,8 +1360,6 @@ _r102_t0['gizmo'] = r0_globalTransform; _r102_t0['set-width'](r0_WIDTH); r102_xn$setwidth$9Jrj(r0_WIDTH); - r102_xn$assignunicode$7Hrq('e'); - r102_include(r0_eMarks); r102_barbottom = r0_XH * r0_BARPOS; r102_outline = r102_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB - r0_O, r102_barbottom)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB - r0_O, r0_XH - r0_SMALLSMOOTHB)['arc-vh-to'](r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r0_O, r0_XH - r0_SMALLSMOOTHA)['line-to'](r0_SB + r0_O, r0_SMALLSMOOTHB)['arc-vh-to'](r0_MIDDLE, r0_O)['heads-to'](r0_RIGHTWARD)['curve-to'](r0_MIDDLE + (r0_KAPPA_HOOK + r0_TAILADJKAPPA * r0_globalTransform['yx']) * (r0_MIDDLE - r0_SB), r0_O, r0_RIGHTSB - r0_OXHOOK + r0_TAILADJX * r0_globalTransform['yx'], r0_HOOK - r0_TAILADJY * r0_globalTransform['yx']); r102_bar = r102_xn$createstroke$7Hrq()['start-from'](r0_SB + r0_HALFSTROKE, r102_barbottom)['set-width'](r0_STROKE, 0)['heads-to'](r0_RIGHTWARD)['line-to'](r0_RIGHTSB - r0_HALFSTROKE, r102_barbottom)['heads-to'](r0_RIGHTWARD); @@ -1369,8 +1367,8 @@ r102_xn$putshapes$9Jrj(r102_bar['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('a.upright', function _r0_t53() { - var r104_xn$setwidth$9Jrj, r104_xn$assignunicode$7Hrq, r104_xn$startfrom$1aao, r104_xn$lineto$5sIl, r104_xn$curveto$1aao, r104_xn$cubicto$1aao, r104_xn$putshapes$9Jrj, r104_xn$reverselast$3qIs, r104_include, r104_xn$createstroke$7Hrq, r104_xn$setanchor$9Jrj, r104_bartop, _r104_t0; + r0_xn$createglyph$7Hrq('e.italic', function _r0_t53() { + var r104_xn$setwidth$9Jrj, r104_xn$assignunicode$7Hrq, r104_xn$startfrom$1aao, r104_xn$lineto$5sIl, r104_xn$curveto$1aao, r104_xn$cubicto$1aao, r104_xn$putshapes$9Jrj, r104_xn$reverselast$3qIs, r104_include, r104_xn$createstroke$7Hrq, r104_xn$setanchor$9Jrj, r104_barbottom, r104_outline, _r104_t0; _r104_t0 = this; r104_xn$setwidth$9Jrj = _r104_t0['set-width']['bind'](_r104_t0); r104_xn$assignunicode$7Hrq = _r104_t0['assign-unicode']['bind'](_r104_t0); @@ -1386,13 +1384,12 @@ _r104_t0['gizmo'] = r0_globalTransform; _r104_t0['set-width'](r0_WIDTH); r104_xn$setwidth$9Jrj(r0_WIDTH); - r104_bartop = r0_XH * r0_BARPOS + r0_STROKE; - r104_xn$putshapes$9Jrj(r104_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, 0)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, r0_XH - r0_SMOOTHA)['arc-vh-to'](r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['curve-to'](r0_MIDDLE - r0_KAPPA_AHOOK * (r0_MIDDLE - r0_SB), r0_XO, r0_SB + r0_OXHOOK, r0_XH - r0_AHOOK)['form-stroke']()); - r104_xn$putshapes$9Jrj(r104_xn$createstroke$7Hrq()['start-from'](r0_WIDTH * 0.47, r0_O)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r0_O, r104_bartop * 0.45)['arc-vh-to'](r0_WIDTH * 0.6, r104_bartop)['line-to'](r0_RIGHTSB, r104_bartop)['heads-to'](r0_RIGHTWARD)['form-stroke']()); - r104_xn$putshapes$9Jrj(r104_xn$createstroke$7Hrq()['start-from'](r0_WIDTH * 0.47, r0_O + r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_RIGHTWARD)['arc-hv-to'](r0_RIGHTSB - r0_STROKE, r0_SMALLSMOOTHA * 0.65)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE * 0.4)['form-stroke']()); + r104_barbottom = r0_XH * (r0_BARPOS - 0.04); + r104_outline = r104_xn$createstroke$7Hrq()['start-from'](r0_SB + r0_O + r0_STROKE, r104_barbottom)['set-width'](r0_STROKE, 0)['arc-hv-to'](r0_RIGHTSB - r0_O, r0_XH - r0_SMALLSMOOTHB)['arc-vh-to'](r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r0_O, r0_XH - r0_SMALLSMOOTHA)['line-to'](r0_SB + r0_O, r0_SMALLSMOOTHB)['arc-vh-to'](r0_MIDDLE, r0_O)['heads-to'](r0_RIGHTWARD)['curve-to'](r0_MIDDLE + (r0_KAPPA_HOOK + r0_TAILADJKAPPA * r0_globalTransform['yx']) * (r0_MIDDLE - r0_SB), r0_O, r0_RIGHTSB - r0_OXHOOK + r0_TAILADJX * r0_globalTransform['yx'], r0_HOOK - r0_TAILADJY * r0_globalTransform['yx']); + r104_xn$putshapes$9Jrj(r104_outline['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('a.italic', function _r0_t54() { + r0_xn$createglyph$7Hrq('e', function _r0_t54() { var r106_xn$setwidth$9Jrj, r106_xn$assignunicode$7Hrq, r106_xn$startfrom$1aao, r106_xn$lineto$5sIl, r106_xn$curveto$1aao, r106_xn$cubicto$1aao, r106_xn$putshapes$9Jrj, r106_xn$reverselast$3qIs, r106_include, r106_xn$createstroke$7Hrq, r106_xn$setanchor$9Jrj, _r106_t0; _r106_t0 = this; r106_xn$setwidth$9Jrj = _r106_t0['set-width']['bind'](_r106_t0); @@ -1409,12 +1406,17 @@ _r106_t0['gizmo'] = r0_globalTransform; _r106_t0['set-width'](r0_WIDTH); r106_xn$setwidth$9Jrj(r0_WIDTH); - r106_include(r0_glyphs['o.right']); - r106_xn$putshapes$9Jrj(r106_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, 0)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); + r106_xn$assignunicode$7Hrq('e'); + r106_include(r0_eMarks); + if (r0_para['italicangle'] > 0) { + r106_include(r0_glyphs['e.italic']); + } else { + r106_include(r0_glyphs['e.upright']); + } return void 0; }); - r0_xn$createglyph$7Hrq('a', function _r0_t55() { - var r108_xn$setwidth$9Jrj, r108_xn$assignunicode$7Hrq, r108_xn$startfrom$1aao, r108_xn$lineto$5sIl, r108_xn$curveto$1aao, r108_xn$cubicto$1aao, r108_xn$putshapes$9Jrj, r108_xn$reverselast$3qIs, r108_include, r108_xn$createstroke$7Hrq, r108_xn$setanchor$9Jrj, _r108_t0; + r0_xn$createglyph$7Hrq('a.upright', function _r0_t55() { + var r108_xn$setwidth$9Jrj, r108_xn$assignunicode$7Hrq, r108_xn$startfrom$1aao, r108_xn$lineto$5sIl, r108_xn$curveto$1aao, r108_xn$cubicto$1aao, r108_xn$putshapes$9Jrj, r108_xn$reverselast$3qIs, r108_include, r108_xn$createstroke$7Hrq, r108_xn$setanchor$9Jrj, r108_bartop, _r108_t0; _r108_t0 = this; r108_xn$setwidth$9Jrj = _r108_t0['set-width']['bind'](_r108_t0); r108_xn$assignunicode$7Hrq = _r108_t0['assign-unicode']['bind'](_r108_t0); @@ -1430,16 +1432,13 @@ _r108_t0['gizmo'] = r0_globalTransform; _r108_t0['set-width'](r0_WIDTH); r108_xn$setwidth$9Jrj(r0_WIDTH); - r108_xn$assignunicode$7Hrq('a'); - r108_include(r0_eMarks); - if (r0_para['italicangle'] > 0) { - r108_include(r0_glyphs['a.italic']); - } else { - r108_include(r0_glyphs['a.upright']); - } + r108_bartop = r0_XH * r0_BARPOS + r0_STROKE; + r108_xn$putshapes$9Jrj(r108_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, 0)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, r0_XH - r0_SMOOTHA)['arc-vh-to'](r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['curve-to'](r0_MIDDLE - r0_KAPPA_AHOOK * (r0_MIDDLE - r0_SB), r0_XO, r0_SB + r0_OXHOOK, r0_XH - r0_AHOOK)['form-stroke']()); + r108_xn$putshapes$9Jrj(r108_xn$createstroke$7Hrq()['start-from'](r0_WIDTH * 0.47, r0_O)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r0_O, r108_bartop * 0.45)['arc-vh-to'](r0_WIDTH * 0.6, r108_bartop)['line-to'](r0_RIGHTSB, r108_bartop)['heads-to'](r0_RIGHTWARD)['form-stroke']()); + r108_xn$putshapes$9Jrj(r108_xn$createstroke$7Hrq()['start-from'](r0_WIDTH * 0.47, r0_O + r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_RIGHTWARD)['arc-hv-to'](r0_RIGHTSB - r0_STROKE, r0_SMALLSMOOTHA * 0.65)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE * 0.4)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('u', function _r0_t56() { + r0_xn$createglyph$7Hrq('a.italic', function _r0_t56() { var r110_xn$setwidth$9Jrj, r110_xn$assignunicode$7Hrq, r110_xn$startfrom$1aao, r110_xn$lineto$5sIl, r110_xn$curveto$1aao, r110_xn$cubicto$1aao, r110_xn$putshapes$9Jrj, r110_xn$reverselast$3qIs, r110_include, r110_xn$createstroke$7Hrq, r110_xn$setanchor$9Jrj, _r110_t0; _r110_t0 = this; r110_xn$setwidth$9Jrj = _r110_t0['set-width']['bind'](_r110_t0); @@ -1456,14 +1455,11 @@ _r110_t0['gizmo'] = r0_globalTransform; _r110_t0['set-width'](r0_WIDTH); r110_xn$setwidth$9Jrj(r0_WIDTH); - r110_xn$assignunicode$7Hrq('u'); - r110_include(r0_eMarks); - r110_xn$putshapes$9Jrj(r110_xn$createstroke$7Hrq()['start-from'](r0_SB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_SB, r0_SMALLSMOOTHA)['arc-vh-to'](r0_MIDDLE, r0_O)['heads-to'](r0_RIGHTWARD)['form-stroke']()); - r110_xn$putshapes$9Jrj(r110_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, r0_O + r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_RIGHTWARD)['arc-hv-to'](r0_RIGHTSB - r0_STROKE * r0_ITALICCOR, r0_SMALLSMOOTHA)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE * 0.4)['form-stroke']()); + r110_include(r0_glyphs['o.right']); r110_xn$putshapes$9Jrj(r110_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, 0)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('nbowl', function _r0_t57() { + r0_xn$createglyph$7Hrq('a', function _r0_t57() { var r112_xn$setwidth$9Jrj, r112_xn$assignunicode$7Hrq, r112_xn$startfrom$1aao, r112_xn$lineto$5sIl, r112_xn$curveto$1aao, r112_xn$cubicto$1aao, r112_xn$putshapes$9Jrj, r112_xn$reverselast$3qIs, r112_include, r112_xn$createstroke$7Hrq, r112_xn$setanchor$9Jrj, _r112_t0; _r112_t0 = this; r112_xn$setwidth$9Jrj = _r112_t0['set-width']['bind'](_r112_t0); @@ -1479,11 +1475,17 @@ r112_xn$setanchor$9Jrj = _r112_t0['set-anchor']['bind'](_r112_t0); _r112_t0['gizmo'] = r0_globalTransform; _r112_t0['set-width'](r0_WIDTH); - r112_xn$putshapes$9Jrj(r112_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, 0)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, r0_XH - r0_SMALLSMOOTHB)['arc-vh-to'](r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['form-stroke']()); - r112_xn$putshapes$9Jrj(r112_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, r0_XO - r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r0_STROKE * r0_ITALICCOR, r0_XH - r0_SMALLSMOOTHA)['heads-to'](r0_DOWNWARD)['set-width'](0, r0_STROKE * 0.4)['form-stroke']()); + r112_xn$setwidth$9Jrj(r0_WIDTH); + r112_xn$assignunicode$7Hrq('a'); + r112_include(r0_eMarks); + if (r0_para['italicangle'] > 0) { + r112_include(r0_glyphs['a.italic']); + } else { + r112_include(r0_glyphs['a.upright']); + } return void 0; }); - r0_xn$createglyph$7Hrq('n', function _r0_t58() { + r0_xn$createglyph$7Hrq('u', function _r0_t58() { var r114_xn$setwidth$9Jrj, r114_xn$assignunicode$7Hrq, r114_xn$startfrom$1aao, r114_xn$lineto$5sIl, r114_xn$curveto$1aao, r114_xn$cubicto$1aao, r114_xn$putshapes$9Jrj, r114_xn$reverselast$3qIs, r114_include, r114_xn$createstroke$7Hrq, r114_xn$setanchor$9Jrj, _r114_t0; _r114_t0 = this; r114_xn$setwidth$9Jrj = _r114_t0['set-width']['bind'](_r114_t0); @@ -1500,13 +1502,14 @@ _r114_t0['gizmo'] = r0_globalTransform; _r114_t0['set-width'](r0_WIDTH); r114_xn$setwidth$9Jrj(r0_WIDTH); - r114_xn$assignunicode$7Hrq('n'); + r114_xn$assignunicode$7Hrq('u'); r114_include(r0_eMarks); - r114_include(r0_glyphs['nbowl']); - r114_xn$putshapes$9Jrj(r114_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE)['line-to'](r0_SB, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); + r114_xn$putshapes$9Jrj(r114_xn$createstroke$7Hrq()['start-from'](r0_SB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_SB, r0_SMALLSMOOTHA)['arc-vh-to'](r0_MIDDLE, r0_O)['heads-to'](r0_RIGHTWARD)['form-stroke']()); + r114_xn$putshapes$9Jrj(r114_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, r0_O + r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_RIGHTWARD)['arc-hv-to'](r0_RIGHTSB - r0_STROKE * r0_ITALICCOR, r0_SMALLSMOOTHA)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE * 0.4)['form-stroke']()); + r114_xn$putshapes$9Jrj(r114_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, 0)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('h', function _r0_t59() { + r0_xn$createglyph$7Hrq('nbowl', function _r0_t59() { var r116_xn$setwidth$9Jrj, r116_xn$assignunicode$7Hrq, r116_xn$startfrom$1aao, r116_xn$lineto$5sIl, r116_xn$curveto$1aao, r116_xn$cubicto$1aao, r116_xn$putshapes$9Jrj, r116_xn$reverselast$3qIs, r116_include, r116_xn$createstroke$7Hrq, r116_xn$setanchor$9Jrj, _r116_t0; _r116_t0 = this; r116_xn$setwidth$9Jrj = _r116_t0['set-width']['bind'](_r116_t0); @@ -1522,15 +1525,12 @@ r116_xn$setanchor$9Jrj = _r116_t0['set-anchor']['bind'](_r116_t0); _r116_t0['gizmo'] = r0_globalTransform; _r116_t0['set-width'](r0_WIDTH); - r116_xn$setwidth$9Jrj(r0_WIDTH); - r116_xn$assignunicode$7Hrq('h'); - r116_include(r0_bMarks); - r116_include(r0_glyphs['nbowl']); - r116_xn$putshapes$9Jrj(r116_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE)['line-to'](r0_SB, r0_CAP)['heads-to'](r0_UPWARD)['form-stroke']()); + r116_xn$putshapes$9Jrj(r116_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, 0)['heads-to'](r0_UPWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, r0_XH - r0_SMALLSMOOTHB)['arc-vh-to'](r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['form-stroke']()); + r116_xn$putshapes$9Jrj(r116_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, r0_XO - r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r0_STROKE * r0_ITALICCOR, r0_XH - r0_SMALLSMOOTHA)['heads-to'](r0_DOWNWARD)['set-width'](0, r0_STROKE * 0.4)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('m', function _r0_t60() { - var r118_xn$setwidth$9Jrj, r118_xn$assignunicode$7Hrq, r118_xn$startfrom$1aao, r118_xn$lineto$5sIl, r118_xn$curveto$1aao, r118_xn$cubicto$1aao, r118_xn$putshapes$9Jrj, r118_xn$reverselast$3qIs, r118_include, r118_xn$createstroke$7Hrq, r118_xn$setanchor$9Jrj, r118_sw, r118_m1, r118_m2, _r118_t0; + r0_xn$createglyph$7Hrq('n', function _r0_t60() { + var r118_xn$setwidth$9Jrj, r118_xn$assignunicode$7Hrq, r118_xn$startfrom$1aao, r118_xn$lineto$5sIl, r118_xn$curveto$1aao, r118_xn$cubicto$1aao, r118_xn$putshapes$9Jrj, r118_xn$reverselast$3qIs, r118_include, r118_xn$createstroke$7Hrq, r118_xn$setanchor$9Jrj, _r118_t0; _r118_t0 = this; r118_xn$setwidth$9Jrj = _r118_t0['set-width']['bind'](_r118_t0); r118_xn$assignunicode$7Hrq = _r118_t0['assign-unicode']['bind'](_r118_t0); @@ -1546,17 +1546,13 @@ _r118_t0['gizmo'] = r0_globalTransform; _r118_t0['set-width'](r0_WIDTH); r118_xn$setwidth$9Jrj(r0_WIDTH); - r118_xn$assignunicode$7Hrq('m'); + r118_xn$assignunicode$7Hrq('n'); r118_include(r0_eMarks); - r118_sw = Math['min'](r0_STROKE, (r0_WIDTH - r0_SB * 2) * 0.24); - r118_m1 = (r0_MIDDLE + r0_SB + r118_sw * 0.25) / 2; - r118_m2 = r118_m1 + (r0_MIDDLE - r118_sw / 2 - r0_SB); - r118_xn$putshapes$9Jrj(r118_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE - r118_sw / 2, 0)['set-width'](0, r118_sw)['heads-to'](r0_UPWARD)['line-to'](r0_MIDDLE - r118_sw / 2, r0_XH - r0_SMALLSMOOTHA)['arc-vh-to'](r118_m1, r0_XO - r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r118_sw * 0.75, r0_XH - r0_SMALLSMOOTHA)['heads-to'](r0_DOWNWARD)['set-width'](0, r118_sw * 0.4)['form-stroke']()); - r118_xn$putshapes$9Jrj(r118_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB - r118_sw, 0)['set-width'](0, r118_sw)['heads-to'](r0_UPWARD)['line-to'](r0_RIGHTSB - r118_sw, r0_XH - r0_SMALLSMOOTHA)['arc-vh-to'](r118_m2, r0_XO - r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_MIDDLE + r118_sw * 0.25, r0_XH - r0_SMALLSMOOTHA)['heads-to'](r0_DOWNWARD)['set-width'](0, r118_sw * 0.4)['form-stroke']()); - r118_xn$putshapes$9Jrj(r118_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_UPWARD)['set-width'](0, r118_sw)['line-to'](r0_SB, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); + r118_include(r0_glyphs['nbowl']); + r118_xn$putshapes$9Jrj(r118_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE)['line-to'](r0_SB, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessi.straight', function _r0_t61() { + r0_xn$createglyph$7Hrq('h', function _r0_t61() { var r120_xn$setwidth$9Jrj, r120_xn$assignunicode$7Hrq, r120_xn$startfrom$1aao, r120_xn$lineto$5sIl, r120_xn$curveto$1aao, r120_xn$cubicto$1aao, r120_xn$putshapes$9Jrj, r120_xn$reverselast$3qIs, r120_include, r120_xn$createstroke$7Hrq, r120_xn$setanchor$9Jrj, _r120_t0; _r120_t0 = this; r120_xn$setwidth$9Jrj = _r120_t0['set-width']['bind'](_r120_t0); @@ -1572,12 +1568,15 @@ r120_xn$setanchor$9Jrj = _r120_t0['set-anchor']['bind'](_r120_t0); _r120_t0['gizmo'] = r0_globalTransform; _r120_t0['set-width'](r0_WIDTH); - r120_include(r0_eMarks); - r120_xn$putshapes$9Jrj(r120_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); + r120_xn$setwidth$9Jrj(r0_WIDTH); + r120_xn$assignunicode$7Hrq('h'); + r120_include(r0_bMarks); + r120_include(r0_glyphs['nbowl']); + r120_xn$putshapes$9Jrj(r120_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_UPWARD)['set-width'](0, r0_STROKE)['line-to'](r0_SB, r0_CAP)['heads-to'](r0_UPWARD)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessi.hooky', function _r0_t62() { - var r122_xn$setwidth$9Jrj, r122_xn$assignunicode$7Hrq, r122_xn$startfrom$1aao, r122_xn$lineto$5sIl, r122_xn$curveto$1aao, r122_xn$cubicto$1aao, r122_xn$putshapes$9Jrj, r122_xn$reverselast$3qIs, r122_include, r122_xn$createstroke$7Hrq, r122_xn$setanchor$9Jrj, _r122_t0; + r0_xn$createglyph$7Hrq('m', function _r0_t62() { + var r122_xn$setwidth$9Jrj, r122_xn$assignunicode$7Hrq, r122_xn$startfrom$1aao, r122_xn$lineto$5sIl, r122_xn$curveto$1aao, r122_xn$cubicto$1aao, r122_xn$putshapes$9Jrj, r122_xn$reverselast$3qIs, r122_include, r122_xn$createstroke$7Hrq, r122_xn$setanchor$9Jrj, r122_sw, r122_m1, r122_m2, _r122_t0; _r122_t0 = this; r122_xn$setwidth$9Jrj = _r122_t0['set-width']['bind'](_r122_t0); r122_xn$assignunicode$7Hrq = _r122_t0['assign-unicode']['bind'](_r122_t0); @@ -1592,11 +1591,18 @@ r122_xn$setanchor$9Jrj = _r122_t0['set-anchor']['bind'](_r122_t0); _r122_t0['gizmo'] = r0_globalTransform; _r122_t0['set-width'](r0_WIDTH); - r122_include(r0_glyphs['dotlessi.straight'], true); - r122_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE, r0_XH, r0_LONGSERIF)); + r122_xn$setwidth$9Jrj(r0_WIDTH); + r122_xn$assignunicode$7Hrq('m'); + r122_include(r0_eMarks); + r122_sw = Math['min'](r0_STROKE, (r0_WIDTH - r0_SB * 2) * 0.24); + r122_m1 = (r0_MIDDLE + r0_SB + r122_sw * 0.25) / 2; + r122_m2 = r122_m1 + (r0_MIDDLE - r122_sw / 2 - r0_SB); + r122_xn$putshapes$9Jrj(r122_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE - r122_sw / 2, 0)['set-width'](0, r122_sw)['heads-to'](r0_UPWARD)['line-to'](r0_MIDDLE - r122_sw / 2, r0_XH - r0_SMALLSMOOTHA)['arc-vh-to'](r122_m1, r0_XO - r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB + r122_sw * 0.75, r0_XH - r0_SMALLSMOOTHA)['heads-to'](r0_DOWNWARD)['set-width'](0, r122_sw * 0.4)['form-stroke']()); + r122_xn$putshapes$9Jrj(r122_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB - r122_sw, 0)['set-width'](0, r122_sw)['heads-to'](r0_UPWARD)['line-to'](r0_RIGHTSB - r122_sw, r0_XH - r0_SMALLSMOOTHA)['arc-vh-to'](r122_m2, r0_XO - r0_STROKE)['set-width'](0, r0_STROKE)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_MIDDLE + r122_sw * 0.25, r0_XH - r0_SMALLSMOOTHA)['heads-to'](r0_DOWNWARD)['set-width'](0, r122_sw * 0.4)['form-stroke']()); + r122_xn$putshapes$9Jrj(r122_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_UPWARD)['set-width'](0, r122_sw)['line-to'](r0_SB, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessi.zshaped', function _r0_t63() { + r0_xn$createglyph$7Hrq('dotlessi.straight', function _r0_t63() { var r124_xn$setwidth$9Jrj, r124_xn$assignunicode$7Hrq, r124_xn$startfrom$1aao, r124_xn$lineto$5sIl, r124_xn$curveto$1aao, r124_xn$cubicto$1aao, r124_xn$putshapes$9Jrj, r124_xn$reverselast$3qIs, r124_include, r124_xn$createstroke$7Hrq, r124_xn$setanchor$9Jrj, _r124_t0; _r124_t0 = this; r124_xn$setwidth$9Jrj = _r124_t0['set-width']['bind'](_r124_t0); @@ -1612,12 +1618,12 @@ r124_xn$setanchor$9Jrj = _r124_t0['set-anchor']['bind'](_r124_t0); _r124_t0['gizmo'] = r0_globalTransform; _r124_t0['set-width'](r0_WIDTH); - r124_include(r0_glyphs['dotlessi.hooky'], true); - r124_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); + r124_include(r0_eMarks); + r124_xn$putshapes$9Jrj(r124_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessi.serifed', function _r0_t64() { - var r126_xn$setwidth$9Jrj, r126_xn$assignunicode$7Hrq, r126_xn$startfrom$1aao, r126_xn$lineto$5sIl, r126_xn$curveto$1aao, r126_xn$cubicto$1aao, r126_xn$putshapes$9Jrj, r126_xn$reverselast$3qIs, r126_include, r126_xn$createstroke$7Hrq, r126_xn$setanchor$9Jrj, r126_balance, _r126_t0; + r0_xn$createglyph$7Hrq('dotlessi.hooky', function _r0_t64() { + var r126_xn$setwidth$9Jrj, r126_xn$assignunicode$7Hrq, r126_xn$startfrom$1aao, r126_xn$lineto$5sIl, r126_xn$curveto$1aao, r126_xn$cubicto$1aao, r126_xn$putshapes$9Jrj, r126_xn$reverselast$3qIs, r126_include, r126_xn$createstroke$7Hrq, r126_xn$setanchor$9Jrj, _r126_t0; _r126_t0 = this; r126_xn$setwidth$9Jrj = _r126_t0['set-width']['bind'](_r126_t0); r126_xn$assignunicode$7Hrq = _r126_t0['assign-unicode']['bind'](_r126_t0); @@ -1632,63 +1638,32 @@ r126_xn$setanchor$9Jrj = _r126_t0['set-anchor']['bind'](_r126_t0); _r126_t0['gizmo'] = r0_globalTransform; _r126_t0['set-width'](r0_WIDTH); - r126_include(r0_eMarks); - r126_balance = r0_ILBALANCE; - r126_xn$putshapes$9Jrj(r126_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r126_balance, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE + r126_balance, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); - r126_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE + r126_balance, r0_XH, r0_LONGSERIF - r126_balance)); - r126_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); - r126_xn$putshapes$9Jrj(r0_leftwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); + r126_include(r0_glyphs['dotlessi.straight'], true); + r126_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE, r0_XH, r0_LONGSERIF)); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessi', function _r0_t65() { - var r128_xn$setwidth$9Jrj, r128_xn$assignunicode$7Hrq, r128_xn$startfrom$1aao, r128_xn$lineto$5sIl, r128_xn$curveto$1aao, r128_xn$cubicto$1aao, r128_xn$putshapes$9Jrj, r128_xn$reverselast$3qIs, r128_include, r128_xn$createstroke$7Hrq, r128_xn$setanchor$9Jrj, r128_otherwise, _r128_t0, _r128_t1, _r128_t2, _r128_t3, _r128_t4, _r128_t5, _r128_t6, _r128_t7, _r128_t8, _r128_t9; - _r128_t1 = this; - r128_xn$setwidth$9Jrj = _r128_t1['set-width']['bind'](_r128_t1); - r128_xn$assignunicode$7Hrq = _r128_t1['assign-unicode']['bind'](_r128_t1); - r128_xn$startfrom$1aao = _r128_t1['start-from']['bind'](_r128_t1); - r128_xn$lineto$5sIl = _r128_t1['line-to']['bind'](_r128_t1); - r128_xn$curveto$1aao = _r128_t1['curve-to']['bind'](_r128_t1); - r128_xn$cubicto$1aao = _r128_t1['cubic-to']['bind'](_r128_t1); - r128_xn$putshapes$9Jrj = _r128_t1['put-shapes']['bind'](_r128_t1); - r128_xn$reverselast$3qIs = _r128_t1['reverse-last']['bind'](_r128_t1); - r128_include = _r128_t1['include']['bind'](_r128_t1); - r128_xn$createstroke$7Hrq = _r128_t1['create-stroke']['bind'](_r128_t1); - r128_xn$setanchor$9Jrj = _r128_t1['set-anchor']['bind'](_r128_t1); - _r128_t1['gizmo'] = r0_globalTransform; - _r128_t1['set-width'](r0_WIDTH); - r128_xn$setwidth$9Jrj(r0_WIDTH); - r128_xn$assignunicode$7Hrq(305); - _r128_t2 = r128_include; - _r128_t3 = r0_glyphs; - _r128_t0 = r0_variantSelector['zero']; - if ('straight' === _r128_t0) { - _r128_t4 = 'dotlessi.straight'; - } else { - if ('hooky' === _r128_t0) { - _r128_t5 = 'dotlessi.hooky'; - } else { - if ('zshaped' === _r128_t0) { - _r128_t6 = 'dotlessi.zshaped'; - } else { - if ('serifed' === _r128_t0) { - _r128_t7 = 'dotlessi.serifed'; - } else { - r128_otherwise = _r128_t0; - _r128_t7 = 'dotlessi.serifed'; - } - _r128_t6 = _r128_t7; - } - _r128_t5 = _r128_t6; - } - _r128_t4 = _r128_t5; - } - _r128_t8 = _r128_t3[_r128_t4]; - _r128_t9 = true; - _r128_t2(_r128_t8, _r128_t9); + r0_xn$createglyph$7Hrq('dotlessi.zshaped', function _r0_t65() { + var r128_xn$setwidth$9Jrj, r128_xn$assignunicode$7Hrq, r128_xn$startfrom$1aao, r128_xn$lineto$5sIl, r128_xn$curveto$1aao, r128_xn$cubicto$1aao, r128_xn$putshapes$9Jrj, r128_xn$reverselast$3qIs, r128_include, r128_xn$createstroke$7Hrq, r128_xn$setanchor$9Jrj, _r128_t0; + _r128_t0 = this; + r128_xn$setwidth$9Jrj = _r128_t0['set-width']['bind'](_r128_t0); + r128_xn$assignunicode$7Hrq = _r128_t0['assign-unicode']['bind'](_r128_t0); + r128_xn$startfrom$1aao = _r128_t0['start-from']['bind'](_r128_t0); + r128_xn$lineto$5sIl = _r128_t0['line-to']['bind'](_r128_t0); + r128_xn$curveto$1aao = _r128_t0['curve-to']['bind'](_r128_t0); + r128_xn$cubicto$1aao = _r128_t0['cubic-to']['bind'](_r128_t0); + r128_xn$putshapes$9Jrj = _r128_t0['put-shapes']['bind'](_r128_t0); + r128_xn$reverselast$3qIs = _r128_t0['reverse-last']['bind'](_r128_t0); + r128_include = _r128_t0['include']['bind'](_r128_t0); + r128_xn$createstroke$7Hrq = _r128_t0['create-stroke']['bind'](_r128_t0); + r128_xn$setanchor$9Jrj = _r128_t0['set-anchor']['bind'](_r128_t0); + _r128_t0['gizmo'] = r0_globalTransform; + _r128_t0['set-width'](r0_WIDTH); + r128_include(r0_glyphs['dotlessi.hooky'], true); + r128_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); return void 0; }); - r0_xn$createglyph$7Hrq('dotaccent', function _r0_t66() { - var r130_xn$setwidth$9Jrj, r130_xn$assignunicode$7Hrq, r130_xn$startfrom$1aao, r130_xn$lineto$5sIl, r130_xn$curveto$1aao, r130_xn$cubicto$1aao, r130_xn$putshapes$9Jrj, r130_xn$reverselast$3qIs, r130_include, r130_xn$createstroke$7Hrq, r130_xn$setanchor$9Jrj, _r130_t0; + r0_xn$createglyph$7Hrq('dotlessi.serifed', function _r0_t66() { + var r130_xn$setwidth$9Jrj, r130_xn$assignunicode$7Hrq, r130_xn$startfrom$1aao, r130_xn$lineto$5sIl, r130_xn$curveto$1aao, r130_xn$cubicto$1aao, r130_xn$putshapes$9Jrj, r130_xn$reverselast$3qIs, r130_include, r130_xn$createstroke$7Hrq, r130_xn$setanchor$9Jrj, r130_balance, _r130_t0; _r130_t0 = this; r130_xn$setwidth$9Jrj = _r130_t0['set-width']['bind'](_r130_t0); r130_xn$assignunicode$7Hrq = _r130_t0['assign-unicode']['bind'](_r130_t0); @@ -1703,34 +1678,62 @@ r130_xn$setanchor$9Jrj = _r130_t0['set-anchor']['bind'](_r130_t0); _r130_t0['gizmo'] = r0_globalTransform; _r130_t0['set-width'](r0_WIDTH); - r130_xn$setwidth$9Jrj(r0_WIDTH); - r130_xn$setanchor$9Jrj('above', r0_MARK, r0_MIDDLE, r0_XH, r0_MIDDLE, r0_XH + r0_ACCENT); - r130_xn$putshapes$9Jrj([r0_Ring(r0_XH + r0_ACCENT + r0_DOTRADIUS, r0_XH + r0_ACCENT - r0_DOTRADIUS, r0_MIDDLE - r0_DOTRADIUS, r0_MIDDLE + r0_DOTRADIUS)]); + r130_include(r0_eMarks); + r130_balance = r0_ILBALANCE; + r130_xn$putshapes$9Jrj(r130_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r130_balance, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE + r130_balance, r0_XH)['heads-to'](r0_UPWARD)['form-stroke']()); + r130_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE + r130_balance, r0_XH, r0_LONGSERIF - r130_balance)); + r130_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); + r130_xn$putshapes$9Jrj(r0_leftwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); return void 0; }); - r0_xn$createglyph$7Hrq('i', function _r0_t67() { - var r132_xn$setwidth$9Jrj, r132_xn$assignunicode$7Hrq, r132_xn$startfrom$1aao, r132_xn$lineto$5sIl, r132_xn$curveto$1aao, r132_xn$cubicto$1aao, r132_xn$putshapes$9Jrj, r132_xn$reverselast$3qIs, r132_include, r132_xn$createstroke$7Hrq, r132_xn$setanchor$9Jrj, _r132_t0; - _r132_t0 = this; - r132_xn$setwidth$9Jrj = _r132_t0['set-width']['bind'](_r132_t0); - r132_xn$assignunicode$7Hrq = _r132_t0['assign-unicode']['bind'](_r132_t0); - r132_xn$startfrom$1aao = _r132_t0['start-from']['bind'](_r132_t0); - r132_xn$lineto$5sIl = _r132_t0['line-to']['bind'](_r132_t0); - r132_xn$curveto$1aao = _r132_t0['curve-to']['bind'](_r132_t0); - r132_xn$cubicto$1aao = _r132_t0['cubic-to']['bind'](_r132_t0); - r132_xn$putshapes$9Jrj = _r132_t0['put-shapes']['bind'](_r132_t0); - r132_xn$reverselast$3qIs = _r132_t0['reverse-last']['bind'](_r132_t0); - r132_include = _r132_t0['include']['bind'](_r132_t0); - r132_xn$createstroke$7Hrq = _r132_t0['create-stroke']['bind'](_r132_t0); - r132_xn$setanchor$9Jrj = _r132_t0['set-anchor']['bind'](_r132_t0); - _r132_t0['gizmo'] = r0_globalTransform; - _r132_t0['set-width'](r0_WIDTH); + r0_xn$createglyph$7Hrq('dotlessi', function _r0_t67() { + var r132_xn$setwidth$9Jrj, r132_xn$assignunicode$7Hrq, r132_xn$startfrom$1aao, r132_xn$lineto$5sIl, r132_xn$curveto$1aao, r132_xn$cubicto$1aao, r132_xn$putshapes$9Jrj, r132_xn$reverselast$3qIs, r132_include, r132_xn$createstroke$7Hrq, r132_xn$setanchor$9Jrj, r132_otherwise, _r132_t0, _r132_t1, _r132_t2, _r132_t3, _r132_t4, _r132_t5, _r132_t6, _r132_t7, _r132_t8, _r132_t9; + _r132_t1 = this; + r132_xn$setwidth$9Jrj = _r132_t1['set-width']['bind'](_r132_t1); + r132_xn$assignunicode$7Hrq = _r132_t1['assign-unicode']['bind'](_r132_t1); + r132_xn$startfrom$1aao = _r132_t1['start-from']['bind'](_r132_t1); + r132_xn$lineto$5sIl = _r132_t1['line-to']['bind'](_r132_t1); + r132_xn$curveto$1aao = _r132_t1['curve-to']['bind'](_r132_t1); + r132_xn$cubicto$1aao = _r132_t1['cubic-to']['bind'](_r132_t1); + r132_xn$putshapes$9Jrj = _r132_t1['put-shapes']['bind'](_r132_t1); + r132_xn$reverselast$3qIs = _r132_t1['reverse-last']['bind'](_r132_t1); + r132_include = _r132_t1['include']['bind'](_r132_t1); + r132_xn$createstroke$7Hrq = _r132_t1['create-stroke']['bind'](_r132_t1); + r132_xn$setanchor$9Jrj = _r132_t1['set-anchor']['bind'](_r132_t1); + _r132_t1['gizmo'] = r0_globalTransform; + _r132_t1['set-width'](r0_WIDTH); r132_xn$setwidth$9Jrj(r0_WIDTH); - r132_xn$assignunicode$7Hrq('i'); - r132_include(r0_glyphs['dotlessi'], r0_BASE); - r132_include(r0_glyphs['dotaccent']); + r132_xn$assignunicode$7Hrq(305); + _r132_t2 = r132_include; + _r132_t3 = r0_glyphs; + _r132_t0 = r0_variantSelector['zero']; + if ('straight' === _r132_t0) { + _r132_t4 = 'dotlessi.straight'; + } else { + if ('hooky' === _r132_t0) { + _r132_t5 = 'dotlessi.hooky'; + } else { + if ('zshaped' === _r132_t0) { + _r132_t6 = 'dotlessi.zshaped'; + } else { + if ('serifed' === _r132_t0) { + _r132_t7 = 'dotlessi.serifed'; + } else { + r132_otherwise = _r132_t0; + _r132_t7 = 'dotlessi.serifed'; + } + _r132_t6 = _r132_t7; + } + _r132_t5 = _r132_t6; + } + _r132_t4 = _r132_t5; + } + _r132_t8 = _r132_t3[_r132_t4]; + _r132_t9 = true; + _r132_t2(_r132_t8, _r132_t9); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessj.straight', function _r0_t68() { + r0_xn$createglyph$7Hrq('dotaccent', function _r0_t68() { var r134_xn$setwidth$9Jrj, r134_xn$assignunicode$7Hrq, r134_xn$startfrom$1aao, r134_xn$lineto$5sIl, r134_xn$curveto$1aao, r134_xn$cubicto$1aao, r134_xn$putshapes$9Jrj, r134_xn$reverselast$3qIs, r134_include, r134_xn$createstroke$7Hrq, r134_xn$setanchor$9Jrj, _r134_t0; _r134_t0 = this; r134_xn$setwidth$9Jrj = _r134_t0['set-width']['bind'](_r134_t0); @@ -1746,10 +1749,12 @@ r134_xn$setanchor$9Jrj = _r134_t0['set-anchor']['bind'](_r134_t0); _r134_t0['gizmo'] = r0_globalTransform; _r134_t0['set-width'](r0_WIDTH); - r134_xn$putshapes$9Jrj(r134_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r0_JBALANCE, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE + r0_JBALANCE, 0)['arc-vh-to'](r0_MIDDLE + r0_DESCENDER, r0_DESCENDER + r0_HALFSTROKE)['form-stroke']()); + r134_xn$setwidth$9Jrj(r0_WIDTH); + r134_xn$setanchor$9Jrj('above', r0_MARK, r0_MIDDLE, r0_XH, r0_MIDDLE, r0_XH + r0_ACCENT); + r134_xn$putshapes$9Jrj([r0_Ring(r0_XH + r0_ACCENT + r0_DOTRADIUS, r0_XH + r0_ACCENT - r0_DOTRADIUS, r0_MIDDLE - r0_DOTRADIUS, r0_MIDDLE + r0_DOTRADIUS)]); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessj.serifed', function _r0_t69() { + r0_xn$createglyph$7Hrq('i', function _r0_t69() { var r136_xn$setwidth$9Jrj, r136_xn$assignunicode$7Hrq, r136_xn$startfrom$1aao, r136_xn$lineto$5sIl, r136_xn$curveto$1aao, r136_xn$cubicto$1aao, r136_xn$putshapes$9Jrj, r136_xn$reverselast$3qIs, r136_include, r136_xn$createstroke$7Hrq, r136_xn$setanchor$9Jrj, _r136_t0; _r136_t0 = this; r136_xn$setwidth$9Jrj = _r136_t0['set-width']['bind'](_r136_t0); @@ -1765,11 +1770,13 @@ r136_xn$setanchor$9Jrj = _r136_t0['set-anchor']['bind'](_r136_t0); _r136_t0['gizmo'] = r0_globalTransform; _r136_t0['set-width'](r0_WIDTH); - r136_include(r0_glyphs['dotlessj.straight']); - r136_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE + r0_JBALANCE, r0_XH, r0_LONGSERIF)); + r136_xn$setwidth$9Jrj(r0_WIDTH); + r136_xn$assignunicode$7Hrq('i'); + r136_include(r0_glyphs['dotlessi'], r0_BASE); + r136_include(r0_glyphs['dotaccent']); return void 0; }); - r0_xn$createglyph$7Hrq('dotlessj', function _r0_t70() { + r0_xn$createglyph$7Hrq('dotlessj.straight', function _r0_t70() { var r138_xn$setwidth$9Jrj, r138_xn$assignunicode$7Hrq, r138_xn$startfrom$1aao, r138_xn$lineto$5sIl, r138_xn$curveto$1aao, r138_xn$cubicto$1aao, r138_xn$putshapes$9Jrj, r138_xn$reverselast$3qIs, r138_include, r138_xn$createstroke$7Hrq, r138_xn$setanchor$9Jrj, _r138_t0; _r138_t0 = this; r138_xn$setwidth$9Jrj = _r138_t0['set-width']['bind'](_r138_t0); @@ -1785,13 +1792,10 @@ r138_xn$setanchor$9Jrj = _r138_t0['set-anchor']['bind'](_r138_t0); _r138_t0['gizmo'] = r0_globalTransform; _r138_t0['set-width'](r0_WIDTH); - r138_xn$setwidth$9Jrj(r0_WIDTH); - r138_xn$setanchor$9Jrj('above', r0_BASE, r0_MIDDLE + r0_JBALANCE, r0_XH); - r138_xn$assignunicode$7Hrq(567); - r138_include(r0_glyphs['dotlessj.serifed']); + r138_xn$putshapes$9Jrj(r138_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r0_JBALANCE, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE + r0_JBALANCE, 0)['arc-vh-to'](r0_MIDDLE + r0_DESCENDER, r0_DESCENDER + r0_HALFSTROKE)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('j', function _r0_t71() { + r0_xn$createglyph$7Hrq('dotlessj.serifed', function _r0_t71() { var r140_xn$setwidth$9Jrj, r140_xn$assignunicode$7Hrq, r140_xn$startfrom$1aao, r140_xn$lineto$5sIl, r140_xn$curveto$1aao, r140_xn$cubicto$1aao, r140_xn$putshapes$9Jrj, r140_xn$reverselast$3qIs, r140_include, r140_xn$createstroke$7Hrq, r140_xn$setanchor$9Jrj, _r140_t0; _r140_t0 = this; r140_xn$setwidth$9Jrj = _r140_t0['set-width']['bind'](_r140_t0); @@ -1807,13 +1811,11 @@ r140_xn$setanchor$9Jrj = _r140_t0['set-anchor']['bind'](_r140_t0); _r140_t0['gizmo'] = r0_globalTransform; _r140_t0['set-width'](r0_WIDTH); - r140_xn$setwidth$9Jrj(r0_WIDTH); - r140_xn$assignunicode$7Hrq('j'); - r140_include(r0_glyphs['dotlessj'], r0_BASE); - r140_include(r0_glyphs['dotaccent']); + r140_include(r0_glyphs['dotlessj.straight']); + r140_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE + r0_JBALANCE, r0_XH, r0_LONGSERIF)); return void 0; }); - r0_xn$createglyph$7Hrq('l.straight', function _r0_t72() { + r0_xn$createglyph$7Hrq('dotlessj', function _r0_t72() { var r142_xn$setwidth$9Jrj, r142_xn$assignunicode$7Hrq, r142_xn$startfrom$1aao, r142_xn$lineto$5sIl, r142_xn$curveto$1aao, r142_xn$cubicto$1aao, r142_xn$putshapes$9Jrj, r142_xn$reverselast$3qIs, r142_include, r142_xn$createstroke$7Hrq, r142_xn$setanchor$9Jrj, _r142_t0; _r142_t0 = this; r142_xn$setwidth$9Jrj = _r142_t0['set-width']['bind'](_r142_t0); @@ -1829,10 +1831,13 @@ r142_xn$setanchor$9Jrj = _r142_t0['set-anchor']['bind'](_r142_t0); _r142_t0['gizmo'] = r0_globalTransform; _r142_t0['set-width'](r0_WIDTH); - r142_xn$putshapes$9Jrj(r142_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE, r0_CAP)['heads-to'](r0_UPWARD)['form-stroke']()); + r142_xn$setwidth$9Jrj(r0_WIDTH); + r142_xn$setanchor$9Jrj('above', r0_BASE, r0_MIDDLE + r0_JBALANCE, r0_XH); + r142_xn$assignunicode$7Hrq(567); + r142_include(r0_glyphs['dotlessj.serifed']); return void 0; }); - r0_xn$createglyph$7Hrq('l.hooky', function _r0_t73() { + r0_xn$createglyph$7Hrq('j', function _r0_t73() { var r144_xn$setwidth$9Jrj, r144_xn$assignunicode$7Hrq, r144_xn$startfrom$1aao, r144_xn$lineto$5sIl, r144_xn$curveto$1aao, r144_xn$cubicto$1aao, r144_xn$putshapes$9Jrj, r144_xn$reverselast$3qIs, r144_include, r144_xn$createstroke$7Hrq, r144_xn$setanchor$9Jrj, _r144_t0; _r144_t0 = this; r144_xn$setwidth$9Jrj = _r144_t0['set-width']['bind'](_r144_t0); @@ -1848,11 +1853,13 @@ r144_xn$setanchor$9Jrj = _r144_t0['set-anchor']['bind'](_r144_t0); _r144_t0['gizmo'] = r0_globalTransform; _r144_t0['set-width'](r0_WIDTH); - r144_include(r0_glyphs['l.straight']); - r144_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE, r0_CAP, r0_LONGSERIF)); + r144_xn$setwidth$9Jrj(r0_WIDTH); + r144_xn$assignunicode$7Hrq('j'); + r144_include(r0_glyphs['dotlessj'], r0_BASE); + r144_include(r0_glyphs['dotaccent']); return void 0; }); - r0_xn$createglyph$7Hrq('l.zshaped', function _r0_t74() { + r0_xn$createglyph$7Hrq('l.straight', function _r0_t74() { var r146_xn$setwidth$9Jrj, r146_xn$assignunicode$7Hrq, r146_xn$startfrom$1aao, r146_xn$lineto$5sIl, r146_xn$curveto$1aao, r146_xn$cubicto$1aao, r146_xn$putshapes$9Jrj, r146_xn$reverselast$3qIs, r146_include, r146_xn$createstroke$7Hrq, r146_xn$setanchor$9Jrj, _r146_t0; _r146_t0 = this; r146_xn$setwidth$9Jrj = _r146_t0['set-width']['bind'](_r146_t0); @@ -1868,12 +1875,11 @@ r146_xn$setanchor$9Jrj = _r146_t0['set-anchor']['bind'](_r146_t0); _r146_t0['gizmo'] = r0_globalTransform; _r146_t0['set-width'](r0_WIDTH); - r146_include(r0_glyphs['l.hooky']); - r146_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); + r146_xn$putshapes$9Jrj(r146_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE, r0_CAP)['heads-to'](r0_UPWARD)['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('l.serifed', function _r0_t75() { - var r148_xn$setwidth$9Jrj, r148_xn$assignunicode$7Hrq, r148_xn$startfrom$1aao, r148_xn$lineto$5sIl, r148_xn$curveto$1aao, r148_xn$cubicto$1aao, r148_xn$putshapes$9Jrj, r148_xn$reverselast$3qIs, r148_include, r148_xn$createstroke$7Hrq, r148_xn$setanchor$9Jrj, r148_balance, _r148_t0; + r0_xn$createglyph$7Hrq('l.hooky', function _r0_t75() { + var r148_xn$setwidth$9Jrj, r148_xn$assignunicode$7Hrq, r148_xn$startfrom$1aao, r148_xn$lineto$5sIl, r148_xn$curveto$1aao, r148_xn$cubicto$1aao, r148_xn$putshapes$9Jrj, r148_xn$reverselast$3qIs, r148_include, r148_xn$createstroke$7Hrq, r148_xn$setanchor$9Jrj, _r148_t0; _r148_t0 = this; r148_xn$setwidth$9Jrj = _r148_t0['set-width']['bind'](_r148_t0); r148_xn$assignunicode$7Hrq = _r148_t0['assign-unicode']['bind'](_r148_t0); @@ -1888,62 +1894,32 @@ r148_xn$setanchor$9Jrj = _r148_t0['set-anchor']['bind'](_r148_t0); _r148_t0['gizmo'] = r0_globalTransform; _r148_t0['set-width'](r0_WIDTH); - r148_balance = r0_ILBALANCE; - r148_xn$putshapes$9Jrj(r148_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r148_balance, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE + r148_balance, r0_CAP)['heads-to'](r0_UPWARD)['form-stroke']()); - r148_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE + r148_balance, r0_CAP, r0_LONGSERIF - r148_balance)); - r148_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); - r148_xn$putshapes$9Jrj(r0_leftwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); + r148_include(r0_glyphs['l.straight']); + r148_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE, r0_CAP, r0_LONGSERIF)); return void 0; }); - r0_xn$createglyph$7Hrq('l', function _r0_t76() { - var r150_xn$setwidth$9Jrj, r150_xn$assignunicode$7Hrq, r150_xn$startfrom$1aao, r150_xn$lineto$5sIl, r150_xn$curveto$1aao, r150_xn$cubicto$1aao, r150_xn$putshapes$9Jrj, r150_xn$reverselast$3qIs, r150_include, r150_xn$createstroke$7Hrq, r150_xn$setanchor$9Jrj, r150_otherwise, _r150_t0, _r150_t1, _r150_t2, _r150_t3, _r150_t4, _r150_t5, _r150_t6, _r150_t7, _r150_t8; - _r150_t1 = this; - r150_xn$setwidth$9Jrj = _r150_t1['set-width']['bind'](_r150_t1); - r150_xn$assignunicode$7Hrq = _r150_t1['assign-unicode']['bind'](_r150_t1); - r150_xn$startfrom$1aao = _r150_t1['start-from']['bind'](_r150_t1); - r150_xn$lineto$5sIl = _r150_t1['line-to']['bind'](_r150_t1); - r150_xn$curveto$1aao = _r150_t1['curve-to']['bind'](_r150_t1); - r150_xn$cubicto$1aao = _r150_t1['cubic-to']['bind'](_r150_t1); - r150_xn$putshapes$9Jrj = _r150_t1['put-shapes']['bind'](_r150_t1); - r150_xn$reverselast$3qIs = _r150_t1['reverse-last']['bind'](_r150_t1); - r150_include = _r150_t1['include']['bind'](_r150_t1); - r150_xn$createstroke$7Hrq = _r150_t1['create-stroke']['bind'](_r150_t1); - r150_xn$setanchor$9Jrj = _r150_t1['set-anchor']['bind'](_r150_t1); - _r150_t1['gizmo'] = r0_globalTransform; - _r150_t1['set-width'](r0_WIDTH); - r150_xn$setwidth$9Jrj(r0_WIDTH); - r150_xn$assignunicode$7Hrq('l'); - r150_include(r0_bMarks); - _r150_t2 = r150_include; - _r150_t3 = r0_glyphs; - _r150_t0 = r0_variantSelector['zero']; - if ('straight' === _r150_t0) { - _r150_t4 = 'l.straight'; - } else { - if ('hooky' === _r150_t0) { - _r150_t5 = 'l.hooky'; - } else { - if ('zshaped' === _r150_t0) { - _r150_t6 = 'l.zshaped'; - } else { - if ('serifed' === _r150_t0) { - _r150_t7 = 'l.serifed'; - } else { - r150_otherwise = _r150_t0; - _r150_t7 = 'l.serifed'; - } - _r150_t6 = _r150_t7; - } - _r150_t5 = _r150_t6; - } - _r150_t4 = _r150_t5; - } - _r150_t8 = _r150_t3[_r150_t4]; - _r150_t2(_r150_t8); + r0_xn$createglyph$7Hrq('l.zshaped', function _r0_t76() { + var r150_xn$setwidth$9Jrj, r150_xn$assignunicode$7Hrq, r150_xn$startfrom$1aao, r150_xn$lineto$5sIl, r150_xn$curveto$1aao, r150_xn$cubicto$1aao, r150_xn$putshapes$9Jrj, r150_xn$reverselast$3qIs, r150_include, r150_xn$createstroke$7Hrq, r150_xn$setanchor$9Jrj, _r150_t0; + _r150_t0 = this; + r150_xn$setwidth$9Jrj = _r150_t0['set-width']['bind'](_r150_t0); + r150_xn$assignunicode$7Hrq = _r150_t0['assign-unicode']['bind'](_r150_t0); + r150_xn$startfrom$1aao = _r150_t0['start-from']['bind'](_r150_t0); + r150_xn$lineto$5sIl = _r150_t0['line-to']['bind'](_r150_t0); + r150_xn$curveto$1aao = _r150_t0['curve-to']['bind'](_r150_t0); + r150_xn$cubicto$1aao = _r150_t0['cubic-to']['bind'](_r150_t0); + r150_xn$putshapes$9Jrj = _r150_t0['put-shapes']['bind'](_r150_t0); + r150_xn$reverselast$3qIs = _r150_t0['reverse-last']['bind'](_r150_t0); + r150_include = _r150_t0['include']['bind'](_r150_t0); + r150_xn$createstroke$7Hrq = _r150_t0['create-stroke']['bind'](_r150_t0); + r150_xn$setanchor$9Jrj = _r150_t0['set-anchor']['bind'](_r150_t0); + _r150_t0['gizmo'] = r0_globalTransform; + _r150_t0['set-width'](r0_WIDTH); + r150_include(r0_glyphs['l.hooky']); + r150_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); return void 0; }); - r0_xn$createglyph$7Hrq('x', function _r0_t77() { - var r152_xn$setwidth$9Jrj, r152_xn$assignunicode$7Hrq, r152_xn$startfrom$1aao, r152_xn$lineto$5sIl, r152_xn$curveto$1aao, r152_xn$cubicto$1aao, r152_xn$putshapes$9Jrj, r152_xn$reverselast$3qIs, r152_include, r152_xn$createstroke$7Hrq, r152_xn$setanchor$9Jrj, r152_TURN, r152_barone, r152_bartwo, _r152_t0; + r0_xn$createglyph$7Hrq('l.serifed', function _r0_t77() { + var r152_xn$setwidth$9Jrj, r152_xn$assignunicode$7Hrq, r152_xn$startfrom$1aao, r152_xn$lineto$5sIl, r152_xn$curveto$1aao, r152_xn$cubicto$1aao, r152_xn$putshapes$9Jrj, r152_xn$reverselast$3qIs, r152_include, r152_xn$createstroke$7Hrq, r152_xn$setanchor$9Jrj, r152_balance, _r152_t0; _r152_t0 = this; r152_xn$setwidth$9Jrj = _r152_t0['set-width']['bind'](_r152_t0); r152_xn$assignunicode$7Hrq = _r152_t0['assign-unicode']['bind'](_r152_t0); @@ -1958,49 +1934,62 @@ r152_xn$setanchor$9Jrj = _r152_t0['set-anchor']['bind'](_r152_t0); _r152_t0['gizmo'] = r0_globalTransform; _r152_t0['set-width'](r0_WIDTH); - r152_xn$setwidth$9Jrj(r0_WIDTH); - r152_xn$assignunicode$7Hrq('x'); - r152_include(r0_eMarks); - r152_TURN = r0_XH * 0.1; - r152_barone = r152_xn$createstroke$7Hrq()['start-from'](r0_SB + r0_HALFSTROKE + r0_O, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['cubic-to'](r0_SB + r0_HALFSTROKE + r0_O, r152_TURN + 0.17 * (r0_XH - r152_TURN), r0_RIGHTSB - r0_HALFSTROKE - r0_O, r0_XH - r152_TURN - 0.17 * (r0_XH - r152_TURN), r0_RIGHTSB - r0_HALFSTROKE - r0_O, r0_XH)['heads-to'](r0_UPWARD); - r152_bartwo = r152_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB - r0_HALFSTROKE - r0_O, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['cubic-to'](r0_RIGHTSB - r0_HALFSTROKE - r0_O, r152_TURN + 0.17 * (r0_XH - r152_TURN), r0_SB + r0_HALFSTROKE + r0_O, r0_XH - r152_TURN - 0.17 * (r0_XH - r152_TURN), r0_SB + r0_HALFSTROKE + r0_O, r0_XH)['heads-to'](r0_UPWARD); - r152_xn$putshapes$9Jrj(r152_barone['form-stroke']()); - r152_xn$putshapes$9Jrj(r152_bartwo['form-stroke']()); + r152_balance = r0_ILBALANCE; + r152_xn$putshapes$9Jrj(r152_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r152_balance, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['line-to'](r0_MIDDLE + r152_balance, r0_CAP)['heads-to'](r0_UPWARD)['form-stroke']()); + r152_xn$putshapes$9Jrj(r0_leftwardTopSerif(r0_MIDDLE + r152_balance, r0_CAP, r0_LONGSERIF - r152_balance)); + r152_xn$putshapes$9Jrj(r0_rightwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); + r152_xn$putshapes$9Jrj(r0_leftwardBottomSerif(r0_MIDDLE, 0, r0_LONGSERIF)); return void 0; }); - r0_xn$createglyph$7Hrq('v', function _r0_t78() { - var r154_xn$setwidth$9Jrj, r154_xn$assignunicode$7Hrq, r154_xn$startfrom$1aao, r154_xn$lineto$5sIl, r154_xn$curveto$1aao, r154_xn$cubicto$1aao, r154_xn$putshapes$9Jrj, r154_xn$reverselast$3qIs, r154_include, r154_xn$createstroke$7Hrq, r154_xn$setanchor$9Jrj, r154_TURN, r154_leftbar, r154_rightbar, _r154_t0; - _r154_t0 = this; - r154_xn$setwidth$9Jrj = _r154_t0['set-width']['bind'](_r154_t0); - r154_xn$assignunicode$7Hrq = _r154_t0['assign-unicode']['bind'](_r154_t0); - r154_xn$startfrom$1aao = _r154_t0['start-from']['bind'](_r154_t0); - r154_xn$lineto$5sIl = _r154_t0['line-to']['bind'](_r154_t0); - r154_xn$curveto$1aao = _r154_t0['curve-to']['bind'](_r154_t0); - r154_xn$cubicto$1aao = _r154_t0['cubic-to']['bind'](_r154_t0); - r154_xn$putshapes$9Jrj = _r154_t0['put-shapes']['bind'](_r154_t0); - r154_xn$reverselast$3qIs = _r154_t0['reverse-last']['bind'](_r154_t0); - r154_include = _r154_t0['include']['bind'](_r154_t0); - r154_xn$createstroke$7Hrq = _r154_t0['create-stroke']['bind'](_r154_t0); - r154_xn$setanchor$9Jrj = _r154_t0['set-anchor']['bind'](_r154_t0); - _r154_t0['gizmo'] = r0_globalTransform; - _r154_t0['set-width'](r0_WIDTH); + r0_xn$createglyph$7Hrq('l', function _r0_t78() { + var r154_xn$setwidth$9Jrj, r154_xn$assignunicode$7Hrq, r154_xn$startfrom$1aao, r154_xn$lineto$5sIl, r154_xn$curveto$1aao, r154_xn$cubicto$1aao, r154_xn$putshapes$9Jrj, r154_xn$reverselast$3qIs, r154_include, r154_xn$createstroke$7Hrq, r154_xn$setanchor$9Jrj, r154_otherwise, _r154_t0, _r154_t1, _r154_t2, _r154_t3, _r154_t4, _r154_t5, _r154_t6, _r154_t7, _r154_t8; + _r154_t1 = this; + r154_xn$setwidth$9Jrj = _r154_t1['set-width']['bind'](_r154_t1); + r154_xn$assignunicode$7Hrq = _r154_t1['assign-unicode']['bind'](_r154_t1); + r154_xn$startfrom$1aao = _r154_t1['start-from']['bind'](_r154_t1); + r154_xn$lineto$5sIl = _r154_t1['line-to']['bind'](_r154_t1); + r154_xn$curveto$1aao = _r154_t1['curve-to']['bind'](_r154_t1); + r154_xn$cubicto$1aao = _r154_t1['cubic-to']['bind'](_r154_t1); + r154_xn$putshapes$9Jrj = _r154_t1['put-shapes']['bind'](_r154_t1); + r154_xn$reverselast$3qIs = _r154_t1['reverse-last']['bind'](_r154_t1); + r154_include = _r154_t1['include']['bind'](_r154_t1); + r154_xn$createstroke$7Hrq = _r154_t1['create-stroke']['bind'](_r154_t1); + r154_xn$setanchor$9Jrj = _r154_t1['set-anchor']['bind'](_r154_t1); + _r154_t1['gizmo'] = r0_globalTransform; + _r154_t1['set-width'](r0_WIDTH); r154_xn$setwidth$9Jrj(r0_WIDTH); - r154_xn$assignunicode$7Hrq('v'); - r154_include(r0_eMarks); - r154_TURN = r0_XH * 0.9; - r154_leftbar = r154_xn$createstroke$7Hrq(); - r154_leftbar['start-from'](r0_SB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_SB, r154_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_SB, (1 - 0.27) * r154_TURN, r0_MIDDLE - r0_STROKE / 2, 0)['set-width'](r0_STROKE * 0.8, 0); - r154_rightbar = r154_xn$createstroke$7Hrq(); - r154_rightbar['start-from'](r0_RIGHTSB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](0, r0_STROKE)['line-to'](r0_RIGHTSB, r154_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_RIGHTSB, (1 - 0.27) * r154_TURN, r0_MIDDLE + r0_STROKE / 2, 0)['set-width'](0, r0_STROKE * 0.8); - r154_xn$putshapes$9Jrj(r154_leftbar['form-stroke']()); - r154_xn$putshapes$9Jrj(r154_rightbar['form-stroke']()); - r154_xn$startfrom$1aao(r0_MIDDLE + r0_STROKE / 2, 0); - r154_xn$lineto$5sIl(r0_MIDDLE - r0_STROKE / 2, 0); - r154_xn$lineto$5sIl(r0_MIDDLE, r0_STROKE); + r154_xn$assignunicode$7Hrq('l'); + r154_include(r0_bMarks); + _r154_t2 = r154_include; + _r154_t3 = r0_glyphs; + _r154_t0 = r0_variantSelector['zero']; + if ('straight' === _r154_t0) { + _r154_t4 = 'l.straight'; + } else { + if ('hooky' === _r154_t0) { + _r154_t5 = 'l.hooky'; + } else { + if ('zshaped' === _r154_t0) { + _r154_t6 = 'l.zshaped'; + } else { + if ('serifed' === _r154_t0) { + _r154_t7 = 'l.serifed'; + } else { + r154_otherwise = _r154_t0; + _r154_t7 = 'l.serifed'; + } + _r154_t6 = _r154_t7; + } + _r154_t5 = _r154_t6; + } + _r154_t4 = _r154_t5; + } + _r154_t8 = _r154_t3[_r154_t4]; + _r154_t2(_r154_t8); return void 0; }); - r0_xn$createglyph$7Hrq('w', function _r0_t79() { - var r156_xn$setwidth$9Jrj, r156_xn$assignunicode$7Hrq, r156_xn$startfrom$1aao, r156_xn$lineto$5sIl, r156_xn$curveto$1aao, r156_xn$cubicto$1aao, r156_xn$putshapes$9Jrj, r156_xn$reverselast$3qIs, r156_include, r156_xn$createstroke$7Hrq, r156_xn$setanchor$9Jrj, r156_TURN, r156_turn2, r156_wheight, r156_bottomStroke, r156_m1, r156_m2, _r156_t0; + r0_xn$createglyph$7Hrq('x', function _r0_t79() { + var r156_xn$setwidth$9Jrj, r156_xn$assignunicode$7Hrq, r156_xn$startfrom$1aao, r156_xn$lineto$5sIl, r156_xn$curveto$1aao, r156_xn$cubicto$1aao, r156_xn$putshapes$9Jrj, r156_xn$reverselast$3qIs, r156_include, r156_xn$createstroke$7Hrq, r156_xn$setanchor$9Jrj, r156_TURN, r156_barone, r156_bartwo, _r156_t0; _r156_t0 = this; r156_xn$setwidth$9Jrj = _r156_t0['set-width']['bind'](_r156_t0); r156_xn$assignunicode$7Hrq = _r156_t0['assign-unicode']['bind'](_r156_t0); @@ -2016,28 +2005,17 @@ _r156_t0['gizmo'] = r0_globalTransform; _r156_t0['set-width'](r0_WIDTH); r156_xn$setwidth$9Jrj(r0_WIDTH); - r156_xn$assignunicode$7Hrq('w'); + r156_xn$assignunicode$7Hrq('x'); r156_include(r0_eMarks); - r156_TURN = r0_XH * 0.75; - r156_turn2 = r0_XH * 0.59; - r156_wheight = r0_XH * 0.6; - r156_bottomStroke = Math['min'](r0_STROKE * 0.8, (r0_WIDTH - r0_SB * 2) * 0.175); - r156_m1 = r0_WIDTH * 0.35; - r156_m2 = r0_WIDTH * 0.65; - r156_xn$putshapes$9Jrj(r156_xn$createstroke$7Hrq()['start-from'](r0_SB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_SB, r156_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_SB, (1 - 0.27) * r156_TURN, r156_m1 - r156_bottomStroke / 2, 0)['set-width'](r156_bottomStroke, 0)['form-stroke']()); - r156_xn$putshapes$9Jrj(r156_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](0, r0_STROKE)['line-to'](r0_RIGHTSB, r156_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_RIGHTSB, (1 - 0.27) * r156_TURN, r156_m2 + r156_bottomStroke / 2, 0)['set-width'](0, r156_bottomStroke)['form-stroke']()); - r156_xn$putshapes$9Jrj(r156_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r156_bottomStroke / 2, r156_wheight)['heads-to'](r0_DOWNWARD)['set-width'](0, r156_bottomStroke)['line-to'](r0_MIDDLE + r156_bottomStroke / 2, r156_turn2)['heads-to'](r0_DOWNWARD)['curve-to'](r0_MIDDLE + r156_bottomStroke / 2, (1 - 0.1) * r156_turn2, r156_m1 + r156_bottomStroke / 2, 0)['set-width'](0, r156_bottomStroke)['form-stroke']()); - r156_xn$putshapes$9Jrj(r156_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE - r156_bottomStroke / 2, r156_wheight)['heads-to'](r0_DOWNWARD)['set-width'](r156_bottomStroke, 0)['line-to'](r0_MIDDLE - r156_bottomStroke / 2, r156_turn2)['heads-to'](r0_DOWNWARD)['curve-to'](r0_MIDDLE - r156_bottomStroke / 2, (1 - 0.1) * r156_turn2, r156_m2 - r156_bottomStroke / 2, 0)['set-width'](r156_bottomStroke, 0)['form-stroke']()); - r156_xn$startfrom$1aao(r156_m1 + r156_bottomStroke / 2, 0); - r156_xn$lineto$5sIl(r156_m1 - r156_bottomStroke / 2, 0); - r156_xn$lineto$5sIl(r156_m1, r156_bottomStroke); - r156_xn$startfrom$1aao(r156_m2 + r156_bottomStroke / 2, 0); - r156_xn$lineto$5sIl(r156_m2 - r156_bottomStroke / 2, 0); - r156_xn$lineto$5sIl(r156_m2, r156_bottomStroke); + r156_TURN = r0_XH * 0.1; + r156_barone = r156_xn$createstroke$7Hrq()['start-from'](r0_SB + r0_HALFSTROKE + r0_O, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['cubic-to'](r0_SB + r0_HALFSTROKE + r0_O, r156_TURN + 0.17 * (r0_XH - r156_TURN), r0_RIGHTSB - r0_HALFSTROKE - r0_O, r0_XH - r156_TURN - 0.17 * (r0_XH - r156_TURN), r0_RIGHTSB - r0_HALFSTROKE - r0_O, r0_XH)['heads-to'](r0_UPWARD); + r156_bartwo = r156_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB - r0_HALFSTROKE - r0_O, 0)['heads-to'](r0_UPWARD)['set-width'](r0_HALFSTROKE, r0_HALFSTROKE)['cubic-to'](r0_RIGHTSB - r0_HALFSTROKE - r0_O, r156_TURN + 0.17 * (r0_XH - r156_TURN), r0_SB + r0_HALFSTROKE + r0_O, r0_XH - r156_TURN - 0.17 * (r0_XH - r156_TURN), r0_SB + r0_HALFSTROKE + r0_O, r0_XH)['heads-to'](r0_UPWARD); + r156_xn$putshapes$9Jrj(r156_barone['form-stroke']()); + r156_xn$putshapes$9Jrj(r156_bartwo['form-stroke']()); return void 0; }); - r0_xn$createglyph$7Hrq('z', function _r0_t80() { - var r158_xn$setwidth$9Jrj, r158_xn$assignunicode$7Hrq, r158_xn$startfrom$1aao, r158_xn$lineto$5sIl, r158_xn$curveto$1aao, r158_xn$cubicto$1aao, r158_xn$putshapes$9Jrj, r158_xn$reverselast$3qIs, r158_include, r158_xn$createstroke$7Hrq, r158_xn$setanchor$9Jrj, r158_cor, _r158_t0; + r0_xn$createglyph$7Hrq('v', function _r0_t80() { + var r158_xn$setwidth$9Jrj, r158_xn$assignunicode$7Hrq, r158_xn$startfrom$1aao, r158_xn$lineto$5sIl, r158_xn$curveto$1aao, r158_xn$cubicto$1aao, r158_xn$putshapes$9Jrj, r158_xn$reverselast$3qIs, r158_include, r158_xn$createstroke$7Hrq, r158_xn$setanchor$9Jrj, r158_TURN, r158_leftbar, r158_rightbar, _r158_t0; _r158_t0 = this; r158_xn$setwidth$9Jrj = _r158_t0['set-width']['bind'](_r158_t0); r158_xn$assignunicode$7Hrq = _r158_t0['assign-unicode']['bind'](_r158_t0); @@ -2053,20 +2031,22 @@ _r158_t0['gizmo'] = r0_globalTransform; _r158_t0['set-width'](r0_WIDTH); r158_xn$setwidth$9Jrj(r0_WIDTH); - r158_xn$assignunicode$7Hrq('z'); + r158_xn$assignunicode$7Hrq('v'); r158_include(r0_eMarks); - r158_cor = 1.2; - r158_xn$putshapes$9Jrj(r158_xn$createstroke$7Hrq()['start-from'](r0_SB, r0_XH)['heads-to'](r0_RIGHTWARD)['set-width'](0, r0_STROKE)['line-to'](r0_RIGHTSB, r0_XH)['heads-to'](r0_RIGHTWARD)['form-stroke']()); - r158_xn$putshapes$9Jrj(r158_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_RIGHTWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, 0)['heads-to'](r0_RIGHTWARD)['form-stroke']()); - r158_xn$startfrom$1aao(r0_SB, r0_STROKE); - r158_xn$lineto$5sIl(r0_SB + r0_STROKE * r158_cor, r0_STROKE); - r158_xn$lineto$5sIl(r0_RIGHTSB, r0_XH - r0_STROKE); - r158_xn$lineto$5sIl(r0_RIGHTSB - r0_STROKE * r158_cor, r0_XH - r0_STROKE); - r158_xn$reverselast$3qIs(); + r158_TURN = r0_XH * 0.9; + r158_leftbar = r158_xn$createstroke$7Hrq(); + r158_leftbar['start-from'](r0_SB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_SB, r158_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_SB, (1 - 0.27) * r158_TURN, r0_MIDDLE - r0_STROKE / 2, 0)['set-width'](r0_STROKE * 0.8, 0); + r158_rightbar = r158_xn$createstroke$7Hrq(); + r158_rightbar['start-from'](r0_RIGHTSB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](0, r0_STROKE)['line-to'](r0_RIGHTSB, r158_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_RIGHTSB, (1 - 0.27) * r158_TURN, r0_MIDDLE + r0_STROKE / 2, 0)['set-width'](0, r0_STROKE * 0.8); + r158_xn$putshapes$9Jrj(r158_leftbar['form-stroke']()); + r158_xn$putshapes$9Jrj(r158_rightbar['form-stroke']()); + r158_xn$startfrom$1aao(r0_MIDDLE + r0_STROKE / 2, 0); + r158_xn$lineto$5sIl(r0_MIDDLE - r0_STROKE / 2, 0); + r158_xn$lineto$5sIl(r0_MIDDLE, r0_STROKE); return void 0; }); - r0_xn$createglyph$7Hrq('s', function _r0_t81() { - var r160_xn$setwidth$9Jrj, r160_xn$assignunicode$7Hrq, r160_xn$startfrom$1aao, r160_xn$lineto$5sIl, r160_xn$curveto$1aao, r160_xn$cubicto$1aao, r160_xn$putshapes$9Jrj, r160_xn$reverselast$3qIs, r160_include, r160_xn$createstroke$7Hrq, r160_xn$setanchor$9Jrj, r160_slope, r160_expand, r160_coexpand, r160_ssmootha, r160_bowltop, r160_strokemiddle, r160_bowlbottom, _r160_t0; + r0_xn$createglyph$7Hrq('w', function _r0_t81() { + var r160_xn$setwidth$9Jrj, r160_xn$assignunicode$7Hrq, r160_xn$startfrom$1aao, r160_xn$lineto$5sIl, r160_xn$curveto$1aao, r160_xn$cubicto$1aao, r160_xn$putshapes$9Jrj, r160_xn$reverselast$3qIs, r160_include, r160_xn$createstroke$7Hrq, r160_xn$setanchor$9Jrj, r160_TURN, r160_turn2, r160_wheight, r160_bottomStroke, r160_m1, r160_m2, _r160_t0; _r160_t0 = this; r160_xn$setwidth$9Jrj = _r160_t0['set-width']['bind'](_r160_t0); r160_xn$assignunicode$7Hrq = _r160_t0['assign-unicode']['bind'](_r160_t0); @@ -2082,21 +2062,87 @@ _r160_t0['gizmo'] = r0_globalTransform; _r160_t0['set-width'](r0_WIDTH); r160_xn$setwidth$9Jrj(r0_WIDTH); - r160_xn$assignunicode$7Hrq('s'); + r160_xn$assignunicode$7Hrq('w'); r160_include(r0_eMarks); - r160_slope = 0.015; - r160_expand = 0.175; - r160_coexpand = (1 - r160_expand) / 2; - r160_ssmootha = r0_SMOOTHA * 0.87; - r160_bowltop = r160_xn$createstroke$7Hrq(); - r160_bowltop['start-from'](r0_RIGHTSB - r0_OXHOOK, r0_XH - r0_SHOOK)['set-width'](r0_STROKE, 0)['curve-to'](r0_MIDDLE + r0_KAPPA_AHOOK * (r0_MIDDLE - r0_para['sb']), r0_XO, r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB, r0_XH - r160_ssmootha); - r160_strokemiddle = r160_xn$createstroke$7Hrq(); - r160_strokemiddle['start-from'](r0_SB + r0_STROKE / 2, r0_XH - r160_ssmootha)['set-width'](r0_STROKE / 2, r0_STROKE / 2)['curve-to'](r0_SB + r0_STROKE / 2, (0.5 + r160_slope) * r0_XH + 2 * r160_slope * r0_XH / (r160_expand * r0_WIDTH) * (r160_coexpand * r0_WIDTH - r0_SB - r0_STROKE / 2), r160_coexpand * r0_WIDTH, (0.5 + r160_slope) * r0_XH)['line-to']((1 - r160_coexpand) * r0_WIDTH, (0.5 - r160_slope) * r0_XH)['curve-to'](r0_RIGHTSB - r0_STROKE / 2, (0.5 - r160_slope) * r0_XH - 2 * r160_slope * r0_XH / (r160_expand * r0_WIDTH) * (r160_coexpand * r0_WIDTH - r0_SB - r0_STROKE / 2), r0_RIGHTSB - r0_STROKE / 2, r160_ssmootha); - r160_bowlbottom = r160_xn$createstroke$7Hrq(); - r160_bowlbottom['start-from'](r0_RIGHTSB, r160_ssmootha)['set-width'](0, r0_STROKE)['arc-vh-to'](r0_MIDDLE, r0_O)['heads-to'](r0_LEFTWARD)['curve-to'](r0_MIDDLE - r0_KAPPA_AHOOK * (r0_MIDDLE - r0_para['sb']), r0_O, r0_SB + r0_OXHOOK, r0_SHOOK); - r160_xn$putshapes$9Jrj(r160_bowltop['form-stroke']()); - r160_xn$putshapes$9Jrj(r160_strokemiddle['form-stroke']()); - r160_xn$putshapes$9Jrj(r160_bowlbottom['form-stroke']()); + r160_TURN = r0_XH * 0.75; + r160_turn2 = r0_XH * 0.59; + r160_wheight = r0_XH * 0.6; + r160_bottomStroke = Math['min'](r0_STROKE * 0.8, (r0_WIDTH - r0_SB * 2) * 0.175); + r160_m1 = r0_WIDTH * 0.325; + r160_m2 = r0_WIDTH * 0.675; + r160_xn$putshapes$9Jrj(r160_xn$createstroke$7Hrq()['start-from'](r0_SB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_SB, r160_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_SB, (1 - 0.27) * r160_TURN, r160_m1 - r160_bottomStroke / 2, 0)['set-width'](r160_bottomStroke, 0)['form-stroke']()); + r160_xn$putshapes$9Jrj(r160_xn$createstroke$7Hrq()['start-from'](r0_RIGHTSB, r0_XH)['heads-to'](r0_DOWNWARD)['set-width'](0, r0_STROKE)['line-to'](r0_RIGHTSB, r160_TURN)['heads-to'](r0_DOWNWARD)['curve-to'](r0_RIGHTSB, (1 - 0.27) * r160_TURN, r160_m2 + r160_bottomStroke / 2, 0)['set-width'](0, r160_bottomStroke)['form-stroke']()); + r160_xn$putshapes$9Jrj(r160_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE + r160_bottomStroke / 2, r160_wheight)['heads-to'](r0_DOWNWARD)['set-width'](0, r160_bottomStroke)['line-to'](r0_MIDDLE + r160_bottomStroke / 2, r160_turn2)['heads-to'](r0_DOWNWARD)['curve-to'](r0_MIDDLE + r160_bottomStroke / 2, (1 - 0.1) * r160_turn2, r160_m1 + r160_bottomStroke / 2, 0)['set-width'](0, r160_bottomStroke)['form-stroke']()); + r160_xn$putshapes$9Jrj(r160_xn$createstroke$7Hrq()['start-from'](r0_MIDDLE - r160_bottomStroke / 2, r160_wheight)['heads-to'](r0_DOWNWARD)['set-width'](r160_bottomStroke, 0)['line-to'](r0_MIDDLE - r160_bottomStroke / 2, r160_turn2)['heads-to'](r0_DOWNWARD)['curve-to'](r0_MIDDLE - r160_bottomStroke / 2, (1 - 0.1) * r160_turn2, r160_m2 - r160_bottomStroke / 2, 0)['set-width'](r160_bottomStroke, 0)['form-stroke']()); + r160_xn$startfrom$1aao(r160_m1 + r160_bottomStroke / 2, 0); + r160_xn$lineto$5sIl(r160_m1 - r160_bottomStroke / 2, 0); + r160_xn$lineto$5sIl(r160_m1, r160_bottomStroke); + r160_xn$startfrom$1aao(r160_m2 + r160_bottomStroke / 2, 0); + r160_xn$lineto$5sIl(r160_m2 - r160_bottomStroke / 2, 0); + r160_xn$lineto$5sIl(r160_m2, r160_bottomStroke); + return void 0; + }); + r0_xn$createglyph$7Hrq('z', function _r0_t82() { + var r162_xn$setwidth$9Jrj, r162_xn$assignunicode$7Hrq, r162_xn$startfrom$1aao, r162_xn$lineto$5sIl, r162_xn$curveto$1aao, r162_xn$cubicto$1aao, r162_xn$putshapes$9Jrj, r162_xn$reverselast$3qIs, r162_include, r162_xn$createstroke$7Hrq, r162_xn$setanchor$9Jrj, r162_cor, _r162_t0; + _r162_t0 = this; + r162_xn$setwidth$9Jrj = _r162_t0['set-width']['bind'](_r162_t0); + r162_xn$assignunicode$7Hrq = _r162_t0['assign-unicode']['bind'](_r162_t0); + r162_xn$startfrom$1aao = _r162_t0['start-from']['bind'](_r162_t0); + r162_xn$lineto$5sIl = _r162_t0['line-to']['bind'](_r162_t0); + r162_xn$curveto$1aao = _r162_t0['curve-to']['bind'](_r162_t0); + r162_xn$cubicto$1aao = _r162_t0['cubic-to']['bind'](_r162_t0); + r162_xn$putshapes$9Jrj = _r162_t0['put-shapes']['bind'](_r162_t0); + r162_xn$reverselast$3qIs = _r162_t0['reverse-last']['bind'](_r162_t0); + r162_include = _r162_t0['include']['bind'](_r162_t0); + r162_xn$createstroke$7Hrq = _r162_t0['create-stroke']['bind'](_r162_t0); + r162_xn$setanchor$9Jrj = _r162_t0['set-anchor']['bind'](_r162_t0); + _r162_t0['gizmo'] = r0_globalTransform; + _r162_t0['set-width'](r0_WIDTH); + r162_xn$setwidth$9Jrj(r0_WIDTH); + r162_xn$assignunicode$7Hrq('z'); + r162_include(r0_eMarks); + r162_cor = 1.2; + r162_xn$putshapes$9Jrj(r162_xn$createstroke$7Hrq()['start-from'](r0_SB, r0_XH)['heads-to'](r0_RIGHTWARD)['set-width'](0, r0_STROKE)['line-to'](r0_RIGHTSB, r0_XH)['heads-to'](r0_RIGHTWARD)['form-stroke']()); + r162_xn$putshapes$9Jrj(r162_xn$createstroke$7Hrq()['start-from'](r0_SB, 0)['heads-to'](r0_RIGHTWARD)['set-width'](r0_STROKE, 0)['line-to'](r0_RIGHTSB, 0)['heads-to'](r0_RIGHTWARD)['form-stroke']()); + r162_xn$startfrom$1aao(r0_SB, r0_STROKE); + r162_xn$lineto$5sIl(r0_SB + r0_STROKE * r162_cor, r0_STROKE); + r162_xn$lineto$5sIl(r0_RIGHTSB, r0_XH - r0_STROKE); + r162_xn$lineto$5sIl(r0_RIGHTSB - r0_STROKE * r162_cor, r0_XH - r0_STROKE); + r162_xn$reverselast$3qIs(); + return void 0; + }); + r0_xn$createglyph$7Hrq('s', function _r0_t83() { + var r164_xn$setwidth$9Jrj, r164_xn$assignunicode$7Hrq, r164_xn$startfrom$1aao, r164_xn$lineto$5sIl, r164_xn$curveto$1aao, r164_xn$cubicto$1aao, r164_xn$putshapes$9Jrj, r164_xn$reverselast$3qIs, r164_include, r164_xn$createstroke$7Hrq, r164_xn$setanchor$9Jrj, r164_slope, r164_expand, r164_coexpand, r164_ssmootha, r164_bowltop, r164_strokemiddle, r164_bowlbottom, _r164_t0; + _r164_t0 = this; + r164_xn$setwidth$9Jrj = _r164_t0['set-width']['bind'](_r164_t0); + r164_xn$assignunicode$7Hrq = _r164_t0['assign-unicode']['bind'](_r164_t0); + r164_xn$startfrom$1aao = _r164_t0['start-from']['bind'](_r164_t0); + r164_xn$lineto$5sIl = _r164_t0['line-to']['bind'](_r164_t0); + r164_xn$curveto$1aao = _r164_t0['curve-to']['bind'](_r164_t0); + r164_xn$cubicto$1aao = _r164_t0['cubic-to']['bind'](_r164_t0); + r164_xn$putshapes$9Jrj = _r164_t0['put-shapes']['bind'](_r164_t0); + r164_xn$reverselast$3qIs = _r164_t0['reverse-last']['bind'](_r164_t0); + r164_include = _r164_t0['include']['bind'](_r164_t0); + r164_xn$createstroke$7Hrq = _r164_t0['create-stroke']['bind'](_r164_t0); + r164_xn$setanchor$9Jrj = _r164_t0['set-anchor']['bind'](_r164_t0); + _r164_t0['gizmo'] = r0_globalTransform; + _r164_t0['set-width'](r0_WIDTH); + r164_xn$setwidth$9Jrj(r0_WIDTH); + r164_xn$assignunicode$7Hrq('s'); + r164_include(r0_eMarks); + r164_slope = 0.015; + r164_expand = 0.175; + r164_coexpand = (1 - r164_expand) / 2; + r164_ssmootha = r0_SMOOTHA * 0.87; + r164_bowltop = r164_xn$createstroke$7Hrq(); + r164_bowltop['start-from'](r0_RIGHTSB - r0_OXHOOK, r0_XH - r0_SHOOK)['set-width'](r0_STROKE, 0)['curve-to'](r0_MIDDLE + r0_KAPPA_AHOOK * (r0_MIDDLE - r0_para['sb']), r0_XO, r0_MIDDLE, r0_XO)['heads-to'](r0_LEFTWARD)['arc-hv-to'](r0_SB, r0_XH - r164_ssmootha); + r164_strokemiddle = r164_xn$createstroke$7Hrq(); + r164_strokemiddle['start-from'](r0_SB + r0_STROKE / 2, r0_XH - r164_ssmootha)['set-width'](r0_STROKE / 2, r0_STROKE / 2)['curve-to'](r0_SB + r0_STROKE / 2, (0.5 + r164_slope) * r0_XH + 2 * r164_slope * r0_XH / (r164_expand * r0_WIDTH) * (r164_coexpand * r0_WIDTH - r0_SB - r0_STROKE / 2), r164_coexpand * r0_WIDTH, (0.5 + r164_slope) * r0_XH)['line-to']((1 - r164_coexpand) * r0_WIDTH, (0.5 - r164_slope) * r0_XH)['curve-to'](r0_RIGHTSB - r0_STROKE / 2, (0.5 - r164_slope) * r0_XH - 2 * r164_slope * r0_XH / (r164_expand * r0_WIDTH) * (r164_coexpand * r0_WIDTH - r0_SB - r0_STROKE / 2), r0_RIGHTSB - r0_STROKE / 2, r164_ssmootha); + r164_bowlbottom = r164_xn$createstroke$7Hrq(); + r164_bowlbottom['start-from'](r0_RIGHTSB, r164_ssmootha)['set-width'](0, r0_STROKE)['arc-vh-to'](r0_MIDDLE, r0_O)['heads-to'](r0_LEFTWARD)['curve-to'](r0_MIDDLE - r0_KAPPA_AHOOK * (r0_MIDDLE - r0_para['sb']), r0_O, r0_SB + r0_OXHOOK, r0_SHOOK); + r164_xn$putshapes$9Jrj(r164_bowltop['form-stroke']()); + r164_xn$putshapes$9Jrj(r164_strokemiddle['form-stroke']()); + r164_xn$putshapes$9Jrj(r164_bowlbottom['form-stroke']()); return void 0; }); } diff --git a/font.patel b/font.patel index aea3e92..91eb339 100644 --- a/font.patel +++ b/font.patel @@ -49,7 +49,7 @@ para_italic.italicangle = 10 define para_bolditalic : Object.create para_bold para_bolditalic.italicangle = 10 -para = para_bold +para = para_bolditalic define variantSelector ( .zero 'slashed' diff --git a/glyphs/latin-lower.patel b/glyphs/latin-lower.patel index e105e21..d2c1b47 100644 --- a/glyphs/latin-lower.patel +++ b/glyphs/latin-lower.patel @@ -174,11 +174,9 @@ create-glyph 'c' : glyph-construction { :.curve-to [MIDDLE + [KAPPA_HOOK + TAILADJKAPPA * globalTransform.yx] * [MIDDLE - SB]] O [RIGHTSB - OXHOOK + TAILADJX * globalTransform.yx] [HOOK - TAILADJY * globalTransform.yx] put-shapes : outline.form-stroke STROKE 0 } -create-glyph 'e' : glyph-construction { +create-glyph 'e.upright' : glyph-construction { set-width WIDTH - assign-unicode 'e' - include eMarks - + local barbottom [XH * BARPOS] local outline : create-stroke @@ -204,6 +202,35 @@ create-glyph 'e' : glyph-construction { put-shapes : outline.form-stroke put-shapes : bar.form-stroke } +create-glyph 'e.italic' : glyph-construction { + set-width WIDTH + + local barbottom [XH * [BARPOS - 0.04]] + + local outline : create-stroke + :.start-from [SB + O + STROKE] barbottom + :.set-width STROKE 0 + :.arc-hv-to [RIGHTSB - O] [XH - SMALLSMOOTHB] + :.arc-vh-to MIDDLE XO + :.heads-to LEFTWARD + :.arc-hv-to [SB + O] [XH - SMALLSMOOTHA] + :.line-to [SB + O] SMALLSMOOTHB + :.arc-vh-to MIDDLE O + :.heads-to RIGHTWARD + :.curve-to [MIDDLE + [KAPPA_HOOK + TAILADJKAPPA * globalTransform.yx] * [MIDDLE - SB]] O [RIGHTSB - OXHOOK + TAILADJX * globalTransform.yx] [HOOK - TAILADJY * globalTransform.yx] + + put-shapes : outline.form-stroke +} +create-glyph 'e' : glyph-construction { + set-width WIDTH + assign-unicode 'e' + include eMarks + + if [para.italicangle > 0] { + then : include glyphs.'e.italic' + else : include glyphs.'e.upright' + } +} ### a u create-glyph 'a.upright' : glyph-construction { @@ -574,8 +601,8 @@ create-glyph 'w' : glyph-construction { local turn2 [XH * 0.59] local wheight [XH * 0.6] local bottomStroke : Math.min [STROKE * 0.8] [[WIDTH - SB * 2] * 0.175] - local m1 : WIDTH * 0.35 - local m2 : WIDTH * 0.65 + local m1 : WIDTH * 0.325 + local m2 : WIDTH * 0.675 put-shapes: create-stroke :.start-from SB XH diff --git a/support/stroke.js b/support/stroke.js index 29ad8ee..6f9da7a 100644 --- a/support/stroke.js +++ b/support/stroke.js @@ -18,7 +18,7 @@ var r2_a; return [r2_a[0]]['concat'](r2_a['concat']([r2_a[r2_a['length'] - 1]])); }; - r0_SAMPLES = 5; + r0_SAMPLES = 4; r0_TINY = 0.0001; r0_LITTLE = 0.01; r0_CUTOFF = 10000; diff --git a/support/stroke.patel b/support/stroke.patel index 955703d..b539e88 100644 --- a/support/stroke.patel +++ b/support/stroke.patel @@ -11,7 +11,7 @@ define [xs-array low high] : begin { } define [ys-array a] (a.0 :: [a.concat (a`[a.length - 1])]) -define SAMPLES 5 +define SAMPLES 4 define TINY 0.0001 define LITTLE 0.01 define CUTOFF 10000