Skip to content

Commit 3f3e338

Browse files
jmcwilliams403jmcwilliams403
committed
Cleanup of be5invis#2578 .
1 parent cf21cd8 commit 3f3e338

File tree

6 files changed

+46
-41
lines changed

6 files changed

+46
-41
lines changed

‎packages/font-glyphs/src/letter/armenian/feh.ptl

+19-17
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,45 @@ glyph-block Letter-Armenian-Feh : begin
1010
glyph-block-import Common-Derivatives
1111
glyph-block-import Letter-Shared-Shapes : SerifFrame
1212

13-
define [FehBody df top bot ada adb] : glyph-proc
13+
define [FehBody df top bot sw hook ada adb] : glyph-proc
1414
local midy : mix bot top HBarPos
15-
local midyTop : midy + 0.5 * df.mvs
16-
local midyBot : midy - 0.5 * df.mvs
15+
local midyTop : midy + 0.5 * sw
16+
local midyBot : midy - 0.5 * sw
1717
include : dispiro
18-
widths.lhs df.mvs
18+
widths.lhs sw
1919
straight.left.start df.middle top
2020
archv
2121
flatside.ld df.leftSB midyBot top ada adb
2222
arcvh
2323
straight.right.end df.middle midyBot [heading Rightward]
2424
include : dispiro
25-
widths.rhs df.mvs
25+
widths.rhs sw
2626
straight.right.start df.middle midyTop [heading Rightward]
2727
archv
2828
flatside.rd df.rightSB 0 midyTop ada adb
29-
hookend 0 (sw -- df.mvs)
30-
g4 (df.leftSB + OX) Hook
29+
hookend 0 (sw -- sw)
30+
g4 (df.leftSB + OX) (0 + hook)
3131

3232
create-glyph 'armn/Feh' 0x556 : glyph-proc
3333
local df : include : DivFrame para.diversityM 3
3434
include : df.markSet.capital
35-
local ada : df.archDepthA ArchDepth df.mvs
36-
local adb : df.archDepthB ArchDepth df.mvs
37-
include : FehBody df CAP 0 ada adb
38-
include : VBar.m df.middle 0 CAP df.mvs
35+
local sw : Math.min df.mvs : AdviceStroke2 3 3 CAP df.div
36+
local ada : df.archDepthA ArchDepth sw
37+
local adb : df.archDepthB ArchDepth sw
38+
include : FehBody df CAP 0 sw Hook ada adb
39+
include : VBar.m df.middle 0 CAP sw
3940
if SLAB : begin
40-
local sf : SerifFrame.fromDf df CAP 0
41+
local sf : SerifFrame.fromDf df CAP 0 (swSerif -- sw)
4142
include sf.mt.right
4243

4344
create-glyph 'armn/feh' 0x586 : glyph-proc
4445
local df : include : DivFrame para.diversityM 3
4546
include : df.markSet.bp
46-
local ada : df.archDepthA SmallArchDepth df.mvs
47-
local adb : df.archDepthB SmallArchDepth df.mvs
48-
include : FehBody df Ascender 0 ada adb
49-
include : VBar.m df.middle Descender Ascender df.mvs
47+
local sw : Math.min df.mvs : AdviceStroke2 3 3 Ascender df.div
48+
local ada : df.archDepthA SmallArchDepth sw
49+
local adb : df.archDepthB SmallArchDepth sw
50+
include : FehBody df Ascender 0 sw Hook ada adb
51+
include : VBar.m df.middle Descender Ascender sw
5052
if SLAB : begin
51-
local sf : SerifFrame.fromDf df Ascender Descender
53+
local sf : SerifFrame.fromDf df Ascender Descender (swSerif -- sw)
5254
include sf.mb.full

‎packages/font-glyphs/src/letter/armenian/hook-group.ptl

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,27 @@ glyph-block Letter-Armenian-Hook-Group : begin
1111
glyph-block-import Letter-Shared-Shapes : nShoulder uBowl SerifFrame
1212
glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar
1313

14-
define [RightHook df top bot sw _hook _ada _adb] : glyph-proc
14+
define [RightHook df top bot _sw _hook _ada _adb] : glyph-proc
15+
local sw : fallback _sw df.mvs
1516
local hook : fallback _hook Hook
1617
local ada : fallback _ada ArchDepthA
1718
local adb : fallback _adb ArchDepthB
1819
local yMid : if (top - bot > ada + adb) (top - ada) : mix top bot (ada / (ada + adb))
1920
include : dispiro
20-
widths.lhs df.mvs
21+
widths.lhs sw
2122
g4 df.rightSB (top - hook)
2223
hookstart top (sw -- sw)
2324
flat df.leftSB yMid
2425
curl df.leftSB bot [heading Downward]
2526

26-
define [LeftHook df top bot sw _hook _ada _adb] : glyph-proc
27+
define [LeftHook df top bot _sw _hook _ada _adb] : glyph-proc
28+
local sw : fallback _sw df.mvs
2729
local hook : fallback _hook Hook
2830
local ada : fallback _ada ArchDepthA
2931
local adb : fallback _adb ArchDepthB
3032
local yMid : if (top - bot > ada + adb) (top - adb) : mix top bot (adb / (ada + adb))
3133
include : dispiro
32-
widths.rhs df.mvs
34+
widths.rhs sw
3335
g4 df.leftSB (top - hook)
3436
hookstart top (sw -- sw)
3537
flat df.rightSB yMid

‎packages/font-glyphs/src/letter/armenian/lower-u-group.ptl

+3-5
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
279279
include : VBar.l df.leftSB 0 XH df.mvs
280280

281281
# Combination of nShoulder.knots and the straight 2 shape
282-
local fine : df.mvs * (ShoulderFine / Stroke)
282+
local fine : ShoulderFine * (df.mvs / Stroke)
283283
local left : Math.max (df.rightSB - [HSwToV df.mvs] - jut) df.middle
284284
include : dispiro
285285
widths.rhs fine
@@ -291,8 +291,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
291291
if SLAB : begin
292292
local sf : SerifFrame.fromDf df XH 0
293293
include sf.lt.outer
294-
if [not para.isItalic] : begin
295-
include : composite-proc sf.lb.outer
294+
if [not para.isItalic] : include sf.lb.outer
296295

297296
# Alternate straight 'n' form
298297
# include : nShoulder.shape
@@ -305,8 +304,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
305304
# if SLAB : begin
306305
# local sf : SerifFrame.fromDf df XH 0
307306
# include sf.lt.outer
308-
# if [not para.isItalic] : begin
309-
# include : composite-proc sf.lb.full
307+
# if [not para.isItalic] : include sf.lb.full
310308

311309
do "Seh"
312310
create-glyph 'armn/seh' 0x57D : glyph-proc

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

+14-13
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ glyph-block Letter-Armenian-Shared-Shapes : begin
1414
define highBarPos XH
1515
define jut Jut
1616

17-
define JUT-NORMAL 0
18-
define JUT-SHORT 1
19-
define JUT-RIGHT 2
20-
define JUT-LEFT 3
17+
define JUT : object
18+
NORMAL 0
19+
SHORT 1
20+
RIGHT 2
21+
LEFT 3
2122

2223
glyph-block-export ArmHBar
2324
define [ArmHBar hPos df] : namespace
2425
define left : match hPos
25-
[Just JUT-RIGHT] df.rightSB
26-
[Just JUT-LEFT] (df.leftSB - (jut * [if SLAB 1.5 1]) + [HSwToV : 0.5 * df.mvs])
26+
[Just JUT.RIGHT] df.rightSB
27+
[Just JUT.LEFT] (df.leftSB - (jut * [if SLAB 1.5 1]) + [HSwToV : 0.5 * df.mvs])
2728
-- df.leftSB
2829
define right : match hPos
29-
[Just JUT-RIGHT] (df.rightSB + (jut * [if SLAB 1.5 1]) - [HSwToV : 0.5 * df.mvs])
30-
[Just JUT-SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.div)
31-
[Just JUT-LEFT] df.leftSB
30+
[Just JUT.RIGHT] (df.rightSB + (jut * [if SLAB 1.5 1]) - [HSwToV : 0.5 * df.mvs])
31+
[Just JUT.SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.div)
32+
[Just JUT.LEFT] df.leftSB
3233
-- df.rightSB
3334

3435
export : define [cap] : glyph-proc
@@ -46,10 +47,10 @@ glyph-block Letter-Armenian-Shared-Shapes : begin
4647
export : define [at y] : glyph-proc
4748
include : HBar.m left right y df.mvs
4849

49-
set [ArmHBar.normal df] : ArmHBar JUT-NORMAL df
50-
set [ArmHBar.short df] : ArmHBar JUT-SHORT df
51-
set [ArmHBar.right df] : ArmHBar JUT-RIGHT df
52-
set [ArmHBar.left df] : ArmHBar JUT-LEFT df
50+
set [ArmHBar.normal df] : ArmHBar JUT.NORMAL df
51+
set [ArmHBar.short df] : ArmHBar JUT.SHORT df
52+
set [ArmHBar.right df] : ArmHBar JUT.RIGHT df
53+
set [ArmHBar.left df] : ArmHBar JUT.LEFT df
5354

5455
glyph-block-export TwoNeck
5556
define [TwoNeck df top bot _left _right _adb _flatp] : begin

‎packages/font-glyphs/src/letter/armenian/upper-ho.ptl

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ glyph-block Letter-Armenian-Upper-Ho : begin
3030
curl df.middle CAP [heading Rightward]
3131
archv
3232
flatside.rd df.rightSB midyBot CAP ArchDepthA ArchDepthB
33+
arcvh
3334
straight.left.end df.middle midyBot [heading Leftward]
3435

3536
include : dispiro

‎packages/font-glyphs/src/letter/armenian/upper-yi.ptl

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ glyph-block Letter-Armenian-Upper-Yi : begin
1818
local ze : CyrZe 0 0 CAP 0
1919
left -- df.leftSB
2020
right -- df.rightSB
21-
blend -- (1 + 2 * O / (df.rightSB - df.leftSB))
21+
blend -- (1 + (2 * O) / (df.rightSB - df.leftSB))
2222
hook -- Hook
23+
op -- HBarPos
2324
include : ze.Shape
2425
if SLAB : begin
25-
local midy : mix 0 CAP OverlayPos
26+
local midy : mix 0 CAP HBarPos
2627
local vJut : Math.min VJut : CAP - 2 * Hook - df.mvs
2728
include : VBar.l (df.leftSB - 2 * O) (midy - 0.5 * vJut) (midy + 0.5 * vJut) df.mvs

0 commit comments

Comments
 (0)