From 7e69e4d8c14b7335d7b389311dc43ffb3bf68142 Mon Sep 17 00:00:00 2001 From: jmcwilliams403 Date: Tue, 29 Oct 2024 07:40:08 -0400 Subject: [PATCH 1/5] Cleanup of #2560 . --- .../src/letter/armenian/aliases.ptl | 2 +- .../src/letter/armenian/lower-q-group.ptl | 37 ++++++++++++------- .../font-glyphs/src/letter/latin/lower-g.ptl | 3 +- .../font-glyphs/src/letter/latin/lower-q.ptl | 1 - params/variants.toml | 11 ------ 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/font-glyphs/src/letter/armenian/aliases.ptl b/packages/font-glyphs/src/letter/armenian/aliases.ptl index 628b55974a..f607eafe3d 100644 --- a/packages/font-glyphs/src/letter/armenian/aliases.ptl +++ b/packages/font-glyphs/src/letter/armenian/aliases.ptl @@ -16,6 +16,6 @@ glyph-block Letter-Armenian-Aliases : begin alias 'armn/yi' 0x575 'dotlessj.flatHook' alias 'armn/vo' 0x578 'n' alias 'armn/seh' 0x57D 'u' - alias 'armn/co' 0x581 'cyrl/de.BGR' + alias 'armn/co' 0x581 'g.singleStorey' alias 'armn/oh' 0x585 'o' alias 'armn/yiBar' 0x588 'dotlessjBar.flatHook' diff --git a/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl index e00f013467..3bbb0c2de4 100644 --- a/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl +++ b/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl @@ -1,6 +1,6 @@ $$include '../../meta/macros.ptl' -import [mix linreg clamp fallback SuffixCfg] from "@iosevka/util" +import [mix linreg clamp fallback] from "@iosevka/util" import [DependentSelector] from "@iosevka/glyph/relation" glyph-module @@ -8,18 +8,29 @@ glyph-module glyph-block Letter-Armenian-Lower-Q-Group : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives - glyph-block-import Letter-Shared-Shapes : SerifFrame + glyph-block-import Letter-Shared-Shapes : SerifFrame OBarRight glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar - glyph-block-import Letter-Latin-Lower-Q : QConfig - foreach { suffix { Body {terminal fTail} {sRT sRB} } } [Object.entries QConfig] : if [not fTail] : do - create-glyph "armn/gim.\(suffix)" : glyph-proc - include [refer-glyph "q.\(suffix)"] AS_BASE ALSO_METRICS - include : [ArmHBar.right [DivFrame 1] 0].base + do "Gim" + create-glyph 'armn/gim' 0x563 : glyph-proc + local df : include : DivFrame 1 + include : df.markSet.p + include : OBarRight.shape (top -- XH) + include : VBar.r df.rightSB Descender XH + include : [ArmHBar.right df 0].base + if SLAB : begin + local sf : SerifFrame.fromDf df XH Descender + include sf.rb.fullSide + if [not para.isItalic] : begin + include sf.rt.outer - if [not sRB] : create-glyph "armn/za.\(suffix)" : glyph-proc - include [refer-glyph "q.\(suffix)"] AS_BASE ALSO_METRICS - include : [ArmHBar.right [DivFrame 1] 0].desc - - select-variant 'armn/gim' 0x563 (follow -- 'q/tailless') - select-variant 'armn/za' 0x566 (follow -- 'qRTail') + do "Za" + create-glyph 'armn/za' 0x566 : glyph-proc + local df : include : DivFrame 1 + include : df.markSet.p + include : OBarRight.shape (top -- XH) + include : VBar.r df.rightSB Descender XH + include : [ArmHBar.right df 0].desc + if (SLAB && [not para.isItalic]) : begin + local sf : SerifFrame.fromDf df XH Descender + include sf.rt.outer diff --git a/packages/font-glyphs/src/letter/latin/lower-g.ptl b/packages/font-glyphs/src/letter/latin/lower-g.ptl index f8d6a561f9..e0d003fa90 100644 --- a/packages/font-glyphs/src/letter/latin/lower-g.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-g.ptl @@ -128,7 +128,7 @@ glyph-block Letter-Latin-Lower-G : begin export : define [AutoSerifedBody df top] : glyph-proc include : SeriflessBody df top - if SLAB : include : tagged 'serifRT' : HSerif.rt df.rightSB top SideJut + if (SLAB && [not para.isItalic]) : include : tagged 'serifRT' : HSerif.rt df.rightSB top SideJut export : define [EarlessCornerBody df top] : glyph-proc include : OBarLeft.toothless @@ -154,6 +154,7 @@ glyph-block Letter-Latin-Lower-G : begin singleStorey SingleStorey.RoundHook singleStoreyFlatHook SingleStorey.FlatHook object # ear/serif + "" { SingleStorey.AutoSerifedBody 0 } serifless { SingleStorey.SeriflessBody 0 } serifed { SingleStorey.SerifedBody 0 } earlessCorner { SingleStorey.EarlessCornerBody DToothlessRise } diff --git a/packages/font-glyphs/src/letter/latin/lower-q.ptl b/packages/font-glyphs/src/letter/latin/lower-q.ptl index 099e7f4d8e..964359830e 100644 --- a/packages/font-glyphs/src/letter/latin/lower-q.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-q.ptl @@ -59,7 +59,6 @@ glyph-block Letter-Latin-Lower-Q : begin HSerif.rb (RightSB - [HSwToV HalfStroke]) y Jut define [RbSerifAuto y] : NeedSlab SLAB : RbSerif y - glyph-block-export QConfig define QConfig : SuffixCfg.weave object # body "" EaredBody diff --git a/params/variants.toml b/params/variants.toml index 831a15d699..976aba1591 100644 --- a/params/variants.toml +++ b/params/variants.toml @@ -3951,7 +3951,6 @@ keyAffix = "" selectorAffix.q = "" selectorAffix."q/sansSerif" = "" selectorAffix."q/hookTopBase" = "" -selectorAffix."q/tailless" = "" selectorAffix.qRTail = "" selectorAffix.gha = "" @@ -3961,7 +3960,6 @@ descriptionAffix = "earless (cornered) shape" selectorAffix.q = "earlessCorner" selectorAffix."q/sansSerif" = "earlessCorner" selectorAffix."q/hookTopBase" = "earlessCorner" -selectorAffix."q/tailless" = "earlessCorner" selectorAffix.qRTail = "earlessCorner" selectorAffix.gha = "" @@ -3971,7 +3969,6 @@ descriptionAffix = "earless (rounded) shape" selectorAffix.q = "earlessRounded" selectorAffix."q/sansSerif" = "earlessRounded" selectorAffix."q/hookTopBase" = "" -selectorAffix."q/tailless" = "earlessRounded" selectorAffix.qRTail = "earlessRounded" selectorAffix.gha = "" @@ -3984,7 +3981,6 @@ descriptionAffix = "straight terminal" selectorAffix.q = "straight" selectorAffix."q/sansSerif" = "straight" selectorAffix."q/hookTopBase" = "straight" -selectorAffix."q/tailless" = "straight" selectorAffix.qRTail = "straight" selectorAffix.gha = "straight" @@ -3994,7 +3990,6 @@ descriptionAffix = "tailed terminal" selectorAffix.q = "tailed" selectorAffix."q/sansSerif" = "tailed" selectorAffix."q/hookTopBase" = "tailed" -selectorAffix."q/tailless" = "straight" selectorAffix.qRTail = "straight" selectorAffix.gha = "tailed" @@ -4004,7 +3999,6 @@ descriptionAffix = "diagonally tailed terminal" selectorAffix.q = "diagonalTailed" selectorAffix."q/sansSerif" = "diagonalTailed" selectorAffix."q/hookTopBase" = "diagonalTailed" -selectorAffix."q/tailless" = "straight" selectorAffix.qRTail = "straight" selectorAffix.gha = "diagonalTailed" @@ -4015,7 +4009,6 @@ descriptionJoiner = "without" selectorAffix.q = "serifless" selectorAffix."q/sansSerif" = "serifless" selectorAffix."q/hookTopBase" = "serifless" -selectorAffix."q/tailless" = "serifless" selectorAffix.qRTail = "serifless" selectorAffix.gha = "serifless" @@ -4026,7 +4019,6 @@ descriptionAffix = "serif at bottom" selectorAffix.q = "bottomSerifed" selectorAffix."q/sansSerif" = "serifless" selectorAffix."q/hookTopBase" = "bottomSerifed" -selectorAffix."q/tailless" = "bottomSerifed" selectorAffix.qRTail = "serifless" selectorAffix.gha = "bottomSerifed" @@ -4037,7 +4029,6 @@ descriptionAffix = "motion serifs" selectorAffix.q = "motionSerifed" selectorAffix."q/sansSerif" = "serifless" selectorAffix."q/hookTopBase" = "serifless" -selectorAffix."q/tailless" = "motionSerifed" selectorAffix.qRTail = "motionSerifed" selectorAffix.gha = "serifless" @@ -4049,7 +4040,6 @@ descriptionAffix = "serifs" selectorAffix.q = "serifed" selectorAffix."q/sansSerif" = "serifless" selectorAffix."q/hookTopBase" = "bottomSerifed" -selectorAffix."q/tailless" = "serifed" selectorAffix.qRTail = "motionSerifed" selectorAffix.gha = "bottomSerifed" @@ -4061,7 +4051,6 @@ descriptionAffix = "serifs" selectorAffix.q = "bottomSerifed" selectorAffix."q/sansSerif" = "serifless" selectorAffix."q/hookTopBase" = "bottomSerifed" -selectorAffix."q/tailless" = "bottomSerifed" selectorAffix.qRTail = "serifless" selectorAffix.gha = "bottomSerifed" From f4fe9f82fbeeea746c8c72bfa6afd7208a301591 Mon Sep 17 00:00:00 2001 From: jmcwilliams403 Date: Tue, 29 Oct 2024 07:42:12 -0400 Subject: [PATCH 2/5] Cleanup of #2563 . --- packages/font-glyphs/src/letter/armenian/shared.ptl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/font-glyphs/src/letter/armenian/shared.ptl b/packages/font-glyphs/src/letter/armenian/shared.ptl index a73967626f..ca9c025146 100644 --- a/packages/font-glyphs/src/letter/armenian/shared.ptl +++ b/packages/font-glyphs/src/letter/armenian/shared.ptl @@ -55,7 +55,7 @@ glyph-block Letter-Armenian-Shared-Shapes : begin local hookY : fallback _hookY (top - Hook) local ada : fallback _ada ArchDepthA local adb : fallback _adb ArchDepthB - local yMidDepth : if (top > ada + adb) ada (top * (ada / (ada + adb))) + local yMidDepth : if (top - base > ada + adb) ada ((top - base) * (ada / (ada + adb))) include : dispiro widths.lhs df.mvs g4 df.rightSB hookY @@ -75,7 +75,7 @@ glyph-block Letter-Armenian-Shared-Shapes : begin local hookY : fallback _hookY (top - Hook) local ada : fallback _ada ArchDepthA local adb : fallback _adb ArchDepthB - local yMidDepth : if (top > ada + adb) adb (top * (adb / (ada + adb))) + local yMidDepth : if (top - base > ada + adb) adb ((top - base) * (adb / (ada + adb))) include : dispiro widths.rhs df.mvs g4 df.leftSB hookY From 40733cf2f7c1f08c904682b3ff2bd520e1a1dd37 Mon Sep 17 00:00:00 2001 From: jmcwilliams403 Date: Tue, 29 Oct 2024 08:31:47 -0400 Subject: [PATCH 3/5] =?UTF-8?q?Cleanup=20of=20`=D5=A1`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/letter/armenian/aliases.ptl | 2 -- .../src/letter/armenian/lower-u-group.ptl | 28 +++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/packages/font-glyphs/src/letter/armenian/aliases.ptl b/packages/font-glyphs/src/letter/armenian/aliases.ptl index f607eafe3d..59dcea40ff 100644 --- a/packages/font-glyphs/src/letter/armenian/aliases.ptl +++ b/packages/font-glyphs/src/letter/armenian/aliases.ptl @@ -10,8 +10,6 @@ glyph-block Letter-Armenian-Aliases : begin alias 'armn/Tiun' 0x54F 'S.serifless' alias 'armn/Piur' 0x553 'grek/Phi' alias 'armn/Oh' 0x555 'O' - alias 'armn/aybTurned' 0x560 'm' - alias 'armn/ayb' 0x561 'turnm' alias 'armn/ho' 0x570 'h' alias 'armn/yi' 0x575 'dotlessj.flatHook' alias 'armn/vo' 0x578 'n' diff --git a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl index 03d2839742..7247f91330 100644 --- a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl +++ b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl @@ -12,12 +12,38 @@ glyph-block Letter-Armenian-Lower-U-Group : begin glyph-block-import Letter-Shared-Shapes : SerifFrame glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar TwoNeck glyph-block-import Letter-Latin-U : USerifs + glyph-block-import Letter-Latin-Lower-M : SmallMArches # Common Params define barPos : XH / 2 define highBarPos XH define jut Jut + do "Turned Ayb" + create-glyph 'armn/aybTurned' 0x560 : glyph-proc + local df : include : DivFrame para.diversityM 3 + include : df.markSet.e + include : SmallMArches df XH 0 0 0 + if SLAB : begin + local sf : SerifFrame.fromDf df XH 0 + include : if para.isItalic + composite-proc sf.lt.outer sf.rb.outer + if sf.enoughSpaceForFullSerifs + composite-proc sf.lt.outer sf.lb.full sf.mb.full sf.rb.full + composite-proc sf.lt.outer sf.lb.outer sf.rb.outer + + do "Ayb" + create-glyph 'armn/ayb' 0x561 : glyph-proc + local df : include : DivFrame para.diversityM 3 + include : df.markSet.e + include : SmallMArches df XH 0 0 0 + include : FlipAround df.middle (XH / 2) + if SLAB : begin + local sf : SerifFrame.fromDf df XH 0 + include : if ([not para.isItalic] && sf.enoughSpaceForFullSerifs) + composite-proc sf.lt.outer sf.mt.left sf.rt.inner sf.rb.outer + composite-proc sf.lt.outer sf.rb.outer + do "Ben" create-glyph 'armn/ben' 0x562 : glyph-proc local df : include : DivFrame 1 @@ -209,8 +235,6 @@ glyph-block Letter-Armenian-Lower-U-Group : begin if [not para.isItalic] : include sf.rt.inner do "Peh" - glyph-block-import Letter-Latin-Lower-M : SmallMArches - create-glyph 'armn/peh' 0x57A : glyph-proc local df : include : DivFrame para.diversityM 3 include : df.markSet.p From 88ab7c7a53c80dfa71f3c1db5bb0e0789fbc1936 Mon Sep 17 00:00:00 2001 From: jmcwilliams403 Date: Tue, 29 Oct 2024 08:53:35 -0400 Subject: [PATCH 4/5] =?UTF-8?q?cleanup=20of=20`=D5=B0`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../font-glyphs/src/letter/armenian/aliases.ptl | 1 - .../src/letter/armenian/lower-u-group.ptl | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/font-glyphs/src/letter/armenian/aliases.ptl b/packages/font-glyphs/src/letter/armenian/aliases.ptl index 59dcea40ff..7d9408d00a 100644 --- a/packages/font-glyphs/src/letter/armenian/aliases.ptl +++ b/packages/font-glyphs/src/letter/armenian/aliases.ptl @@ -10,7 +10,6 @@ glyph-block Letter-Armenian-Aliases : begin alias 'armn/Tiun' 0x54F 'S.serifless' alias 'armn/Piur' 0x553 'grek/Phi' alias 'armn/Oh' 0x555 'O' - alias 'armn/ho' 0x570 'h' alias 'armn/yi' 0x575 'dotlessj.flatHook' alias 'armn/vo' 0x578 'n' alias 'armn/seh' 0x57D 'u' diff --git a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl index 7247f91330..900cbe24bd 100644 --- a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl +++ b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl @@ -181,6 +181,23 @@ glyph-block Letter-Armenian-Lower-U-Group : begin include sf2.rb.fullSide include : composite-proc sf2.rt.inner sf2.rb.fullSide + do "Ho" + create-glyph 'armn/ho' 0x570 : glyph-proc + local df : include : DivFrame 1 + include : df.markSet.b + include : VBar.l df.leftSB 0 Ascender df.mvs + include : nShoulder + left -- (df.leftSB + [HSwToV df.mvs]) + right -- df.rightSB + top -- XH + bottom -- 0 + stroke -- df.mvs + if SLAB : begin + local sf : SerifFrame.fromDf df Ascender 0 + include : if para.isItalic + composite-proc sf.lt.outer sf.rb.outer + composite-proc sf.lt.outer sf.lb.full sf.rb.full + do "Ghat" create-glyph 'armn/ghat' 0x572 : glyph-proc local df : include : DivFrame 1 From 04699c22b1e78a6d4dde6b4817c7e730a4a2d536 Mon Sep 17 00:00:00 2001 From: jmcwilliams403 Date: Tue, 29 Oct 2024 09:31:19 -0400 Subject: [PATCH 5/5] =?UTF-8?q?Cleanup=20of=20`=D5=BD`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/letter/armenian/aliases.ptl | 2 -- .../src/letter/armenian/lower-u-group.ptl | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/packages/font-glyphs/src/letter/armenian/aliases.ptl b/packages/font-glyphs/src/letter/armenian/aliases.ptl index 7d9408d00a..7c4036f556 100644 --- a/packages/font-glyphs/src/letter/armenian/aliases.ptl +++ b/packages/font-glyphs/src/letter/armenian/aliases.ptl @@ -11,8 +11,6 @@ glyph-block Letter-Armenian-Aliases : begin alias 'armn/Piur' 0x553 'grek/Phi' alias 'armn/Oh' 0x555 'O' alias 'armn/yi' 0x575 'dotlessj.flatHook' - alias 'armn/vo' 0x578 'n' - alias 'armn/seh' 0x57D 'u' alias 'armn/co' 0x581 'g.singleStorey' alias 'armn/oh' 0x585 'o' alias 'armn/yiBar' 0x588 'dotlessjBar.flatHook' diff --git a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl index 900cbe24bd..fa13f093da 100644 --- a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl +++ b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl @@ -251,6 +251,23 @@ glyph-block Letter-Armenian-Lower-U-Group : begin include sf.rb.outer if [not para.isItalic] : include sf.rt.inner + do "Vo" + create-glyph 'armn/vo' 0x578 : glyph-proc + local df : include : DivFrame 1 + include : df.markSet.e + include : VBar.l df.leftSB 0 XH df.mvs + include : nShoulder + left -- (df.leftSB + [HSwToV df.mvs]) + right -- df.rightSB + top -- XH + bottom -- 0 + stroke -- df.mvs + if SLAB : begin + local sf : SerifFrame.fromDf df XH 0 + include : if para.isItalic + composite-proc sf.lt.outer sf.rb.outer + composite-proc sf.lt.outer sf.lb.full sf.rb.full + do "Peh" create-glyph 'armn/peh' 0x57A : glyph-proc local df : include : DivFrame para.diversityM 3 @@ -300,6 +317,24 @@ glyph-block Letter-Armenian-Lower-U-Group : begin # if [not para.isItalic] : begin # include : composite-proc sf.lb.full + do "Seh" + create-glyph 'armn/seh' 0x57D : glyph-proc + local df : include : DivFrame 1 + include : df.markSet.e + include : nShoulder + top -- 0 + bottom -- (-XH) + left -- (df.leftSB + [HSwToV df.mvs]) + right -- df.rightSB + stroke -- df.mvs + include : FlipAround df.middle 0 + include : VBar.r df.rightSB 0 XH df.mvs + if SLAB : begin + local sf : SerifFrame.fromDf df XH 0 + include : if para.isItalic + composite-proc sf.lt.outer sf.rb.outer + composite-proc sf.lt.outer sf.rt.inner sf.rb.outer + do "Vew" create-glyph 'armn/vew' 0x57E : glyph-proc local df : include : DivFrame 1