Skip to content

Commit f74cbae

Browse files
jmcwilliams403jmcwilliams403
authored
Move armn/{Ini|Ken|Vew} to their own files. (#2663)
1 parent 8056f49 commit f74cbae

File tree

4 files changed

+84
-62
lines changed

4 files changed

+84
-62
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ export : define [apply] : begin
1111
run-glyph-module "./armenian/upper-za-group.mjs"
1212
run-glyph-module "./armenian/eh-liun-hiun.mjs"
1313
run-glyph-module "./armenian/to.mjs"
14+
run-glyph-module "./armenian/upper-ini.mjs"
1415
run-glyph-module "./armenian/upper-xeh.mjs"
1516
run-glyph-module "./armenian/ca.mjs"
17+
run-glyph-module "./armenian/upper-ken-vew.mjs"
1618
run-glyph-module "./armenian/upper-ho.mjs"
1719
run-glyph-module "./armenian/upper-dza-group.mjs"
1820
run-glyph-module "./armenian/lower-dza-cheh.mjs"

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

+5-62
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ glyph-module
88
glyph-block Letter-Armenian-Hook-Group : begin
99
glyph-block-import CommonShapes
1010
glyph-block-import Common-Derivatives
11-
glyph-block-import Letter-Shared-Shapes : nShoulder uBowl SerifFrame
11+
glyph-block-import Letter-Shared-Shapes : SerifFrame
1212
glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar
1313

1414
define [RightHook df top bot _sw _hook _ada _adb] : glyph-proc
1515
local sw : fallback _sw df.mvs
1616
local hook : fallback _hook Hook
1717
local ada : fallback _ada ArchDepthA
1818
local adb : fallback _adb ArchDepthB
19-
local yMid : if (top - bot > ada + adb) (top - ada) : mix top bot (ada / (ada + adb))
19+
local yMidLeft : if (top - bot > ada + adb) (top - ada) : mix top bot (ada / (ada + adb))
2020
include : dispiro
2121
widths.lhs sw
2222
g4 df.rightSB (top - hook)
2323
hookstart top (sw -- sw)
24-
flat df.leftSB yMid
24+
flat df.leftSB yMidLeft
2525
curl df.leftSB bot [heading Downward]
2626

2727
define [LeftHook df top bot _sw _hook _ada _adb] : glyph-proc
2828
local sw : fallback _sw df.mvs
2929
local hook : fallback _hook Hook
3030
local ada : fallback _ada ArchDepthA
3131
local adb : fallback _adb ArchDepthB
32-
local yMid : if (top - bot > ada + adb) (top - adb) : mix top bot (adb / (ada + adb))
32+
local yMidRight : if (top - bot > ada + adb) (top - adb) : mix top bot (adb / (ada + adb))
3333
include : dispiro
3434
widths.rhs sw
3535
g4 df.leftSB (top - hook)
3636
hookstart top (sw -- sw)
37-
flat df.rightSB yMid
37+
flat df.rightSB yMidRight
3838
curl df.rightSB bot [heading Downward]
3939

4040
do "Ben"
@@ -78,43 +78,6 @@ glyph-block Letter-Armenian-Hook-Group : begin
7878
local sf : SerifFrame.fromDf df CAP 0
7979
include sf.lb.outer
8080

81-
do "Ini"
82-
create-glyph 'armn/Ini' 0x53B : glyph-proc
83-
local df : include : DivFrame 1
84-
include : df.markSet.capital
85-
include : nShoulder.shape
86-
left -- (df.leftSB + [HSwToV df.mvs])
87-
right -- df.rightSB
88-
top -- XH
89-
bottom -- (XH / 2)
90-
ada -- ArchDepthA
91-
adb -- ArchDepthB
92-
stroke -- df.mvs
93-
include : VBar.l df.leftSB 0 CAP
94-
if SLAB : begin
95-
local sf : SerifFrame.fromDf df CAP 0
96-
include : composite-proc sf.lt.full sf.lb.full
97-
98-
do "Ken"
99-
create-glyph 'armn/Ken' 0x53F : glyph-proc
100-
local df : include : DivFrame 1
101-
include : df.markSet.capital
102-
local midy : XH / 2 - df.mvs / 2
103-
include : uBowl.shape
104-
left -- df.leftSB
105-
right -- (df.rightSB - [HSwToV df.mvs])
106-
top -- CAP
107-
bottom -- midy
108-
ada -- ArchDepthA
109-
adb -- ArchDepthB
110-
stroke -- df.mvs
111-
include : VBar.r df.rightSB 0 XH
112-
113-
if SLAB : begin
114-
local sf : SerifFrame.fromDf df CAP 0
115-
local sf2 : SerifFrame.fromDf df XH 0
116-
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full
117-
11881
do "Ghat"
11982
create-glyph 'armn/Ghat' 0x542 : glyph-proc
12083
local df : include : DivFrame 1
@@ -146,26 +109,6 @@ glyph-block Letter-Armenian-Hook-Group : begin
146109
local sf : SerifFrame.fromDf df CAP 0
147110
include sf.rb.full
148111

149-
do "Vew"
150-
create-glyph 'armn/Vew' 0x54E : glyph-proc
151-
local df : include : DivFrame 1
152-
include : df.markSet.capital
153-
local midy : XH / 2 - df.mvs / 2
154-
include : uBowl.shape
155-
left -- df.leftSB
156-
right -- (df.rightSB - [HSwToV df.mvs])
157-
top -- XH
158-
bottom -- midy
159-
ada -- ArchDepthA
160-
adb -- ArchDepthB
161-
stroke -- df.mvs
162-
include : VBar.r df.rightSB 0 CAP df.mvs
163-
include : [ArmHBar.right df].base
164-
if SLAB : begin
165-
local sf : SerifFrame.fromDf df XH 0
166-
local sf2 : SerifFrame.fromDf df CAP 0
167-
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full
168-
169112
do "Reh"
170113
create-glyph 'armn/Reh' 0x550 : glyph-proc
171114
local df : include : DivFrame 1

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

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
$$include '../../meta/macros.ptl'
2+
3+
import [mix linreg clamp fallback] from "@iosevka/util"
4+
import [DependentSelector] from "@iosevka/glyph/relation"
5+
6+
glyph-module
7+
8+
glyph-block Letter-Armenian-Upper-Ini : begin
9+
glyph-block-import CommonShapes
10+
glyph-block-import Common-Derivatives
11+
glyph-block-import Letter-Shared-Shapes : nShoulder SerifFrame
12+
13+
do "Ini"
14+
create-glyph 'armn/Ini' 0x53B : glyph-proc
15+
local df : include : DivFrame 1
16+
include : df.markSet.capital
17+
include : nShoulder.shape
18+
top -- XH
19+
bottom -- (XH / 2)
20+
left -- (df.leftSB + [HSwToV df.mvs])
21+
right -- df.rightSB
22+
ada -- ArchDepthA
23+
adb -- ArchDepthB
24+
stroke -- df.mvs
25+
include : VBar.l df.leftSB 0 CAP df.mvs
26+
if SLAB : begin
27+
local sf : SerifFrame.fromDf df CAP 0
28+
include : composite-proc sf.lt.full sf.lb.full

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

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
$$include '../../meta/macros.ptl'
2+
3+
import [mix linreg clamp fallback] from "@iosevka/util"
4+
import [DependentSelector] from "@iosevka/glyph/relation"
5+
6+
glyph-module
7+
8+
glyph-block Letter-Armenian-Upper-Ken-Vew : begin
9+
glyph-block-import CommonShapes
10+
glyph-block-import Common-Derivatives
11+
glyph-block-import Letter-Shared-Shapes : uBowl SerifFrame
12+
glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar
13+
14+
do "Ken"
15+
create-glyph 'armn/Ken' 0x53F : glyph-proc
16+
local df : include : DivFrame 1
17+
include : df.markSet.capital
18+
include : uBowl.shape
19+
top -- CAP
20+
bottom -- (XH / 2 - df.mvs / 2)
21+
left -- df.leftSB
22+
right -- (df.rightSB - [HSwToV df.mvs])
23+
ada -- ArchDepthA
24+
adb -- ArchDepthB
25+
stroke -- df.mvs
26+
include : VBar.r df.rightSB 0 XH df.mvs
27+
if SLAB : begin
28+
local sf : SerifFrame.fromDf df CAP 0
29+
local sf2 : SerifFrame.fromDf df XH 0
30+
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full
31+
32+
do "Vew"
33+
create-glyph 'armn/Vew' 0x54E : glyph-proc
34+
local df : include : DivFrame 1
35+
include : df.markSet.capital
36+
include : uBowl.shape
37+
top -- XH
38+
bottom -- (XH / 2 - df.mvs / 2)
39+
left -- df.leftSB
40+
right -- (df.rightSB - [HSwToV df.mvs])
41+
ada -- ArchDepthA
42+
adb -- ArchDepthB
43+
stroke -- df.mvs
44+
include : VBar.r df.rightSB 0 CAP df.mvs
45+
include : [ArmHBar.right df].base
46+
if SLAB : begin
47+
local sf : SerifFrame.fromDf df XH 0
48+
local sf2 : SerifFrame.fromDf df CAP 0
49+
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full

0 commit comments

Comments
 (0)