2021-02-01 13:20:00

4 files changed, 21 insertions, 14 deletions

diff --git a/tex/context/fonts/mkiv/px-math.lfg b/tex/context/fonts/mkiv/px-math.lfg
index 08d208b3f..4000ae199 100644
--- a/tex/context/fonts/mkiv/px-math.lfg
+++ b/tex/context/fonts/mkiv/px-math.lfg
@@ -10,18 +10,18 @@ return {
         },
         virtuals = {
             ["px-math"] = {
---                 { name = "texgyre-pagella-math-regular.otf", features = "virtualmath", main = true },
---                 { name = "texgyrepagella-regular.otf", features = "virtualmath", vector = "tex-mr-missing" } ,
-                { name = "texgyrepagella-regular.otf", features = "virtualmath" } ,
-                { name = "rpxr.tfm", vector = "tex-mr" } ,
+                { name = "texgyrepagella-regular.otf", features = "virtualmath" },
+                { name = "texgyrepagella-regular.otf", features = "virtualmath", vector = "tex-mr-missing" },
+                { name = "rpxr.tfm", vector = "tex-mr" },
                 { name = "rpxmi.tfm", vector = "tex-mi", skewchar=0x7F },
-                { name = "rpxpplri.tfm", vector = "tex-it", skewchar=0x7F },
-                { name = "pxsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
+             -- { name = "rpxpplri.tfm", vector = "tex-it", skewchar=0x7F, backmap = true }, -- backmap for lmtx
+                { name = "texgyrepagella-italic.otf", vector = "tex-it", skewchar=0x7F },
+                { name = "pxsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
                 { name = "pxex.tfm", vector = "tex-ex", extension = true } ,
                 { name = "pxsya.tfm", vector = "tex-ma" },
                 { name = "pxsyb.tfm", vector = "tex-mb" },
-                { name = "texgyrepagella-bold.otf", vector = "tex-bf", skewchar=0x7F } ,
-                { name = "texgyrepagella-bolditalic.otf", vector = "tex-bi" } ,
+                { name = "texgyrepagella-bold.otf", vector = "tex-bf", skewchar=0x7F },
+                { name = "texgyrepagella-bolditalic.otf", vector = "tex-bi" },
                 { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true },
                 { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true },
             },
diff --git a/tex/context/fonts/mkiv/tx-math.lfg b/tex/context/fonts/mkiv/tx-math.lfg
index 2ad173486..58467129e 100644
--- a/tex/context/fonts/mkiv/tx-math.lfg
+++ b/tex/context/fonts/mkiv/tx-math.lfg
@@ -12,15 +12,15 @@ return {
             ["tx-math"] = {
                 { name = "texgyretermes-regular.otf", features = "virtualmath", main = true },
                 { name = "texgyretermes-regular.otf", features = "virtualmath", vector = "tex-mr-missing" },
-                { name = "rtxr.tfm", vector = "tex-mr" } ,
+                { name = "rtxr.tfm", vector = "tex-mr" },
                 { name = "rtxptmri.tfm", vector = "tex-it", skewchar=0x7F },
                 { name = "rtxmi.tfm", vector = "tex-mi", skewchar=0x7F },
-                { name = "txsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } ,
-                { name = "txex.tfm", vector = "tex-ex", extension = true } ,
+                { name = "txsy.tfm", vector = "tex-sy", skewchar=0x30, parameters = true },
+                { name = "txex.tfm", vector = "tex-ex", extension = true },
                 { name = "txsya.tfm", vector = "tex-ma" },
                 { name = "txsyb.tfm", vector = "tex-mb" },
-                { name = "texgyretermes-bold.otf", vector = "tex-bf", skewchar=0x7F } ,
-                { name = "texgyretermes-bolditalic.otf", vector = "tex-bi" } ,
+                { name = "texgyretermes-bold.otf", vector = "tex-bf", skewchar=0x7F },
+                { name = "texgyretermes-bolditalic.otf", vector = "tex-bi" },
                 { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true },
                 { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true },
             }
diff --git a/tex/context/fonts/mkiv/type-imp-euler.mkiv b/tex/context/fonts/mkiv/type-imp-euler.mkiv
index e98a6e963..64961830c 100644
--- a/tex/context/fonts/mkiv/type-imp-euler.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-euler.mkiv
@@ -48,7 +48,7 @@
     \stoptypescript
 
     \starttypescript [\s!math] [eulernova] [\s!name]
-        \loadfontgoodies[euler-math]
+      % \loadfontgoodies[euler-math]
         \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features={\s!math\mathsizesuffix,mathextra}]
     \stoptypescript
 
diff --git a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
index 72d3b3588..01cbb869d 100644
--- a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
+++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv
@@ -14,6 +14,13 @@
 %D There are some weird ones that are never used .. all these Caps ... we can better
 %D split them into pagella-caps etc.
 
+%D The tx and px font setups depend on the definitions in px-math.lfg and tx-math.lfg
+%D and because these fonts (mappings, names) are not that stable you should not use
+%D these variants. At some point I will remove this because we have \OPENTYPE\ fonts
+%D that (mostly) work. The mechanism to construct virtual math fonts will probably stay
+%D around but I won't waste time on sorting out all the (changing) font hassles. Also,
+%D the T1 fonts involved are unlikely to be available.
+
 \definefontfeature
   [mathcollapseitalics]
   [collapseitalics=yes]