@@ -39,11 +39,11 @@ glyph-block Letter-Cyrillic-Che : begin
39
39
__ : VBar.r df.rightSB 0 top sw
40
40
41
41
include : cheBowl.shape
42
- left -- df.leftSB
43
- right -- df.rightSB
44
- top -- top
42
+ left -- df.leftSB
43
+ right -- df.rightSB
44
+ top -- top
45
45
bottom -- (bar - DToothlessRise - 0.5 * sw)
46
- sw -- sw
46
+ sw -- sw
47
47
48
48
local sf : SerifFrame.fromDf df top 0
49
49
include : tagged 'serifLT' : match slabType
@@ -102,19 +102,19 @@ glyph-block Letter-Cyrillic-Che : begin
102
102
define [CyrTcheShape] : with-params [df top pyBar bodyType slabType [teSerifs SLAB] [sw : AdviceStroke 2.75] [yBarOffset DToothlessRise]] : glyph-proc
103
103
local bar : top * [fallback pyBar 0.5] + yBarOffset
104
104
105
- local left : [mix df.leftSB df.rightSB 0.2] - [HSwToV : 0.25 * sw] + OX
105
+ local left : [mix df.leftSB df.rightSB : if (df.div > 1) 0.25 0.2] - [HSwToV : 0.25 * sw] + OX
106
106
local right : df.rightSB - OX
107
107
108
108
include : tagged 'strokeR' : match bodyType
109
109
[Just BODY.TAILED] : RightwardTailedBar right 0 top (sw -- sw)
110
110
__ : VBar.r right 0 top sw
111
111
112
- include : dispiro
113
- widths.lhs sw
114
- flat left top [heading Downward]
115
- curl left (bar - DToothlessRise + ArchDepthB - HalfStroke)
116
- arch.lhs.centerAt.ltr.b [mix left right 0.5] (bar - DToothlessRise - HalfStroke )
117
- g4 (right - 1 / 16) (bar - HalfStroke) [heading Rightward]
112
+ include : cheBowl.shape
113
+ left -- left
114
+ right -- right
115
+ top -- top
116
+ bottom -- (bar - DToothlessRise - 0.5 * sw )
117
+ sw -- sw
118
118
119
119
local xTopBarLeft : df.leftSB - SideJut
120
120
local xTopBarRight : mix xTopBarLeft (left + [HSwToV : 0.5 * sw]) 2
@@ -136,9 +136,9 @@ glyph-block Letter-Cyrillic-Che : begin
136
136
__ : glyph-proc
137
137
138
138
if teSerifs : begin
139
- local swVJut : Math.min [AdviceStroke 4.5] (0.625 * (left - xTopBarLeft))
140
- include : VSerif.dl xTopBarLeft top VJut swVJut
141
- include : VSerif.dr xTopBarRight top VJut swVJut
139
+ local swVJut : Math.min (0.625 * (left - xTopBarLeft)) : AdviceStroke 4.5
140
+ include : VSerif.dl xTopBarLeft top VJut swVJut
141
+ include : VSerif.dr xTopBarRight top VJut swVJut
142
142
143
143
create-glyph 'cyrl/Che' 0x427 : glyph-proc
144
144
include : MarkSet.capital
@@ -166,9 +166,10 @@ glyph-block Letter-Cyrillic-Che : begin
166
166
167
167
foreach { suffix { doST doSB } } [Object.entries TcheConfig] : do
168
168
create-glyph "cyrl/Tche.\(suffix)" : glyph-proc
169
- include : MarkSet.capital
170
- include : LeaningAnchor.Below.VBar.r RightSB
171
- include : CyrTcheShape [DivFrame 1] CAP [if SLAB 0.45 0.35] BODY.STRAIGHT
169
+ local df : include : DivFrame para.diversityT
170
+ include : df.markSet.capital
171
+ include : LeaningAnchor.Below.VBar.r df.rightSB
172
+ include : CyrTcheShape df CAP [if SLAB 0.45 0.35] BODY.STRAIGHT
172
173
if SLAB SERIFS.ALL SERIFS.NONE
173
174
teSerifs -- doST
174
175
@@ -199,14 +200,16 @@ glyph-block Letter-Cyrillic-Che : begin
199
200
include : CyrCcheShape df XH [if SLAB 0.45 0.4] body
200
201
if SLAB [if para.isItalic slabItalic slabUpright] SERIFS.NONE
201
202
202
- DefineSelectorGlyph "cyrl/tche" suffix [DivFrame 1] 'e'
203
+ define cyrTcheDf : DivFrame para.diversityT
204
+
205
+ DefineSelectorGlyph "cyrl/tche" suffix cyrTcheDf 'e'
203
206
204
207
foreach { suffixTe { doST doSB } } [Object.entries TcheConfig] : do
205
208
create-glyph "cyrl/tche.\(suffix).\(suffixTe)" : glyph-proc
206
209
set-width 0
207
210
set-mark-anchor 'cvDecompose' 0 0
208
- include : LeaningAnchor.Below.VBar.r RightSB
209
- include : CyrTcheShape [DivFrame 1] XH [if SLAB 0.45 0.4] body
211
+ include : LeaningAnchor.Below.VBar.r cyrTcheDf.rightSB
212
+ include : CyrTcheShape cyrTcheDf XH [if SLAB 0.45 0.4] body
210
213
if SLAB [if para.isItalic slabItalic slabUpright] SERIFS.NONE
211
214
teSerifs -- doST
212
215
@@ -232,7 +235,7 @@ glyph-block Letter-Cyrillic-Che : begin
232
235
return : VBar.m Middle (yc + LongVJut * 0.8) (yc - LongVJut * 0.8) SwCheVBar
233
236
234
237
derive-composites 'cyrl/CheVBar' 0x4B8 'cyrl/Che' [CheVBarBarShape CAP : if SLAB 0.45 0.35]
235
- derive-composites 'cyrl/cheVBar' 0x4B9 'cyrl/che' [CheVBarBarShape XH : if SLAB 0.45 0.40 ]
238
+ derive-composites 'cyrl/cheVBar' 0x4B9 'cyrl/che' [CheVBarBarShape XH : if SLAB 0.45 0.4 ]
236
239
237
240
define ShhaConfig : object
238
241
serifless SERIFS.NONE
0 commit comments