diff --git a/packages/font-glyphs/src/letter/cyrillic/omega.ptl b/packages/font-glyphs/src/letter/cyrillic/omega.ptl index 44ffa31a8..a69400a9b 100644 --- a/packages/font-glyphs/src/letter/cyrillic/omega.ptl +++ b/packages/font-glyphs/src/letter/cyrillic/omega.ptl @@ -7,7 +7,6 @@ glyph-module glyph-block Letter-Cyrillic-Omega : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives - glyph-block-import Letter-Shared : CreateAccentedComposition glyph-block-import Letter-Latin-W glyph-block-import Letter-Cyrillic-Te-Comb @@ -55,6 +54,3 @@ glyph-block Letter-Cyrillic-Omega : begin define df : include : DivFrame para.diversityM 3 include : [DivFrame df.div].markSet.e include : CyrlOmegaShape df XH 0.30 0.31 - - CreateAccentedComposition 'cyrl/Ot' 0x47E 'cyrl/Omega' 'cyrl/teAbove' - CreateAccentedComposition 'cyrl/ot' 0x47F 'cyrl/omega' 'cyrl/teAbove' diff --git a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl index 1214c00f7..02214902c 100644 --- a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl +++ b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl @@ -10,7 +10,7 @@ glyph-block Letter-Greek-Lower-Epsilon : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives glyph-block-import Mark-Adjustment : ExtendBelowBaseAnchors - glyph-block-import Letter-Shared : CreateAccentedComposition CreateTurnedLetter + glyph-block-import Letter-Shared : CreateTurnedLetter glyph-block-import Letter-Shared-Shapes : SerifedArcStart SerifedArcEnd SerifFrame glyph-block-import Letter-Shared-Shapes : InwardSlabArcStart InwardSlabArcEnd glyph-block-import Letter-Shared-Shapes : ArcStartSerif ArcEndSerif @@ -502,9 +502,6 @@ glyph-block Letter-Greek-Lower-Epsilon : begin RetroflexHook.l SB 0 (refSw -- [AdviceStroke2 2 3 XH]) ExtendBelowBaseAnchors Descender - CreateAccentedComposition 'cyrl/Ksi' 0x46E 'cyrl/KsiBase' 'caronAbove' - CreateAccentedComposition 'cyrl/ksi' 0x46F 'cyrl/ksiBase' 'caronAbove' - create-glyph 'voicedLaryngealSpirant' 0x1D24 : glyph-proc include : MarkSet.b local blend 0.505 diff --git a/packages/font-glyphs/src/letter/latin-ext/egyptological.ptl b/packages/font-glyphs/src/letter/latin-ext/egyptological.ptl index 318e0927e..98cc2ac02 100644 --- a/packages/font-glyphs/src/letter/latin-ext/egyptological.ptl +++ b/packages/font-glyphs/src/letter/latin-ext/egyptological.ptl @@ -8,7 +8,6 @@ glyph-module glyph-block Letter-Latin-Egyptological : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives - glyph-block-import Letter-Shared : CreateAccentedComposition define [EgyptologicalYodComponent sw x bot top] : glyph-proc local rad : (top - bot) / 2 @@ -80,7 +79,3 @@ glyph-block Letter-Latin-Egyptological : begin set-mark-anchor 'grekUpperTonos' markMiddle XH set-base-anchor 'aboveBraceL' markMiddle aboveMarkMid set-base-anchor 'aboveBraceR' markMiddle aboveMarkMid - - CreateAccentedComposition 'AGlottal' 0xA7BA 'grek/Alpha' 'EgyptologicalYodTonos' - CreateAccentedComposition 'IGlottal' 0xA7BC 'grek/Iota' 'EgyptologicalYodTonos' - CreateAccentedComposition 'UGlottal' 0xA7BE 'U/withTonos' 'EgyptologicalYodTonos' diff --git a/packages/font-glyphs/src/letter/latin/lower-b.ptl b/packages/font-glyphs/src/letter/latin/lower-b.ptl index e8d5b7cc3..e9fa18711 100644 --- a/packages/font-glyphs/src/letter/latin/lower-b.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-b.ptl @@ -9,7 +9,6 @@ glyph-block Letter-Latin-Lower-B : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives glyph-block-import Mark-Adjustment : LeaningAnchor - glyph-block-import Letter-Shared : CreateAccentedComposition glyph-block-import Letter-Shared-Shapes : OBarLeft DToothlessRise DMBlend TopHook glyph-block-import Letter-Shared-Shapes : LetterBarOverlay PalatalHook @@ -82,7 +81,6 @@ glyph-block Letter-Latin-Lower-B : begin yAttach -- [mix O SmallArchDepthA : archv.yFromX 0.75] link-reduced-variant 'b/sansSerif' 'b' MathSansSerif - CreateAccentedComposition 'bTildeOver' 0x1D6C 'b' 'tildeOverOnExension' select-variant 'bHookTop' 0x253 derive-multi-part-glyphs 'bDot' 0x1E03 {'b' 'dotAbove'} : lambda [srcs gr] : glyph-proc diff --git a/packages/font-glyphs/src/letter/latin/lower-d.ptl b/packages/font-glyphs/src/letter/latin/lower-d.ptl index 616809727..ee459c43e 100644 --- a/packages/font-glyphs/src/letter/latin/lower-d.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-d.ptl @@ -10,7 +10,7 @@ glyph-block Letter-Latin-Lower-D : begin glyph-block-import Common-Derivatives glyph-block-import Mark-Shared-Metrics : markExtend glyph-block-import Mark-Adjustment : LeaningAnchor - glyph-block-import Letter-Shared : CreateAccentedComposition CreateCommaCaronComposition + glyph-block-import Letter-Shared : CreateCommaCaronComposition glyph-block-import Letter-Shared-Shapes : OBarRight RightwardTailedBar DToothlessRise DMBlend glyph-block-import Letter-Shared-Shapes : CurlyTail LetterBarOverlay SerifFrame glyph-block-import Letter-Shared-Shapes : UpwardHookShape PalatalHook RetroflexHook TopHook @@ -148,7 +148,6 @@ glyph-block Letter-Latin-Lower-D : begin link-reduced-variant 'd/sansSerif' 'd' MathSansSerif link-reduced-variant 'd/phoneticLeft' 'd' link-reduced-variant 'd/hookBottomBase' 'd' - CreateAccentedComposition 'dTildeOver' 0x1D6D 'd' 'tildeOverOnExension' select-variant 'dHookTop' 0x257 link-reduced-variant 'dHookTop/hookBottomBase' 'dHookTop' diff --git a/packages/font-glyphs/src/letter/latin/lower-p.ptl b/packages/font-glyphs/src/letter/latin/lower-p.ptl index 5a6f85c45..bb5c0758f 100644 --- a/packages/font-glyphs/src/letter/latin/lower-p.ptl +++ b/packages/font-glyphs/src/letter/latin/lower-p.ptl @@ -9,7 +9,6 @@ glyph-block Letter-Latin-Lower-P : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives glyph-block-import Mark-Adjustment : ExtendAboveBaseAnchors LeaningAnchor - glyph-block-import Letter-Shared : CreateAccentedComposition glyph-block-import Letter-Shared-Shapes : OBarLeft LetterBarOverlay glyph-block-import Letter-Shared-Shapes : DToothlessRise DMBlend glyph-block-import Letter-Shared-Shapes : TopHook PalatalHook SerifFrame @@ -122,7 +121,6 @@ glyph-block Letter-Latin-Lower-P : begin alias 'grek/rho' 0x3C1 'p.earlessRoundedSerifless' - CreateAccentedComposition 'pStroke' 0x1D7D 'p' 'hStrike' select-variant 'pStrokeBot' 0xA751 (follow -- 'p') alias 'grek/rhoStroke' 0x3FC 'pStrokeBot.earlessRoundedSerifless' @@ -133,8 +131,6 @@ glyph-block Letter-Latin-Lower-P : begin select-variant 'thornStroke' 0xA765 (follow -- 'thorn') select-variant 'thornStrokeBot' 0xA767 (follow -- 'thorn') - CreateAccentedComposition 'pTildeOver' 0x1D71 'p' 'tildeOverOnExension' - derive-glyphs 'cyrl/erTick' 0x48F 'cyrl/er' : lambda [src gr] : glyph-proc include [refer-glyph src] AS_BASE ALSO_METRICS include : dispiro diff --git a/packages/font-glyphs/src/letter/latin/s.ptl b/packages/font-glyphs/src/letter/latin/s.ptl index f050ba746..0e45ee490 100644 --- a/packages/font-glyphs/src/letter/latin/s.ptl +++ b/packages/font-glyphs/src/letter/latin/s.ptl @@ -8,7 +8,7 @@ glyph-module glyph-block Letter-Latin-S : begin glyph-block-import CommonShapes glyph-block-import Common-Derivatives - glyph-block-import Letter-Shared : CreateAccentedComposition CreateDependentComposite + glyph-block-import Letter-Shared : CreateDependentComposite glyph-block-import Letter-Blackboard : BBS BBD glyph-block-import Letter-Shared-Shapes : DToothlessRise FlatHookDepth glyph-block-import Letter-Shared-Shapes : ArcStartSerifWidth ArcStartSerifDepth diff --git a/packages/font-glyphs/src/meta/unicode-knowledge.ptl b/packages/font-glyphs/src/meta/unicode-knowledge.ptl index b23330c70..71cae193d 100644 --- a/packages/font-glyphs/src/meta/unicode-knowledge.ptl +++ b/packages/font-glyphs/src/meta/unicode-knowledge.ptl @@ -144,17 +144,24 @@ export : define decompOverrides : object 0x3CD { 'grek/upsilon' 'tonosAbove' } 0x3CE { 'grek/omega' 'tonosAbove' } + 0x46E { 'cyrl/KsiBase' 'caronAbove' } + 0x46F { 'cyrl/ksiBase' 'caronAbove' } 0x47C { 'cyrl/BroadOmega' 'cyrlPsiliAbove' 'cyrlPokrytieAbove' } 0x47D { 'cyrl/broadOmega' 'cyrlPsiliAbove' 'cyrlPokrytieAbove' } + 0x47E { 'cyrl/Omega' 'cyrl/teAbove' } + 0x47F { 'cyrl/omega' 'cyrl/teAbove' } + 0x1D6C { 'b' 'tildeOverOnExension' } + 0x1D6D { 'd' 'tildeOverOnExension' } 0x1D6E { 'f' 'tildeOver' } 0x1D6F { 'm' 'tildeStrikeDivM' } 0x1D70 { 'n' 'tildeStrike' } + 0x1D71 { 'p' 'tildeOverOnExension' } 0x1D74 { 's' 'tildeStrike' } 0x1D75 { 't' 'tildeOver' } 0x1D76 { 'z/reduced' 'tildeStrike2' } - 0x1D7C { 'latn/iota' 'barOver' } + 0x1D7D { 'p' 'hStrike' } 0x1D7F { 'latn/upsilon' 'hStrike' } 0x1E9C { 'longs' 'shortSlashOver' } @@ -183,6 +190,9 @@ export : define decompOverrides : object 0xA799 { 'f' 'barOver' } 0xA7B8 { 'U' 'longSlash' } 0xA7B9 { 'u' 'shortSlash' } + 0xA7BA { 'grek/Alpha' 'EgyptologicalYodTonos' } + 0xA7BC { 'grek/Iota' 'EgyptologicalYodTonos' } + 0xA7BE { 'U/withTonos' 'EgyptologicalYodTonos' } 0xA7BB { 'a' 'EgyptologicalYodAbove' } 0xA7BD { 'i' 'EgyptologicalYodAbove' } 0xA7BF { 'u' 'EgyptologicalYodAbove' } diff --git a/packages/font-otl/src/gpos-mark-mkmk.ptl b/packages/font-otl/src/gpos-mark-mkmk.ptl index 8ac767b31..1631b282c 100644 --- a/packages/font-otl/src/gpos-mark-mkmk.ptl +++ b/packages/font-otl/src/gpos-mark-mkmk.ptl @@ -5,7 +5,7 @@ define MarkClasses { 'above' 'tieAbove' 'leaningAbove' 'topLeft' 'topRight' 'grekUpperTonos' 'aboveBraceL' 'aboveBraceR' 'below' 'tieBelow' 'leaningBelow' 'bottomLeft' 'bottomRight' 'trailing' 'lf' 'belowBraceL' 'belowBraceR' - 'overlay' 'slash' 'strike' + 'overlay' 'slash' 'strike' 'overlayOnExtension' 'cvDecompose' 'enclosureInner' 'enclosureInnerFirstHalf' 'enclosureInnerSecondHalf' 'fracBuildUp' }