2022-04-20 19:17:00

9 files changed, 105 insertions, 111 deletions

diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg
index 766baa610..f946e2a80 100644
--- a/tex/context/fonts/mkiv/bonum-math.lfg
+++ b/tex/context/fonts/mkiv/bonum-math.lfg
@@ -135,7 +135,7 @@ return {
                         [0x1D484] = { 0,      1,       0,    0.95 }, -- bold lowercase italic c
                         [0x1D485] = { 0,      1,       0,    0.75 }, -- bold lowercase italic d
                         [0x1D486] = { 0,      1,       0,    0.95 }, -- bold lowercase italic e
-                        -- [0x1D487] = { 0,      1,       0,    0.95 }, -- bold lowercase italic f
+                     -- [0x1D487] = { 0,      1,       0,    0.95 }, -- bold lowercase italic f
                         [0x1D488] = { 0,      1,       0,    0.9  }, -- bold lowercase italic g
                         [0x1D489] = { 0,      1,       0,    1.2  }, -- bold lowercase italic h
                      -- [0x1D48A] = { 0,      1,       0,    0.6  }, -- bold lowercase italic i
@@ -164,8 +164,8 @@ return {
                 },
                 {
                     tweak   = "fixprimes",
-                   --  scale   = 0.8,
-                   --  smaller = true,
+                 -- scale   = 0.8,
+                 -- smaller = true,
                     factor  = 1.1,
                 },
                 {
diff --git a/tex/context/fonts/mkiv/cambria-math.lfg b/tex/context/fonts/mkiv/cambria-math.lfg
index f73bc3ab7..a97a3f709 100644
--- a/tex/context/fonts/mkiv/cambria-math.lfg
+++ b/tex/context/fonts/mkiv/cambria-math.lfg
@@ -66,31 +66,31 @@ return {
                 {
                     tweak = "dimensions",
                     list  = {
-                        -- [0x00060] = { yoffset = -0.1 }, -- grave
-                        -- [0x000B4] = { yoffset = -0.1 }, -- acute
-                        -- [0x002C6] = { yoffset = -0.1 }, -- hat
-                        -- [0x002DC] = { yoffset = -0.1 }, -- tilde
-                        -- [0x000AF] = { yoffset = -0.1 }, -- bar
-                        -- [0x002D8] = { yoffset = -0.15 }, -- breve
-                        -- [0x002D9] = { yoffset = -0.15 }, -- dot
-                        -- [0x000A8] = { yoffset = -0.1 }, -- ddot
+                     -- [0x00060] = { yoffset = -0.1 }, -- grave
+                     -- [0x000B4] = { yoffset = -0.1 }, -- acute
+                     -- [0x002C6] = { yoffset = -0.1 }, -- hat
+                     -- [0x002DC] = { yoffset = -0.1 }, -- tilde
+                     -- [0x000AF] = { yoffset = -0.1 }, -- bar
+                     -- [0x002D8] = { yoffset = -0.15 }, -- breve
+                     -- [0x002D9] = { yoffset = -0.15 }, -- dot
+                     -- [0x000A8] = { yoffset = -0.1 }, -- ddot
                         [0x020DB] = { yoffset = -0.05 }, -- dddot
-                        -- [0x002C7] = { yoffset = -0.1 }, -- check
+                     -- [0x002C7] = { yoffset = -0.1 }, -- check
                         [0x020D7] = { yoffset = -0.05 }, -- vec
-                        -- [0x00300] = { yoffset = -0.12 , all=true }, -- widegrave
-                        -- [0x00301] = { yoffset = -0.12 , all=true }, -- wideacute
-                        -- [0x00302] = { yoffset = -0.12 , all=true }, -- widehat
-                        -- [0x00303] = { yoffset = -0.12 , all=true }, -- widetilde
-                        -- [0x00304] = { yoffset = -0.12 , all=true }, -- widebar
-                        -- [0x00306] = { yoffset = -0.12 , all=true }, -- widebreve
+                     -- [0x00300] = { yoffset = -0.12 , all=true }, -- widegrave
+                     -- [0x00301] = { yoffset = -0.12 , all=true }, -- wideacute
+                     -- [0x00302] = { yoffset = -0.12 , all=true }, -- widehat
+                     -- [0x00303] = { yoffset = -0.12 , all=true }, -- widetilde
+                     -- [0x00304] = { yoffset = -0.12 , all=true }, -- widebar
+                     -- [0x00306] = { yoffset = -0.12 , all=true }, -- widebreve
                         [0x00307] = { yoffset = -0.025 , all=true }, -- widedot
                         [0x00308] = { yoffset = -0.025 , all=true }, -- wideddot
-                        -- [0x020DB] = { yoffset = -0.1 , all=true }, -- widedddot
-                        -- [0x0030A] = { yoffset = -0.12 , all=true }, -- widering
-                        -- [0x0030C] = { yoffset = -0.12 , all=true }, -- widecheck
-                         [0x1D43D] = { 0.25, 1.15,   0.2     }, -- J
+                     -- [0x020DB] = { yoffset = -0.1 , all=true }, -- widedddot
+                     -- [0x0030A] = { yoffset = -0.12 , all=true }, -- widering
+                     -- [0x0030C] = { yoffset = -0.12 , all=true }, -- widecheck
+                        [0x1D43D] = { 0.25, 1.15,   0.2     }, -- J
                         [0x1D487] = { anchor = 0.8 }, -- bold lower case italic f
-                        -- [0x1D487] = {    0,    1,   0,   1.3}, -- bold lower case italic f
+                     -- [0x1D487] = {    0,    1,   0,   1.3}, -- bold lower case italic f
                     },
                 },
                 {
diff --git a/tex/context/fonts/mkiv/garamond-math.lfg b/tex/context/fonts/mkiv/garamond-math.lfg
index 4c5eb5ba6..e6778d4b7 100644
--- a/tex/context/fonts/mkiv/garamond-math.lfg
+++ b/tex/context/fonts/mkiv/garamond-math.lfg
@@ -6,16 +6,16 @@ return {
     copyright = "ConTeXt development team",
     mathematics = {
         parameters = {
-            NoLimitSupFactor      =    0,
-            NoLimitSubFactor      = 1200,
-            FractionRuleThickness =   60,
-            OverbarRuleThickness  =   60,
-            -- RadicalRuleThickness  =   60,
-            UnderbarRuleThickness =   60,
-            -- AccentBaseHeight = 0,
-            AccentBaseDepth = 75,
-            -- AccentTopShiftUp = -75,
-            -- FlattenedAccentTopShiftUp = -100,
+            NoLimitSupFactor          =    0,
+            NoLimitSubFactor          = 1200,
+            FractionRuleThickness     =   60,
+            OverbarRuleThickness      =   60,
+         -- RadicalRuleThickness      =   60,
+            UnderbarRuleThickness     =   60,
+         -- AccentBaseHeight          =    0,
+            AccentBaseDepth           =   75,
+         -- AccentTopShiftUp          =  -75,
+         -- FlattenedAccentTopShiftUp = -100,
         },
         tweaks = {
             aftercopying = {
@@ -27,14 +27,14 @@ return {
                     tweak = "dimensions",
                     list  = {
                         -- offset width italic
-                        -- [0x00060] = { yoffset = -0.1 }, -- grave
-                        -- [0x000B4] = { yoffset = -0.1 }, -- acute
+                     -- [0x00060] = { yoffset = -0.1 }, -- grave
+                     -- [0x000B4] = { yoffset = -0.1 }, -- acute
                         [0x002C6] = { yoffset = -0.1 }, -- hat
                         [0x002DC] = { yoffset = -0.1 }, -- tilde
-                        -- [0x000AF] = { yoffset = -0.1 }, -- bar
+                     -- [0x000AF] = { yoffset = -0.1 }, -- bar
                         [0x002D8] = { yoffset = -0.15 }, -- breve
                         [0x002D9] = { yoffset = -0.15 }, -- dot
-                        -- [0x000A8] = { yoffset = -0.1 }, -- ddot
+                     -- [0x000A8] = { yoffset = -0.1 }, -- ddot
                         [0x020DB] = { yoffset = -0.115 }, -- dddot
                         [0x002C7] = { yoffset = -0.1 }, -- check
                         [0x020D7] = { yoffset = -0.1 }, -- vec
@@ -46,10 +46,10 @@ return {
                         [0x00306] = { yoffset = -0.12 , all=true }, -- widebreve
                         [0x00307] = { yoffset = -0.12 , all=true }, -- widedot
                         [0x00308] = { yoffset = -0.12 , all=true }, -- wideddot
-                        -- [0x020DB] = { yoffset = -0.1 , all=true }, -- widedddot
+                     -- [0x020DB] = { yoffset = -0.1 , all=true }, -- widedddot
                         [0x0030A] = { yoffset = -0.12 , all=true }, -- widering
                         [0x0030C] = { yoffset = -0.12 , all=true }, -- widecheck
-                        -- [0x002C6] = { scale=.85, yoffset = .1, width = .85, height = .935 }, -- hat
+                     -- [0x002C6] = { scale=.85, yoffset = .1, width = .85, height = .935 }, -- hat
                         [0x00393] = { 0.05, 1.05, 0.075       }, -- \Gamma
                      -- [0x003A6] = { 0.05, 1.05, 0           }, -- \Phi difficult!
                         [0x003A8] = { 0.05, 1.05, 0.075       }, -- \Psi
@@ -107,9 +107,9 @@ return {
                 {
                     tweak   = "fixprimes",
                     scale   = 0.9,
-                    -- smaller = true,
+                 -- smaller = true,
                     factor  = 0.9,
-                    -- fake    = 0.75,
+                 -- fake    = 0.75,
                 },
                 {
                     tweak = "checkspacing",
diff --git a/tex/context/fonts/mkiv/lm.lfg b/tex/context/fonts/mkiv/lm.lfg
index 44ea14571..5ea043b55 100644
--- a/tex/context/fonts/mkiv/lm.lfg
+++ b/tex/context/fonts/mkiv/lm.lfg
@@ -76,17 +76,17 @@ return {
                         [0x002DA] = { yoffset = -0.05 }, -- ring
                         [0x002C7] = { yoffset = -0.05 }, -- check
                         [0x020D7] = { yoffset = -0.05 }, -- vec
-                        [0x00300] = { yoffset = -0.07 , all=true }, -- widegrave
-                        [0x00301] = { yoffset = -0.07 , all=true }, -- wideacute
-                        [0x00302] = { yoffset = -0.1 , all=true }, -- widehat
-                        [0x00303] = { yoffset = -0.09 , all=true }, -- widetilde
-                        [0x00304] = { yoffset = -0.1 , all=true }, -- widebar
-                        [0x00306] = { yoffset = -0.07 , all=true }, -- widebreve
-                        [0x00307] = { yoffset = -0.05 , all=true }, -- widedot
-                        [0x00308] = { yoffset = -0.05 , all=true }, -- wideddot
-                        [0x020DB] = { yoffset = -0.075 , all=true }, -- widedddot
-                        [0x0030A] = { yoffset = -0.05 , all=true }, -- widering
-                        [0x0030C] = { yoffset = -0.075 , all=true }, -- widecheck
+                        [0x00300] = { yoffset = -0.07,  all = true }, -- widegrave
+                        [0x00301] = { yoffset = -0.07,  all = true }, -- wideacute
+                        [0x00302] = { yoffset = -0.1,   all = true }, -- widehat
+                        [0x00303] = { yoffset = -0.09,  all = true }, -- widetilde
+                        [0x00304] = { yoffset = -0.1,   all = true }, -- widebar
+                        [0x00306] = { yoffset = -0.07,  all = true }, -- widebreve
+                        [0x00307] = { yoffset = -0.05,  all = true }, -- widedot
+                        [0x00308] = { yoffset = -0.05,  all = true }, -- wideddot
+                        [0x020DB] = { yoffset = -0.075, all = true }, -- widedddot
+                        [0x0030A] = { yoffset = -0.05,  all = true }, -- widering
+                        [0x0030C] = { yoffset = -0.075, all = true }, -- widecheck
                     },
                 },
                 {
@@ -103,9 +103,9 @@ return {
                 {
                     tweak   = "fixprimes",
                     factor  = 1.05,
-                    -- smaller = true,
+                 -- smaller = true,
                     scale   = 0.9,
-                    -- fake    = 0.6,
+                 -- fake    = 0.6,
                 },
                 {
                     tweak = "checkspacing",
@@ -125,21 +125,15 @@ return {
             },
         },
         parameters = {
-            FractionNumeratorDisplayStyleShiftUp = function(value,target,original)
-                local o = original.mathparameters.FractionNumeratorDisplayStyleShiftUp
-                if o > 675 then
-                    o = 600
-                else
-                    -- probably tuned
-                end
-                return o * target.parameters.factor
-            end,
-            NoLimitSupFactor =   0,
-            NoLimitSubFactor = 900,
-            -- AccentBaseHeight = 0,
-            AccentBaseDepth  = 50,
-        },
-        bigs = {1, 3, 5, 7},
+            FractionNumeratorDisplayStyleShiftUp = 600, -- used to be a function
+            NoLimitSupFactor                     =   0,
+            NoLimitSubFactor                     = 900,
+         -- AccentBaseHeight                     =   0,
+            AccentBaseDepth                      =  50,
+        },
+        bigslots = {
+            1, 3, 5, 7
+        },
         --
         -- experimental fixes for mkiv:
         --
diff --git a/tex/context/fonts/mkiv/lucida-opentype-math.lfg b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
index 72f4ca9e6..44d470650 100644
--- a/tex/context/fonts/mkiv/lucida-opentype-math.lfg
+++ b/tex/context/fonts/mkiv/lucida-opentype-math.lfg
@@ -37,7 +37,7 @@ return {
             NoLimitSupFactor               =   0,
             NoLimitSubFactor               = 900,
             FractionRuleThickness          =  55,
-            -- AccentBaseHeight               = 650,
+         -- AccentBaseHeight               = 650,
             AccentBaseDepth                = 150,
         },
         tweaks = {
@@ -102,10 +102,10 @@ return {
                 },
                 {
                   tweak   = "fixprimes",
-                  factor  = 0.8, -- accent base height
-               --    smaller = true, -- replace multiples
-                  scale   = 1.1, -- glyph scale
-               --    fake    = 0.65, -- replace multiples with this width proportion
+                  factor  = 0.8,  -- accent base height
+               -- smaller = true, -- replace multiples
+                  scale   = 1.1,  -- glyph scale
+               -- fake    = 0.65, -- replace multiples with this width proportion
                -- keep    = true, -- keep the text size prime (aka minute)
                 },
                 {
diff --git a/tex/context/fonts/mkiv/pagella-math.lfg b/tex/context/fonts/mkiv/pagella-math.lfg
index d1e77e9bf..17f59d952 100644
--- a/tex/context/fonts/mkiv/pagella-math.lfg
+++ b/tex/context/fonts/mkiv/pagella-math.lfg
@@ -38,8 +38,8 @@ return {
             NoLimitSupFactor =   0,
             NoLimitSubFactor = 900,
             AccentTopShiftUp =  30,
-            -- AccentBaseHeight = 0,
-            AccentBaseDepth  = 80,
+         -- AccentBaseHeight =   0,
+            AccentBaseDepth  =  80,
         },
         tweaks = {
             aftercopying = {
@@ -62,8 +62,8 @@ return {
                 {
                     tweak = "dimensions",
                     list  = {      -- offset width italic
-                        -- [0x002C6] = { scale=.85, yoffset = .1, width = .85, height = .935 }, -- hat
-                        -- [0x00302] = { scale=.85, yoffset = .1, width = .85, height = .935 }, -- hat
+                     -- [0x002C6] = { scale=.85, yoffset = .1, width = .85, height = .935 }, -- hat
+                     -- [0x00302] = { scale=.85, yoffset = .1, width = .85, height = .935 }, -- hat
                      -- [0x002C6] = { scale=.75, yoffset = .2, advance = .75, width = .75, height = .90 }, -- hat
                      -- [0x00302] = { scale=.75, yoffset = .2, advance = .75, width = .75, height = .90 }, -- hat
                         [0x00060] = { yoffset = -0.035 }, -- grave
@@ -75,19 +75,19 @@ return {
                         [0x002D9] = { yoffset = -0.035 }, -- dot
                         [0x000A8] = { yoffset = -0.05 }, -- ddot
                         [0x020DB] = { yoffset = -0.06 }, -- dddot
-                        -- [0x002DA] = { yoffset = -0.05 }, -- ring
-                        -- [0x002C7] = { yoffset = -0.05 }, -- check
+                     -- [0x002DA] = { yoffset = -0.05 }, -- ring
+                     -- [0x002C7] = { yoffset = -0.05 }, -- check
                         [0x020D7] = { yoffset = -0.05 }, -- vec
-                        -- [0x00300] = { yoffset = -0.07 , all=true }, -- widegrave
-                        -- [0x00301] = { yoffset = -0.07 , all=true }, -- wideacute
+                     -- [0x00300] = { yoffset = -0.07 , all=true }, -- widegrave
+                     -- [0x00301] = { yoffset = -0.07 , all=true }, -- wideacute
                         [0x00302] = { yoffset = -0.02 , all=true }, -- widehat
                         [0x00303] = { yoffset = -0.02 , all=true }, -- widetilde
                         [0x00304] = { yoffset = -0.05 , all=true }, -- widebar
                         [0x00306] = { yoffset = -0.03 , all=true }, -- widebreve
                         [0x00307] = { yoffset = -0.03 , all=true }, -- widedot
                         [0x00308] = { yoffset = -0.03 , all=true }, -- wideddot
-                        -- [0x020DB] = { yoffset =  0.0 , all=true }, -- widedddot
-                        -- [0x0030A] = { yoffset = -0.05 , all=true }, -- widering
+                     -- [0x020DB] = { yoffset =  0.0 , all=true }, -- widedddot
+                     -- [0x0030A] = { yoffset = -0.05 , all=true }, -- widering
                         [0x0030C] = { yoffset = -0.03 , all=true }, -- widecheck
                         [0x1D44E] = { 0,     1,    0,   0.9  }, -- a
                         [0x1D44F] = { 0,     1,    0,   1.3  }, -- b
@@ -128,9 +128,9 @@ return {
                 {
                     tweak   = "fixprimes",
                     factor  = 0.9,
-                    -- smaller = true,
+                 -- smaller = true,
                     scale   = 0.9,
-                    -- fake    = 0.65,
+                 -- fake    = 0.65,
                 },
                 {
                     tweak = "checkspacing",
diff --git a/tex/context/fonts/mkiv/schola-math.lfg b/tex/context/fonts/mkiv/schola-math.lfg
index cea6b501c..02bfa8925 100644
--- a/tex/context/fonts/mkiv/schola-math.lfg
+++ b/tex/context/fonts/mkiv/schola-math.lfg
@@ -20,8 +20,8 @@ return {
         parameters = {
             NoLimitSupFactor =   0,
             NoLimitSubFactor = 900,
-            -- AccentBaseHeight = 0,
-            AccentBaseDepth  = 30,
+         -- AccentBaseHeight =   0,
+            AccentBaseDepth  =  30,
         },
         tweaks = {
             aftercopying = {
@@ -49,7 +49,7 @@ return {
                 {
                     tweak   = "fixprimes",
                     scale   = 0.85,
-                    -- smaller = true,
+                 -- smaller = true,
                     factor  = 1,
                 },
                 {
diff --git a/tex/context/fonts/mkiv/stix-two-math.lfg b/tex/context/fonts/mkiv/stix-two-math.lfg
index 351c6a8ee..5761e53a2 100644
--- a/tex/context/fonts/mkiv/stix-two-math.lfg
+++ b/tex/context/fonts/mkiv/stix-two-math.lfg
@@ -50,7 +50,7 @@ return {
                  -- feature  = false, -- use the saved ones (see typescript)
                     selector = 0xFE00,
                 },
-                -- 0xFEO1 should be roundhand style, if present                
+                -- 0xFEO1 should be roundhand style, if present
                 {
                     tweak    = "variants",
                     kind     = "script",
@@ -60,34 +60,34 @@ return {
                 {
                     tweak = "dimensions",
                     list  = {
-                        -- [0x00060] = { yoffset = -0.035 }, -- grave
-                        -- [0x000B4] = { yoffset = -0.035 }, -- acute
-                        -- [0x002C6] = { yoffset = -0.035 }, -- hat
-                        -- [0x002DC] = { yoffset = -0.035 }, -- tilde
-                        -- [0x000AF] = { yoffset = -0.05 }, -- bar
-                        -- [0x002D8] = { yoffset = -0.035 }, -- breve
+                     -- [0x00060] = { yoffset = -0.035 }, -- grave
+                     -- [0x000B4] = { yoffset = -0.035 }, -- acute
+                     -- [0x002C6] = { yoffset = -0.035 }, -- hat
+                     -- [0x002DC] = { yoffset = -0.035 }, -- tilde
+                     -- [0x000AF] = { yoffset = -0.05 }, -- bar
+                     -- [0x002D8] = { yoffset = -0.035 }, -- breve
                         [0x002D9] = { yoffset = -0.02 }, -- dot
                         [0x000A8] = { yoffset = -0.02 }, -- ddot
                         [0x020DB] = { yoffset =  0.04 }, -- dddot
-                        -- [0x002DA] = { yoffset = -0.05 }, -- ring
-                        -- [0x002C7] = { yoffset = -0.05 }, -- check
+                     -- [0x002DA] = { yoffset = -0.05 }, -- ring
+                     -- [0x002C7] = { yoffset = -0.05 }, -- check
                         [0x020D7] = { yoffset = -0.07 }, -- vec
-                        -- [0x00300] = { yoffset = -0.07 , all=true }, -- widegrave
-                        -- [0x00301] = { yoffset = -0.07 , all=true }, -- wideacute
-                        -- [0x00302] = { yoffset = -0.02 , all=true }, -- widehat
-                        -- [0x00303] = { yoffset = -0.02 , all=true }, -- widetilde
-                        -- [0x00304] = { yoffset = -0.05 , all=true }, -- widebar
-                        -- [0x00306] = { yoffset = -0.03 , all=true }, -- widebreve
-                        -- [0x00307] = { yoffset = -0.03 , all=true }, -- widedot
-                        -- [0x00308] = { yoffset = -0.03 , all=true }, -- wideddot
-                        -- [0x020DB] = { yoffset =  0.0 , all=true }, -- widedddot
-                        -- [0x0030A] = { yoffset = -0.05 , all=true }, -- widering
+                     -- [0x00300] = { yoffset = -0.07 , all=true }, -- widegrave
+                     -- [0x00301] = { yoffset = -0.07 , all=true }, -- wideacute
+                     -- [0x00302] = { yoffset = -0.02 , all=true }, -- widehat
+                     -- [0x00303] = { yoffset = -0.02 , all=true }, -- widetilde
+                     -- [0x00304] = { yoffset = -0.05 , all=true }, -- widebar
+                     -- [0x00306] = { yoffset = -0.03 , all=true }, -- widebreve
+                     -- [0x00307] = { yoffset = -0.03 , all=true }, -- widedot
+                     -- [0x00308] = { yoffset = -0.03 , all=true }, -- wideddot
+                     -- [0x020DB] = { yoffset =  0.0 , all=true }, -- widedddot
+                     -- [0x0030A] = { yoffset = -0.05 , all=true }, -- widering
                     },
                 },
                 {
                     tweak   = "fixprimes",
                     scale   = 1,
-                    -- smaller = true,
+                 -- smaller = true,
                     factor  = 1,
                 },
                 {
diff --git a/tex/context/fonts/mkiv/termes-math.lfg b/tex/context/fonts/mkiv/termes-math.lfg
index 45eaa0505..e9796dc31 100644
--- a/tex/context/fonts/mkiv/termes-math.lfg
+++ b/tex/context/fonts/mkiv/termes-math.lfg
@@ -28,7 +28,7 @@ return {
         parameters = {
             NoLimitSupFactor =   0,
             NoLimitSubFactor = 900,
-            -- AccentBaseHeight = 0,
+         -- AccentBaseHeight = 0,
             AccentBaseDepth  = 50,
         },
         tweaks = {
@@ -70,7 +70,7 @@ return {
                 {
                     tweak   = "fixprimes",
                     scale   = 0.85,
-                  --  smaller = true,
+                 -- smaller = true,
                     factor  = 0.95,
                 },
                 {