Cleanup, AE bug fixes (#2081)

be5invis · Nov 10, 2023 · 712d5db · 712d5db
1 parent 5b4688b
commit 712d5db
Show file tree

Hide file tree

Showing 60 changed files with 57 additions and 76 deletions.
diff --git a/font-src/glyphs/common/derivatives.ptl b/font-src/glyphs/common/derivatives.ptl
@@ -1,7 +1,7 @@
 $$include '../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../support/utils.mjs"
-import [Cv AnyCv AnyDerivingCv Dotless SvInheritableRelations CvDecompose PseudoCvDecompose getGrMesh] from"../../support/gr.mjs"
+import [Cv AnyCv AnyDerivingCv Dotless SvInheritableRelations PseudoCvDecompose getGrMesh] from"../../support/gr.mjs"
 
 extern Map
 

diff --git a/font-src/glyphs/letter/cyrillic/dzzhe-zhwe.ptl b/font-src/glyphs/letter/cyrillic/dzzhe-zhwe.ptl
@@ -1,7 +1,6 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl b/font-src/glyphs/letter/latin-ext/bidental-percussive.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/egyptological.ptl b/font-src/glyphs/letter/latin-ext/egyptological.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/eszet.ptl b/font-src/glyphs/letter/latin-ext/eszet.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 import [maskBits] from"../../../support/util/mask-bit.mjs"
 
 glyph-module

diff --git a/font-src/glyphs/letter/latin-ext/eth.ptl b/font-src/glyphs/letter/latin-ext/eth.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/ezh.ptl b/font-src/glyphs/letter/latin-ext/ezh.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/f-ligatures.ptl b/font-src/glyphs/letter/latin-ext/f-ligatures.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/gha.ptl b/font-src/glyphs/letter/latin-ext/gha.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/glottal-stop.ptl b/font-src/glyphs/letter/latin-ext/glottal-stop.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/hwair.ptl b/font-src/glyphs/letter/latin-ext/hwair.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/long-s.ptl b/font-src/glyphs/letter/latin-ext/long-s.ptl
@@ -1,7 +1,7 @@
 $$include "../../../meta/macros.ptl"
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 import [maskBit maskBits] from"../../../support/util/mask-bit.mjs"
 
 glyph-module

diff --git a/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl b/font-src/glyphs/letter/latin-ext/lower-ae-oe.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/lower-db-qp.ptl b/font-src/glyphs/letter/latin-ext/lower-db-qp.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/middle-welsh-v.ptl b/font-src/glyphs/letter/latin-ext/middle-welsh-v.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/ou.ptl b/font-src/glyphs/letter/latin-ext/ou.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/rams-horn.ptl b/font-src/glyphs/letter/latin-ext/rams-horn.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/rhotic.ptl b/font-src/glyphs/letter/latin-ext/rhotic.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose IsSuperscript IsSubscript] from"../../../support/gr.mjs"
+import [IsSuperscript IsSubscript] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/thorn.ptl b/font-src/glyphs/letter/latin-ext/thorn.ptl
@@ -1,7 +1,6 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/upper-aa-ao.ptl b/font-src/glyphs/letter/latin-ext/upper-aa-ao.ptl
@@ -1,7 +1,6 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
 import [bitOr] from"../../../support/util/mask-bit.mjs"
 
 glyph-module

diff --git a/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl b/font-src/glyphs/letter/latin-ext/upper-ae-oe.ptl
@@ -1,7 +1,6 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
 
 glyph-module
 
@@ -151,19 +150,9 @@ glyph-block Letter-Latin-Upper-AE-OE : begin
 	select-variant 'smcpAE/AHalf' (follow -- 'A')
 	select-variant 'smcpAE/EHalf' (follow -- 'AE/EHalf')
 
-	create-glyph "AE" 0xC6 : glyph-proc
-		include [refer-glyph 'AE/AHalf'] AS_BASE ALSO_METRICS
-		include [refer-glyph 'AE/EHalf']
-		CvDecompose.set currentGlyph { 'AE/AHalf' 'AE/EHalf' }
-
-	create-glyph "smcpAE" 0x1D01 : glyph-proc
-		include [refer-glyph 'smcpAE/AHalf'] AS_BASE ALSO_METRICS
-		include [refer-glyph 'smcpAE/EHalf']
-		CvDecompose.set currentGlyph { 'smcpAE/AHalf' 'smcpAE/EHalf' }
-
+	derive-composites "AE" 0xC6 'AE/AHalf' 'AE/EHalf'
+	derive-composites "smcpAE" 0x1D01 'smcpAE/AHalf' 'smcpAE/EHalf'
 	alias 'cyrl/AE' 0x4D4 'AE'
-	if [query-glyph 'cyrl/AE'] : begin
-		CvDecompose.set [query-glyph 'cyrl/AE'] { 'AE/AHalf' 'AE/EHalf' }
 
 	define [OEShape top df slabKind] : glyph-proc
 		define eBarPos DesignParameters.upperEBarPos

diff --git a/font-src/glyphs/letter/latin-ext/wynn.ptl b/font-src/glyphs/letter/latin-ext/wynn.ptl
@@ -1,7 +1,6 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin-ext/yogh.ptl b/font-src/glyphs/letter/latin-ext/yogh.ptl
@@ -1,7 +1,6 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/c.ptl b/font-src/glyphs/letter/latin/c.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [DependentSelector CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [DependentSelector MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/k.ptl b/font-src/glyphs/letter/latin/k.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix clamp fallback linreg SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif HintClass] from"../../../support/gr.mjs"
+import [Dotless MathSansSerif HintClass] from"../../../support/gr.mjs"
 import [maskBit] from"../../../support/util/mask-bit.mjs"
 
 glyph-module

diff --git a/font-src/glyphs/letter/latin/lower-a.ptl b/font-src/glyphs/letter/latin/lower-a.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-b.ptl b/font-src/glyphs/letter/latin/lower-b.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-d.ptl b/font-src/glyphs/letter/latin/lower-d.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix clamp fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-f.ptl b/font-src/glyphs/letter/latin/lower-f.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-g.ptl b/font-src/glyphs/letter/latin/lower-g.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-il.ptl b/font-src/glyphs/letter/latin/lower-il.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [Dotless MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-j.ptl b/font-src/glyphs/letter/latin/lower-j.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [Dotless MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-m.ptl b/font-src/glyphs/letter/latin/lower-m.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-n.ptl b/font-src/glyphs/letter/latin/lower-n.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix clamp fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif Joining] from"../../../support/gr.mjs"
+import [MathSansSerif Joining] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-p.ptl b/font-src/glyphs/letter/latin/lower-p.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-q.ptl b/font-src/glyphs/letter/latin/lower-q.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-r.ptl b/font-src/glyphs/letter/latin/lower-r.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/lower-t.ptl b/font-src/glyphs/letter/latin/lower-t.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix clamp SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 
@@ -370,10 +370,7 @@ glyph-block Letter-Latin-Lower-T : begin
 	select-variant 'tsLig/upperHalf'
 	select-variant 'tsLig/lowerHalf'
 
-	create-glyph "tsLig" 0x1BE : glyph-proc
-		include [refer-glyph 'tsLig/upperHalf'] AS_BASE ALSO_METRICS
-		include [refer-glyph 'tsLig/lowerHalf']
-		CvDecompose.set currentGlyph { 'tsLig/upperHalf' 'tsLig/lowerHalf' }
+	derive-composites "tsLig" 0x1BE 'tsLig/upperHalf' 'tsLig/lowerHalf'
 
 	create-glyph 'mathbb/t' 0x1D565 : glyph-proc
 		define df : DivFrame 1

diff --git a/font-src/glyphs/letter/latin/o.ptl b/font-src/glyphs/letter/latin/o.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix linreg clamp fallback] from"../../../support/utils.mjs"
-import [Dotless CvDecompose] from"../../../support/gr.mjs"
+
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/u.ptl b/font-src/glyphs/letter/latin/u.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 
 glyph-module
 

diff --git a/font-src/glyphs/letter/latin/upper-a.ptl b/font-src/glyphs/letter/latin/upper-a.ptl
@@ -1,7 +1,7 @@
 $$include '../../../meta/macros.ptl'
 
 import [mix fallback SuffixCfg] from"../../../support/utils.mjs"
-import [Dotless CvDecompose MathSansSerif] from"../../../support/gr.mjs"
+import [MathSansSerif] from"../../../support/gr.mjs"
 import [maskBits bitOr] from"../../../support/util/mask-bit.mjs"
 
 glyph-module