diff --git a/packages/font-glyphs/src/letter/latin-ext/gha.ptl b/packages/font-glyphs/src/letter/latin-ext/gha.ptl index 62ce15b0b..4e8feec3f 100644 --- a/packages/font-glyphs/src/letter/latin-ext/gha.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/gha.ptl @@ -8,7 +8,7 @@ glyph-module glyph-block Letter-Latin-Gha : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives - glyph-block-import Letter-Shared-Shapes : SerifFrame RightwardTailedBar + glyph-block-import Letter-Shared-Shapes : RightwardTailedBar glyph-block-import Letter-Latin-Lower-Q : RDiagTailedBar glyph-block-import Mark-Adjustment : LeaningAnchor @@ -36,8 +36,8 @@ glyph-block Letter-Latin-Gha : begin g4 (df.rightSB - O - [HSwToV df.mvs]) top [widths 0 df.mvs] if slab : begin - local sf : SerifFrame.fromDf df top bot - include sf.rb.full + include : HSerif.rb (df.rightSB - O - [HSwToV : 0.5 * df.mvs]) bot Jut + include : HSerif.lb (df.rightSB - O - [HSwToV : 0.5 * df.mvs]) bot MidJutSide define GhaConfig : object straightSerifless { TERMINAL-NORMAL false } diff --git a/packages/font-glyphs/src/letter/latin/c.ptl b/packages/font-glyphs/src/letter/latin/c.ptl index d596a1e1d..7472bae3d 100644 --- a/packages/font-glyphs/src/letter/latin/c.ptl +++ b/packages/font-glyphs/src/letter/latin/c.ptl @@ -10,7 +10,7 @@ glyph-block Letter-Latin-C : begin glyph-block-import Common-Derivatives glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors ExtendBelowBaseAnchors LeaningAnchor glyph-block-import Letter-Shared : CreateAccentedComposition CreateDependentComposite CreateTurnedLetter - glyph-block-import Letter-Shared-Shapes : SerifFrame CurlyTail SerifedArcStart SerifedArcEnd + glyph-block-import Letter-Shared-Shapes : CurlyTail SerifedArcStart SerifedArcEnd glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd glyph-block-import Letter-Shared-Shapes : ArcStartSerif ArcEndSerif glyph-block-import Letter-Shared-Shapes : LetterBarOverlay PalatalHook RetroflexHook TopHook @@ -286,7 +286,9 @@ glyph-block Letter-Latin-C : begin local lf : CLetterForm [DivFrame 1] sty styBot CAP 0 include : union [lf.descBase] [lf.topSerif] include : VBar.r RightSB Descender [ArcStartSerifDepth Hook] [ArcStartSerifWidth Stroke] - if styBot : let [sf : SerifFrame.fromDf [DivFrame 1] CAP Descender] : include sf.rb.full + if styBot : begin + include : HSerif.rb (RightSB - [HSwToV : 0.5 * [ArcStartSerifWidth Stroke]]) Descender Jut + include : HSerif.lb (RightSB - [HSwToV : 0.5 * [ArcStartSerifWidth Stroke]]) Descender MidJutSide select-variant 'C' 'C' link-reduced-variant 'C/sansSerif' 'C' MathSansSerif diff --git a/packages/font-glyphs/src/number/4.ptl b/packages/font-glyphs/src/number/4.ptl index eaa560ead..9d1061b61 100644 --- a/packages/font-glyphs/src/number/4.ptl +++ b/packages/font-glyphs/src/number/4.ptl @@ -37,7 +37,8 @@ glyph-block Digits-Four : begin include : HBar.t xVertBar (xVertBar + bbd) CAP sw include : HBar.b xVertBar (xVertBar + bbd) 0 sw if (!bbd && slab) : begin - include : HSerif.mb (xVertBar - [HSwToV HalfStroke]) 0 Jut + include : HSerif.rb (xVertBar - [HSwToV HalfStroke]) 0 Jut + include : HSerif.lb (xVertBar - [HSwToV HalfStroke]) 0 MidJutSide define [FourClosedShape top crossing slab] : begin return : FourStdShape top false crossing (slab -- slab) @@ -56,7 +57,8 @@ glyph-block Digits-Four : begin include : VBar.r xVertBar 0 [mix (yBar - Stroke) top 0.75] include : VBar.l SB yBar top if slab : begin - include : HSerif.mb (xVertBar - [HSwToV HalfStroke]) 0 Jut + include : HSerif.rb (xVertBar - [HSwToV HalfStroke]) 0 Jut + include : HSerif.lb (xVertBar - [HSwToV HalfStroke]) 0 MidJutSide define FourConfig : SuffixCfg.weave object # body