mikeslab/Iosevka
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Fix overflow of X and Y under heavy slab

Browse source
This commit is contained in:
Belleve Invis 2020-05-23 01:46:10 -07:00
parent 6382a02ca2
commit 68f4cfac6d
11 changed files with 59 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gen/index.js
View file

@ -44,7 +44,7 @@ async function getParameters(argv) {
if (argv.excludedCharRanges) para.excludedCodePointRanges = argv.excludedCharRanges; if (argv.excludedCharRanges) para.excludedCodePointRanges = argv.excludedCharRanges;
if (argv.compatibilityLigatures) para.compLig = argv.compatibilityLigatures; if (argv.compatibilityLigatures) para.compLig = argv.compatibilityLigatures;
if (argv.metricOverride) Parameters.applymetricOverride(para, argv.metricOverride); if (argv.metricOverride) Parameters.applyMetricOverride(para, argv.metricOverride);
para.naming = { para.naming = {
family: argv.menu.family, family: argv.menu.family,

74
glyphs/letters-unified-basic.ptl
View file

@ -149,7 +149,7 @@ glyph-block LetterUnified-Basic : begin
if para.isItalic if para.isItalic
: then : begin : then : begin
local shift : (1 - df.div) * 0.2 local shift : (1 - df.div) * 0.2
local left : [mix SB df.rightSB ([linreg 18 0.42 126 0.46 STROKE] - shift)] - HALFSTROKE * HVCONTRAST local left : [mix SB df.rightSB ([StrokeWidthBlend 0.42 0.46] - shift)] - HALFSTROKE * HVCONTRAST
local right : mix SB df.rightSB (1.1 - shift) local right : mix SB df.rightSB (1.1 - shift)
local rightTerm : Math.max right (left + HOOKX + STROKE) local rightTerm : Math.max right (left + HOOKX + STROKE)
local middle : mix left right (0.55 * df.div) local middle : mix left right (0.55 * df.div)
@ -158,11 +158,11 @@ glyph-block LetterUnified-Basic : begin
flat left XH [heading DOWNWARD] flat left XH [heading DOWNWARD]
curl left (SMALLSMOOTHB * 0.8) curl left (SMALLSMOOTHB * 0.8)
hookend O hookend O
g4 rightTerm (HOOK * [linreg 18 0.85 126 1 STROKE] * df.div) g4 rightTerm (HOOK * [StrokeWidthBlend 0.85 1] * df.div)
include : dispiro include : dispiro
flat (left - (LONGJUT * df.div) + HALFSTROKE * HVCONTRAST) XH [widths 0 STROKE] flat (left - (LONGJUT * df.div) + HALFSTROKE * HVCONTRAST) XH [widths 0 STROKE]
curl left XH curl left XH
set-anchor 'above' BASE (left + HALFSTROKE * HVCONTRAST + [linreg 18 0.25 126 0 STROKE] * TANSLANT * df.width) XH set-anchor 'above' BASE (left + HALFSTROKE * HVCONTRAST + [StrokeWidthBlend 0.25 0] * TANSLANT * df.width) XH
set-anchor 'below' BASE middle 0 set-anchor 'below' BASE middle 0
: else : begin : else : begin
include : IotaShape XH include : IotaShape XH
@ -493,7 +493,7 @@ glyph-block LetterUnified-Basic : begin
flat left CAP [heading DOWNWARD] flat left CAP [heading DOWNWARD]
curl left (SMALLSMOOTHB * 0.85) curl left (SMALLSMOOTHB * 0.85)
hookend O hookend O
g4 rightTerm (HOOK * [linreg 18 0.85 126 1 STROKE] * df.div) g4 rightTerm (HOOK * [StrokeWidthBlend 0.85 1] * df.div)
include : tagged 'serifLT': dispiro include : tagged 'serifLT': dispiro
flat (left - (LONGJUT * df.div) + HALFSTROKE * HVCONTRAST) CAP [widths 0 STROKE] flat (left - (LONGJUT * df.div) + HALFSTROKE * HVCONTRAST) CAP [widths 0 STROKE]
curl left CAP curl left CAP
@ -644,7 +644,7 @@ glyph-block LetterUnified-Basic : begin
define VShapeMiddleWidth : adviceBlackness 3 define VShapeMiddleWidth : adviceBlackness 3
define pInktrap 0.5 define pInktrap 0.5
define StraightSbShrink : mix 1 designParameters.straightVShapeSbShrink : if SLAB 0.75 1 define StraightSbShrink : mix 1 (designParameters.straightVShapeSbShrink * [StrokeWidthBlend 1 0.25]) : if SLAB 0.75 1
define [VShapeOutline] : params [top [sw STROKE] barStraight div] : glyph-construction define [VShapeOutline] : params [top [sw STROKE] barStraight div] : glyph-construction
local df : DivFrame div local df : DivFrame div
@ -906,7 +906,7 @@ glyph-block LetterUnified-Basic : begin
include : dispiro include : dispiro
widths.lhs stroke widths.lhs stroke
flat RIGHTSB 0 [heading UPWARD] flat RIGHTSB 0 [heading UPWARD]
curl RIGHTSB (XH - SMOOTHB * [linreg 18 0.9 126 0.81 stroke]) curl RIGHTSB (XH - SMOOTHB * [StrokeWidthBlend 0.9 0.81 stroke])
hookend XO hookend XO
g4 (SB - OXHOOK / 2) (XH - AHOOK) g4 (SB - OXHOOK / 2) (XH - AHOOK)
include : dispiro include : dispiro
@ -1205,13 +1205,15 @@ glyph-block LetterUnified-Basic : begin
### X and x ### X and x
do "X, x and related ==========================================================================" do "X, x and related =========================================================================="
define [WithXMask s] : if SLAB [intersection [Rect CAP DESCENDER SB RIGHTSB] s] s
sketch # X sketch # X
set-width WIDTH set-width WIDTH
include MarkSet.capital include MarkSet.capital
branch branch
include : xStrand true SB 0 RIGHTSB CAP 0.1 0.4 0.28 include : WithXMask : union
include : xStrand true SB CAP RIGHTSB 0 0.1 0.4 0.28 xStrand true SB 0 RIGHTSB CAP 0.1 0.4 0.28
xStrand true SB CAP RIGHTSB 0 0.1 0.4 0.28
include : AIHSerifs CAP include : AIHSerifs CAP
save 'X.straight' 'X' save 'X.straight' 'X'
save 'Chi.straight' 0x3A7 save 'Chi.straight' 0x3A7
@ -1221,8 +1223,9 @@ glyph-block LetterUnified-Basic : begin
save 'cyrHadescender.straight' save 'cyrHadescender.straight'
branch branch
include : xStrand false SB 0 RIGHTSB CAP 0.1 0.4 0.28 include : WithXMask : union
include : xStrand false SB CAP RIGHTSB 0 0.1 0.4 0.28 xStrand false SB 0 RIGHTSB CAP 0.1 0.4 0.28
xStrand false SB CAP RIGHTSB 0 0.1 0.4 0.28
include : AIHSerifs CAP include : AIHSerifs CAP
save 'X.curly' 'X' save 'X.curly' 'X'
save 'Chi.curly' 0x3A7 save 'Chi.curly' 0x3A7
@ -1236,8 +1239,9 @@ glyph-block LetterUnified-Basic : begin
local TURN (XH * 0.1) local TURN (XH * 0.1)
branch branch
include : xStrand true SB 0 RIGHTSB XH 0.02 0.4 0.14 include : WithXMask : union
include : xStrand true SB XH RIGHTSB 0 0.02 0.4 0.14 xStrand true SB 0 RIGHTSB XH 0.02 0.4 0.14
xStrand true SB XH RIGHTSB 0 0.02 0.4 0.14
include : AIHSerifs XH include : AIHSerifs XH
save 'x.straight' 'x' save 'x.straight' 'x'
save 'cyrha.straight' 0x445 save 'cyrha.straight' 0x445
@ -1245,8 +1249,9 @@ glyph-block LetterUnified-Basic : begin
include : CyrDescender RIGHTSB (connex -- 0.5) include : CyrDescender RIGHTSB (connex -- 0.5)
save 'cyrhadescender.straight' save 'cyrhadescender.straight'
branch branch
include : xStrand false SB 0 RIGHTSB XH 0.02 0.4 0.14 include : WithXMask : union
include : xStrand false SB XH RIGHTSB 0 0.02 0.4 0.14 xStrand false SB 0 RIGHTSB XH 0.02 0.4 0.14
xStrand false SB XH RIGHTSB 0 0.02 0.4 0.14
include : AIHSerifs XH include : AIHSerifs XH
save 'x.curly' 'x' save 'x.curly' 'x'
save 'cyrha.curly' 0x445 save 'cyrha.curly' 0x445
@ -1259,13 +1264,15 @@ glyph-block LetterUnified-Basic : begin
include MarkSet.p include MarkSet.p
branch branch
include : xStrand true SB DESCENDER RIGHTSB XH 0.05 0.4 0.11 include : WithXMask : union
include : xStrand true SB XH RIGHTSB DESCENDER 0.05 0.4 0.11 xStrand true SB DESCENDER RIGHTSB XH 0.05 0.4 0.11
xStrand true SB XH RIGHTSB DESCENDER 0.05 0.4 0.11
save 'chi.straight' 0x3C7 save 'chi.straight' 0x3C7
save 'latinchi.straight' 0xAB53 save 'latinchi.straight' 0xAB53
branch branch
include : xStrand false SB DESCENDER RIGHTSB XH 0.05 0.4 0.11 include : WithXMask : union
include : xStrand false SB XH RIGHTSB DESCENDER 0.05 0.4 0.11 xStrand false SB DESCENDER RIGHTSB XH 0.05 0.4 0.11
xStrand false SB XH RIGHTSB DESCENDER 0.05 0.4 0.11
save 'chi.curly' 0x3C7 save 'chi.curly' 0x3C7
save 'latinchi.curly' 0xAB53 save 'latinchi.curly' 0xAB53
@ -1281,11 +1288,13 @@ glyph-block LetterUnified-Basic : begin
### Y ### Y
do "Y and related ============================================================================" do "Y and related ============================================================================"
define [WithYMask s] : if SLAB [intersection [Rect CAP DESCENDER SB RIGHTSB] s] s
define [YShape straightBar top bot] : glyph-construction define [YShape straightBar top bot] : glyph-construction
local cross : mix [fallback bot 0] top 0.4 local cross : mix [fallback bot 0] top 0.4
include : halfXStrand straightBar SB top MIDDLE cross 0.1 0.4 0.28 include : WithYMask
include : halfXStrand straightBar RIGHTSB top MIDDLE cross 0.1 0.4 0.28 halfXStrand straightBar SB top MIDDLE cross 0.1 0.4 0.28
tag-contour 'strokeRT' include : tagged 'strokeRT' : WithYMask
halfXStrand straightBar RIGHTSB top MIDDLE cross 0.1 0.4 0.28
include : VBar MIDDLE [fallback bot 0] (cross + HALFSTROKE) include : VBar MIDDLE [fallback bot 0] (cross + HALFSTROKE)
set-anchor 'overlay' BASE MIDDLE cross set-anchor 'overlay' BASE MIDDLE cross
if SLAB : begin if SLAB : begin
@ -1360,7 +1369,7 @@ glyph-block LetterUnified-Basic : begin
local useStraightBottom : !slab && straightBar local useStraightBottom : !slab && straightBar
local useCurlyBottom : slab || straightBar local useCurlyBottom : slab || straightBar
local px1 0.84 local px1 0.84
local py1 : linreg 18 0.8 126 0.76 STROKE local py1 : StrokeWidthBlend 0.8 0.76
local px2 0.95 local px2 0.95
local py20 0.88 local py20 0.88
local py2 : if (useStraightBottom || useCurlyBottom) 0.97 py20 local py2 : if (useStraightBottom || useCurlyBottom) 0.97 py20
@ -1371,8 +1380,8 @@ glyph-block LetterUnified-Basic : begin
local dpy2 : (1 - [linreg (1 - px1) (1 - py1) px2 py2 1]) / (1 - py2) local dpy2 : (1 - [linreg (1 - px1) (1 - py1) px2 py2 1]) / (1 - py2)
local yrstrokel0 : MIDDLE - WIDTH * 0.1 local yrstrokel0 : MIDDLE - WIDTH * 0.1
local yrstrokel : MIDDLE - WIDTH * 0.1 + (STROKE * HVCONTRAST * [if (useStraightBottom || useCurlyBottom) (2 / 3) (1 / 3)]) local yrstrokel : MIDDLE - WIDTH * 0.1 + (STROKE * HVCONTRAST * [if (useStraightBottom || useCurlyBottom) (2 / 3) (1 / 3)])
local yrstroker : WIDTH - SB * [if (straightBar && SLAB && !slab) 1.5 1] * [if (straightBar && !slab) designParameters.straightSmallYShapeSbShrink 1] local yrstroker : WIDTH - SB * [if (straightBar && SLAB && !slab) 1.5 1] * [if (straightBar) designParameters.straightSmallYShapeSbShrink 1]
local yshrink : [linreg 18 1 126 0.85 STROKE] * [if straightBar ([adviceBlackness 3.25] / STROKE) 1] local yshrink : [StrokeWidthBlend 1 0.85] * [if straightBar ([adviceBlackness 3.25] / STROKE) 1]
local yBottomJut : JUT * 1.25 local yBottomJut : JUT * 1.25
local slabysize : JUT * 1.0625 * (WIDTH / UPM) + STROKE local slabysize : JUT * 1.0625 * (WIDTH / UPM) + STROKE
local slabyvx 0.7 local slabyvx 0.7
@ -1477,6 +1486,7 @@ glyph-block LetterUnified-Basic : begin
yTopKnots (WIDTH - yrstroker) top bottom ds (-1) yTopKnots (WIDTH - yrstroker) top bottom ds (-1)
yJoinKnots ds ds2 top bottom yJoinKnots ds ds2 top bottom
SmallYStrokeSplitMask top bottom false (-1) SmallYStrokeSplitMask top bottom false (-1)
Rect (bottom + HALFSTROKE) bottom 0 WIDTH
if slab : begin if slab : begin
include : AIVSerifs top include : AIVSerifs top
@ -2909,7 +2919,7 @@ glyph-block LetterUnified-Basic : begin
arcvh arcvh
g4 (MIDDLE + CORRECTION_OMIDS) 0 g4 (MIDDLE + CORRECTION_OMIDS) 0
alsothru 0.5 0.1353 alsothru 0.5 0.1353
g4.down.mid (RIGHTSB - STROKE * HVCONTRAST + OX) [mix DESCENDER STROKE [linreg 18 0.5 126 0.49 STROKE]] [heading DOWNWARD] g4.down.mid (RIGHTSB - STROKE * HVCONTRAST + OX) [mix DESCENDER STROKE : StrokeWidthBlend 0.5 0.49] [heading DOWNWARD]
arcvh arcvh
flat (RIGHTSB - HOOKX + OX) (DESCENDER + STROKE) [heading LEFTWARD] flat (RIGHTSB - HOOKX + OX) (DESCENDER + STROKE) [heading LEFTWARD]
curl [Math.min (RIGHTSB - STROKE * HVCONTRAST * 1.5) (RIGHTSB - HOOKX + OX - 1)] (DESCENDER + STROKE) [heading LEFTWARD] curl [Math.min (RIGHTSB - STROKE * HVCONTRAST * 1.5) (RIGHTSB - HOOKX + OX - 1)] (DESCENDER + STROKE) [heading LEFTWARD]
@ -3219,7 +3229,7 @@ glyph-block LetterUnified-Basic : begin
sketch # Q.straight sketch # Q.straight
set-width WIDTH set-width WIDTH
include [refer-glyph 'O'] AS_BASE include [refer-glyph 'O'] AS_BASE
local shift : linreg 18 0 126 0.25 STROKE local shift : StrokeWidthBlend 0 0.25
include : dispiro include : dispiro
widths.rhs widths.rhs
flat (MIDDLE + WIDTH * 0.075 - STROKE * HVCONTRAST * shift) (-CAP * 0.2) [heading UPWARD] flat (MIDDLE + WIDTH * 0.075 - STROKE * HVCONTRAST * shift) (-CAP * 0.2) [heading UPWARD]
@ -3228,7 +3238,7 @@ glyph-block LetterUnified-Basic : begin
sketch # Q.taily sketch # Q.taily
set-width WIDTH set-width WIDTH
include [refer-glyph 'O'] AS_BASE include [refer-glyph 'O'] AS_BASE
local shift : linreg 18 0.5 126 0.6 STROKE local shift : StrokeWidthBlend 0.5 0.6
local startx : MIDDLE + (STROKE * shift) * HVCONTRAST local startx : MIDDLE + (STROKE * shift) * HVCONTRAST
local terminalx : MIDDLE + HOOKX local terminalx : MIDDLE + HOOKX
include : dispiro include : dispiro
@ -4327,7 +4337,7 @@ glyph-block LetterUnified-Basic : begin
g4 hookx (bot + HOOK) g4 hookx (bot + HOOK)
local g : G.call currentGlyph # Not using include local g : G.call currentGlyph # Not using include
set-anchor 'bottomright' BASE g.knots.(g.knots.length - 1).x g.knots.(g.knots.length - 1).y set-anchor 'bottomright' BASE g.knots.(g.knots.length - 1).x g.knots.(g.knots.length - 1).y
set-anchor 'below' BASE [mix tcenter g.knots.(g.knots.length - 1).x : linreg 18 0.375 126 0.5 STROKE] bot set-anchor 'below' BASE [mix tcenter g.knots.(g.knots.length - 1).x : StrokeWidthBlend 0.375 0.5] bot
include : dispiro include : dispiro
widths.rhs widths.rhs
flat (tcenter + HALFSTROKE - LONGJUT + TBALANCE2 - HALFSTROKE * TANSLANT) XH flat (tcenter + HALFSTROKE - LONGJUT + TBALANCE2 - HALFSTROKE * TANSLANT) XH
@ -4433,7 +4443,7 @@ glyph-block LetterUnified-Basic : begin
### S and s ### S and s
do "s and related" do "s and related"
define [SNeck] : params [[stroke STROKE] [slantCoeff 0]] : begin define [SNeck] : params [[stroke STROKE] [slantCoeff 0]] : begin
define strokeCoeff : linreg 18 0 126 1 stroke define strokeCoeff : StrokeWidthBlend 0 1 stroke
define tension : 0.46 - 0.005 * strokeCoeff + slantCoeff * TANSLANT define tension : 0.46 - 0.005 * strokeCoeff + slantCoeff * TANSLANT
return : alsothruthem {{0.4 tension} {0.6 (1 - tension)}} [widths.center stroke] return : alsothruthem {{0.4 tension} {0.6 (1 - tension)}} [widths.center stroke]
@ -4468,7 +4478,7 @@ glyph-block LetterUnified-Basic : begin
define [sStroke] : begin define [sStroke] : begin
define stroke : adviceBlackness2 2.875 2 XH define stroke : adviceBlackness2 2.875 2 XH
define ess : mix stroke (ESS * stroke / STROKE) 0.5 define ess : mix stroke (ESS * stroke / STROKE) 0.5
define strokeCoeff : linreg 18 0 126 1 stroke define strokeCoeff : StrokeWidthBlend 0 1 stroke
define smooth : adviceSSmooth XH (-1) stroke define smooth : adviceSSmooth XH (-1) stroke
return : dispiro return : dispiro
widths.lhs stroke widths.lhs stroke
@ -4483,7 +4493,7 @@ glyph-block LetterUnified-Basic : begin
define [sStrokePhoneticRight] : begin define [sStrokePhoneticRight] : begin
define stroke : adviceBlackness2 2.875 2 XH define stroke : adviceBlackness2 2.875 2 XH
define ess : mix stroke (ESS * stroke / STROKE) 0.5 define ess : mix stroke (ESS * stroke / STROKE) 0.5
define strokeCoeff : linreg 18 0 126 1 stroke define strokeCoeff : StrokeWidthBlend 0 1 stroke
define smooth : adviceSSmooth XH (-1) stroke define smooth : adviceSSmooth XH (-1) stroke
return : dispiro return : dispiro
widths.lhs stroke widths.lhs stroke
@ -4499,7 +4509,7 @@ glyph-block LetterUnified-Basic : begin
define [RevsStroke] : begin define [RevsStroke] : begin
define stroke : adviceBlackness2 2.875 2 XH define stroke : adviceBlackness2 2.875 2 XH
define ess : ESS * stroke / STROKE define ess : ESS * stroke / STROKE
define strokeCoeff : linreg 18 0 126 1 stroke define strokeCoeff : StrokeWidthBlend 0 1 stroke
define smooth : adviceSSmooth XH 1 stroke define smooth : adviceSSmooth XH 1 stroke
return : dispiro return : dispiro
widths.rhs stroke widths.rhs stroke

8
glyphs/letters-unified-extended.ptl
View file

@ -1152,8 +1152,8 @@ glyph-block LetterUnified-Extended : begin
eject-contour 'serifRT' eject-contour 'serifRT'
include : FlipAround df.middle (top / 2) include : FlipAround df.middle (top / 2)
local p : if straightBar local p : if straightBar
linreg 18 0.24 108 0.24 STROKE StrokeWidthBlend 0.24 0.24
linreg 18 0.16 108 0.16 STROKE StrokeWidthBlend 0.16 0.16
local bary (top / 2) local bary (top / 2)
if (SLAB && !para.isItalic) : set p : p * 1.33 if (SLAB && !para.isItalic) : set p : p * 1.33
include : HBarTop [mix df.leftSB df.rightSB p] [mix df.rightSB df.leftSB p] bary fine include : HBarTop [mix df.leftSB df.rightSB p] [mix df.rightSB df.leftSB p] bary fine
@ -1311,7 +1311,7 @@ glyph-block LetterUnified-Extended : begin
define [CyrYuShape top xtop sma smb div] : glyph-construction define [CyrYuShape top xtop sma smb div] : glyph-construction
local df : DivFrame div 3 local df : DivFrame div 3
local xm : barmixL df.leftSB df.rightSB (df.mvs * HVCONTRAST) [linreg 18 0.4 126 0.45 STROKE] local xm : barmixL df.leftSB df.rightSB (df.mvs * HVCONTRAST) [StrokeWidthBlend 0.4 0.45]
include : VBarLeft df.leftSB 0 xtop df.mvs include : VBarLeft df.leftSB 0 xtop df.mvs
include : OShape top 0 xm df.rightSB df.mvs (sma * 0.7 * df.div) (smb * 0.7 * df.div) include : OShape top 0 xm df.rightSB df.mvs (sma * 0.7 * df.div) (smb * 0.7 * df.div)
include : HBar (df.leftSB + 1) xm (top / 2) include : HBar (df.leftSB + 1) xm (top / 2)
@ -1734,7 +1734,7 @@ glyph-block LetterUnified-Extended : begin
sketch # ou sketch # ou
include MarkSet.b include MarkSet.b
local bar : linreg 18 (XH * 0.9) 108 XH STROKE local bar : StrokeWidthBlend (XH * 0.9) XH
include : OShape bar 0 SB RIGHTSB include : OShape bar 0 SB RIGHTSB
include : dispiro include : dispiro
widths.lhs widths.lhs

4
glyphs/numbers.ptl
View file

@ -126,7 +126,7 @@ glyph-block Numbers : begin
g4 SB (top - HOOK) g4 SB (top - HOOK)
hookstart (top - O) hookstart (top - O)
g4.down.mid (RIGHTSB - OX / 2) (top - smooth) g4.down.mid (RIGHTSB - OX / 2) (top - smooth)
alsothru.g2 0.5 ([linreg 18 0.425 120 0.4 STROKE] * [linreg 500 1 700 0.95 WIDTH]) [widths.center] alsothru.g2 0.5 ([StrokeWidthBlend 0.425 0.4] * [linreg 500 1 700 0.95 WIDTH]) [widths.center]
flat SB 1 [widths.heading STROKE 0 DOWNWARD] flat SB 1 [widths.heading STROKE 0 DOWNWARD]
curl SB 0 [heading DOWNWARD] curl SB 0 [heading DOWNWARD]
@ -314,7 +314,7 @@ glyph-block Numbers : begin
select-variant 'seven.onum' (follow -- 'seven') select-variant 'seven.onum' (follow -- 'seven')
local EightPr : linreg 18 0.85 120 0.975 STROKE local EightPr : StrokeWidthBlend 0.85 0.975
define [EightShape top] : begin define [EightShape top] : begin
local p 0.96 local p 0.96
local l (SB + OX) local l (SB + OX)

2
glyphs/symbol-letter.ptl
View file

@ -25,7 +25,7 @@ glyph-block Symbol-Currency : begin
do "Dollar" do "Dollar"
define [SNeck] : params [[stroke STROKE] [slantCoeff 0]] : begin define [SNeck] : params [[stroke STROKE] [slantCoeff 0]] : begin
define strokeCoeff : linreg 18 0 126 1 stroke define strokeCoeff : StrokeWidthBlend 0 1 stroke
define tension : 0.46 - 0.0 * strokeCoeff + slantCoeff * TANSLANT define tension : 0.46 - 0.0 * strokeCoeff + slantCoeff * TANSLANT
return : alsothruthem {{0.4 tension} {0.6 (1 - tension)}} [widths.center stroke] return : alsothruthem {{0.4 tension} {0.6 (1 - tension)}} [widths.center stroke]

1
glyphs/symbol-other.ptl
View file

@ -1256,7 +1256,6 @@ glyph-block Symbol-Other-Ligation : begin
save ('hyphen.lig.' + subclass) save ('hyphen.lig.' + subclass)
# => # =>
# local dblArrowD : XH * [linreg 18 0.15 126 0.275 STROKE]
local dblArrowD : (parenTop - parenBot) * designParameters.equal_wideness + OPERATORSTROKE * 0.75 local dblArrowD : (parenTop - parenBot) * designParameters.equal_wideness + OPERATORSTROKE * 0.75
local dblArrowSw : Math.min OPERATORSTROKE (dblArrowD * 3 / 4) local dblArrowSw : Math.min OPERATORSTROKE (dblArrowD * 3 / 4)
local dblExtend : clamp 0 WIDTH (RIGHTSB - (dblArrowD - dblArrowSw / 2) * arrowheadSlope) local dblExtend : clamp 0 WIDTH (RIGHTSB - (dblArrowD - dblArrowSw / 2) * arrowheadSlope)

2
glyphs/symbol-punctuation.ptl
View file

@ -724,7 +724,7 @@ glyph-block Symbol-Punctuation : begin
alsothru 0.5 0.5 [widths HALFSTROKE HALFSTROKE] alsothru 0.5 0.5 [widths HALFSTROKE HALFSTROKE]
g4 RIGHTSB [mix bot top 0.501] [widths 0 STROKE] g4 RIGHTSB [mix bot top 0.501] [widths 0 STROKE]
g4 RIGHTSB [mix bot top 0.5] [widths 0 STROKE] g4 RIGHTSB [mix bot top 0.5] [widths 0 STROKE]
g4 [mix SB RIGHTSB 0.6] [mix bot top : [linreg 18 0.325 108 0.3 STROKE] * (1 - TANSLANT * 0.1)] g4 [mix SB RIGHTSB 0.6] [mix bot top : [StrokeWidthBlend 0.325 0.3] * (1 - TANSLANT * 0.1)]
include s include s
include : FlipAround MIDDLE symbolMid include : FlipAround MIDDLE symbolMid
include s include s

7
meta/aesthetics.ptl
View file

@ -133,7 +133,8 @@ export : define [calculateMetrics para] : begin
define SMALLSMOOTHA : SMALLSMOOTH - TANSLANT * para.smoothadjust define SMALLSMOOTHA : SMALLSMOOTH - TANSLANT * para.smoothadjust
define SMALLSMOOTHB : SMALLSMOOTH + TANSLANT * para.smoothadjust define SMALLSMOOTHB : SMALLSMOOTH + TANSLANT * para.smoothadjust
define CORRECTION_OMIDX : TANSLANT * 0.9 * [linreg 18 1.3 126 0.9 STROKE] define [StrokeWidthBlend min max sw] : linreg 18 min 126 max [fallback sw STROKE]
define CORRECTION_OMIDX : TANSLANT * 0.9 * [StrokeWidthBlend 1.3 0.9]
define CORRECTION_OMIDS : STROKE * CORRECTION_OMIDX define CORRECTION_OMIDS : STROKE * CORRECTION_OMIDX
# Blackness parameters # Blackness parameters
@ -187,7 +188,7 @@ export : define [calculateMetrics para] : begin
FBALANCE ONEBALANCE WIDE-WIDTH-0 WIDE-WIDTH-1 WIDE-WIDTH-2 OXE ESS ESSQUESTION XO CAPO HALFSTROKE RIGHTSB FWRSB FBALANCE ONEBALANCE WIDE-WIDTH-0 WIDE-WIDTH-1 WIDE-WIDTH-2 OXE ESS ESSQUESTION XO CAPO HALFSTROKE RIGHTSB FWRSB
MIDDLE FWMIDDLE CAPMIDDLE CAP_SMOOTH DOTRADIUS PERIODRADIUS SIDEJUT SMOOTHA SMOOTHB SMALLSMOOTHA SMALLSMOOTHB CORRECTION_OMIDX CORRECTION_OMIDS MIDDLE FWMIDDLE CAPMIDDLE CAP_SMOOTH DOTRADIUS PERIODRADIUS SIDEJUT SMOOTHA SMOOTHB SMALLSMOOTHA SMALLSMOOTHB CORRECTION_OMIDX CORRECTION_OMIDS
WHITENESS adviceBlackness adviceBlackness2 MVERTSTROKE MVERTSTROKE_D OVERLAYSTROKE OPERATORSTROKE GEOMETRYSTROKE SHOULDERFINE SUPERNESS superxy WHITENESS adviceBlackness adviceBlackness2 MVERTSTROKE MVERTSTROKE_D OVERLAYSTROKE OPERATORSTROKE GEOMETRYSTROKE SHOULDERFINE SUPERNESS superxy
adviceSSmooth adviceGlottalStopSmooth shoulderMidSlope] adviceSSmooth adviceGlottalStopSmooth shoulderMidSlope StrokeWidthBlend]
export : define [setFontMetrics para metrics fm] : begin export : define [setFontMetrics para metrics fm] : begin
define [object CAP DESCENDER XH WIDTH] metrics define [object CAP DESCENDER XH WIDTH] metrics
@ -263,7 +264,7 @@ export : define [MarksetDiv p me] : begin
export : define designParameters : object export : define designParameters : object
# V shape # V shape
straightVShapeSbShrink 0.8 straightVShapeSbShrink 0.8
straightSmallYShapeSbShrink 0.7 straightSmallYShapeSbShrink 0.8
# #
equal_wideness 0.075 equal_wideness 0.075
logic_narrow_shrink 0.75 logic_narrow_shrink 0.75

3
meta/macros.ptl
View file

@ -234,7 +234,8 @@ define-macro glyph-block : syntax-rules
FWMIDDLE CAPMIDDLE CAP_SMOOTH DOTRADIUS PERIODRADIUS SIDEJUT SMOOTHA SMOOTHB FWMIDDLE CAPMIDDLE CAP_SMOOTH DOTRADIUS PERIODRADIUS SIDEJUT SMOOTHA SMOOTHB
SMALLSMOOTHA SMALLSMOOTHB CORRECTION_OMIDX CORRECTION_OMIDS adviceBlackness SMALLSMOOTHA SMALLSMOOTHB CORRECTION_OMIDX CORRECTION_OMIDS adviceBlackness
adviceBlackness2 MVERTSTROKE MVERTSTROKE_D OVERLAYSTROKE OPERATORSTROKE GEOMETRYSTROKE adviceBlackness2 MVERTSTROKE MVERTSTROKE_D OVERLAYSTROKE OPERATORSTROKE GEOMETRYSTROKE
SHOULDERFINE SUPERNESS superxy adviceSSmooth adviceGlottalStopSmooth shoulderMidSlope] SHOULDERFINE SUPERNESS superxy adviceSSmooth adviceGlottalStopSmooth shoulderMidSlope
StrokeWidthBlend]
define spiroFnImports `[g4 g2 corner flat curl close end straight widths disable-gizmo define spiroFnImports `[g4 g2 corner flat curl close end straight widths disable-gizmo
disable-contrast heading unimportant important alsothru alsothruthem bezcontrols disable-contrast heading unimportant important alsothru alsothruthem bezcontrols
quadcontrols archv arcvh complexThru dispiro spiro-outline union intersection difference] quadcontrols archv arcvh complexThru dispiro spiro-outline union intersection difference]

1
support/param-blend.js
View file

@ -8,6 +8,7 @@ module.exports = function (aspect, hive, params, sink) {
const block = hive.blend; const block = hive.blend;
let keys = new Set(); let keys = new Set();
for (const grade in block) { for (const grade in block) {
sink[grade] = block[grade];
if (!isFinite(parseFloat(grade))) continue; if (!isFinite(parseFloat(grade))) continue;
for (const key in block[grade]) { for (const key in block[grade]) {
if (block[grade][key] == null) continue; if (block[grade][key] == null) continue;

2
support/parameters.ptl
View file

@ -26,7 +26,7 @@ export : define [build parametersData styles blendParams] : begin
extern isFinite extern isFinite
define [numericConfigExists x] : [isFinite x] && (x != null) define [numericConfigExists x] : [isFinite x] && (x != null)
export : define [applymetricOverride para mo] : begin export : define [applyMetricOverride para mo] : begin
if [numericConfigExists mo.leading] if [numericConfigExists mo.leading]
set para.leading mo.leading set para.leading mo.leading
if [numericConfigExists mo.winMetricAscenderPad] if [numericConfigExists mo.winMetricAscenderPad]