From bc1ec674607eb523e0f2c1206e5f101f77d54c93 Mon Sep 17 00:00:00 2001 From: John McWilliams Date: Sat, 15 Mar 2025 07:32:06 -0400 Subject: [PATCH] Cleanup of #2707 . --- .../src/letter/latin-ext/glottal-stop.ptl | 4 ++-- packages/font-glyphs/src/letter/latin/c.ptl | 17 +++++++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/font-glyphs/src/letter/latin-ext/glottal-stop.ptl b/packages/font-glyphs/src/letter/latin-ext/glottal-stop.ptl index b4800b87d..0bf3d25f6 100644 --- a/packages/font-glyphs/src/letter/latin-ext/glottal-stop.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/glottal-stop.ptl @@ -66,9 +66,9 @@ glyph-block Letter-Latin-Glottal-Stop : begin if SLAB : begin include : HSerif.mb Middle 0 Jut - CreateTurnedLetter 'glottalStopTurned' 0x296 'revGlottalStop' HalfAdvance (Ascender / 2) + CreateTurnedLetter 'invGlottalStop' 0x296 'revGlottalStop' HalfAdvance (Ascender / 2) - create-glyph 'glottalStopTurnedCurlyTail' 0x1DF0E : glyph-proc + create-glyph 'invGlottalStopCurlyTail' 0x1DF0E : glyph-proc include : MarkSet.b local yMid : AdviceGlottalStopArchDepth Ascender 1 diff --git a/packages/font-glyphs/src/letter/latin/c.ptl b/packages/font-glyphs/src/letter/latin/c.ptl index 813f691cb..d596a1e1d 100644 --- a/packages/font-glyphs/src/letter/latin/c.ptl +++ b/packages/font-glyphs/src/letter/latin/c.ptl @@ -96,8 +96,8 @@ glyph-block Letter-Latin-C : begin __ : glyph-proc define [CCurlyTailShape df slabType top bot] : glyph-proc - local sw : df.adviceStroke2 2 3 (top - bot) - local fine : df.adviceStroke2 3 3 (top - bot) + local sw : AdviceStroke2 2 3 XH + local fine : AdviceStroke2 3 3 XH local loopTop : bot + 0.45 * XH include : dispiro @@ -291,11 +291,10 @@ glyph-block Letter-Latin-C : begin select-variant 'C' 'C' link-reduced-variant 'C/sansSerif' 'C' MathSansSerif select-variant 'revC' 0x2183 (follow -- 'C') + alias 'cyrl/Es' 0x421 'C' alias 'grek/lunateSigma' 0x3F9 'C' - select-variant 'CTopSerifOnly' (shapeFrom -- 'C') - select-variant 'CHookTop' 0x187 select-variant 'smcpC' 0x1D04 (follow -- 'C') @@ -303,7 +302,7 @@ glyph-block Letter-Latin-C : begin select-variant 'c' 'c' link-reduced-variant 'c/sansSerif' 'c' MathSansSerif - link-reduced-variant 'c/turnDescBase' 'c' (follow -- 'cHookTop') + link-reduced-variant 'c/ascBase' 'c' (follow -- 'cHookTop') select-variant 'revc' 0x2184 (follow -- 'c') select-variant 'c/centKernelStd' (follow -- 'c') @@ -315,12 +314,10 @@ glyph-block Letter-Latin-C : begin select-variant 'turncSideways' 0x1D12 (follow -- 'c') select-variant 'cyrl/esWide' 0x1C83 (follow -- 'c') - select-variant 'cTopSerifOnly' (shapeFrom -- 'c') - select-variant 'cCurlyTail' 0x255 select-variant 'cHookTop' 0x188 select-variant 'stretchedC' 0x297 (follow -- 'c') - select-variant 'stretchedCCurlyTail' 0x1DF0F (follow -- 'cHookTop') + select-variant 'stretchedCCurlyTail' 0x1DF0F (follow -- 'cCurlyTail') select-variant 'cyrl/Koppa' 0x480 (follow -- 'CTopSerifOnly') select-variant 'cyrl/koppa' 0x481 (follow -- 'cTopSerifOnly') @@ -336,7 +333,7 @@ glyph-block Letter-Latin-C : begin alias 'grek/revLunateSigma' 0x3FD 'revC' alias 'grek/revLunateSmallSigma' 0x37B 'revc.serifless' - CreateTurnedLetter 'turnc/descBase' null 'c/turnDescBase' HalfAdvance (XH / 2) + CreateTurnedLetter 'turnc/descBase' null 'c/ascBase' HalfAdvance (XH / 2) derive-composites 'turncRetroflexHook' 0x1D97 'turnc/descBase' RetroflexHook.l SB 0 (yAttach -- DToothlessRise) @@ -346,7 +343,7 @@ glyph-block Letter-Latin-C : begin derive-composites 'cPalatalHook' 0xA794 'c/descBase' PalatalHook.r RightSB 0 (yAttach -- DToothlessRise) - derive-composites 'cRetroflexHook' 0x1DF1D 'c/descBase' + derive-composites 'cRTail' 0x1DF1D 'c/descBase' RetroflexHook.r RightSB 0 (yAttach -- DToothlessRise) derive-composites 'grek/dotLunateSigma' 0x3FE 'grek/lunateSigma' 'innerDot'