Skip to content

Commit 14219e3

Browse files
jmcwilliams403jmcwilliams403
committed
Rename
{`uBowl.`{`toothless`|`rounded`}|`nShoulder.`{`earless`|`rounded`}} → {`uBowl.toothless`{`Corner`|`Rounded`}|`nShoulder.earless`{`Corner`|`Rounded`}}.
1 parent 265f2d3 commit 14219e3

File tree

8 files changed

+21
-23
lines changed

8 files changed

+21
-23
lines changed

‎packages/font-glyphs/src/letter/cyrillic/sha.ptl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ glyph-block Letter-Cyrillic-Sha : begin
5050
include : df.markSet.e
5151
include : CyrShaShape df XH 0 (doSerif -- SLAB) (fInv -- true)
5252

53-
create-glyph 'smcpMTurned' 0xA7FA : glyph-proc
53+
create-glyph 'turnSmcpM' 0xA7FA : glyph-proc
5454
local df : include : DivFrame para.advanceScaleM 3
5555
include : df.markSet.e
5656
include : CyrShaShape df XH 0 (doSerif -- SLAB)
@@ -73,7 +73,6 @@ glyph-block Letter-Cyrillic-Sha : begin
7373

7474
alias 'cyrl/shcha/reduced.upright' null 'cyrl/shcha.upright'
7575

76-
7776
define [CyrShweShape] : with-params [df top bot [fine Stroke] [doSerif false]] : glyph-proc
7877
local cofine : fine * df.mvs / Stroke
7978
include : CyrShaShape df top bot (fine -- fine) (doSerif -- doSerif)

‎packages/font-glyphs/src/letter/latin/c.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ glyph-block Letter-Latin-C : begin
221221
create-glyph "revcSideways.\(suffix)" : glyph-proc
222222
local df : DivFrame (XH / Width) 2 ((XH * 0.1) / SB)
223223
include : df.markSet.e
224-
local p : mix 1 (Width / UPM) 0.5
224+
local p : mix 1 (0.5 * (Width / HalfUPM)) 0.5
225225
include : PointingTo Width XH Width 0 : function [] : glyph-proc
226226
local lf : CLetterForm df sty styBot RightSB 0 (hook -- (Hook * p))
227227
include : lf.revFull

‎packages/font-glyphs/src/letter/latin/lower-n.ptl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ glyph-block Letter-Latin-Lower-N : begin
6969
include : VBar.l left 0 (top - DToothlessRise) sw
7070
local ada : fallback _ada SmallArchDepthA
7171
local adb : fallback _adb SmallArchDepthB
72-
include : nShoulder.earless
72+
include : nShoulder.earlessCorner
7373
left -- left
7474
right -- right
7575
top -- top
@@ -82,7 +82,7 @@ glyph-block Letter-Latin-Lower-N : begin
8282
define [EarlessRoundedBody top left right yBR sw _ada _adb] : glyph-proc
8383
local ada : fallback _ada SmallArchDepthA
8484
local adb : fallback _adb SmallArchDepthB
85-
include : nShoulder.rounded
85+
include : nShoulder.earlessRounded
8686
left -- left
8787
right -- right
8888
top -- top

‎packages/font-glyphs/src/letter/latin/lower-r.ptl‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ glyph-block Letter-Latin-Lower-R : begin
9999
widths.lhs
100100
g4.up.start rHookX (XH - rHookY) [heading Upward]
101101
arcvh 32 hookSuperness
102-
g4.left.mid (xArchMiddle - CorrectionOMidS * [linreg 72 0.75 108 1 Stroke]) (XH - O) [widths.heading Stroke 0 {.y (-1) .x (-skew)}]
102+
g4.left.mid (xArchMiddle - CorrectionOMidS * [linreg 72 0.75 108 1 Stroke]) (XH - O) [widths.lhs.heading Stroke {.y (-1) .x (-skew)}]
103103
archv 32
104-
straight.down.end (xBar - [HSwToV fine]) (XH * 0.53 + TanSlope * SmoothAdjust) [widths.heading fine 0 Downward]
104+
straight.down.end (xBar - [HSwToV fine]) (XH * 0.53 + TanSlope * SmoothAdjust) [widths.lhs.heading fine Downward]
105105
include : VBar.r xBar 0 XH
106106
if doBottomSerif : include : rBottomSerif 0
107107
if doTopSerif : include : rTopSerif XH
@@ -123,16 +123,16 @@ glyph-block Letter-Latin-Lower-R : begin
123123
flat (rHookXN - xCor) (XH - arcTopShift) [if doHookSerif [heading Leftward] null]
124124
curl (xArchMiddle - xCor) (XH - arcTopShift) [if doHookSerif [heading Leftward] null]
125125
archv
126-
straight.down.end (xBar - [HSwToV fine]) (XH * 0.53 + TanSlope * SmoothAdjust) [widths.heading fine 0 Downward]
126+
straight.down.end (xBar - [HSwToV fine]) (XH * 0.53 + TanSlope * SmoothAdjust) [widths.lhs.heading fine Downward]
127127
include : dispiro [widths.lhs arcTopWidth] [ArcKnots]
128128
include : VBar.r xBar 0 XH
129129
if doHookSerif : include : intersection
130130
VSerif.dr (rHookXN - xCor) XH VJut
131131
spiro-outline
132132
ArcKnots
133133
corner (xBar - [HSwToV fine]) 0
134-
corner (Width * 16) 0
135-
corner (Width * 16) XH
134+
corner VERY-FAR 0
135+
corner VERY-FAR XH
136136
if doBottomSerif : include : rBottomSerif 0
137137
if doTopSerif : include : rTopSerif XH
138138

@@ -149,10 +149,9 @@ glyph-block Letter-Latin-Lower-R : begin
149149

150150
define [EarlessRoundedShape df md doTopSerif doBottomSerif] : glyph-proc
151151
define [object xBar xArchMiddle rHookX rHookY hookSuperness rBottomSerif] : RDim df md
152-
local hx : Math.max rHookX (xBar + 1.25 * Stroke)
153152
include : dispiro
154153
widths.lhs
155-
g4 hx (XH - rHookY)
154+
g4 [Math.max rHookX : xBar + 1.25 * Stroke] (XH - rHookY)
156155
hookstart XH
157156
flat (xBar - [HSwToV Stroke]) [Math.max TINY : XH - SmallArchDepthA]
158157
curl (xBar - [HSwToV Stroke]) 0 [heading Downward]
@@ -331,7 +330,7 @@ glyph-block Letter-Latin-Lower-R : begin
331330
arcvh nothing hookSuperness
332331
g4.left.mid (xArchMiddle - CorrectionOMidS * [linreg 72 0.75 108 1 BBS]) (XH - O) [widths.heading BBS 0 {.y (-1) .x (-skew)}]
333332
archv
334-
straight.down.end (xBar - [HSwToV fine]) (XH * 0.53 + TanSlope * SmoothAdjust) [widths.heading fine 0 Downward]
333+
straight.down.end (xBar - [HSwToV fine]) (XH * 0.53 + TanSlope * SmoothAdjust) [widths.lhs.heading fine Downward]
335334
include : BBBarRight xBar 0 XH
336335
set-base-anchor 'overlay' (xBar - [HSwToV : BBD * 0.25 + BBS * 0.5]) (XH * 0.5)
337336

‎packages/font-glyphs/src/letter/latin/lower-y.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ glyph-block Letter-Latin-Lower-Y : begin
4040
local bottomIsNotVertical : doSlabBottom || useStraightBottom || bottomShape
4141

4242
define yBottomJut : Jut * 1.25
43-
define slabysize : yBottomJut * (Width / UPM) + Stroke
43+
define slabysize : 0.5 * yBottomJut * (Width / HalfUPM) + Stroke
4444

4545
define [CalcDS top bottom] : begin
4646
local pds 0.1

‎packages/font-glyphs/src/letter/latin/u.ptl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ glyph-block Letter-Latin-U : begin
5454
export : define [ToothlessCorner df top sw fHookLeft fShortLeg] : glyph-proc
5555
local yTL : top - [if fHookLeft (TailY + HalfStroke) 0]
5656
local yTR : if fShortLeg [mix [Math.min ada : YSmoothMidR top 0 ada adb] top 0.5] top
57-
include : uBowl.toothless
57+
include : uBowl.toothlessCorner
5858
top -- yTL
5959
bottom -- 0
6060
left -- df.leftSB
@@ -69,7 +69,7 @@ glyph-block Letter-Latin-U : begin
6969
export : define [ToothlessRounded df top sw fHookLeft fShortLeg] : glyph-proc
7070
local yTL : top - [if fHookLeft (TailY + HalfStroke) 0]
7171
local yTR : if fShortLeg [mix [Math.min ada : YSmoothMidR top 0 ada adb] top 0.5] top
72-
include : uBowl.rounded
72+
include : uBowl.toothlessRounded
7373
top -- yTL
7474
bottom -- 0
7575
left -- df.leftSB

‎packages/font-glyphs/src/letter/latin/v.ptl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ glyph-block Letter-Latin-V : begin
299299
CreateTurnedLetter 'turnv' 0x28C 'v' HalfAdvance (XH / 2)
300300

301301
define [VScriptShape df top ada adb] : glyph-proc
302-
include : uBowl.rounded
302+
include : uBowl.toothlessRounded
303303
top -- top
304304
bottom -- 0
305305
left -- df.leftSB

‎packages/font-glyphs/src/letter/shared.ptl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ glyph-block Letter-Shared-Shapes : begin
257257
glyph-proc
258258
include : spiro-outline : knots.apply null [a.concat { (fMask -- true) }]
259259

260-
export : define flex-params [earless] : begin
260+
export : define flex-params [earlessCorner] : begin
261261
local-parameter : left
262262
local-parameter : right
263263
local-parameter : top -- XH
@@ -273,7 +273,7 @@ glyph-block Letter-Shared-Shapes : begin
273273
flat right [Math.max (top - adb) (bottom + TINY)]
274274
curl right bottom [heading Downward]
275275

276-
export : define flex-params [rounded] : begin
276+
export : define flex-params [earlessRounded] : begin
277277
local-parameter : left
278278
local-parameter : right
279279
local-parameter : top -- XH
@@ -320,7 +320,7 @@ glyph-block Letter-Shared-Shapes : begin
320320
glyph-proc
321321
include : spiro-outline : knots.apply null [a.concat { (fMask -- true) }]
322322

323-
export : define flex-params [toothless] : begin
323+
export : define flex-params [toothlessCorner] : begin
324324
local-parameter : left
325325
local-parameter : right
326326
local-parameter : top -- XH
@@ -336,7 +336,7 @@ glyph-block Letter-Shared-Shapes : begin
336336
arch.lhs bottom (sw -- stroke) (blendPost -- {})
337337
g4 right (bottom + rise)
338338

339-
export : define flex-params [rounded] : begin
339+
export : define flex-params [toothlessRounded] : begin
340340
local-parameter : left
341341
local-parameter : right
342342
local-parameter : top -- XH
@@ -390,7 +390,7 @@ glyph-block Letter-Shared-Shapes : begin
390390
export : define [arcEnd] : with-params [
391391
[bot 0] [left SB] [right RightSB] [sw Stroke] [fine ShoulderFine]
392392
[ada SmallArchDepthA] [adb SmallArchDepthB]
393-
[yend ((bot + ada) + TINY)]
393+
[yend ((bot + adb) + TINY)]
394394
] : begin
395395
local xend : left + [HSwToV : sw - fine]
396396
return : list
@@ -470,7 +470,7 @@ glyph-block Letter-Shared-Shapes : begin
470470
export : define [arcStart] : with-params [
471471
[top XH] [left SB] [right RightSB] [sw Stroke] [fine ShoulderFine]
472472
[ada SmallArchDepthA] [adb SmallArchDepthB]
473-
[ystart ((top - ada) - TINY)]
473+
[ystart ((top - adb) - TINY)]
474474
] : begin
475475
local xstart : right - [HSwToV : sw - fine]
476476
return : list

0 commit comments

Comments
 (0)