From 9c96237091c6989edd64c68b5d5cac1f179da3e2 Mon Sep 17 00:00:00 2001 From: be5invis Date: Mon, 24 May 2021 23:16:19 -0700 Subject: [PATCH] Refine `feng` shape and variants (#1063) --- font-src/glyphs/auto-build/composite.ptl | 22 +++++++++++----------- font-src/glyphs/letter/latin/lower-f.ptl | 3 +-- params/variants.toml | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/font-src/glyphs/auto-build/composite.ptl b/font-src/glyphs/auto-build/composite.ptl index 81b836af4..d60e215eb 100644 --- a/font-src/glyphs/auto-build/composite.ptl +++ b/font-src/glyphs/auto-build/composite.ptl @@ -1195,17 +1195,17 @@ glyph-block Autobuild-Pnonetic-Ligatures : begin define stdShrink : clamp 0.75 0.9 : StrokeWidthBlend 0.78 0.9 createPhoneticLigatures 'phonetic' para.diversityM stdShrink stdShrink 1 1 : list - list 0x02A3 { 'd/phoneticLeft' 'z/reduced' } 'b' - list 0x02A4 { 'd/phoneticLeft' 'ezh' } 'if' - list 0x02A5 { 'd/phoneticLeft' 'zCurlyTail' } 'if' - list 0x02A6 { 't.phoneticLeft' 's/phoneticRight' } 'b' - list 0x02A7 { 't/teshLeft' 'esh' } 'if' - list 0x02A8 { 't.phoneticLeft' 'cCurlyTail' } 'b' - list 0x02A9 { 'f.phoneticLeft' 'eng' } 'if' - list 0x02AA { 'l/phoneticLeft' 's/phoneticRight' } 'b' - list 0x02AB { 'l/phoneticLeft' 'z/reduced' } 'b' - list 0xAB66 { 'd/phoneticLeft' 'zRTailBR' } 'if' - list 0xAB67 { 't.phoneticLeft' 'sRTail' } null + list 0x02A3 { 'd/phoneticLeft' 'z/reduced' } 'b' + list 0x02A4 { 'd/phoneticLeft' 'ezh' } 'if' + list 0x02A5 { 'd/phoneticLeft' 'zCurlyTail' } 'if' + list 0x02A6 { 't.phoneticLeft' 's/phoneticRight' } 'b' + list 0x02A7 { 't/teshLeft' 'esh' } 'if' + list 0x02A8 { 't.phoneticLeft' 'cCurlyTail' } 'b' + list 0x02A9 { 'f/phoneticLeft' 'eng.straightTopLeftSerifed' } 'if' + list 0x02AA { 'l/phoneticLeft' 's/phoneticRight' } 'b' + list 0x02AB { 'l/phoneticLeft' 'z/reduced' } 'b' + list 0xAB66 { 'd/phoneticLeft' 'zRTailBR' } 'if' + list 0xAB67 { 't.phoneticLeft' 'sRTail' } null define compatLigShrink : clamp 0.75 1 : StrokeWidthBlend 0.78 1 createPhoneticLigatures 'compatLig' 1 compatLigShrink compatLigShrink 1 1 : list diff --git a/font-src/glyphs/letter/latin/lower-f.ptl b/font-src/glyphs/letter/latin/lower-f.ptl index 5ca9ecf3d..476756000 100644 --- a/font-src/glyphs/letter/latin/lower-f.ptl +++ b/font-src/glyphs/letter/latin/lower-f.ptl @@ -147,8 +147,6 @@ glyph-block Letter-Latin-Lower-F : begin 'flatHookTailedCLC2' { { [NarrowFShape 2] dfNarrowF } { pNarrowSide fbar CH-HOOK } { 'if' 'if' } } 'flatHookDiagonalTailedCLC2' { { [NarrowFShape 2] dfNarrowF } { pNarrowSide fbar CH-DIAGONAL-HOOK } { 'if' 'if' } } - 'phoneticLeft' { { StandardSmallFShape [DivFrame 1] } { 1 fbar [if SLAB CH-SERIF CH-NONE] } { 'b' 'p' } } - # Construct shape of U+0284 with "f" code 'dotlessJHookBar' { { StandardSmallFShape [DivFrame 1] } { 1 (XH * 0.1 + Stroke) CH-HOOK } { 'if' 'if' } } @@ -166,6 +164,7 @@ glyph-block Letter-Latin-Lower-F : begin select-variant 'fltail' 0x192 (shapeFrom -- 'f') select-variant 'f/compLigLeft1' (shapeFrom -- 'f') select-variant 'f/compLigLeft2' (shapeFrom -- 'f') + select-variant 'f/phoneticLeft' (shapeFrom -- 'f') alias 'dotlessJHookBar' 0x284 'f.dotlessJHookBar' diff --git a/params/variants.toml b/params/variants.toml index a4eeae645..da1cb5585 100644 --- a/params/variants.toml +++ b/params/variants.toml @@ -1994,6 +1994,7 @@ selector.f = "serifless" selector."f/sansSerif" = "serifless" selector."f/compLigLeft1" = "flatHookCLC1" selector."f/compLigLeft2" = "flatHookCLC2" +selector."f/phoneticLeft" = "seriflessCrossbarAtXHeight" selector.lenisf = "serifless" selector.fltail = "tailed" @@ -2004,6 +2005,7 @@ selector.f = "serifed" selector."f/sansSerif" = "serifless" selector."f/compLigLeft1" = "flatHookSerifedCLC1" selector."f/compLigLeft2" = "flatHookSerifedCLC2" +selector."f/phoneticLeft" = "serifedCrossbarAtXHeight" selector.lenisf = "serifless" selector.fltail = "tailed" @@ -2014,6 +2016,7 @@ selector.f = "tailed" selector."f/sansSerif" = "tailed" selector."f/compLigLeft1" = "flatHookTailedCLC1" selector."f/compLigLeft2" = "flatHookTailedCLC2" +selector."f/phoneticLeft" = "tailedCrossbarAtXHeight" selector.lenisf = "serifless" selector.fltail = "tailed" @@ -2024,6 +2027,7 @@ selector.f = "extended" selector."f/sansSerif" = "extended" selector."f/compLigLeft1" = "flatHookExtendedCLC1" selector."f/compLigLeft2" = "flatHookExtendedCLC2" +selector."f/phoneticLeft" = "extendedCrossbarAtXHeight" selector.lenisf = "serifless" selector.fltail = "tailed" @@ -2034,6 +2038,7 @@ selector.f = "diagonalTailed" selector."f/sansSerif" = "diagonalTailed" selector."f/compLigLeft1" = "flatHookDiagonalTailedCLC1" selector."f/compLigLeft2" = "flatHookDiagonalTailedCLC2" +selector."f/phoneticLeft" = "diagonalTailedCrossbarAtXHeight" selector.lenisf = "serifless" selector.fltail = "tailed" @@ -2044,6 +2049,7 @@ selector.f = "seriflessCrossbarAtXHeight" selector."f/sansSerif" = "seriflessCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookCLC1" selector."f/compLigLeft2" = "flatHookCLC2" +selector."f/phoneticLeft" = "seriflessCrossbarAtXHeight" selector.lenisf = "seriflessCrossbarAtXHeight" selector.fltail = "tailedCrossbarAtXHeight" @@ -2054,6 +2060,7 @@ selector.f = "serifedCrossbarAtXHeight" selector."f/sansSerif" = "seriflessCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookSerifedCLC1" selector."f/compLigLeft2" = "flatHookSerifedCLC2" +selector."f/phoneticLeft" = "serifedCrossbarAtXHeight" selector.lenisf = "seriflessCrossbarAtXHeight" selector.fltail = "tailedCrossbarAtXHeight" @@ -2064,6 +2071,7 @@ selector.f = "tailedCrossbarAtXHeight" selector."f/sansSerif" = "tailedCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookTailedCLC1" selector."f/compLigLeft2" = "flatHookTailedCLC2" +selector."f/phoneticLeft" = "tailedCrossbarAtXHeight" selector.lenisf = "seriflessCrossbarAtXHeight" selector.fltail = "tailedCrossbarAtXHeight" @@ -2074,6 +2082,7 @@ selector.f = "extendedCrossbarAtXHeight" selector."f/sansSerif" = "extendedCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookExtendedCLC1" selector."f/compLigLeft2" = "flatHookExtendedCLC2" +selector."f/phoneticLeft" = "extendedCrossbarAtXHeight" selector.lenisf = "seriflessCrossbarAtXHeight" selector.fltail = "tailedCrossbarAtXHeight" @@ -2084,6 +2093,7 @@ selector.f = "diagonalTailedCrossbarAtXHeight" selector."f/sansSerif" = "diagonalTailedCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookDiagonalTailedCLC1" selector."f/compLigLeft2" = "flatHookDiagonalTailedCLC2" +selector."f/phoneticLeft" = "diagonalTailedCrossbarAtXHeight" selector.lenisf = "seriflessCrossbarAtXHeight" selector.fltail = "tailedCrossbarAtXHeight" @@ -2094,6 +2104,7 @@ selector.f = "flatHook" selector."f/sansSerif" = "flatHook" selector."f/compLigLeft1" = "flatHookCLC1" selector."f/compLigLeft2" = "flatHookCLC2" +selector."f/phoneticLeft" = "flatHookCrossbarAtXHeight" selector.lenisf = "flatHook" selector.fltail = "flatHookTailed" @@ -2104,6 +2115,7 @@ selector.f = "flatHookSerifed" selector."f/sansSerif" = "flatHook" selector."f/compLigLeft1" = "flatHookSerifedCLC1" selector."f/compLigLeft2" = "flatHookSerifedCLC2" +selector."f/phoneticLeft" = "flatHookSerifedCrossbarAtXHeight" selector.lenisf = "flatHook" selector.fltail = "flatHookTailed" @@ -2114,6 +2126,7 @@ selector.f = "flatHookTailed" selector."f/sansSerif" = "flatHookTailed" selector."f/compLigLeft1" = "flatHookTailedCLC1" selector."f/compLigLeft2" = "flatHookTailedCLC2" +selector."f/phoneticLeft" = "flatHookTailedCrossbarAtXHeight" selector.lenisf = "flatHook" selector.fltail = "flatHookTailed" @@ -2124,6 +2137,7 @@ selector.f = "flatHookExtended" selector."f/sansSerif" = "flatHookExtended" selector."f/compLigLeft1" = "flatHookExtendedCLC1" selector."f/compLigLeft2" = "flatHookExtendedCLC2" +selector."f/phoneticLeft" = "flatHookExtendedCrossbarAtXHeight" selector.lenisf = "flatHook" selector.fltail = "flatHookTailed" @@ -2134,6 +2148,7 @@ selector.f = "flatHookDiagonalTailed" selector."f/sansSerif" = "flatHookDiagonalTailed" selector."f/compLigLeft1" = "flatHookDiagonalTailedCLC1" selector."f/compLigLeft2" = "flatHookDiagonalTailedCLC2" +selector."f/phoneticLeft" = "flatHookDiagonalTailedCrossbarAtXHeight" selector.lenisf = "flatHook" selector.fltail = "flatHookTailed" @@ -2144,6 +2159,7 @@ selector.f = "flatHookCrossbarAtXHeight" selector."f/sansSerif" = "flatHookCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookCLC1" selector."f/compLigLeft2" = "flatHookCLC2" +selector."f/phoneticLeft" = "flatHookCrossbarAtXHeight" selector.lenisf = "flatHookCrossbarAtXHeight" selector.fltail = "flatHookTailedCrossbarAtXHeight" @@ -2154,6 +2170,7 @@ selector.f = "flatHookSerifedCrossbarAtXHeight" selector."f/sansSerif" = "flatHookCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookSerifedCLC1" selector."f/compLigLeft2" = "flatHookSerifedCLC2" +selector."f/phoneticLeft" = "flatHookSerifedCrossbarAtXHeight" selector.lenisf = "flatHookCrossbarAtXHeight" selector.fltail = "flatHookTailedCrossbarAtXHeight" @@ -2164,6 +2181,7 @@ selector.f = "flatHookTailedCrossbarAtXHeight" selector."f/sansSerif" = "flatHookTailedCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookTailedCLC1" selector."f/compLigLeft2" = "flatHookTailedCLC2" +selector."f/phoneticLeft" = "flatHookTailedCrossbarAtXHeight" selector.lenisf = "flatHookCrossbarAtXHeight" selector.fltail = "flatHookTailedCrossbarAtXHeight" @@ -2174,6 +2192,7 @@ selector.f = "flatHookExtendedCrossbarAtXHeight" selector."f/sansSerif" = "flatHookExtendedCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookExtendedCLC1" selector."f/compLigLeft2" = "flatHookExtendedCLC2" +selector."f/phoneticLeft" = "flatHookExtendedCrossbarAtXHeight" selector.lenisf = "flatHookCrossbarAtXHeight" selector.fltail = "flatHookTailedCrossbarAtXHeight" @@ -2184,6 +2203,7 @@ selector.f = "flatHookDiagonalTailedCrossbarAtXHeight" selector."f/sansSerif" = "flatHookDiagonalTailedCrossbarAtXHeight" selector."f/compLigLeft1" = "flatHookDiagonalTailedCLC1" selector."f/compLigLeft2" = "flatHookDiagonalTailedCLC2" +selector."f/phoneticLeft" = "flatHookDiagonalTailedCrossbarAtXHeight" selector.lenisf = "flatHookCrossbarAtXHeight" selector.fltail = "flatHookTailedCrossbarAtXHeight"