From 9f9bb164ca79da15d8549f50835e1ca0e67b2e88 Mon Sep 17 00:00:00 2001 From: be5invis Date: Wed, 3 Feb 2021 00:01:45 -0800 Subject: [PATCH] Sync variants of lambda with y (#872). --- font-src/glyphs/letter/latin/lower-y.ptl | 37 ++++++++++++------------ params/variants.toml | 36 +++++++++++++++++++++-- 2 files changed, 51 insertions(+), 22 deletions(-) diff --git a/font-src/glyphs/letter/latin/lower-y.ptl b/font-src/glyphs/letter/latin/lower-y.ptl index d6498b809..8a0f189ba 100644 --- a/font-src/glyphs/letter/latin/lower-y.ptl +++ b/font-src/glyphs/letter/latin/lower-y.ptl @@ -339,26 +339,25 @@ glyph-block Letter-Latin-Lower-Y : begin turned 'turny' 0x28E 'y' Middle (XH / 2) [MarkSet.b] define [LambdaBarOverlayShape] : FlatSlashShape [mix SB RightSB 0.45] [mix 0 CAP 0.8] (OverlayStroke / 2) + define LambdaConfig : object + straight { true false SLAB-NONE } + straightTurn { true true SLAB-NONE } + curly { false false SLAB-NONE } + curlyTurn { false true SLAB-NONE } + straightMotionSerifed { true false SLAB-MOTION } + straightTurnMotionSerifed { true true SLAB-MOTION } + curlyMotionSerifed { false false SLAB-MOTION } + curlyTurnMotionSerifed { false true SLAB-MOTION } - create-glyph 'grek/lambda.straight' : glyph-proc - include : MarkSet.b - include : [GenSmallYShape true false SLAB-NONE].SmallLambdaShape CAP 0 - - create-glyph 'grek/lambda.curly' : glyph-proc - include : MarkSet.b - include : [GenSmallYShape false false SLAB-NONE].SmallLambdaShape CAP 0 - - create-glyph 'lambdaSlash.straight' : glyph-proc - include : MarkSet.b - include : union - refer-glyph 'grek/lambda.straight' - LambdaBarOverlayShape - - create-glyph 'lambdaSlash.curly' : glyph-proc - include : MarkSet.b - include : union - refer-glyph 'grek/lambda.curly' - LambdaBarOverlayShape + foreach { suffix { fStraight fTurn slabType } } [Object.entries LambdaConfig] : do + create-glyph "grek/lambda.\(suffix)" : glyph-proc + include : MarkSet.b + include : [GenSmallYShape fStraight fTurn slabType].SmallLambdaShape CAP 0 + create-glyph "lambdaSlash.\(suffix)" : glyph-proc + include : MarkSet.b + include : union + LambdaBarOverlayShape + [GenSmallYShape fStraight fTurn slabType].SmallLambdaShape CAP 0 select-variant 'grek/lambda' 0x3BB select-variant 'lambdaSlash' 0x19B (follow -- 'grek/lambda') diff --git a/params/variants.toml b/params/variants.toml index 094c1ec1b..c497d7a42 100644 --- a/params/variants.toml +++ b/params/variants.toml @@ -2628,11 +2628,41 @@ rank = 1 description = "More-straight Greek small Lambda (`λ`)" selector."grek/lambda" = "straight" -[prime.lambda.variants.curly] +[prime.lambda.variants.straight-turn] rank = 2 +description = "Greek small Lambda (`λ`) with straight upper and a tail turns leftward" +selector."grek/lambda" = "straightTurn" + +[prime.lambda.variants.curly] +rank = 3 description = "More curly Greek small Lambda (`λ`), like Iosevka 2.x" selector."grek/lambda" = "curly" +[prime.lambda.variants.curly-turn] +rank = 4 +description = "More curly Greek small Lambda (`λ`), like Iosevka 2.x, with a tail turns leftward" +selector."grek/lambda" = "curlyTurn" + +[prime.lambda.variants.straight-motion-serifed] +rank = 5 +description = "Greek small Lambda (`λ`) that is fully straight, with motion serifs" +selector."grek/lambda" = "straightMotionSerifed" + +[prime.lambda.variants.straight-turn-motion-serifed] +rank = 6 +description = "Greek small Lambda (`λ`) with straight upper and a tail turns leftward, and motion serifs" +selector."grek/lambda" = "straightTurnMotionSerifed" + +[prime.lambda.variants.curly-motion-serifed] +rank = 7 +description = "More curly Greek small Lambda (`λ`), like Iosevka 2.x, with motion serifs" +selector."grek/lambda" = "curlyMotionSerifed" + +[prime.lambda.variants.curly-turn-motion-serifed] +rank = 8 +description = "More curly Greek small Lambda (`λ`), like Iosevka 2.x, with a tail turns leftward and motion serifs" +selector."grek/lambda" = "curlyTurnMotionSerifed" + [prime.cyrl-capital-u] @@ -2652,12 +2682,12 @@ selector."cyrl/U" = "straightTurn" [prime.cyrl-capital-u.variants.curly] rank = 3 -description = "More curly cyrillic capital U (`У`), like Iosevka 2.x" +description = "More curly Cyrillic capital U (`У`), like Iosevka 2.x" selector."cyrl/U" = "curly" [prime.cyrl-capital-u.variants.curly-turn] rank = 4 -description = "More curly cyrillic capital U (`У`), like Iosevka 2.x, with a tail turns leftward" +description = "More curly Cyrillic capital U (`У`), like Iosevka 2.x, with a tail turns leftward" selector."cyrl/U" = "curlyTurn" [prime.cyrl-capital-u.variants.cursive]