Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move armn/{Ini|Ken|Vew} to their own files. #2663

Merged
merged 1 commit into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/font-glyphs/src/letter/armenian.ptl
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ export : define [apply] : begin
run-glyph-module "./armenian/upper-za-group.mjs"
run-glyph-module "./armenian/eh-liun-hiun.mjs"
run-glyph-module "./armenian/to.mjs"
run-glyph-module "./armenian/upper-ini.mjs"
run-glyph-module "./armenian/upper-xeh.mjs"
run-glyph-module "./armenian/ca.mjs"
run-glyph-module "./armenian/upper-ken-vew.mjs"
run-glyph-module "./armenian/upper-ho.mjs"
run-glyph-module "./armenian/upper-dza-group.mjs"
run-glyph-module "./armenian/lower-dza-cheh.mjs"
Expand Down
67 changes: 5 additions & 62 deletions packages/font-glyphs/src/letter/armenian/hook-group.ptl
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ glyph-module
glyph-block Letter-Armenian-Hook-Group : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Letter-Shared-Shapes : nShoulder uBowl SerifFrame
glyph-block-import Letter-Shared-Shapes : SerifFrame
glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar

define [RightHook df top bot _sw _hook _ada _adb] : glyph-proc
local sw : fallback _sw df.mvs
local hook : fallback _hook Hook
local ada : fallback _ada ArchDepthA
local adb : fallback _adb ArchDepthB
local yMid : if (top - bot > ada + adb) (top - ada) : mix top bot (ada / (ada + adb))
local yMidLeft : if (top - bot > ada + adb) (top - ada) : mix top bot (ada / (ada + adb))
include : dispiro
widths.lhs sw
g4 df.rightSB (top - hook)
hookstart top (sw -- sw)
flat df.leftSB yMid
flat df.leftSB yMidLeft
curl df.leftSB bot [heading Downward]

define [LeftHook df top bot _sw _hook _ada _adb] : glyph-proc
local sw : fallback _sw df.mvs
local hook : fallback _hook Hook
local ada : fallback _ada ArchDepthA
local adb : fallback _adb ArchDepthB
local yMid : if (top - bot > ada + adb) (top - adb) : mix top bot (adb / (ada + adb))
local yMidRight : if (top - bot > ada + adb) (top - adb) : mix top bot (adb / (ada + adb))
include : dispiro
widths.rhs sw
g4 df.leftSB (top - hook)
hookstart top (sw -- sw)
flat df.rightSB yMid
flat df.rightSB yMidRight
curl df.rightSB bot [heading Downward]

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

do "Ini"
create-glyph 'armn/Ini' 0x53B : glyph-proc
local df : include : DivFrame 1
include : df.markSet.capital
include : nShoulder.shape
left -- (df.leftSB + [HSwToV df.mvs])
right -- df.rightSB
top -- XH
bottom -- (XH / 2)
ada -- ArchDepthA
adb -- ArchDepthB
stroke -- df.mvs
include : VBar.l df.leftSB 0 CAP
if SLAB : begin
local sf : SerifFrame.fromDf df CAP 0
include : composite-proc sf.lt.full sf.lb.full

do "Ken"
create-glyph 'armn/Ken' 0x53F : glyph-proc
local df : include : DivFrame 1
include : df.markSet.capital
local midy : XH / 2 - df.mvs / 2
include : uBowl.shape
left -- df.leftSB
right -- (df.rightSB - [HSwToV df.mvs])
top -- CAP
bottom -- midy
ada -- ArchDepthA
adb -- ArchDepthB
stroke -- df.mvs
include : VBar.r df.rightSB 0 XH

if SLAB : begin
local sf : SerifFrame.fromDf df CAP 0
local sf2 : SerifFrame.fromDf df XH 0
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full

do "Ghat"
create-glyph 'armn/Ghat' 0x542 : glyph-proc
local df : include : DivFrame 1
Expand Down Expand Up @@ -146,26 +109,6 @@ glyph-block Letter-Armenian-Hook-Group : begin
local sf : SerifFrame.fromDf df CAP 0
include sf.rb.full

do "Vew"
create-glyph 'armn/Vew' 0x54E : glyph-proc
local df : include : DivFrame 1
include : df.markSet.capital
local midy : XH / 2 - df.mvs / 2
include : uBowl.shape
left -- df.leftSB
right -- (df.rightSB - [HSwToV df.mvs])
top -- XH
bottom -- midy
ada -- ArchDepthA
adb -- ArchDepthB
stroke -- df.mvs
include : VBar.r df.rightSB 0 CAP df.mvs
include : [ArmHBar.right df].base
if SLAB : begin
local sf : SerifFrame.fromDf df XH 0
local sf2 : SerifFrame.fromDf df CAP 0
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full

do "Reh"
create-glyph 'armn/Reh' 0x550 : glyph-proc
local df : include : DivFrame 1
Expand Down
28 changes: 28 additions & 0 deletions packages/font-glyphs/src/letter/armenian/upper-ini.ptl
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
$$include '../../meta/macros.ptl'

import [mix linreg clamp fallback] from "@iosevka/util"
import [DependentSelector] from "@iosevka/glyph/relation"

glyph-module

glyph-block Letter-Armenian-Upper-Ini : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Letter-Shared-Shapes : nShoulder SerifFrame

do "Ini"
create-glyph 'armn/Ini' 0x53B : glyph-proc
local df : include : DivFrame 1
include : df.markSet.capital
include : nShoulder.shape
top -- XH
bottom -- (XH / 2)
left -- (df.leftSB + [HSwToV df.mvs])
right -- df.rightSB
ada -- ArchDepthA
adb -- ArchDepthB
stroke -- df.mvs
include : VBar.l df.leftSB 0 CAP df.mvs
if SLAB : begin
local sf : SerifFrame.fromDf df CAP 0
include : composite-proc sf.lt.full sf.lb.full
49 changes: 49 additions & 0 deletions packages/font-glyphs/src/letter/armenian/upper-ken-vew.ptl
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
$$include '../../meta/macros.ptl'

import [mix linreg clamp fallback] from "@iosevka/util"
import [DependentSelector] from "@iosevka/glyph/relation"

glyph-module

glyph-block Letter-Armenian-Upper-Ken-Vew : begin
glyph-block-import CommonShapes
glyph-block-import Common-Derivatives
glyph-block-import Letter-Shared-Shapes : uBowl SerifFrame
glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar

do "Ken"
create-glyph 'armn/Ken' 0x53F : glyph-proc
local df : include : DivFrame 1
include : df.markSet.capital
include : uBowl.shape
top -- CAP
bottom -- (XH / 2 - df.mvs / 2)
left -- df.leftSB
right -- (df.rightSB - [HSwToV df.mvs])
ada -- ArchDepthA
adb -- ArchDepthB
stroke -- df.mvs
include : VBar.r df.rightSB 0 XH df.mvs
if SLAB : begin
local sf : SerifFrame.fromDf df CAP 0
local sf2 : SerifFrame.fromDf df XH 0
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full

do "Vew"
create-glyph 'armn/Vew' 0x54E : glyph-proc
local df : include : DivFrame 1
include : df.markSet.capital
include : uBowl.shape
top -- XH
bottom -- (XH / 2 - df.mvs / 2)
left -- df.leftSB
right -- (df.rightSB - [HSwToV df.mvs])
ada -- ArchDepthA
adb -- ArchDepthB
stroke -- df.mvs
include : VBar.r df.rightSB 0 CAP df.mvs
include : [ArmHBar.right df].base
if SLAB : begin
local sf : SerifFrame.fromDf df XH 0
local sf2 : SerifFrame.fromDf df CAP 0
include : composite-proc sf.lt.full sf2.rt.full sf.rb.full
Loading