code cleanup
This commit is contained in:
parent
3de8056f95
commit
fed22dbf58
|
@ -430,7 +430,6 @@ export as build : define [buildFont para recursive recursiveCodes] : begin
|
||||||
g.include t AS_BASE
|
g.include t AS_BASE
|
||||||
set g.advanceWidth t.advanceWidth
|
set g.advanceWidth t.advanceWidth
|
||||||
set g.shortName t.shortName
|
set g.shortName t.shortName
|
||||||
set g.dense t.dense
|
|
||||||
set g.cmpPriority t.cmpPriority
|
set g.cmpPriority t.cmpPriority
|
||||||
if name : set dependencyProfile.(name) : getDependencyProfile g
|
if name : set dependencyProfile.(name) : getDependencyProfile g
|
||||||
if (g && unicode) : begin
|
if (g && unicode) : begin
|
||||||
|
|
|
@ -543,7 +543,7 @@ define [CyrDescender x shift connex] : glyph-construction
|
||||||
# Derived subfonts
|
# Derived subfonts
|
||||||
define [refair g] : begin
|
define [refair g] : begin
|
||||||
foreach [j : range 0 g.contours.length] : begin
|
foreach [j : range 0 g.contours.length] : begin
|
||||||
set g.contours.(j) : fairify g.contours.(j) globalTransform g.dense
|
set g.contours.(j) : fairify g.contours.(j) globalTransform
|
||||||
return nothing
|
return nothing
|
||||||
define [Fork gs ps] : begin
|
define [Fork gs ps] : begin
|
||||||
# BFS construct ShouldBuildList
|
# BFS construct ShouldBuildList
|
||||||
|
|
|
@ -494,7 +494,6 @@ define VShape : symbol-block 'V, v and nu'
|
||||||
g4 (RIGHTSB - HOOKX / 3) (top - HALFSTROKE - HOOK)
|
g4 (RIGHTSB - HOOKX / 3) (top - HALFSTROKE - HOOK)
|
||||||
quadcontrols 0.4 0.75 64 unimportant
|
quadcontrols 0.4 0.75 64 unimportant
|
||||||
g4 (MIDDLE + cornerdist) 0 [widths.rhs VShape.fine]
|
g4 (MIDDLE + cornerdist) 0 [widths.rhs VShape.fine]
|
||||||
#end [function : set this.dense true]
|
|
||||||
|
|
||||||
sketch # vhooktop
|
sketch # vhooktop
|
||||||
include eMarks
|
include eMarks
|
||||||
|
|
|
@ -207,7 +207,6 @@ symbol-block 'Delta and cyrbe'
|
||||||
curl (SB + OX) (XH - SMALLSMOOTHA)
|
curl (SB + OX) (XH - SMALLSMOOTHA)
|
||||||
alsothruthem [list {0.25 0.79} {0.5 0.87}] important
|
alsothruthem [list {0.25 0.79} {0.5 0.87}] important
|
||||||
g4 (RIGHTSB - HALFSTROKE * HVCONTRAST) CAP
|
g4 (RIGHTSB - HALFSTROKE * HVCONTRAST) CAP
|
||||||
#end : function : set this.dense true
|
|
||||||
save 'cyrbe' 0x431
|
save 'cyrbe' 0x431
|
||||||
|
|
||||||
symbol-block 'epsilon and cyrze'
|
symbol-block 'epsilon and cyrze'
|
||||||
|
|
|
@ -2,29 +2,23 @@
|
||||||
symbol-block "Numbers"
|
symbol-block "Numbers"
|
||||||
sketch # zero.unslashed
|
sketch # zero.unslashed
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
include : OShape CAP 0 SB RIGHTSB
|
include : OShape CAP 0 SB RIGHTSB
|
||||||
|
|
||||||
save 'zero.unslashed'
|
save 'zero.unslashed'
|
||||||
|
|
||||||
sketch # zero.slashed
|
sketch # zero.slashed
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
include glyphs.'zero.unslashed'
|
include glyphs.'zero.unslashed'
|
||||||
local fine : 0.5 * OVERLAYSTROKE
|
local fine : 0.5 * OVERLAYSTROKE
|
||||||
include : dispiro
|
include : dispiro
|
||||||
flat (SB + STROKE / 2) (CAP * (1 - 0.77)) [widths fine fine]
|
flat (SB + STROKE / 2) (CAP * (1 - 0.77)) [widths fine fine]
|
||||||
curl (RIGHTSB - STROKE / 2) (CAP * 0.77)
|
curl (RIGHTSB - STROKE / 2) (CAP * 0.77)
|
||||||
|
|
||||||
save 'zero.slashed'
|
save 'zero.slashed'
|
||||||
|
|
||||||
sketch # zero.dotted
|
sketch # zero.dotted
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
include glyphs.'zero.unslashed'
|
include glyphs.'zero.unslashed'
|
||||||
local radius : Math.min DOTRADIUS ((RIGHTSB - SB - STROKE * 2) / 4)
|
local radius : Math.min DOTRADIUS ((RIGHTSB - SB - STROKE * 2) / 4)
|
||||||
include : Ring (CAPMIDDLE + radius) (CAPMIDDLE - radius) (MIDDLE + radius) (MIDDLE - radius)
|
include : Ring (CAPMIDDLE + radius) (CAPMIDDLE - radius) (MIDDLE + radius) (MIDDLE - radius)
|
||||||
|
|
||||||
save 'zero.dotted'
|
save 'zero.dotted'
|
||||||
|
|
||||||
select-variant 'zero' '0' 'slashed' {
|
select-variant 'zero' '0' 'slashed' {
|
||||||
|
@ -33,11 +27,8 @@ symbol-block "Numbers"
|
||||||
.cv15 'zero.unslashed'
|
.cv15 'zero.unslashed'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sketch # one
|
sketch # one
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
|
|
||||||
include : VBar (MIDDLE + ONEBALANCE) 0 CAP
|
include : VBar (MIDDLE + ONEBALANCE) 0 CAP
|
||||||
include : dispiro
|
include : dispiro
|
||||||
flat (MIDDLE - HALFSTROKE * HVCONTRAST + ONEBALANCE) CAP [widths STROKE 0]
|
flat (MIDDLE - HALFSTROKE * HVCONTRAST + ONEBALANCE) CAP [widths STROKE 0]
|
||||||
|
@ -45,14 +36,10 @@ symbol-block "Numbers"
|
||||||
|
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : CenterBottomSerif (MIDDLE + ONEBALANCE) 0 LONGJUT
|
include : CenterBottomSerif (MIDDLE + ONEBALANCE) 0 LONGJUT
|
||||||
|
|
||||||
|
|
||||||
save 'one' '1'
|
save 'one' '1'
|
||||||
|
|
||||||
sketch # two
|
sketch # two
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
|
|
||||||
define smooth : [adviceGlottalStopSmooth CAP 1] * 0.95
|
define smooth : [adviceGlottalStopSmooth CAP 1] * 0.95
|
||||||
include : dispiro
|
include : dispiro
|
||||||
widths.rhs
|
widths.rhs
|
||||||
|
@ -66,14 +53,10 @@ symbol-block "Numbers"
|
||||||
include : HBarBottom (SB + HALFSTROKE) RIGHTSB 0
|
include : HBarBottom (SB + HALFSTROKE) RIGHTSB 0
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : UpwardRightSerif RIGHTSB 0 VJUT
|
include : UpwardRightSerif RIGHTSB 0 VJUT
|
||||||
|
|
||||||
|
|
||||||
save 'two' '2'
|
save 'two' '2'
|
||||||
|
|
||||||
sketch # three
|
sketch # three
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
|
|
||||||
local barcenter : CAP * 0.53
|
local barcenter : CAP * 0.53
|
||||||
local threeRadius : (CAPMIDDLE + HALFSTROKE - SMOOTH) * 1.25
|
local threeRadius : (CAPMIDDLE + HALFSTROKE - SMOOTH) * 1.25
|
||||||
local fine : STROKE * CTHIN
|
local fine : STROKE * CTHIN
|
||||||
|
@ -97,8 +80,6 @@ symbol-block "Numbers"
|
||||||
|
|
||||||
sketch # four
|
sketch # four
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
|
|
||||||
local bar (CAP * 0.4)
|
local bar (CAP * 0.4)
|
||||||
local vert : [mix SB RIGHTSB 0.825] - HVCONTRAST * STROKE
|
local vert : [mix SB RIGHTSB 0.825] - HVCONTRAST * STROKE
|
||||||
local p 0.25
|
local p 0.25
|
||||||
|
@ -112,8 +93,8 @@ symbol-block "Numbers"
|
||||||
g4 (vert - fine * p * HVCONTRAST) CAP [widths.heading 0 [Math.hypot fine (fine / slope)] UPWARD]
|
g4 (vert - fine * p * HVCONTRAST) CAP [widths.heading 0 [Math.hypot fine (fine / slope)] UPWARD]
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : CenterBottomSerif (vert + HALFSTROKE * HVCONTRAST) 0 JUT
|
include : CenterBottomSerif (vert + HALFSTROKE * HVCONTRAST) 0 JUT
|
||||||
|
|
||||||
save 'four' '4'
|
save 'four' '4'
|
||||||
|
|
||||||
define [FiveShape top bp] : glyph-construction
|
define [FiveShape top bp] : glyph-construction
|
||||||
local t1 : top * bp * 0.8
|
local t1 : top * bp * 0.8
|
||||||
local t2 : top * bp
|
local t2 : top * bp
|
||||||
|
@ -135,26 +116,21 @@ symbol-block "Numbers"
|
||||||
|
|
||||||
sketch # five
|
sketch # five
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
include : FiveShape CAP FIVEBARPOS
|
include : FiveShape CAP FIVEBARPOS
|
||||||
|
|
||||||
save 'five' '5'
|
save 'five' '5'
|
||||||
|
|
||||||
sketch # zhuangToneFive
|
sketch # zhuangToneFive
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
include : FiveShape CAP FIVEBARPOS
|
include : FiveShape CAP FIVEBARPOS
|
||||||
|
|
||||||
save 'zhuangToneFive' 0x1BC
|
save 'zhuangToneFive' 0x1BC
|
||||||
|
|
||||||
sketch # zhuangtonefive
|
sketch # zhuangtonefive
|
||||||
include eMarks
|
include eMarks
|
||||||
include : FiveShape XH FIVEBARPOS
|
include : FiveShape XH FIVEBARPOS
|
||||||
|
|
||||||
save 'zhuangtonefive' 0x1BD
|
save 'zhuangtonefive' 0x1BD
|
||||||
|
|
||||||
sketch # six
|
sketch # six
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
|
|
||||||
include : OShape (CAP * 0.6) 0 SB RIGHTSB
|
include : OShape (CAP * 0.6) 0 SB RIGHTSB
|
||||||
local ymiddlea : (CAP * 0.6 - SMALLSMOOTHA + SMALLSMOOTHB) / 2
|
local ymiddlea : (CAP * 0.6 - SMALLSMOOTHA + SMALLSMOOTHB) / 2
|
||||||
|
@ -167,29 +143,22 @@ symbol-block "Numbers"
|
||||||
|
|
||||||
sketch # seven
|
sketch # seven
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
|
|
||||||
include : HBarTop (SB + OXE) RIGHTSB CAP
|
include : HBarTop (SB + OXE) RIGHTSB CAP
|
||||||
|
|
||||||
local x : mix SB RIGHTSB 0.28
|
local x : mix SB RIGHTSB 0.28
|
||||||
local cor : [Math.hypot 1 ((RIGHTSB - x - HALFSTROKE) / (CAP - STROKE))] * HVCONTRAST
|
local cor : [Math.hypot 1 ((RIGHTSB - x - HALFSTROKE) / (CAP - STROKE))] * HVCONTRAST
|
||||||
|
|
||||||
start-from (x - STROKE * cor / 2) 0
|
start-from (x - STROKE * cor / 2) 0
|
||||||
line-to (x + STROKE * cor / 2) 0
|
line-to (x + STROKE * cor / 2) 0
|
||||||
line-to RIGHTSB (CAP - STROKE)
|
line-to RIGHTSB (CAP - STROKE)
|
||||||
line-to (RIGHTSB - STROKE * cor) (CAP - STROKE)
|
line-to (RIGHTSB - STROKE * cor) (CAP - STROKE)
|
||||||
reverse-last
|
reverse-last
|
||||||
|
|
||||||
if SLAB : begin
|
if SLAB : begin
|
||||||
include : DownwardLeftSerif (SB + OXE) CAP VJUT
|
include : DownwardLeftSerif (SB + OXE) CAP VJUT
|
||||||
|
|
||||||
save 'seven' '7'
|
save 'seven' '7'
|
||||||
|
|
||||||
local pr : linreg 18 0.85 120 0.975 STROKE
|
local pr : linreg 18 0.85 120 0.975 STROKE
|
||||||
|
|
||||||
sketch # eight
|
sketch # eight
|
||||||
include capitalMarks
|
include capitalMarks
|
||||||
set-width WIDTH
|
|
||||||
|
|
||||||
local p 0.96
|
local p 0.96
|
||||||
local l (SB + OX)
|
local l (SB + OX)
|
||||||
local r (RIGHTSB - OX)
|
local r (RIGHTSB - OX)
|
||||||
|
@ -209,8 +178,8 @@ symbol-block "Numbers"
|
||||||
g4 [mix r l p] (CAP - SMOOTHA * pr * p) [widths.rhs]
|
g4 [mix r l p] (CAP - SMOOTHA * pr * p) [widths.rhs]
|
||||||
arcvh
|
arcvh
|
||||||
close
|
close
|
||||||
|
|
||||||
save 'eight' '8'
|
save 'eight' '8'
|
||||||
|
|
||||||
# There is an "eight without lower contour" shape used for /propto
|
# There is an "eight without lower contour" shape used for /propto
|
||||||
sketch # rotetedpropto
|
sketch # rotetedpropto
|
||||||
local p 0.96
|
local p 0.96
|
||||||
|
@ -228,7 +197,6 @@ symbol-block "Numbers"
|
||||||
g4 [mix l r p] (CAP - SMOOTHB * p * pr)
|
g4 [mix l r p] (CAP - SMOOTHB * p * pr)
|
||||||
alsothru 0.5 py [widths (STROKE * py) (STROKE * (1 - py))]
|
alsothru 0.5 py [widths (STROKE * py) (STROKE * (1 - py))]
|
||||||
straight.down.end l 0 [widths.heading STROKE 0 DOWNWARD]
|
straight.down.end l 0 [widths.heading STROKE 0 DOWNWARD]
|
||||||
|
|
||||||
save 'rotetedpropto'
|
save 'rotetedpropto'
|
||||||
|
|
||||||
sketch # nine
|
sketch # nine
|
||||||
|
@ -255,8 +223,6 @@ symbol-block "Numbers"
|
||||||
curl r (CAP * 0.35)
|
curl r (CAP * 0.35)
|
||||||
hookend O
|
hookend O
|
||||||
g4 SB HOOK
|
g4 SB HOOK
|
||||||
|
|
||||||
|
|
||||||
save 'nine' '9'
|
save 'nine' '9'
|
||||||
|
|
||||||
sketch # ten
|
sketch # ten
|
||||||
|
@ -267,4 +233,3 @@ symbol-block "Numbers"
|
||||||
include glyphs.zero
|
include glyphs.zero
|
||||||
apply-transform : Translate WIDTH 0
|
apply-transform : Translate WIDTH 0
|
||||||
save 'ten'
|
save 'ten'
|
||||||
|
|
|
@ -207,15 +207,12 @@ define {TildeShape} : symbol-block 'Above marks'
|
||||||
set-width 0
|
set-width 0
|
||||||
currentGlyph.shortName = 'tilde'
|
currentGlyph.shortName = 'tilde'
|
||||||
set-anchor 'above' MARK markMiddle XH markMiddle aboveMarkTop
|
set-anchor 'above' MARK markMiddle XH markMiddle aboveMarkTop
|
||||||
|
|
||||||
include : TildeShape
|
include : TildeShape
|
||||||
ttop -- aboveMarkTop
|
ttop -- aboveMarkTop
|
||||||
tbot -- aboveMarkBot + markFine / 2
|
tbot -- aboveMarkBot + markFine / 2
|
||||||
leftEnd -- (markMiddle - markExtend * 1.5)
|
leftEnd -- (markMiddle - markExtend * 1.5)
|
||||||
rightEnd -- (markMiddle + markExtend * 1.5)
|
rightEnd -- (markMiddle + markExtend * 1.5)
|
||||||
hs -- markHalfStroke
|
hs -- markHalfStroke
|
||||||
|
|
||||||
set currentGlyph.dense true
|
|
||||||
save 'tildeAbove' 0x303
|
save 'tildeAbove' 0x303
|
||||||
|
|
||||||
sketch # asciitilde.high
|
sketch # asciitilde.high
|
||||||
|
@ -225,8 +222,6 @@ define {TildeShape} : symbol-block 'Above marks'
|
||||||
leftEnd -- SB
|
leftEnd -- SB
|
||||||
rightEnd -- RIGHTSB
|
rightEnd -- RIGHTSB
|
||||||
hs -- (OPERATORSTROKE / 2)
|
hs -- (OPERATORSTROKE / 2)
|
||||||
|
|
||||||
set currentGlyph.dense true
|
|
||||||
save 'asciitilde.high'
|
save 'asciitilde.high'
|
||||||
|
|
||||||
sketch
|
sketch
|
||||||
|
@ -1231,7 +1226,6 @@ symbol-block 'Tie marks'
|
||||||
rightEnd -- tieRight
|
rightEnd -- tieRight
|
||||||
hs -- markHalfStroke
|
hs -- markHalfStroke
|
||||||
|
|
||||||
set currentGlyph.dense true
|
|
||||||
save 'tildeTieAbove' 0x360
|
save 'tildeTieAbove' 0x360
|
||||||
|
|
||||||
symbol-block 'Greek Polytonic Marks'
|
symbol-block 'Greek Polytonic Marks'
|
||||||
|
|
|
@ -296,6 +296,7 @@ function fairify(scurve, gizmo, denseQ, cleanMore) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
// Rebuild curve
|
||||||
for (var j = 0; j < splitpoints.length; j++) if (splitpoints[j].onCurve && !splitpoints[j].remove && splitpoints[j + 1] && !splitpoints[j + 1].onCurve) {
|
for (var j = 0; j < splitpoints.length; j++) if (splitpoints[j].onCurve && !splitpoints[j].remove && splitpoints[j + 1] && !splitpoints[j + 1].onCurve) {
|
||||||
for (var k = j + 2; k < splitpoints.length && splitpoints[k].remove; k++);
|
for (var k = j + 2; k < splitpoints.length && splitpoints[k].remove; k++);
|
||||||
if (k - j > 2) {
|
if (k - j > 2) {
|
||||||
|
|
|
@ -166,7 +166,7 @@ export : define [SetupBuilders args] : begin
|
||||||
lhs.0.type = rhs.0.type = lhs.(lhs.length - 1).type = rhs.(rhs.length - 1).type = 'corner'
|
lhs.0.type = rhs.0.type = lhs.(lhs.length - 1).type = rhs.(rhs.length - 1).type = 'corner'
|
||||||
libspiro.spiroToBezierOnContext [lhs.concat : rhs.reverse] true g QUAD PRECISION
|
libspiro.spiroToBezierOnContext [lhs.concat : rhs.reverse] true g QUAD PRECISION
|
||||||
if ([not s.unfair] && [not para.unfair]) : foreach [j : range 0 g.contours.length] : begin
|
if ([not s.unfair] && [not para.unfair]) : foreach [j : range 0 g.contours.length] : begin
|
||||||
set g.contours.(j) : fairify g.contours.(j) globalTransform s.dense s.cleanmore
|
set g.contours.(j) : fairify g.contours.(j) globalTransform
|
||||||
set g.knots knots
|
set g.knots knots
|
||||||
set g.lhsknots lhs
|
set g.lhsknots lhs
|
||||||
set g.rhsknots rhs
|
set g.rhsknots rhs
|
||||||
|
@ -178,7 +178,7 @@ export : define [SetupBuilders args] : begin
|
||||||
libspiro.spiroToBezierOnContext knots closed g QUAD PRECISION
|
libspiro.spiroToBezierOnContext knots closed g QUAD PRECISION
|
||||||
foreach af [items-of lastafs] : if af : af.call g
|
foreach af [items-of lastafs] : if af : af.call g
|
||||||
if [not para.unfair] : foreach [j : range 0 g.contours.length] : begin
|
if [not para.unfair] : foreach [j : range 0 g.contours.length] : begin
|
||||||
set g.contours.(j) : fairify g.contours.(j) (g.fairGizmo || g.gizmo) g.dense g.cleanmore
|
set g.contours.(j) : fairify g.contours.(j) (g.fairGizmo || g.gizmo)
|
||||||
this.include g
|
this.include g
|
||||||
|
|
||||||
return [object
|
return [object
|
||||||
|
|
Loading…
Reference in New Issue
Block a user