Skip to content

Commit 648b623

Browse files
Further cleanup of be5invis#2571 .
1 parent 3f20b14 commit 648b623

File tree

4 files changed

+63
-63
lines changed

4 files changed

+63
-63
lines changed

packages/font-glyphs/src/letter/greek/lower-epsilon.ptl

+2-2
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,8 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
516516
include : Base df XH Slabs SHook SmallArchDepthA SmallArchDepthB
517517

518518

519-
select-variant 'AeVolapuk' 0xA79A (follow -- [conditional-follow SLAB 'a/single/autoSerifed/slab' 'a/single/autoSerifed/sans'])
520-
select-variant 'aeVolapuk' 0xA79B (follow -- [conditional-follow SLAB 'a/single/autoSerifed/slab' 'a/single/autoSerifed/sans'])
519+
select-variant 'AeVolapuk' 0xA79A (follow -- [conditional-follow SLAB 'a/singleStorey/autoSerifed/slab' 'a/singleStorey/autoSerifed/sans'])
520+
select-variant 'aeVolapuk' 0xA79B (follow -- [conditional-follow SLAB 'a/singleStorey/autoSerifed/slab' 'a/singleStorey/autoSerifed/sans'])
521521
select-variant 'UeVolapuk' 0xA79E (follow -- 'u')
522522
select-variant 'ueVolapuk' 0xA79F (follow -- 'u')
523523

packages/font-glyphs/src/letter/latin/lower-g.ptl

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ glyph-block Letter-Latin-Lower-G : begin
200200
select-variant 'GScript' 0xA7AC (follow -- 'gScript')
201201
select-variant 'gScriptPalatalHook' 0x1D83 (follow -- 'gScript')
202202

203-
select-variant 'cyrl/de.BGR' (shapeFrom -- 'g') (follow -- [conditional-follow SLAB 'g/single/autoSerifed/slab' 'g/single/autoSerifed/sans'])
203+
select-variant 'cyrl/de.BGR' (shapeFrom -- 'g') (follow -- [conditional-follow SLAB 'g/singleStorey/autoSerifed/slab' 'g/singleStorey/autoSerifed/sans'])
204204
alias 'cyrl/de.SRB' null 'cyrl/de.BGR'
205205

206206
select-variant 'g/hookTopBase' (shapeFrom -- 'g')

packages/font-glyphs/src/letter/latin/lower-j.ptl

+12-12
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,18 @@ glyph-block Letter-Latin-Lower-J : begin
9595
export : define FlatHookSerifed para.diversityI
9696

9797
define JConfig : object
98-
'bentHookSerifless' { "BentHook" Serifs.None XMiddle.BentHook Marks.Serifless Div.BentHook }
99-
'bentHookSerifed' { "BentHook" Serifs.Long XMiddle.BentHook Marks.Serifed Div.BentHook }
100-
'bentHookShortSerifed' { "BentHook" Serifs.Short XMiddle.BentHook Marks.Serifed Div.BentHook }
101-
'straightSerifless' { "Straight" Serifs.None XMiddle.StraightSerifless Marks.Serifless Div.StraightSerifless }
102-
'straightSerifed' { "Straight" Serifs.Long XMiddle.StraightSerifed Marks.Serifed Div.StraightSerifed }
103-
'straightShortSerifed' { "Straight" Serifs.Short XMiddle.StraightSerifed Marks.Serifed Div.StraightSerifed }
104-
'flatHookSerifless' { "FlatHook" Serifs.None XMiddle.FlatHookSerifless Marks.Serifless Div.FlatHookSerifless }
105-
'flatHookSerifed' { "FlatHook" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
106-
'flatHookShortSerifed' { "FlatHook" Serifs.Short XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
107-
'diagonalTailedSerifless' { "DiagonalTailed" Serifs.None XMiddle.FlatHookSerifless Marks.Serifless Div.FlatHookSerifless }
108-
'diagonalTailedSerifed' { "DiagonalTailed" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
109-
'diagonalTailedShortSerifed' { "DiagonalTailed" Serifs.Short XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
98+
'bentHookSerifless' { "BentHook" Serifs.None XMiddle.BentHook Marks.Serifless Div.BentHook }
99+
'bentHookSerifed' { "BentHook" Serifs.Long XMiddle.BentHook Marks.Serifed Div.BentHook }
100+
'bentHookShortSerifed' { "BentHook" Serifs.Short XMiddle.BentHook Marks.Serifed Div.BentHook }
101+
'straightSerifless' { "Straight" Serifs.None XMiddle.StraightSerifless Marks.Serifless Div.StraightSerifless }
102+
'straightSerifed' { "Straight" Serifs.Long XMiddle.StraightSerifed Marks.Serifed Div.StraightSerifed }
103+
'straightShortSerifed' { "Straight" Serifs.Short XMiddle.StraightSerifed Marks.Serifed Div.StraightSerifed }
104+
'flatHookSerifless' { "FlatHook" Serifs.None XMiddle.FlatHookSerifless Marks.Serifless Div.FlatHookSerifless }
105+
'flatHookSerifed' { "FlatHook" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
106+
'flatHookShortSerifed' { "FlatHook" Serifs.Short XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
107+
'diagonalTailedSerifless' { "DiagonalTailed" Serifs.None XMiddle.FlatHookSerifless Marks.Serifless Div.FlatHookSerifless }
108+
'diagonalTailedSerifed' { "DiagonalTailed" Serifs.Long XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
109+
'diagonalTailedShortSerifed' { "DiagonalTailed" Serifs.Short XMiddle.FlatHookSerifed Marks.Serifed Div.FlatHookSerifed }
110110

111111
foreach { suffix { shapeId Serif xMiddleT Marks div } } [Object.entries JConfig] : do
112112
local df : DivFrame div

params/variants.toml

+48-48
Original file line numberDiff line numberDiff line change
@@ -2137,8 +2137,8 @@ selectorAffix."ae/a" = "doubleStorey"
21372137
selectorAffix."a/sansSerif" = "doubleStorey"
21382138
selectorAffix."a/rtailBase" = "doubleStorey"
21392139
selectorAffix."a/turnABase" = "doubleStorey"
2140-
selectorAffix."a/single/autoSerifed/slab" = "singleStorey"
2141-
selectorAffix."a/single/autoSerifed/sans" = "singleStorey"
2140+
selectorAffix."a/singleStorey/autoSerifed/slab" = "singleStorey"
2141+
selectorAffix."a/singleStorey/autoSerifed/sans" = "singleStorey"
21422142
selectorAffix."scripta/autoSerifed/slab" = "singleStorey"
21432143
selectorAffix."scripta/autoSerifed/sans" = "singleStorey"
21442144

@@ -2151,8 +2151,8 @@ selectorAffix."ae/a" = "doubleStorey"
21512151
selectorAffix."a/sansSerif" = "singleStorey"
21522152
selectorAffix."a/rtailBase" = "singleStorey"
21532153
selectorAffix."a/turnABase" = "doubleStorey"
2154-
selectorAffix."a/single/autoSerifed/slab" = "singleStorey"
2155-
selectorAffix."a/single/autoSerifed/sans" = "singleStorey"
2154+
selectorAffix."a/singleStorey/autoSerifed/slab" = "singleStorey"
2155+
selectorAffix."a/singleStorey/autoSerifed/sans" = "singleStorey"
21562156
selectorAffix."scripta/autoSerifed/slab" = "singleStorey"
21572157
selectorAffix."scripta/autoSerifed/sans" = "singleStorey"
21582158

@@ -2168,8 +2168,8 @@ selectorAffix."ae/a" = ""
21682168
selectorAffix."a/sansSerif" = ""
21692169
selectorAffix."a/rtailBase" = ""
21702170
selectorAffix."a/turnABase" = ""
2171-
selectorAffix."a/single/autoSerifed/slab" = ""
2172-
selectorAffix."a/single/autoSerifed/sans" = ""
2171+
selectorAffix."a/singleStorey/autoSerifed/slab" = ""
2172+
selectorAffix."a/singleStorey/autoSerifed/sans" = ""
21732173
selectorAffix."scripta/autoSerifed/slab" = ""
21742174
selectorAffix."scripta/autoSerifed/sans" = ""
21752175

@@ -2182,8 +2182,8 @@ selectorAffix."ae/a" = "hookInwardSerifed"
21822182
selectorAffix."a/sansSerif" = ""
21832183
selectorAffix."a/rtailBase" = "hookInwardSerifed"
21842184
selectorAffix."a/turnABase" = "hookInwardSerifed"
2185-
selectorAffix."a/single/autoSerifed/slab" = ""
2186-
selectorAffix."a/single/autoSerifed/sans" = ""
2185+
selectorAffix."a/singleStorey/autoSerifed/slab" = ""
2186+
selectorAffix."a/singleStorey/autoSerifed/sans" = ""
21872187
selectorAffix."scripta/autoSerifed/slab" = ""
21882188
selectorAffix."scripta/autoSerifed/sans" = ""
21892189

@@ -2198,8 +2198,8 @@ selectorAffix."ae/a" = ""
21982198
selectorAffix."a/sansSerif" = ""
21992199
selectorAffix."a/rtailBase" = ""
22002200
selectorAffix."a/turnABase" = ""
2201-
selectorAffix."a/single/autoSerifed/slab" = ""
2202-
selectorAffix."a/single/autoSerifed/sans" = ""
2201+
selectorAffix."a/singleStorey/autoSerifed/slab" = ""
2202+
selectorAffix."a/singleStorey/autoSerifed/sans" = ""
22032203
selectorAffix."scripta/autoSerifed/slab" = ""
22042204
selectorAffix."scripta/autoSerifed/sans" = ""
22052205

@@ -2211,8 +2211,8 @@ selectorAffix."ae/a" = ""
22112211
selectorAffix."a/sansSerif" = "earlessCorner"
22122212
selectorAffix."a/rtailBase" = "earlessCorner"
22132213
selectorAffix."a/turnABase" = ""
2214-
selectorAffix."a/single/autoSerifed/slab" = "earlessCorner"
2215-
selectorAffix."a/single/autoSerifed/sans" = "earlessCorner"
2214+
selectorAffix."a/singleStorey/autoSerifed/slab" = "earlessCorner"
2215+
selectorAffix."a/singleStorey/autoSerifed/sans" = "earlessCorner"
22162216
selectorAffix."scripta/autoSerifed/slab" = ""
22172217
selectorAffix."scripta/autoSerifed/sans" = ""
22182218

@@ -2224,8 +2224,8 @@ selectorAffix."ae/a" = ""
22242224
selectorAffix."a/sansSerif" = "earlessRounded"
22252225
selectorAffix."a/rtailBase" = "earlessRounded"
22262226
selectorAffix."a/turnABase" = ""
2227-
selectorAffix."a/single/autoSerifed/slab" = "earlessRounded"
2228-
selectorAffix."a/single/autoSerifed/sans" = "earlessRounded"
2227+
selectorAffix."a/singleStorey/autoSerifed/slab" = "earlessRounded"
2228+
selectorAffix."a/singleStorey/autoSerifed/sans" = "earlessRounded"
22292229
selectorAffix."scripta/autoSerifed/slab" = ""
22302230
selectorAffix."scripta/autoSerifed/sans" = ""
22312231

@@ -2238,8 +2238,8 @@ selectorAffix."ae/a" = "serifless"
22382238
selectorAffix."a/sansSerif" = "serifless"
22392239
selectorAffix."a/rtailBase" = "serifless"
22402240
selectorAffix."a/turnABase" = "serifless"
2241-
selectorAffix."a/single/autoSerifed/slab" = "serifless"
2242-
selectorAffix."a/single/autoSerifed/sans" = "serifless"
2241+
selectorAffix."a/singleStorey/autoSerifed/slab" = "serifless"
2242+
selectorAffix."a/singleStorey/autoSerifed/sans" = "serifless"
22432243
selectorAffix."scripta/autoSerifed/slab" = "serifless"
22442244
selectorAffix."scripta/autoSerifed/sans" = "serifless"
22452245

@@ -2251,8 +2251,8 @@ selectorAffix."ae/a" = "serifless"
22512251
selectorAffix."a/sansSerif" = "serifless"
22522252
selectorAffix."a/rtailBase" = "serifless"
22532253
selectorAffix."a/turnABase" = "serifed"
2254-
selectorAffix."a/single/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "doubleSerifed", else = "serifed" }
2255-
selectorAffix."a/single/autoSerifed/sans" = "serifed"
2254+
selectorAffix."a/singleStorey/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "doubleSerifed", else = "serifed" }
2255+
selectorAffix."a/singleStorey/autoSerifed/sans" = "serifed"
22562256
selectorAffix."scripta/autoSerifed/slab" = "serifed"
22572257
selectorAffix."scripta/autoSerifed/sans" = "serifed"
22582258

@@ -2265,8 +2265,8 @@ selectorAffix."ae/a" = "serifless"
22652265
selectorAffix."a/sansSerif" = "serifless"
22662266
selectorAffix."a/rtailBase" = "topSerifed"
22672267
selectorAffix."a/turnABase" = "serifed"
2268-
selectorAffix."a/single/autoSerifed/slab" = "doubleSerifed"
2269-
selectorAffix."a/single/autoSerifed/sans" = "doubleSerifed"
2268+
selectorAffix."a/singleStorey/autoSerifed/slab" = "doubleSerifed"
2269+
selectorAffix."a/singleStorey/autoSerifed/sans" = "doubleSerifed"
22702270
selectorAffix."scripta/autoSerifed/slab" = "serifed"
22712271
selectorAffix."scripta/autoSerifed/sans" = "serifed"
22722272

@@ -2278,8 +2278,8 @@ selectorAffix."ae/a" = "serifless"
22782278
selectorAffix."a/sansSerif" = "tailed"
22792279
selectorAffix."a/rtailBase" = "serifless"
22802280
selectorAffix."a/turnABase" = "tailed"
2281-
selectorAffix."a/single/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "tailedSerifed", else = "tailed" }
2282-
selectorAffix."a/single/autoSerifed/sans" = "tailed"
2281+
selectorAffix."a/singleStorey/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "tailedSerifed", else = "tailed" }
2282+
selectorAffix."a/singleStorey/autoSerifed/sans" = "tailed"
22832283
selectorAffix."scripta/autoSerifed/slab" = "tailed"
22842284
selectorAffix."scripta/autoSerifed/sans" = "tailed"
22852285

@@ -2292,8 +2292,8 @@ selectorAffix."ae/a" = "serifless"
22922292
selectorAffix."a/sansSerif" = "tailed"
22932293
selectorAffix."a/rtailBase" = "topSerifed"
22942294
selectorAffix."a/turnABase" = "tailed"
2295-
selectorAffix."a/single/autoSerifed/slab" = "tailedSerifed"
2296-
selectorAffix."a/single/autoSerifed/sans" = "tailedSerifed"
2295+
selectorAffix."a/singleStorey/autoSerifed/slab" = "tailedSerifed"
2296+
selectorAffix."a/singleStorey/autoSerifed/sans" = "tailedSerifed"
22972297
selectorAffix."scripta/autoSerifed/slab" = "tailed"
22982298
selectorAffix."scripta/autoSerifed/sans" = "tailed"
22992299

@@ -2306,8 +2306,8 @@ selectorAffix."ae/a" = "serifless"
23062306
selectorAffix."a/sansSerif" = "toothlessCorner"
23072307
selectorAffix."a/rtailBase" = "serifless"
23082308
selectorAffix."a/turnABase" = "toothlessCorner"
2309-
selectorAffix."a/single/autoSerifed/slab" = "doubleSerifed"
2310-
selectorAffix."a/single/autoSerifed/sans" = "serifless"
2309+
selectorAffix."a/singleStorey/autoSerifed/slab" = "doubleSerifed"
2310+
selectorAffix."a/singleStorey/autoSerifed/sans" = "serifless"
23112311
selectorAffix."scripta/autoSerifed/slab" = "serifed"
23122312
selectorAffix."scripta/autoSerifed/sans" = "serifless"
23132313

@@ -2320,8 +2320,8 @@ selectorAffix."ae/a" = "serifless"
23202320
selectorAffix."a/sansSerif" = "toothlessRounded"
23212321
selectorAffix."a/rtailBase" = "serifless"
23222322
selectorAffix."a/turnABase" = "toothlessRounded"
2323-
selectorAffix."a/single/autoSerifed/slab" = "doubleSerifed"
2324-
selectorAffix."a/single/autoSerifed/sans" = "serifless"
2323+
selectorAffix."a/singleStorey/autoSerifed/slab" = "doubleSerifed"
2324+
selectorAffix."a/singleStorey/autoSerifed/sans" = "serifless"
23252325
selectorAffix."scripta/autoSerifed/slab" = "serifed"
23262326
selectorAffix."scripta/autoSerifed/sans" = "serifless"
23272327

@@ -2767,8 +2767,8 @@ selectorAffix.g = "doubleStorey"
27672767
selectorAffix."g/sansSerif" = "doubleStorey"
27682768
selectorAffix."g/hookTopBase" = "singleStoreySerifless"
27692769
selectorAffix."gScript" = "singleStoreyScriptCut"
2770-
selectorAffix."g/single/autoSerifed/slab" = "singleStoreySerifed"
2771-
selectorAffix."g/single/autoSerifed/sans" = "singleStoreySerifless"
2770+
selectorAffix."g/singleStorey/autoSerifed/slab" = "singleStoreySerifed"
2771+
selectorAffix."g/singleStorey/autoSerifed/sans" = "singleStoreySerifless"
27722772

27732773
[prime.g.variants-buildup.stages.openness."*"]
27742774
next = "END"
@@ -2780,8 +2780,8 @@ selectorAffix.g = ""
27802780
selectorAffix."g/sansSerif" = ""
27812781
selectorAffix."g/hookTopBase" = ""
27822782
selectorAffix."gScript" = ""
2783-
selectorAffix."g/single/autoSerifed/slab" = ""
2784-
selectorAffix."g/single/autoSerifed/sans" = ""
2783+
selectorAffix."g/singleStorey/autoSerifed/slab" = ""
2784+
selectorAffix."g/singleStorey/autoSerifed/sans" = ""
27852785

27862786
[prime.g.variants-buildup.stages.openness.open]
27872787
rank = 1
@@ -2790,8 +2790,8 @@ selectorAffix.g = "open"
27902790
selectorAffix."g/sansSerif" = "open"
27912791
selectorAffix."g/hookTopBase" = ""
27922792
selectorAffix."gScript" = ""
2793-
selectorAffix."g/single/autoSerifed/slab" = ""
2794-
selectorAffix."g/single/autoSerifed/sans" = ""
2793+
selectorAffix."g/singleStorey/autoSerifed/slab" = ""
2794+
selectorAffix."g/singleStorey/autoSerifed/sans" = ""
27952795

27962796
[prime.g.variants-buildup.stages.storey.single-storey]
27972797
next = "hook"
@@ -2801,8 +2801,8 @@ selectorAffix.g = "singleStorey"
28012801
selectorAffix."g/sansSerif" = "singleStorey"
28022802
selectorAffix."g/hookTopBase" = "singleStorey"
28032803
selectorAffix."gScript" = "singleStorey"
2804-
selectorAffix."g/single/autoSerifed/slab" = "singleStorey"
2805-
selectorAffix."g/single/autoSerifed/sans" = "singleStorey"
2804+
selectorAffix."g/singleStorey/autoSerifed/slab" = "singleStorey"
2805+
selectorAffix."g/singleStorey/autoSerifed/sans" = "singleStorey"
28062806

28072807
[prime.g.variants-buildup.stages.hook."*"]
28082808
next = "ear"
@@ -2814,8 +2814,8 @@ selectorAffix.g = ""
28142814
selectorAffix."g/sansSerif" = ""
28152815
selectorAffix."g/hookTopBase" = ""
28162816
selectorAffix."gScript" = ""
2817-
selectorAffix."g/single/autoSerifed/slab" = ""
2818-
selectorAffix."g/single/autoSerifed/sans" = ""
2817+
selectorAffix."g/singleStorey/autoSerifed/slab" = ""
2818+
selectorAffix."g/singleStorey/autoSerifed/sans" = ""
28192819

28202820
[prime.g.variants-buildup.stages.hook.flat-hook]
28212821
rank = 2
@@ -2824,17 +2824,17 @@ selectorAffix.g = "flatHook"
28242824
selectorAffix."g/sansSerif" = "flatHook"
28252825
selectorAffix."g/hookTopBase" = "flatHook"
28262826
selectorAffix."gScript" = "flatHook"
2827-
selectorAffix."g/single/autoSerifed/slab" = "flatHook"
2828-
selectorAffix."g/single/autoSerifed/sans" = "flatHook"
2827+
selectorAffix."g/singleStorey/autoSerifed/slab" = "flatHook"
2828+
selectorAffix."g/singleStorey/autoSerifed/sans" = "flatHook"
28292829

28302830
[prime.g.variants-buildup.stages.ear.serifless]
28312831
rank = 1
28322832
selectorAffix.g = "serifless"
28332833
selectorAffix."g/sansSerif" = "serifless"
28342834
selectorAffix."g/hookTopBase" = "serifless"
28352835
selectorAffix."gScript" = "scriptCut"
2836-
selectorAffix."g/single/autoSerifed/slab" = "serifless"
2837-
selectorAffix."g/single/autoSerifed/sans" = "serifless"
2836+
selectorAffix."g/singleStorey/autoSerifed/slab" = "serifless"
2837+
selectorAffix."g/singleStorey/autoSerifed/sans" = "serifless"
28382838

28392839
[prime.g.variants-buildup.stages.ear.serifed]
28402840
rank = 2
@@ -2843,8 +2843,8 @@ selectorAffix.g = "serifed"
28432843
selectorAffix."g/sansSerif" = "serifless"
28442844
selectorAffix."g/hookTopBase" = "serifless"
28452845
selectorAffix."gScript" = "scriptCut"
2846-
selectorAffix."g/single/autoSerifed/slab" = "serifed"
2847-
selectorAffix."g/single/autoSerifed/sans" = "serifed"
2846+
selectorAffix."g/singleStorey/autoSerifed/slab" = "serifed"
2847+
selectorAffix."g/singleStorey/autoSerifed/sans" = "serifed"
28482848

28492849
[prime.g.variants-buildup.stages.ear.earless-corner]
28502850
rank = 3
@@ -2853,8 +2853,8 @@ selectorAffix.g = "earlessCorner"
28532853
selectorAffix."g/sansSerif" = "earlessCorner"
28542854
selectorAffix."g/hookTopBase" = "earlessCornerHTB"
28552855
selectorAffix."gScript" = "scriptCut"
2856-
selectorAffix."g/single/autoSerifed/slab" = "earlessCorner"
2857-
selectorAffix."g/single/autoSerifed/sans" = "earlessCorner"
2856+
selectorAffix."g/singleStorey/autoSerifed/slab" = "earlessCorner"
2857+
selectorAffix."g/singleStorey/autoSerifed/sans" = "earlessCorner"
28582858

28592859
[prime.g.variants-buildup.stages.ear.earless-rounded]
28602860
rank = 4
@@ -2863,8 +2863,8 @@ selectorAffix.g = "earlessRounded"
28632863
selectorAffix."g/sansSerif" = "earlessRounded"
28642864
selectorAffix."g/hookTopBase" = "serifless"
28652865
selectorAffix."gScript" = "scriptCut"
2866-
selectorAffix."g/single/autoSerifed/slab" = "earlessRounded"
2867-
selectorAffix."g/single/autoSerifed/sans" = "earlessRounded"
2866+
selectorAffix."g/singleStorey/autoSerifed/slab" = "earlessRounded"
2867+
selectorAffix."g/singleStorey/autoSerifed/sans" = "earlessRounded"
28682868

28692869

28702870

0 commit comments

Comments
 (0)