From 2c7dacf7e4c7fddf5b5cce20b2f798e75a014ea9 Mon Sep 17 00:00:00 2001 From: John McWilliams <37010132+jmcwilliams403@users.noreply.github.com> Date: Wed, 15 May 2024 14:43:55 -0400 Subject: [PATCH] Cleanup of #2331 . (#2332) Also reduce unused variants surrounding `m`. --- .../src/letter/latin-ext/lower-ae-oe.ptl | 2 +- .../src/letter/latin-ext/upper-aa-ao.ptl | 2 +- .../font-glyphs/src/letter/latin/lower-m.ptl | 61 +++++------ params/variants.toml | 100 +++++++++--------- 4 files changed, 83 insertions(+), 82 deletions(-) diff --git a/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl index e1dbb349d..a5471426f 100644 --- a/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/lower-ae-oe.ptl @@ -402,7 +402,7 @@ glyph-block Letter-Latin-Lower-AE-OE : begin select-variant "ae/e" (follow -- 'e') select-variant "aeInvE/right" (follow -- 'e') select-variant "ue/u" - select-variant "au/u" (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'au/u' 'au/u/reduced']) + select-variant "au/u" (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'au/u/full' 'au/u/reduced']) select-variant "oeOpenO/left" (follow -- 'c') select-variant "cyrl/yae/left" select-variant "cyrl/rha/left" (follow -- 'cyrl/er') diff --git a/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl index dba6f65c6..e38008410 100644 --- a/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/upper-aa-ao.ptl @@ -117,7 +117,7 @@ glyph-block Letter-Latin-Upper-AA-AO : begin include : with-transform [ApparentTranslate shift 0] union [Base subDf CAP df.mvs] [Slabs subDf CAP] - select-variant "AU/Right" (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'AU/Right' 'AU/Right/reduced']) + select-variant "AU/Right" (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'AU/Right/full' 'AU/Right/reduced']) do "AU" select-variant 'AA/AU/Left' (follow -- 'A') diff --git a/packages/font-glyphs/src/letter/latin/lower-m.ptl b/packages/font-glyphs/src/letter/latin/lower-m.ptl index 922ea8ebf..c7953fe74 100644 --- a/packages/font-glyphs/src/letter/latin/lower-m.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-m.ptl @@ -254,33 +254,34 @@ glyph-block Letter-Latin-Lower-M : begin include : df.markSet.e include : mShapeBody df XH - create-glyph "meng.\(suffix)" : glyph-proc - local df : include : dfM - include : df.markSet.p - include : mShapeBody df XH - eject-contour 'serifRB' - include : EngHook df.rightSB 0 Descender (sw -- df.mvs) + if (!tailed) : begin + create-glyph "meng.\(suffix)" : glyph-proc + local df : include : dfM + include : df.markSet.p + include : mShapeBody df XH + eject-contour 'serifRB' + include : EngHook df.rightSB 0 Descender (sw -- df.mvs) - create-glyph "mCrossedTail.\(suffix)" : glyph-proc - local df : include : DivFrame para.diversityM 4 - include : df.markSet.e + create-glyph "mCrossedTail.\(suffix)" : glyph-proc + local df : include : DivFrame para.diversityM 4 + include : df.markSet.e - local fine : AdviceStroke 4.5 df.div - local rinner : XH * 0.15 - fine * 0.75 - local gap : (df.rightSB - df.leftSB - 3 * [HSwToV df.mvs] - [HSwToV fine]) / 3 - local m1 : df.rightSB - [HSwToV df.mvs] - local m2 : df.leftSB + 2 * ([HSwToV df.mvs] + gap) - local x2 : df.rightSB + SideJut - local y2 : rinner * 2 + fine - O - include : Body df XH 0 [if shortLeg [SmallMShortLegHeight XH df] 0] (y2 + O) - include : dispiro - straight.down.start df.rightSB (y2 + O) [widths.rhs.heading df.mvs Downward] - CurlyTail fine rinner m1 0 m2 x2 y2 (adj -- 0.2) + local fine : AdviceStroke 4.5 df.div + local rinner : XH * 0.15 - fine * 0.75 + local gap : (df.rightSB - df.leftSB - 3 * [HSwToV df.mvs] - [HSwToV fine]) / 3 + local m1 : df.rightSB - [HSwToV df.mvs] + local m2 : df.leftSB + 2 * ([HSwToV df.mvs] + gap) + local x2 : df.rightSB + SideJut + local y2 : rinner * 2 + fine - O + include : Body df XH 0 [if shortLeg [SmallMShortLegHeight XH df] 0] (y2 + O) + include : dispiro + straight.down.start df.rightSB (y2 + O) [widths.rhs.heading df.mvs Downward] + CurlyTail fine rinner m1 0 m2 x2 y2 (adj -- 0.2) - include : Serifs df XH 0 [if shortLeg [SmallMShortLegHeight XH df] 0] 0 true earless + include : Serifs df XH 0 [if shortLeg [SmallMShortLegHeight XH df] 0] 0 true earless - if (Body === SmallMArches && shortLeg == 0) : begin - if (tailed == 0) : begin + if (Body === SmallMArches && !shortLeg) : begin + if (!tailed) : begin create-glyph "cyrl/tjeKomi.italic.\(suffix)" : glyph-proc local df : include : DivFrame para.diversityM 4 include : df.markSet.e @@ -396,7 +397,7 @@ glyph-block Letter-Latin-Lower-M : begin include : turnMShapeBody df (Width - SB) include : Translate 0 (SB / 2) - if (!tailed) : begin + if (Body === SmallMArches && !tailed) : begin create-glyph "cyrl/shcha.italic.\(suffix)" : glyph-proc local df : include : DivFrame para.diversityM 3 include : df.markSet.e @@ -404,22 +405,22 @@ glyph-block Letter-Latin-Lower-M : begin eject-contour 'serifLT' include : CyrDescender.rSideJut df.rightSB 0 (refSw -- df.mvs) - select-variant 'turnm' 0x26F (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnm' 'turnm/reduced']) + select-variant 'turnm' 0x26F (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnm/full' 'turnm/reduced']) select-variant 'turnm/reduced' (shapeFrom -- 'turnm') - select-variant 'capitalTurnm' 0x19C (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnm' 'turnm/reduced']) + select-variant 'capitalTurnm' 0x19C (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnm/full' 'turnm/reduced']) - select-variant 'turnmLeg' 0x270 (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnmLeg' 'turnmLeg/reduced']) + select-variant 'turnmLeg' 0x270 (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnmLeg/full' 'turnmLeg/reduced']) select-variant 'turnmLeg/reduced' (shapeFrom -- 'turnmLeg') - select-variant 'turnmSideways' 0x1D1F (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnm' 'turnm/reduced']) + select-variant 'turnmSideways' 0x1D1F (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'turnm/full' 'turnm/reduced']) - select-variant 'cyrl/sha.italic' (shapeFrom -- 'turnm') (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'cyrl/sha.italic' 'cyrl/sha/reduced.italic']) + select-variant 'cyrl/sha.italic' (shapeFrom -- 'turnm') (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'cyrl/sha/full.italic' 'cyrl/sha/reduced.italic']) alias 'cyrl/sha.BGR' null 'cyrl/sha.italic' select-variant 'cyrl/sha/reduced.italic' (shapeFrom -- 'turnm') alias 'cyrl/sha/reduced.BGR' null 'cyrl/sha/reduced.italic' - select-variant 'cyrl/shcha.italic' (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'cyrl/shcha.italic' 'cyrl/shcha/reduced.italic']) + select-variant 'cyrl/shcha.italic' (follow -- [if [MEnoughSpaceForFullSerifs : dfM] 'cyrl/shcha/full.italic' 'cyrl/shcha/reduced.italic']) alias 'cyrl/shcha.BGR' null 'cyrl/shcha.italic' select-variant 'cyrl/shcha/reduced.italic' (shapeFrom -- 'cyrl/shcha.italic') alias 'cyrl/shcha/reduced.BGR' null 'cyrl/shcha/reduced.italic' diff --git a/params/variants.toml b/params/variants.toml index c5d476564..ec50b3e5e 100644 --- a/params/variants.toml +++ b/params/variants.toml @@ -1083,7 +1083,7 @@ rank = 1 descriptionAffix = "toothed shape" selectorAffix.U = "toothed" selectorAffix."U/sansSerif" = "toothed" -selectorAffix."AU/Right" = "toothed" +selectorAffix."AU/Right/full" = "toothed" selectorAffix."AU/Right/reduced" = "toothed" [prime.capital-u.variants-buildup.stages.body.tailed] @@ -1091,7 +1091,7 @@ rank = 2 descriptionAffix = "tailed shape" selectorAffix.U = "tailed" selectorAffix."U/sansSerif" = "tailed" -selectorAffix."AU/Right" = "tailed" +selectorAffix."AU/Right/full" = "tailed" selectorAffix."AU/Right/reduced" = "tailed" [prime.capital-u.variants-buildup.stages.body.toothless-corner] @@ -1099,7 +1099,7 @@ rank = 3 descriptionAffix = "toothless (corner bottom-right) shape" selectorAffix.U = "toothlessCorner" selectorAffix."U/sansSerif" = "toothlessCorner" -selectorAffix."AU/Right" = "toothlessCorner" +selectorAffix."AU/Right/full" = "toothlessCorner" selectorAffix."AU/Right/reduced" = "toothlessCorner" [prime.capital-u.variants-buildup.stages.body.toothless-rounded] @@ -1107,7 +1107,7 @@ rank = 4 descriptionAffix = "toothless (rounded) shape" selectorAffix.U = "toothlessRounded" selectorAffix."U/sansSerif" = "toothlessRounded" -selectorAffix."AU/Right" = "toothlessRounded" +selectorAffix."AU/Right/full" = "toothlessRounded" selectorAffix."AU/Right/reduced" = "toothlessRounded" [prime.capital-u.variants-buildup.stages.serifs.serifless] @@ -1116,7 +1116,7 @@ descriptionAffix = "serifs" descriptionJoiner = "without" selectorAffix.U = "serifless" selectorAffix."U/sansSerif" = "serifless" -selectorAffix."AU/Right" = "serifless" +selectorAffix."AU/Right/full" = "serifless" selectorAffix."AU/Right/reduced" = "serifless" [prime.capital-u.variants-buildup.stages.serifs.bottom-right-serifed] @@ -1125,7 +1125,7 @@ disableIf = [{ body = "NOT toothed" }] descriptionAffix = "serif at bottom-right" selectorAffix.U = "bottomRightSerifed" selectorAffix."U/sansSerif" = "serifless" -selectorAffix."AU/Right" = "bottomRightSerifed" +selectorAffix."AU/Right/full" = "bottomRightSerifed" selectorAffix."AU/Right/reduced" = "bottomRightSerifed" [prime.capital-u.variants-buildup.stages.serifs.motion-serifed] @@ -1134,7 +1134,7 @@ disableIf = [{ body = "toothless-corner" }, { body = "toothless-rounded" }] descriptionAffix = "motion serifs at top-left and bottom-right" selectorAffix.U = "unilateralMotionSerifed" selectorAffix."U/sansSerif" = "serifless" -selectorAffix."AU/Right" = { if = [{ body = "toothed" }], then = "bottomRightSerifed", else = "serifless" } +selectorAffix."AU/Right/full" = { if = [{ body = "toothed" }], then = "bottomRightSerifed", else = "serifless" } selectorAffix."AU/Right/reduced" = { if = [{ body = "toothed" }], then = "bottomRightSerifed", else = "serifless" } [prime.capital-u.variants-buildup.stages.serifs.unilateral-motion-serifed] @@ -1143,7 +1143,7 @@ disableIf = [{ body = "toothed" }, { body = "tailed" }] descriptionAffix = "motion serifs at left side" selectorAffix.U = "unilateralMotionSerifed" selectorAffix."U/sansSerif" = "serifless" -selectorAffix."AU/Right" = "serifless" +selectorAffix."AU/Right/full" = "serifless" selectorAffix."AU/Right/reduced" = "serifless" [prime.capital-u.variants-buildup.stages.serifs.bilateral-motion-serifed] @@ -1152,7 +1152,7 @@ disableIf = [{ body = "toothed" }, { body = "tailed" }] descriptionAffix = "motion serifs at both sides" selectorAffix.U = "bilateralMotionSerifed" selectorAffix."U/sansSerif" = "serifless" -selectorAffix."AU/Right" = "bilateralMotionSerifed" +selectorAffix."AU/Right/full" = "bilateralMotionSerifed" selectorAffix."AU/Right/reduced" = "bilateralMotionSerifed" [prime.capital-u.variants-buildup.stages.serifs.serifed] @@ -1160,7 +1160,7 @@ rank = 6 descriptionAffix = "serifs" selectorAffix.U = "serifed" selectorAffix."U/sansSerif" = "serifless" -selectorAffix."AU/Right" = "serifed" +selectorAffix."AU/Right/full" = "serifed" selectorAffix."AU/Right/reduced" = { if = [{ body = "toothed" }], then = "bottomRightSerifed", else = { if = [{ body = "tailed" }], then = "serifless", else = "bilateralMotionSerifed" } } @@ -3744,21 +3744,21 @@ selectorAffix.uHookLeft = "toothed" selectorAffix.turnh = "toothed" selectorAffix.turnhHookLeft = "toothed" selectorAffix.turnhHookLeftRTail = "toothed" -selectorAffix.turnm = "toothed" +selectorAffix."turnm/full" = "toothed" selectorAffix."turnm/reduced" = "toothed" -selectorAffix.turnmLeg = "toothed" +selectorAffix."turnmLeg/full" = "toothed" selectorAffix."turnmLeg/reduced" = "toothed" selectorAffix."cyrl/i.italic" = "toothed" selectorAffix."cyrl/i.italic/descBase" = "toothed" -selectorAffix."cyrl/sha.italic" = "toothed" +selectorAffix."cyrl/sha/full.italic" = "toothed" selectorAffix."cyrl/sha/reduced.italic" = "toothed" -selectorAffix."cyrl/shcha.italic" = "toothed" +selectorAffix."cyrl/shcha/full.italic" = "toothed" selectorAffix."cyrl/shcha/reduced.italic" = "toothed" selectorAffix."cyrl/dzhe.italic" = "toothed" selectorAffix."cyrl/tse.italic" = "toothed" selectorAffix."cyrl/tseRev.italic" = "toothed" selectorAffix."ue/u" = "toothed" -selectorAffix."au/u" = "toothed" +selectorAffix."au/u/full" = "toothed" selectorAffix."au/u/reduced" = "toothed" [prime.u.variants-buildup.stages.body.tailed] @@ -3771,21 +3771,21 @@ selectorAffix.uHookLeft = "tailed" selectorAffix.turnh = "toothed" selectorAffix.turnhHookLeft = "toothed" selectorAffix.turnhHookLeftRTail = "toothed" -selectorAffix.turnm = "tailed" +selectorAffix."turnm/full" = "tailed" selectorAffix."turnm/reduced" = "tailed" -selectorAffix.turnmLeg = "toothed" +selectorAffix."turnmLeg/full" = "toothed" selectorAffix."turnmLeg/reduced" = "toothed" selectorAffix."cyrl/i.italic" = "tailed" selectorAffix."cyrl/i.italic/descBase" = "toothed" -selectorAffix."cyrl/sha.italic" = "tailed" +selectorAffix."cyrl/sha/full.italic" = "tailed" selectorAffix."cyrl/sha/reduced.italic" = "tailed" -selectorAffix."cyrl/shcha.italic" = "toothed" +selectorAffix."cyrl/shcha/full.italic" = "toothed" selectorAffix."cyrl/shcha/reduced.italic" = "toothed" selectorAffix."cyrl/dzhe.italic" = "tailed" selectorAffix."cyrl/tse.italic" = "toothed" selectorAffix."cyrl/tseRev.italic" = "tailed" selectorAffix."ue/u" = "toothed" -selectorAffix."au/u" = "tailed" +selectorAffix."au/u/full" = "tailed" selectorAffix."au/u/reduced" = "tailed" [prime.u.variants-buildup.stages.body.toothless-corner] @@ -3798,21 +3798,21 @@ selectorAffix.uHookLeft = "toothlessCorner" selectorAffix.turnh = "toothlessCorner" selectorAffix.turnhHookLeft = "toothlessCorner" selectorAffix.turnhHookLeftRTail = "toothlessCorner" -selectorAffix.turnm = "toothlessCorner" +selectorAffix."turnm/full" = "toothlessCorner" selectorAffix."turnm/reduced" = "toothlessCorner" -selectorAffix.turnmLeg = "toothlessCorner" +selectorAffix."turnmLeg/full" = "toothlessCorner" selectorAffix."turnmLeg/reduced" = "toothlessCorner" selectorAffix."cyrl/i.italic" = "toothed" selectorAffix."cyrl/i.italic/descBase" = "toothed" -selectorAffix."cyrl/sha.italic" = "toothed" +selectorAffix."cyrl/sha/full.italic" = "toothed" selectorAffix."cyrl/sha/reduced.italic" = "toothed" -selectorAffix."cyrl/shcha.italic" = "toothed" +selectorAffix."cyrl/shcha/full.italic" = "toothed" selectorAffix."cyrl/shcha/reduced.italic" = "toothed" selectorAffix."cyrl/dzhe.italic" = "toothed" selectorAffix."cyrl/tse.italic" = "toothed" selectorAffix."cyrl/tseRev.italic" = "toothed" selectorAffix."ue/u" = "toothed" -selectorAffix."au/u" = "toothlessCorner" +selectorAffix."au/u/full" = "toothlessCorner" selectorAffix."au/u/reduced" = "toothlessCorner" [prime.u.variants-buildup.stages.body.toothless-rounded] @@ -3825,21 +3825,21 @@ selectorAffix.uHookLeft = "toothlessRounded" selectorAffix.turnh = "toothed" selectorAffix.turnhHookLeft = "toothed" selectorAffix.turnhHookLeftRTail = "toothed" -selectorAffix.turnm = "toothlessRounded" +selectorAffix."turnm/full" = "toothlessRounded" selectorAffix."turnm/reduced" = "toothlessRounded" -selectorAffix.turnmLeg = "toothed" +selectorAffix."turnmLeg/full" = "toothed" selectorAffix."turnmLeg/reduced" = "toothed" selectorAffix."cyrl/i.italic" = "toothed" selectorAffix."cyrl/i.italic/descBase" = "toothed" -selectorAffix."cyrl/sha.italic" = "toothed" +selectorAffix."cyrl/sha/full.italic" = "toothed" selectorAffix."cyrl/sha/reduced.italic" = "toothed" -selectorAffix."cyrl/shcha.italic" = "toothed" +selectorAffix."cyrl/shcha/full.italic" = "toothed" selectorAffix."cyrl/shcha/reduced.italic" = "toothed" selectorAffix."cyrl/dzhe.italic" = "toothed" selectorAffix."cyrl/tse.italic" = "toothed" selectorAffix."cyrl/tseRev.italic" = "toothed" selectorAffix."ue/u" = "toothed" -selectorAffix."au/u" = "toothlessRounded" +selectorAffix."au/u/full" = "toothlessRounded" selectorAffix."au/u/reduced" = "toothlessRounded" [prime.u.variants-buildup.stages.serifs.serifless] @@ -3853,21 +3853,21 @@ selectorAffix.uHookLeft = "serifless" selectorAffix.turnh = "serifless" selectorAffix.turnhHookLeft = "serifless" selectorAffix.turnhHookLeftRTail = "serifless" -selectorAffix.turnm = "serifless" +selectorAffix."turnm/full" = "serifless" selectorAffix."turnm/reduced" = "serifless" -selectorAffix.turnmLeg = "serifless" +selectorAffix."turnmLeg/full" = "serifless" selectorAffix."turnmLeg/reduced" = "serifless" selectorAffix."cyrl/i.italic" = "serifless" selectorAffix."cyrl/i.italic/descBase" = "serifless" -selectorAffix."cyrl/sha.italic" = "serifless" +selectorAffix."cyrl/sha/full.italic" = "serifless" selectorAffix."cyrl/sha/reduced.italic" = "serifless" -selectorAffix."cyrl/shcha.italic" = "serifless" +selectorAffix."cyrl/shcha/full.italic" = "serifless" selectorAffix."cyrl/shcha/reduced.italic" = "serifless" selectorAffix."cyrl/dzhe.italic" = "serifless" selectorAffix."cyrl/tse.italic" = "serifless" selectorAffix."cyrl/tseRev.italic" = "serifless" selectorAffix."ue/u" = "serifless" -selectorAffix."au/u" = "serifless" +selectorAffix."au/u/full" = "serifless" selectorAffix."au/u/reduced" = "serifless" [prime.u.variants-buildup.stages.serifs.bottom-right-serifed] @@ -3881,21 +3881,21 @@ selectorAffix.uHookLeft = "bottomRightSerifed" selectorAffix.turnh = "serifless" selectorAffix.turnhHookLeft = "serifless" selectorAffix.turnhHookLeftRTail = "serifless" -selectorAffix.turnm = "bottomRightSerifed" +selectorAffix."turnm/full" = "bottomRightSerifed" selectorAffix."turnm/reduced" = "bottomRightSerifed" -selectorAffix.turnmLeg = "serifless" +selectorAffix."turnmLeg/full" = "serifless" selectorAffix."turnmLeg/reduced" = "serifless" selectorAffix."cyrl/i.italic" = "bottomRightSerifed" selectorAffix."cyrl/i.italic/descBase" = "serifless" -selectorAffix."cyrl/sha.italic" = "bottomRightSerifed" +selectorAffix."cyrl/sha/full.italic" = "bottomRightSerifed" selectorAffix."cyrl/sha/reduced.italic" = "bottomRightSerifed" -selectorAffix."cyrl/shcha.italic" = "serifless" +selectorAffix."cyrl/shcha/full.italic" = "serifless" selectorAffix."cyrl/shcha/reduced.italic" = "serifless" selectorAffix."cyrl/dzhe.italic" = "bottomRightSerifed" selectorAffix."cyrl/tse.italic" = "serifless" selectorAffix."cyrl/tseRev.italic" = "bottomRightSerifed" selectorAffix."ue/u" = "serifless" -selectorAffix."au/u" = "bottomRightSerifed" +selectorAffix."au/u/full" = "bottomRightSerifed" selectorAffix."au/u/reduced" = "bottomRightSerifed" [prime.u.variants-buildup.stages.serifs.motion-serifed] @@ -3908,21 +3908,21 @@ selectorAffix.uHookLeft = {if = [{body = "toothed"}], then = "bottomRightSerifed selectorAffix.turnh = "motionSerifed" selectorAffix.turnhHookLeft = "bottomRightSerifed" selectorAffix.turnhHookLeftRTail = "serifless" -selectorAffix.turnm = "motionSerifed" +selectorAffix."turnm/full" = "motionSerifed" selectorAffix."turnm/reduced" = "motionSerifed" -selectorAffix.turnmLeg = "motionSerifed" +selectorAffix."turnmLeg/full" = "motionSerifed" selectorAffix."turnmLeg/reduced" = "motionSerifed" selectorAffix."cyrl/i.italic" = "motionSerifed" selectorAffix."cyrl/i.italic/descBase" = "motionSerifed" -selectorAffix."cyrl/sha.italic" = "motionSerifed" +selectorAffix."cyrl/sha/full.italic" = "motionSerifed" selectorAffix."cyrl/sha/reduced.italic" = "motionSerifed" -selectorAffix."cyrl/shcha.italic" = "motionSerifed" +selectorAffix."cyrl/shcha/full.italic" = "motionSerifed" selectorAffix."cyrl/shcha/reduced.italic" = "motionSerifed" selectorAffix."cyrl/dzhe.italic" = "motionSerifed" selectorAffix."cyrl/tse.italic" = "motionSerifed" selectorAffix."cyrl/tseRev.italic" = "motionSerifed" selectorAffix."ue/u" = "serifed" -selectorAffix."au/u" = {if = [{body = "toothed"}], then = "bottomRightSerifed", else = "serifless"} +selectorAffix."au/u/full" = {if = [{body = "toothed"}], then = "bottomRightSerifed", else = "serifless"} selectorAffix."au/u/reduced" = {if = [{body = "toothed"}], then = "bottomRightSerifed", else = "serifless"} [prime.u.variants-buildup.stages.serifs.serifed] @@ -3935,21 +3935,21 @@ selectorAffix.uHookLeft = "serifed" selectorAffix.turnh = "serifed" selectorAffix.turnhHookLeft = "serifed" selectorAffix.turnhHookLeftRTail = "serifed" -selectorAffix.turnm = "serifed" +selectorAffix."turnm/full" = "serifed" selectorAffix."turnm/reduced" = "motionSerifed" -selectorAffix.turnmLeg = "serifed" +selectorAffix."turnmLeg/full" = "serifed" selectorAffix."turnmLeg/reduced" = "motionSerifed" selectorAffix."cyrl/i.italic" = "serifed" selectorAffix."cyrl/i.italic/descBase" = "serifed" -selectorAffix."cyrl/sha.italic" = "serifed" +selectorAffix."cyrl/sha/full.italic" = "serifed" selectorAffix."cyrl/sha/reduced.italic" = "motionSerifed" -selectorAffix."cyrl/shcha.italic" = "serifed" +selectorAffix."cyrl/shcha/full.italic" = "serifed" selectorAffix."cyrl/shcha/reduced.italic" = "motionSerifed" selectorAffix."cyrl/dzhe.italic" = "serifed" selectorAffix."cyrl/tse.italic" = "serifed" selectorAffix."cyrl/tseRev.italic" = "serifed" selectorAffix."ue/u" = "serifed" -selectorAffix."au/u" = "serifed" +selectorAffix."au/u/full" = "serifed" selectorAffix."au/u/reduced" = {if = [{body = "toothed"}], then = "bottomRightSerifed", else = "serifless"}