Add force-serifed "f" and "r"; Refine SHOULDERFINE and other parameters
This commit is contained in:
parent
fc9d209c29
commit
c1593c7670
5 changed files with 132 additions and 66 deletions
|
@ -304,6 +304,28 @@ export : define [apply] : begin
|
||||||
set-anchor 'above' BASE (df.middle) XH
|
set-anchor 'above' BASE (df.middle) XH
|
||||||
set-anchor 'overlay' BASE (df.middle) (XH / 2)
|
set-anchor 'overlay' BASE (df.middle) (XH / 2)
|
||||||
save 'dotlessj.narrow'
|
save 'dotlessj.narrow'
|
||||||
|
|
||||||
|
sketch # dotlessj.narrow-serifed
|
||||||
|
local df : DivFrame para.diversityI
|
||||||
|
set-width df.width
|
||||||
|
include df.markSet.p
|
||||||
|
local crossLeft : mix 0 SB (1 / 2)
|
||||||
|
local crossRight : mix df.width df.rightSB (1 / 2)
|
||||||
|
local terminal : crossLeft - OX * 2
|
||||||
|
local barCenter : df.middle + JBALANCE * df.div
|
||||||
|
local bar : barCenter + HALFSTROKE * HVCONTRAST
|
||||||
|
local tTurn : Math.max (HOOK * 0.9) (STROKE * 1.5) : Math.min HOOK (STROKE * 1.75)
|
||||||
|
include : LeftwardTopSerif barCenter XH (LONGJUT * df.div)
|
||||||
|
include : dispiro
|
||||||
|
widths.lhs
|
||||||
|
flat [Math.min terminal (bar - tTurn - [Math.max (STROKE / 3) (df.width / 6)])] DESCENDER
|
||||||
|
curl (bar - tTurn) DESCENDER
|
||||||
|
archv
|
||||||
|
flat bar (DESCENDER + tTurn)
|
||||||
|
curl bar XH [heading UPWARD]
|
||||||
|
set-anchor 'above' BASE barCenter XH
|
||||||
|
set-anchor 'overlay' BASE barCenter (XH / 2)
|
||||||
|
save 'dotlessj.narrow-serifed'
|
||||||
|
|
||||||
select-variant 'dotlessj' 0x237
|
select-variant 'dotlessj' 0x237
|
||||||
|
|
||||||
|
@ -1221,15 +1243,15 @@ export : define [apply] : begin
|
||||||
|
|
||||||
### K and k
|
### K and k
|
||||||
define { KShape } : do "k and related ========================================================="
|
define { KShape } : do "k and related ========================================================="
|
||||||
local KBalance : if para.straightBar (WIDTH / 16) 0
|
local [KBalance straightBar] : if straightBar [if SLAB (WIDTH / 16) (WIDTH / 32)] 0
|
||||||
local KBalanceRight : if para.straightBar [if SLAB (-WIDTH / 32) (WIDTH / 16)] 0
|
local [KBalanceRight straightBar] : if straightBar [if SLAB (-WIDTH / 32) (WIDTH / 32)] 0
|
||||||
define [KShape top straightBar] : glyph-construction
|
define [KShape top straightBar] : glyph-construction
|
||||||
local turn (top * 0.99)
|
local turn (top * 0.99)
|
||||||
local fine : adviceBlackness 3.5
|
local fine : adviceBlackness 3.5
|
||||||
local Ok 0
|
local Ok 0
|
||||||
local OkSerif 0
|
local OkSerif 0
|
||||||
local kshLeft : SB + KBalance
|
local kshLeft : SB + [KBalance straightBar]
|
||||||
local kshRight : RIGHTSB + KBalanceRight
|
local kshRight : RIGHTSB + [KBalanceRight straightBar]
|
||||||
|
|
||||||
if straightBar : do
|
if straightBar : do
|
||||||
local attach (top * 0.42 - STROKE)
|
local attach (top * 0.42 - STROKE)
|
||||||
|
@ -1277,11 +1299,11 @@ export : define [apply] : begin
|
||||||
sketch # K
|
sketch # K
|
||||||
set-width WIDTH
|
set-width WIDTH
|
||||||
include markset.capital
|
include markset.capital
|
||||||
include : VBarLeft (SB + KBalance) 0 CAP
|
include : VBarLeft (SB + [KBalance para.straightBar]) 0 CAP
|
||||||
include : KShape CAP para.straightBar
|
include : KShape CAP para.straightBar
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : CenterTopSerif (SB + KBalance + HALFSTROKE * HVCONTRAST) CAP JUT
|
include : CenterTopSerif (SB + [KBalance para.straightBar] + HALFSTROKE * HVCONTRAST) CAP JUT
|
||||||
include : CenterBottomSerif (SB + KBalance + HALFSTROKE * HVCONTRAST) 0 JUT
|
include : CenterBottomSerif (SB + [KBalance para.straightBar] + HALFSTROKE * HVCONTRAST) 0 JUT
|
||||||
|
|
||||||
save 'K' 'K'
|
save 'K' 'K'
|
||||||
save 'Kappa' 0x39A
|
save 'Kappa' 0x39A
|
||||||
|
@ -1292,12 +1314,12 @@ export : define [apply] : begin
|
||||||
sketch # k
|
sketch # k
|
||||||
set-width WIDTH
|
set-width WIDTH
|
||||||
include markset.b
|
include markset.b
|
||||||
include : VBarLeft (SB + KBalance) 0 CAP
|
include : VBarLeft (SB + [KBalance para.straightBar]) 0 CAP
|
||||||
include : KShape XH para.straightBar
|
include : KShape XH para.straightBar
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : LeftwardTopSerif (SB + KBalance) CAP SIDEJUT
|
include : LeftwardTopSerif (SB + [KBalance para.straightBar]) CAP SIDEJUT
|
||||||
if (!para.isItalic) : begin
|
if (!para.isItalic) : begin
|
||||||
include : CenterBottomSerif (SB + KBalance + HALFSTROKE * HVCONTRAST) 0 JUT
|
include : CenterBottomSerif (SB + [KBalance para.straightBar] + HALFSTROKE * HVCONTRAST) 0 JUT
|
||||||
tag-contour 'serifLB'
|
tag-contour 'serifLB'
|
||||||
|
|
||||||
save 'k' 'k'
|
save 'k' 'k'
|
||||||
|
@ -1305,21 +1327,21 @@ export : define [apply] : begin
|
||||||
sketch # kappa
|
sketch # kappa
|
||||||
set-width WIDTH
|
set-width WIDTH
|
||||||
include markset.e
|
include markset.e
|
||||||
include : VBarLeft (SB + KBalance) 0 XH
|
include : VBarLeft (SB + [KBalance para.straightBar]) 0 XH
|
||||||
include : KShape XH para.straightBar
|
include : KShape XH para.straightBar
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : LeftwardTopSerif (SB + KBalance) XH SIDEJUT
|
include : LeftwardTopSerif (SB + [KBalance para.straightBar]) XH SIDEJUT
|
||||||
|
|
||||||
save 'kappa' 0x3BA
|
save 'kappa' 0x3BA
|
||||||
|
|
||||||
sketch # cyrka
|
sketch # cyrka
|
||||||
set-width WIDTH
|
set-width WIDTH
|
||||||
include markset.e
|
include markset.e
|
||||||
include : VBarLeft (SB + KBalance) 0 XH
|
include : VBarLeft (SB + [KBalance para.straightBar]) 0 XH
|
||||||
include : KShape XH para.straightBar
|
include : KShape XH para.straightBar
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : CenterBottomSerif (SB + KBalance + HALFSTROKE * HVCONTRAST) 0 JUT
|
include : CenterBottomSerif (SB + [KBalance para.straightBar] + HALFSTROKE * HVCONTRAST) 0 JUT
|
||||||
include : CenterTopSerif (SB + KBalance + HALFSTROKE * HVCONTRAST) XH JUT
|
include : CenterTopSerif (SB + [KBalance para.straightBar] + HALFSTROKE * HVCONTRAST) XH JUT
|
||||||
|
|
||||||
save 'cyrka' 0x43A
|
save 'cyrka' 0x43A
|
||||||
save 'latinkappa' 0x138
|
save 'latinkappa' 0x138
|
||||||
|
@ -1329,16 +1351,16 @@ export : define [apply] : begin
|
||||||
sketch # Khooktop
|
sketch # Khooktop
|
||||||
include markset.capital
|
include markset.capital
|
||||||
include : KShape CAP para.straightBar
|
include : KShape CAP para.straightBar
|
||||||
include : VBarLeft (SB + KBalance) 0 (CAP - HOOK - HALFSTROKE)
|
include : VBarLeft (SB + [KBalance para.straightBar]) 0 (CAP - HOOK - HALFSTROKE)
|
||||||
include : VerticalHook (SB + KBalance + HALFSTROKE * HVCONTRAST) (CAP - HOOK - HALFSTROKE) HOOKX (-HOOK)
|
include : VerticalHook (SB + [KBalance para.straightBar] + HALFSTROKE * HVCONTRAST) (CAP - HOOK - HALFSTROKE) HOOKX (-HOOK)
|
||||||
|
|
||||||
save 'Khooktop' 0x198
|
save 'Khooktop' 0x198
|
||||||
|
|
||||||
sketch # khooktop
|
sketch # khooktop
|
||||||
include markset.b
|
include markset.b
|
||||||
include : KShape XH para.straightBar
|
include : KShape XH para.straightBar
|
||||||
include : VBarLeft (SB + KBalance) 0 (CAP - HOOK - HALFSTROKE)
|
include : VBarLeft (SB + [KBalance para.straightBar]) 0 (CAP - HOOK - HALFSTROKE)
|
||||||
include : VerticalHook (SB + KBalance + HALFSTROKE * HVCONTRAST) (CAP - HOOK - HALFSTROKE) HOOKX (-HOOK)
|
include : VerticalHook (SB + [KBalance para.straightBar] + HALFSTROKE * HVCONTRAST) (CAP - HOOK - HALFSTROKE) HOOKX (-HOOK)
|
||||||
|
|
||||||
save 'khooktop' 0x199
|
save 'khooktop' 0x199
|
||||||
turned nothing 0xA7B0 'K' MIDDLE (CAP / 2)
|
turned nothing 0xA7B0 'K' MIDDLE (CAP / 2)
|
||||||
|
@ -1819,7 +1841,7 @@ export : define [apply] : begin
|
||||||
### r
|
### r
|
||||||
do "r and related ============================================================================="
|
do "r and related ============================================================================="
|
||||||
local dfR : DivFrame para.diversityF
|
local dfR : DivFrame para.diversityF
|
||||||
define [narrowSuffix narrow] : if narrow ".narrow" ".standard"
|
|
||||||
define [RDim narrowR] : begin
|
define [RDim narrowR] : begin
|
||||||
local rbar : SB + RBALANCE * [if narrowR (1 / 2) 1] + STROKE * HVCONTRAST
|
local rbar : SB + RBALANCE * [if narrowR (1 / 2) 1] + STROKE * HVCONTRAST
|
||||||
local [rBottomSerif y] : tagged 'serifLB'
|
local [rBottomSerif y] : tagged 'serifLB'
|
||||||
|
@ -1835,7 +1857,7 @@ export : define [apply] : begin
|
||||||
local skew : Math.max 0 : (rmiddle - rmiddlein) / STROKE - TANSLANT * [linreg 72 0.25 108 0.75 STROKE]
|
local skew : Math.max 0 : (rmiddle - rmiddlein) / STROKE - TANSLANT * [linreg 72 0.25 108 0.75 STROKE]
|
||||||
return : object rbar rBottomSerif rTopSerif fine rmiddle skew rhookx
|
return : object rbar rBottomSerif rTopSerif fine rmiddle skew rhookx
|
||||||
|
|
||||||
sketch # r.standard
|
sketch
|
||||||
local df dfR
|
local df dfR
|
||||||
set-width df.width
|
set-width df.width
|
||||||
include df.markSet.e
|
include df.markSet.e
|
||||||
|
@ -1850,10 +1872,15 @@ export : define [apply] : begin
|
||||||
include : VBarRight rbar 0 XH
|
include : VBarRight rbar 0 XH
|
||||||
set-anchor 'overlay' BASE (rbar - STROKE * 0.25) (XH * 0.5)
|
set-anchor 'overlay' BASE (rbar - STROKE * 0.25) (XH * 0.5)
|
||||||
|
|
||||||
if SLAB : begin
|
branch
|
||||||
|
if SLAB : begin
|
||||||
|
include : rBottomSerif 0
|
||||||
|
include : rTopSerif XH
|
||||||
|
save "r.standard"
|
||||||
|
branch
|
||||||
include : rBottomSerif 0
|
include : rBottomSerif 0
|
||||||
include : rTopSerif XH
|
include : rTopSerif XH
|
||||||
save 'r.standard'
|
save "r.force-serifed"
|
||||||
|
|
||||||
sketch # r.narrow
|
sketch # r.narrow
|
||||||
local df dfR
|
local df dfR
|
||||||
|
@ -1879,14 +1906,15 @@ export : define [apply] : begin
|
||||||
|
|
||||||
do
|
do
|
||||||
define [marks] : compsiteMarkSet dfR.markSet.e {.anchors {.bottomright {.type BASE .x dfR.rightSB - RBALANCE .y 0}}}
|
define [marks] : compsiteMarkSet dfR.markSet.e {.anchors {.bottomright {.type BASE .x dfR.rightSB - RBALANCE .y 0}}}
|
||||||
turned 'turnr.standard' nothing 'r.standard' dfR.middle (XH / 2) [marks]
|
turned 'turnr.standard' nothing 'r.standard' dfR.middle (XH / 2) [marks]
|
||||||
|
turned 'turnr.force-serifed' nothing 'r.force-serifed' dfR.middle (XH / 2) [marks]
|
||||||
turned 'turnr.narrow' nothing 'r.narrow' dfR.middle (XH / 2) [marks]
|
turned 'turnr.narrow' nothing 'r.narrow' dfR.middle (XH / 2) [marks]
|
||||||
select-variant 'turnr' 0x279 (follow -- 'r')
|
select-variant 'turnr' 0x279 (follow -- 'r')
|
||||||
|
|
||||||
do
|
do
|
||||||
define [SmallRLongLegShape narrow] : glyph-construction
|
define [SmallRLongLegShape narrow suffix] : glyph-construction
|
||||||
define [object rbar rBottomSerif] : RDim narrow
|
define [object rbar rBottomSerif] : RDim narrow
|
||||||
include glyphs.("r" + [narrowSuffix narrow])
|
include glyphs.("r." + suffix)
|
||||||
eject-contour 'serifLB'
|
eject-contour 'serifLB'
|
||||||
include : VBarRight rbar DESCENDER 0
|
include : VBarRight rbar DESCENDER 0
|
||||||
if SLAB : include : rBottomSerif DESCENDER
|
if SLAB : include : rBottomSerif DESCENDER
|
||||||
|
@ -1896,23 +1924,27 @@ export : define [apply] : begin
|
||||||
set-width df.width
|
set-width df.width
|
||||||
include df.markSet.p
|
include df.markSet.p
|
||||||
branch
|
branch
|
||||||
include : SmallRLongLegShape false
|
include : SmallRLongLegShape false 'standard'
|
||||||
save 'rlongleg.standard'
|
save 'rlongleg.standard'
|
||||||
branch
|
branch
|
||||||
include : SmallRLongLegShape true
|
include : SmallRLongLegShape false 'force-serifed'
|
||||||
|
save 'rlongleg.force-serifed'
|
||||||
|
branch
|
||||||
|
include : SmallRLongLegShape true 'narrow'
|
||||||
save 'rlongleg.narrow'
|
save 'rlongleg.narrow'
|
||||||
select-variant 'rlongleg' 0x27C (follow -- 'r')
|
select-variant 'rlongleg' 0x27C (follow -- 'r')
|
||||||
|
|
||||||
do
|
do
|
||||||
local [marks] : compsiteMarkSet dfR.markSet.b {.anchors {.bottomright {.type BASE .x dfR.rightSB - RBALANCE .y 0}}}
|
local [marks] : compsiteMarkSet dfR.markSet.b {.anchors {.bottomright {.type BASE .x dfR.rightSB - RBALANCE .y 0}}}
|
||||||
turned 'turnrlongleg.standard' nothing 'rlongleg.standard' dfR.middle (XH / 2) [marks]
|
turned 'turnrlongleg.standard' nothing 'rlongleg.standard' dfR.middle (XH / 2) [marks]
|
||||||
|
turned 'turnrlongleg.force-serifed' nothing 'rlongleg.force-serifed' dfR.middle (XH / 2) [marks]
|
||||||
turned 'turnrlongleg.narrow' nothing 'rlongleg.narrow' dfR.middle (XH / 2) [marks]
|
turned 'turnrlongleg.narrow' nothing 'rlongleg.narrow' dfR.middle (XH / 2) [marks]
|
||||||
select-variant 'turnrlongleg' 0x27A (follow -- 'r')
|
select-variant 'turnrlongleg' 0x27A (follow -- 'r')
|
||||||
|
|
||||||
do
|
do
|
||||||
define [SmallRRTailShape narrow] : glyph-construction
|
define [SmallRRTailShape narrow suffix] : glyph-construction
|
||||||
define [object rbar rBottomSerif] : RDim narrow
|
define [object rbar rBottomSerif] : RDim narrow
|
||||||
include glyphs.('r' + [narrowSuffix narrow])
|
include glyphs.('r.' + suffix)
|
||||||
eject-contour 'serifLB'
|
eject-contour 'serifLB'
|
||||||
include : create-glyph : glyph-construction
|
include : create-glyph : glyph-construction
|
||||||
include glyphs.rtailBR
|
include glyphs.rtailBR
|
||||||
|
@ -1924,22 +1956,26 @@ export : define [apply] : begin
|
||||||
set-width df.width
|
set-width df.width
|
||||||
include df.markSet.p
|
include df.markSet.p
|
||||||
branch
|
branch
|
||||||
include : SmallRRTailShape false
|
include : SmallRRTailShape false 'standard'
|
||||||
save 'rrtail.standard'
|
save 'rrtail.standard'
|
||||||
branch
|
branch
|
||||||
include : SmallRRTailShape true
|
include : SmallRRTailShape false 'force-serifed'
|
||||||
|
save 'rrtail.force-serifed'
|
||||||
|
branch
|
||||||
|
include : SmallRRTailShape true 'narrow'
|
||||||
save 'rrtail.narrow'
|
save 'rrtail.narrow'
|
||||||
select-variant 'rrtail' 0x27D (follow -- 'r')
|
select-variant 'rrtail' 0x27D (follow -- 'r')
|
||||||
|
|
||||||
do
|
do
|
||||||
turned 'smallLetterTurnedRWithTail.standard' nothing 'rrtail.standard' dfR.middle (XH / 2)
|
turned 'smallLetterTurnedRWithTail.standard' nothing 'rrtail.standard' dfR.middle (XH / 2)
|
||||||
|
turned 'smallLetterTurnedRWithTail.force-serifed' nothing 'rrtail.force-serifed' dfR.middle (XH / 2)
|
||||||
turned 'smallLetterTurnedRWithTail.narrow' nothing 'rrtail.narrow' dfR.middle (XH / 2)
|
turned 'smallLetterTurnedRWithTail.narrow' nothing 'rrtail.narrow' dfR.middle (XH / 2)
|
||||||
select-variant 'smallLetterTurnedRWithTail' 0x2C79 (follow -- 'r')
|
select-variant 'smallLetterTurnedRWithTail' 0x2C79 (follow -- 'r')
|
||||||
|
|
||||||
do
|
do
|
||||||
define [TurnRRTailShape narrow] : glyph-construction
|
define [TurnRRTailShape narrow suffix] : glyph-construction
|
||||||
local df dfR
|
local df dfR
|
||||||
include glyphs.('r' + [if narrow '.narrow' '.standard'])
|
include glyphs.('r.' + suffix)
|
||||||
eject-contour 'serifLT'
|
eject-contour 'serifLT'
|
||||||
include : FlipAround df.middle (XH / 2)
|
include : FlipAround df.middle (XH / 2)
|
||||||
include : create-glyph : glyph-construction
|
include : create-glyph : glyph-construction
|
||||||
|
@ -1952,10 +1988,13 @@ export : define [apply] : begin
|
||||||
set-width df.width
|
set-width df.width
|
||||||
include df.markSet.p
|
include df.markSet.p
|
||||||
branch
|
branch
|
||||||
include : TurnRRTailShape false
|
include : TurnRRTailShape false 'standard'
|
||||||
save 'turnrrtail.standard'
|
save 'turnrrtail.standard'
|
||||||
branch
|
branch
|
||||||
include : TurnRRTailShape true
|
include : TurnRRTailShape false 'force-serifed'
|
||||||
|
save 'turnrrtail.force-serifed'
|
||||||
|
branch
|
||||||
|
include : TurnRRTailShape true 'narrow'
|
||||||
save 'turnrrtail.narrow'
|
save 'turnrrtail.narrow'
|
||||||
|
|
||||||
select-variant 'turnrrtail' 0x27B (follow -- 'r')
|
select-variant 'turnrrtail' 0x27B (follow -- 'r')
|
||||||
|
@ -1974,8 +2013,13 @@ export : define [apply] : begin
|
||||||
hookstart XO
|
hookstart XO
|
||||||
flat (rbar - STROKE * HVCONTRAST) (XH - SMALLSMOOTHA)
|
flat (rbar - STROKE * HVCONTRAST) (XH - SMALLSMOOTHA)
|
||||||
curl (rbar - STROKE * HVCONTRAST) 0 [heading DOWNWARD]
|
curl (rbar - STROKE * HVCONTRAST) 0 [heading DOWNWARD]
|
||||||
if SLAB : include : rBottomSerif 0
|
|
||||||
save 'rflap.standard'
|
branch
|
||||||
|
if SLAB : include : rBottomSerif 0
|
||||||
|
save 'rflap.standard'
|
||||||
|
branch
|
||||||
|
include : rBottomSerif 0
|
||||||
|
save 'rflap.force-serifed'
|
||||||
|
|
||||||
sketch # rflap.narrow
|
sketch # rflap.narrow
|
||||||
local df dfR
|
local df dfR
|
||||||
|
@ -2167,7 +2211,9 @@ export : define [apply] : begin
|
||||||
### G
|
### G
|
||||||
do "G and related ============================================================================="
|
do "G and related ============================================================================="
|
||||||
define [GShape top sma smb] : glyph-construction
|
define [GShape top sma smb] : glyph-construction
|
||||||
local ybar : top * 0.52 + STROKE * 0.25
|
local yBar : top * 0.52 + STROKE * 0.25
|
||||||
|
local fine SHOULDERFINE
|
||||||
|
local sb : shoulderMidSlope fine nothing (-1)
|
||||||
include : dispiro
|
include : dispiro
|
||||||
widths.lhs
|
widths.lhs
|
||||||
g4 RIGHTSB (top - HOOK)
|
g4 RIGHTSB (top - HOOK)
|
||||||
|
@ -2175,20 +2221,17 @@ export : define [apply] : begin
|
||||||
flat (SB + OX) (top - sma)
|
flat (SB + OX) (top - sma)
|
||||||
curl (SB + OX) smb
|
curl (SB + OX) smb
|
||||||
arcvh
|
arcvh
|
||||||
g4 (MIDDLE + CORRECTION_OMIDS) O
|
g4.right.mid (MIDDLE + (CORRECTION_OMIDX - sb) * STROKE) O [widths.heading STROKE 0 {.y (1) .x (sb)}]
|
||||||
archv
|
archv
|
||||||
flat RIGHTSB sma
|
straight.up.end (RIGHTSB - (STROKE - fine) * HVCONTRAST) sma [widths.heading fine 0 UPWARD]
|
||||||
curl RIGHTSB ybar [heading UPWARD]
|
include : HBarTop MIDDLE RIGHTSB yBar
|
||||||
include : dispiro
|
include : VBarRight RIGHTSB sma yBar
|
||||||
flat MIDDLE ybar [widths 0 STROKE]
|
include : VBarRight RIGHTSB sma 0 (STROKE - fine / 2)
|
||||||
curl RIGHTSB ybar [heading RIGHTWARD]
|
|
||||||
|
|
||||||
sketch # G
|
sketch # G
|
||||||
set-width WIDTH
|
set-width WIDTH
|
||||||
include markset.capital
|
include markset.capital
|
||||||
|
|
||||||
include : GShape CAP SMOOTHA SMOOTHB
|
include : GShape CAP SMOOTHA SMOOTHB
|
||||||
|
|
||||||
save 'G' 'G'
|
save 'G' 'G'
|
||||||
|
|
||||||
sketch # smcpG
|
sketch # smcpG
|
||||||
|
@ -3182,14 +3225,22 @@ export : define [apply] : begin
|
||||||
widths.rhs
|
widths.rhs
|
||||||
flat ([mix SB RIGHTSB 0] - HALFSTROKE * TANSLANT) fbar
|
flat ([mix SB RIGHTSB 0] - HALFSTROKE * TANSLANT) fbar
|
||||||
curl ([mix SB RIGHTSB 0.95] - HALFSTROKE * TANSLANT) fbar
|
curl ([mix SB RIGHTSB 0.95] - HALFSTROKE * TANSLANT) fbar
|
||||||
if SLAB : include : dispiro
|
|
||||||
widths.lhs
|
branch
|
||||||
flat ([mix SB RIGHTSB 0.02] + HALFSTROKE * TANSLANT) 0
|
if SLAB : include : dispiro
|
||||||
curl ([mix SB RIGHTSB 0.875] + HALFSTROKE * TANSLANT) 0
|
widths.lhs
|
||||||
|
flat ([mix SB RIGHTSB 0.02] + HALFSTROKE * TANSLANT) 0
|
||||||
|
curl ([mix SB RIGHTSB 0.875] + HALFSTROKE * TANSLANT) 0
|
||||||
|
save 'f.straight'
|
||||||
|
save 'lenisf' 0xAB35
|
||||||
|
|
||||||
save 'f.straight'
|
branch
|
||||||
save 'lenisf' 0xAB35
|
include : dispiro
|
||||||
|
widths.lhs
|
||||||
|
flat ([mix SB RIGHTSB 0.02] + HALFSTROKE * TANSLANT) 0
|
||||||
|
curl ([mix SB RIGHTSB 0.875] + HALFSTROKE * TANSLANT) 0
|
||||||
|
save 'f.force-serifed'
|
||||||
|
|
||||||
define dfNarrowF : DivFrame para.diversityF
|
define dfNarrowF : DivFrame para.diversityF
|
||||||
sketch # f.narrow
|
sketch # f.narrow
|
||||||
local df : DivFrame para.diversityF
|
local df : DivFrame para.diversityF
|
||||||
|
@ -3224,6 +3275,7 @@ export : define [apply] : begin
|
||||||
select-variant 'f' 'f'
|
select-variant 'f' 'f'
|
||||||
|
|
||||||
turned 'turnf.straight' nothing 'f.straight' MIDDLE (XH / 2) markset.p
|
turned 'turnf.straight' nothing 'f.straight' MIDDLE (XH / 2) markset.p
|
||||||
|
turned 'turnf.force-serifed' nothing 'f.force-serifed' MIDDLE (XH / 2) markset.p
|
||||||
turned 'turnf.narrow' nothing 'f.narrow' dfNarrowF.middle (XH / 2) dfNarrowF.markSet.p
|
turned 'turnf.narrow' nothing 'f.narrow' dfNarrowF.middle (XH / 2) dfNarrowF.markSet.p
|
||||||
turned 'turnf.tailed' nothing 'f.tailed' MIDDLE (XH / 2) markset.p
|
turned 'turnf.tailed' nothing 'f.tailed' MIDDLE (XH / 2) markset.p
|
||||||
select-variant 'turnf' 0x25F (follow -- 'f')
|
select-variant 'turnf' 0x25F (follow -- 'f')
|
||||||
|
|
|
@ -149,7 +149,7 @@ export : define [calculateMetrics para] : begin
|
||||||
define OVERLAYSTROKE : adviceBlackness 3.75
|
define OVERLAYSTROKE : adviceBlackness 3.75
|
||||||
define OPERATORSTROKE : adviceBlackness 3.2
|
define OPERATORSTROKE : adviceBlackness 3.2
|
||||||
define GEOMETRYSTROKE : adviceBlackness 4.5
|
define GEOMETRYSTROKE : adviceBlackness 4.5
|
||||||
define SHOULDERFINE : if para.shoulderfine (STROKE * para.shoulderfine) [adviceBlackness 10]
|
define SHOULDERFINE : Math.min (STROKE * para.shoulderfineMin) [adviceBlackness 16]
|
||||||
|
|
||||||
define SUPERNESS : fallback para.superness 2
|
define SUPERNESS : fallback para.superness 2
|
||||||
define [superxy x] : Math.pow (1 - [Math.pow x SUPERNESS]) (1 / SUPERNESS)
|
define [superxy x] : Math.pow (1 - [Math.pow x SUPERNESS]) (1 / SUPERNESS)
|
||||||
|
|
|
@ -57,6 +57,8 @@ fhook = 120
|
||||||
rhook = 90
|
rhook = 90
|
||||||
hookx = 170
|
hookx = 170
|
||||||
|
|
||||||
|
shoulderfineMin = 0.8
|
||||||
|
|
||||||
tbalance = 50
|
tbalance = 50
|
||||||
tbalance2 = 30
|
tbalance2 = 30
|
||||||
rbalance = 60
|
rbalance = 60
|
||||||
|
@ -114,7 +116,6 @@ periodsize = 55
|
||||||
cthin = 0.9
|
cthin = 0.9
|
||||||
cthinb = 0.9
|
cthinb = 0.9
|
||||||
vtipfine = 1
|
vtipfine = 1
|
||||||
shoulderfine = 0.8
|
|
||||||
pbarpos = 0.5
|
pbarpos = 0.5
|
||||||
|
|
||||||
[w-200]
|
[w-200]
|
||||||
|
@ -149,6 +150,7 @@ stroke = 84
|
||||||
dotsize = 135
|
dotsize = 135
|
||||||
periodsize = 160
|
periodsize = 160
|
||||||
smooth = 200
|
smooth = 200
|
||||||
|
vjut = 157
|
||||||
|
|
||||||
[w-600]
|
[w-600]
|
||||||
sb = 54
|
sb = 54
|
||||||
|
@ -156,6 +158,7 @@ stroke = 97
|
||||||
dotsize = 145
|
dotsize = 145
|
||||||
periodsize = 168
|
periodsize = 168
|
||||||
essx = 1.07
|
essx = 1.07
|
||||||
|
vjut = 170
|
||||||
|
|
||||||
rbalance = 55
|
rbalance = 55
|
||||||
rbalance2 = 20
|
rbalance2 = 20
|
||||||
|
@ -169,7 +172,7 @@ periodsize = 180
|
||||||
essx = 1.06
|
essx = 1.06
|
||||||
essxq = 1.10
|
essxq = 1.10
|
||||||
jut = 89
|
jut = 89
|
||||||
vjut = 158
|
vjut = 179
|
||||||
|
|
||||||
barpos = 0.51
|
barpos = 0.51
|
||||||
fivebarpos = 0.64
|
fivebarpos = 0.64
|
||||||
|
@ -186,7 +189,7 @@ periodsize = 188
|
||||||
essx = 1.05
|
essx = 1.05
|
||||||
essxq = 1.15
|
essxq = 1.15
|
||||||
jut = 96
|
jut = 96
|
||||||
vjut = 172
|
vjut = 189
|
||||||
|
|
||||||
barpos = 0.51
|
barpos = 0.51
|
||||||
fivebarpos = 0.64
|
fivebarpos = 0.64
|
||||||
|
@ -203,7 +206,7 @@ periodsize = 200
|
||||||
essx = 1.03
|
essx = 1.03
|
||||||
essxq = 1.15
|
essxq = 1.15
|
||||||
jut = 100
|
jut = 100
|
||||||
vjut = 175
|
vjut = 199
|
||||||
|
|
||||||
barpos = 0.51
|
barpos = 0.51
|
||||||
fivebarpos = 0.64
|
fivebarpos = 0.64
|
||||||
|
@ -257,6 +260,7 @@ width = 1.152 # 576mem for normal char
|
||||||
sb = 1.375
|
sb = 1.375
|
||||||
jut = 1.15
|
jut = 1.15
|
||||||
longjut = 1.15
|
longjut = 1.15
|
||||||
|
rhook = 1.15
|
||||||
rbalance = 1.375
|
rbalance = 1.375
|
||||||
tbalance = 1.100
|
tbalance = 1.100
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,8 @@ function regulateGlyph(g, skew) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// De-overlap
|
// De-overlap
|
||||||
g.contours = [...cSimple, ...caryllShapeOps.removeOverlap(cFill, 1, 2048, true)];
|
// g.contours = [...cSimple, ...caryllShapeOps.removeOverlap(cFill, 1, 2048, true)];
|
||||||
|
g.contours = [...cSimple, ...cFill];
|
||||||
|
|
||||||
// Finalize
|
// Finalize
|
||||||
g.contours = c2q.contours(g.contours);
|
g.contours = c2q.contours(g.contours);
|
||||||
|
|
|
@ -285,15 +285,12 @@ f = 'narrow'
|
||||||
[simple.v-t-narrow]
|
[simple.v-t-narrow]
|
||||||
t = 'narrow'
|
t = 'narrow'
|
||||||
|
|
||||||
[simple.v-r-standard]
|
|
||||||
r = "standard"
|
|
||||||
|
|
||||||
[simple.v-r-narrow]
|
|
||||||
r = "narrow"
|
|
||||||
|
|
||||||
[simple.v-j-narrow]
|
[simple.v-j-narrow]
|
||||||
dotlessj = "narrow"
|
dotlessj = "narrow"
|
||||||
|
|
||||||
|
[simple.v-j-narrow-serifed]
|
||||||
|
dotlessj = "narrow-serifed"
|
||||||
|
|
||||||
[simple.v-seven-normal]
|
[simple.v-seven-normal]
|
||||||
tag = "cv64"
|
tag = "cv64"
|
||||||
seven = "normal"
|
seven = "normal"
|
||||||
|
@ -302,6 +299,18 @@ seven = "normal"
|
||||||
tag = "cv65"
|
tag = "cv65"
|
||||||
seven = "force-serifed"
|
seven = "force-serifed"
|
||||||
|
|
||||||
|
[simple.v-r-standard]
|
||||||
|
r = "standard"
|
||||||
|
|
||||||
|
[simple.v-r-narrow]
|
||||||
|
r = "narrow"
|
||||||
|
|
||||||
|
[simple.v-r-force-serifed]
|
||||||
|
r = "force-serifed"
|
||||||
|
|
||||||
|
[simple.v-f-force-serifed]
|
||||||
|
f = "force-serifed"
|
||||||
|
|
||||||
[default]
|
[default]
|
||||||
design = [
|
design = [
|
||||||
'v-m-longleg',
|
'v-m-longleg',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue