We have a better "r".

This commit is contained in:
be5invis 2015-10-21 00:15:10 +08:00
parent be2bf04131
commit 7e0968feda
3 changed files with 19 additions and 16 deletions

View File

@ -121,6 +121,7 @@ define [buildFont para recursive] : begin
define TBALANCE : fallback para.tbalance JBALANCE define TBALANCE : fallback para.tbalance JBALANCE
define TBALANCE2 : fallback para.tbalance2 TBALANCE define TBALANCE2 : fallback para.tbalance2 TBALANCE
define RBALANCE : fallback para.rbalance (JBALANCE * 0.3) define RBALANCE : fallback para.rbalance (JBALANCE * 0.3)
define RBALANCE2 : fallback para.rbalance2 0
define SBALANCE : fallback para.sbalance 0.52 define SBALANCE : fallback para.sbalance 0.52
# derived metrics # derived metrics
@ -340,8 +341,8 @@ define [buildFont para recursive] : begin
bez3 0 y1 y2 1 [mix tiny (1 - tiny) (j / samples)] bez3 0 y1 y2 1 [mix tiny (1 - tiny) (j / samples)]
alsothruthem rs raf alsothruthem rs raf
define [quadcontrols x1 y1 samples raf] : bezcontrols (x1 * 2 / 3) (y1 * 2 / 3) [mix 1 x1 (2 / 3)] [mix 1 y1 (2 / 3)] samples raf define [quadcontrols x1 y1 samples raf] : bezcontrols (x1 * 2 / 3) (y1 * 2 / 3) [mix 1 x1 (2 / 3)] [mix 1 y1 (2 / 3)] samples raf
define [archv samples] : bezcontrols KAPPA_SPIRO_ARC 0 1 (1 - KAPPA_SPIRO_ARC) samples define [archv samples notiny k] : bezcontrols [fallback k KAPPA_SPIRO_ARC] 0 1 (1 - [fallback k KAPPA_SPIRO_ARC]) samples
define [arcvh samples] : bezcontrols 0 KAPPA_SPIRO_ARC (1 - KAPPA_SPIRO_ARC) 1 samples define [arcvh samples notiny k] : bezcontrols 0 [fallback k KAPPA_SPIRO_ARC] (1 - [fallback k KAPPA_SPIRO_ARC]) 1 samples
define [complexThru] : begin define [complexThru] : begin
local a : {}.slice.call arguments local a : {}.slice.call arguments

View File

@ -638,18 +638,19 @@ create-glyph 'r' : glyph-construction
assign-unicode 'r' assign-unicode 'r'
include eMarks include eMarks
local rhookx : RIGHTSB + JBALANCE / 2 - STROKE local rhookx (RIGHTSB + RBALANCE2)
local rmiddle : [mix (SB + RBALANCE + STROKE) (rhookx - HALFSTROKE) 0.5] - CORRECTION_OMIDS local fine (STROKE * 0.25)
local barright : SB + STROKE * CORRECTION_HX + RBALANCE local rbar : SB + RBALANCE + STROKE * CORRECTION_HX
local rmiddle : [mix (rbar - fine) rhookx (0.5 + globalTransform.yx * STROKE / WIDTH)] - CORRECTION_OMIDS
include : spiro include : spiro
widths.rhs widths.lhs
g4 rhookx (XH - RHOOK - STROKE * 0.5) g4 rhookx (XH - RHOOK)
g4 [mix barright rhookx 0.575] (XO - STROKE) [heading {.y (-1) .x (-0.1)}] g4 rmiddle XO [heading {.y (-1) .x (-0.2 - globalTransform.yx)}]
archv 8 'notiny' archv 8 'notiny'
flat barright (XH - SMALLSMOOTHA) [widths 0 (STROKE * 0.3)] flat (rbar - fine) (XH - SMALLSMOOTHA) [widths fine 0]
curl barright (XH - SMALLSMOOTHA - 1) curl (rbar - fine) (XH - SMALLSMOOTHA - 1)
include : VBarLeft (SB + RBALANCE) 0 XH include : VBarLeft (SB + RBALANCE) 0 XH
set-anchor 'overlay' BASE (SB + RBALANCE + STROKE * CORRECTION_HX) (XH * 0.5) set-anchor 'overlay' BASE rbar (XH * 0.5)
### f ### f

View File

@ -42,7 +42,7 @@ ckappa = 0.618
tbalance = 50 tbalance = 50
tbalance2 = 30 tbalance2 = 30
rbalance = 25 rbalance = 30
sbalance = 0.51 sbalance = 0.51
kappa_hook = 0.7 kappa_hook = 0.7
@ -79,6 +79,9 @@ ebarpos = 0.4
oxhook = 0 oxhook = 0
ahook = 120 ahook = 120
shook = 110 shook = 110
rbalance = 50
rbalance2 = 12
rhook = 80
smooth = 210 smooth = 210
bkappa = 0.5 bkappa = 0.5
kappa_hook = 0.7 kappa_hook = 0.7
@ -86,7 +89,6 @@ kappa_ahook = 0.65
kappa_rhook = 0.6 kappa_rhook = 0.6
jbalance = 60 jbalance = 60
tbalance = 50 tbalance = 50
rbalance = 18
sbalance = 0.5 sbalance = 0.5
# Slant # Slant
@ -96,9 +98,8 @@ isItalic = false
[s-italic] [s-italic]
isItalic = true isItalic = true
italicangle = 10 italicangle = 10
rhook = 80
tbalance = 50 tbalance = 50
rbalance = 30
ebarpos = 0.41 ebarpos = 0.41
# Combinations # Combinations
@ -113,6 +114,6 @@ style = 'Italic'
[x-bolditalic] [x-bolditalic]
style = 'Bold Italic' style = 'Bold Italic'
rbalance = 25 rbalance = 30
ebalance = 0.375 ebalance = 0.375
sbalance = 0.53 sbalance = 0.53