From 974640d66e61e81cb197ad96fdff7b08343e4c5a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Mar 2021 21:58:15 +0000 Subject: context git-svn-id: svn://tug.org/texlive/trunk@58167 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/context/fonts/mkiv/bonum-math.lfg | 22 +++++++-- .../tex/context/fonts/mkiv/color-latin.lfg | 49 ++++++++++++++++++++ .../tex/context/fonts/mkiv/dejavu-math.lfg | 15 ++++-- .../tex/context/fonts/mkiv/minion-math.lfg | 10 ++-- .../tex/context/fonts/mkiv/pagella-math.lfg | 24 +++++++--- .../texmf-dist/tex/context/fonts/mkiv/px-math.lfg | 16 +++---- .../tex/context/fonts/mkiv/schola-math.lfg | 16 +++++-- .../tex/context/fonts/mkiv/termes-math.lfg | 22 +++++++-- .../texmf-dist/tex/context/fonts/mkiv/tx-math.lfg | 10 ++-- .../tex/context/fonts/mkiv/type-imp-dejavu.mkiv | 3 ++ .../tex/context/fonts/mkiv/type-imp-euler.mkiv | 2 +- .../context/fonts/mkiv/type-imp-latinmodern.mkiv | 4 +- .../context/fonts/mkiv/type-imp-libertinus.mkiv | 4 +- .../context/fonts/mkiv/type-imp-modernlatin.mkiv | 4 +- .../tex/context/fonts/mkiv/type-imp-plex.mkiv | 2 +- .../tex/context/fonts/mkiv/type-imp-punk.mkxl | 54 ++++++++++++++++++++++ .../tex/context/fonts/mkiv/type-imp-stix.mkiv | 22 +++++++-- .../tex/context/fonts/mkiv/type-imp-texgyre.mkiv | 7 +++ .../tex/context/fonts/mkiv/xits-math.lfg | 1 + 19 files changed, 233 insertions(+), 54 deletions(-) create mode 100644 Master/texmf-dist/tex/context/fonts/mkiv/color-latin.lfg create mode 100644 Master/texmf-dist/tex/context/fonts/mkiv/type-imp-punk.mkxl (limited to 'Master/texmf-dist/tex/context/fonts') diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg index 8dfa6340537..51ca2d7f19b 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/bonum-math.lfg @@ -1,5 +1,8 @@ -local kern_200 = { bottomright = { { kern = -200 } } } -local kern_100 = { bottomright = { { kern = -100 } } } +local kern_V = { bottomright = { { kern = -200 } } } +local kern_W = { bottomright = { { kern = -100 } } } +local offset_f = { xoffset = "llx" } + +-- Beware of updates in ssty slots! return { name = "bonum-math", @@ -10,12 +13,21 @@ return { mathematics = { dimensions = { default = { - [0x1D453] = { xoffset = "llx" },-- 𝑓 + -- [0x1D453] = offset_f, -- 𝑓 + -- ["1:0x1D453"] = offset_f, -- needed for compact + -- ["2:0x1D453"] = offset_f, -- needed for compact + ["*:0x1D453"] = offset_f, -- 𝑓 }, }, kerns = { - [0x1D449] = kern_200, -- 𝑉 - [0x1D44A] = kern_100, -- 𝑊 + -- [0x1D449] = kern_V, -- 𝑉 + -- ["1:0x1D449"] = kern_V, -- needed for compact + -- ["2:0x1D449"] = kern_V, -- needed for compact + -- [0x1D44A] = kern_W, -- 𝑊 + -- ["1:0x1D44A"] = kern_W, -- needed for compact + -- ["2:0x1D44A"] = kern_W, -- needed for compact + ["*:0x1D449"] = kern_V, -- 𝑉 + ["*:0x1D44A"] = kern_W, -- 𝑊 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/color-latin.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/color-latin.lfg new file mode 100644 index 00000000000..c7d24cc1d51 --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/color-latin.lfg @@ -0,0 +1,49 @@ +-- If needed we can add names glyphs (maybe some wildcard mapping) ... not that fast +-- but for a specific font one can always make a dedicated file. + +local type = type +local imerged = table.imerged + +local shapes = { } +local default = { } +local upper = { } +local lower = { } + +for k, v in next, characters.data do + local sh = v.shcode + if sh and type(sh) == "number" then + local tsh = shapes[sh] + if tsh then + tsh[#tsh+1] = k + else + shapes[sh] = { sh, k } + end + end +end + +for i=1,26 do + local l = shapes[65 + i - 1] or { } + local u = shapes[97 + i - 1] or { } + upper[i] = u + lower[i] = l + default[i] = imerged(l, u) +end + +-- default = { +-- [1] = { codepoint, ..., glyph_name, ... }, +-- [2] = { codepoint, ..., glyph_name, ... }, +-- ... +-- } + +return { + name = "color-latin", + version = "1.00", + comment = "Side effect of mails from Marcus Vinicius Mesquita to the list.", + author = "Hans Hagen", + copyright = "ConTeXt development team", + colorschemes = { + default = default, + upper = upper, + lower = lower, + } +} diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg index d28c69060e1..608b396f8f7 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/dejavu-math.lfg @@ -1,4 +1,7 @@ -local kern_250 = { bottomright = { { kern = -250 } } } +local kern_V = { bottomright = { { kern = -250 } } } +local kern_W = kern_W + +-- Beware of updates in ssty slots! return { name = "dejavu-math", @@ -8,8 +11,14 @@ return { copyright = "ConTeXt development team", mathematics = { kerns = { - [0x1D449] = kern_250, -- - [0x1D44A] = kern_250, -- 𝑊 + -- [0x1D449] = kern_V, -- 𝑉 + -- ["1:0x1D449"] = kern_V, -- needed for compact + -- ["2:0x1D449"] = kern_V, -- needed for compact + -- [0x1D44A] = kern_W, -- 𝑊 + -- ["1:0x1D44A"] = kern_W, -- needed for compact + -- ["2:0x1D44A"] = kern_W, -- needed for compact + ["*:0x1D449"] = kern_V, -- 𝑉 + ["*:0x1D44A"] = kern_W, -- 𝑊 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg index a4f539ec7b3..863836c1cc0 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/minion-math.lfg @@ -1,6 +1,5 @@ -local kern_100 = { bottomright = { { kern = -100 } } } -local kern_150 = { bottomright = { { kern = -150 } } } -local kern_200 = { bottomright = { { kern = -200 } } } +local kern_W = { bottomright = { { kern = -150 } } } +local kern_V = { bottomright = { { kern = -200 } } } return { name = "minion-math", @@ -23,8 +22,9 @@ return { }, mathematics = { kerns = { - [0x1D449] = kern_200, -- 𝑉 - [0x1D44A] = kern_150, -- 𝑊 + [0x1D449] = kern_V, -- 𝑉 + [0x1D44A] = kern_W, -- 𝑊 + -- todo: ssty 1/2 }, }, } diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg index c85ff3f6b88..d4ae1416288 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/pagella-math.lfg @@ -1,7 +1,8 @@ -local kern_200 = { bottomright = { { kern = -200 } } } -local kern_100 = { bottomright = { { kern = -100 } } } +local kern_V = { bottomright = { { kern = -200 } } } +local kern_W = { bottomright = { { kern = -100 } } } +local offset_f = { xoffset = "llx" } --- Beware of updates ! +-- Beware of updates in ssty slots! return { name = "pagella-math", @@ -12,13 +13,22 @@ return { mathematics = { dimensions = { default = { - -- [0x1D453] = { xoffset = 162, width = 278 + 162 },-- 𝑓 - [0x1D453] = { xoffset = "llx" },-- 𝑓 + -- [0x1D453] = { xoffset = 162, width = 278 + 162 },-- 𝑓 + -- [0x1D453] = offset_f, -- 𝑓 + -- ["1:0x1D453"] = offset_f, -- needed for compact + -- ["2:0x1D453"] = offset_f, -- needed for compact + ["*:0x1D453"] = offset_f, -- 𝑓 }, }, kerns = { - [0x1D449] = kern_200, -- 𝑉 - [0x1D44A] = kern_100, -- 𝑊 + -- [0x1D449] = kern_V, -- 𝑉 + -- ["1:0x1D449"] = kern_V, -- needed for compact + -- ["2:0x1D449"] = kern_V, -- needed for compact + -- [0x1D44A] = kern_W, -- 𝑊 + -- ["1:0x1D44A"] = kern_W, -- needed for compact + -- ["2:0x1D44A"] = kern_W, -- needed for compact + ["*:0x1D449"] = kern_V, -- 𝑉 + ["*:0x1D44A"] = kern_W, -- 𝑊 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/px-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/px-math.lfg index 08d208b3f7f..4000ae1996b 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/px-math.lfg +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg index 9787c18a94e..b60bc6d99f9 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/schola-math.lfg @@ -1,5 +1,7 @@ -local kern_200_050 = { bottomright = { { kern = -200 } }, topright = { { kern = 50 } } } -local kern_100_050 = { bottomright = { { kern = -100 } }, topright = { { kern = 50 } } } +local kern_V = { bottomright = { { kern = -200 } }, topright = { { kern = 50 } } } +local kern_W = { bottomright = { { kern = -100 } }, topright = { { kern = 50 } } } + +-- Beware of updates in ssty slots! return { name = "schola-math", @@ -9,8 +11,14 @@ return { copyright = "ConTeXt development team", mathematics = { kerns = { - [0x1D449] = kern_200_050, -- - [0x1D44A] = kern_100_050, -- 𝑊 + -- [0x1D449] = kern_V, -- 𝑉 + -- ["1:0x1D449"] = kern_V, -- needed for compact + -- ["2:0x1D449"] = kern_V, -- needed for compact + -- [0x1D44A] = kern_W, -- 𝑊 + -- ["1:0x1D44A"] = kern_W, -- needed for compact + -- ["2:0x1D44A"] = kern_W, -- needed for compact + ["*:0x1D449"] = kern_V, -- 𝑉 + ["*:0x1D44A"] = kern_W, -- 𝑊 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg index 1501fd53699..3cf8685ebf0 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/termes-math.lfg @@ -1,5 +1,8 @@ -local kern_200 = { bottomright = { { kern = -200 } } } -local kern_100 = { bottomright = { { kern = -100 } } } +local kern_V = { bottomright = { { kern = -200 } } } +local kern_W = { bottomright = { { kern = -100 } } } +local offset_f = { xoffset = "llx" } + +-- Beware of updates in ssty slots! return { name = "termes-math", @@ -10,12 +13,21 @@ return { mathematics = { dimensions = { default = { - [0x1D453] = { xoffset = "llx" },-- 𝑓 + -- [0x1D453] = offset_f, -- 𝑓 + -- ["1:0x1D453"] = offset_f, -- needed for compact + -- ["2:0x1D453"] = offset_f, -- needed for compact + ["*:0x1D453"] = offset_f, -- 𝑓 }, }, kerns = { - [0x1D449] = kern_200, -- 𝑉 - [0x1D44A] = kern_100, -- 𝑊 + -- [0x1D449] = kern_V, -- 𝑉 + -- ["1:0x1D449"] = kern_V, -- needed for compact + -- ["2:0x1D449"] = kern_V, -- needed for compact + -- [0x1D44A] = kern_W, -- 𝑊 + -- ["1:0x1D44A"] = kern_W, -- needed for compact + -- ["2:0x1D44A"] = kern_W, -- needed for compact + ["*:0x1D449"] = kern_V, -- 𝑉 + ["*:0x1D44A"] = kern_W, -- 𝑊 }, alternates = { dotless = { feature = 'dtls', value = 1, comment = "Mathematical Dotless Forms" }, diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/tx-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/tx-math.lfg index 2ad17348659..58467129e97 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/tx-math.lfg +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv index ee1e9f3831e..6da2daa8996 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-dejavu.mkiv @@ -11,6 +11,9 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% \definefontfallback[Serif] [file:notoserif-regular.ttf] [0x0000-0xFFFF] [check=yes,rscale=1.02] +% \definefontfallback[SerifBold][file:notoserif-bold.ttf] [0x0000-0xFFFF] [check=yes,rscale=1.02] + \definefontfeature[dejavu-condensed-mono][extend=.8] \starttypescriptcollection[dejavu] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-euler.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-euler.mkiv index e98a6e96317..64961830c31 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-euler.mkiv +++ b/Master/texmf-dist/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/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv index cc9559d8b50..dc31715a46a 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv @@ -235,6 +235,8 @@ %D It doesn't hurt to have these, at least for the moment (can go to type-imp-symbol) -\definefontsynonym [ZapfDingbats] [\s!file:uzdr] [\s!features=dingbats]% [\s!goodies=dingbats] +\definefontsynonym [ZapfDingbats] [\s!file:uzdr*dingbats] % works better with symbols + +% \definefontsynonym [ZapfDingbats] [\s!file:uzdr] [\s!features=dingbats]% [\s!goodies=dingbats] \endinput diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv index dc9c23fe2a3..26d17bc03f2 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-libertinus.mkiv @@ -63,12 +63,12 @@ \starttypescript [\s!mono] [libertinus] \setups[\s!font:\s!fallback:\s!mono] - \definefontsynonym [LibertinusMono-Regular] [\s!file:libertinusmono-regular] + \definefontsynonym [LibertinusMono-Regular] [\s!file:libertinusmono-regular] \stoptypescript \starttypescript [\s!mono] [libertinus] [\s!name] \setups[\s!font:\s!fallback:\s!mono] - \definefontsynonym [\s!Mono] [LibertinusMono-Regular] [\s!features=\s!default] + \definefontsynonym [\s!Mono] [LibertinusMono-Regular] [\s!features=\s!none] \stoptypescript \starttypescript [\s!math] [libertinus] [\s!name] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv index 2494d1af2e5..e3417fca557 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-modernlatin.mkiv @@ -54,8 +54,8 @@ \starttypescript [\s!math] [modern-latin] \loadfontgoodies[lm] - \definefontsynonym [MathRoman] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,lm-math-regular,mathextra},\s!goodies=lm] - \definefontsynonym [MathRomanBold] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,lm-math-bold,mathextra},\s!goodies=lm] + \definefontsynonym [MathRoman] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,oldmath,lm-math-regular,mathextra},\s!goodies=lm] + \definefontsynonym [MathRomanBold] [\v!file:latinmodern-math-regular.otf] [\s!features={\s!math\mathsizesuffix,lm-math,oldmath,lm-math-bold,mathextra},\s!goodies=lm] \stoptypescript \starttypescript [modern-latin,modernlatin] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv index 4087cd64df5..1e94306bcc3 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-plex.mkiv @@ -48,7 +48,7 @@ \edefinefontsynonym [\typescriptprefix{\typescriptone}] [\s!file:\typescriptprefix{n:plex\typescriptone}-thin] [\s!features=\typescriptprefix{f:plex\typescriptone}] \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Italic] [\s!file:\typescriptprefix{n:plex\typescriptone}-thinitalic] [\s!features=\typescriptprefix{f:plex\typescriptone}] \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!Bold] [\s!file:\typescriptprefix{n:plex\typescriptone}-light] [\s!features=\typescriptprefix{f:plex\typescriptone}] - \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-light] [\s!features=\typescriptprefix{f:plex\typescriptone}] + \edefinefontsynonym [\typescriptprefix{\typescriptone}\s!BoldItalic] [\s!file:\typescriptprefix{n:plex\typescriptone}-lightitalic][\s!features=\typescriptprefix{f:plex\typescriptone}] \stoptypescript % extralight diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-punk.mkxl b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-punk.mkxl new file mode 100644 index 00000000000..aa01a1d4eaa --- /dev/null +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-punk.mkxl @@ -0,0 +1,54 @@ +%D \module +%D [ file=type-imp-punk, +%D version=2020.01.17, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Punk Again, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D Yet another look at punk. + +\ifdefined\enablerandomvariants\else + \useMPlibrary[punk] +\fi + +\doifelse {\truefontname{Serif}} {unknown} { + \writestatus{fonts}{you need to load a base bodyfont first} + \endinput +} { + % we're ok +} + +\starttypescriptcollection[punk] + + \definefontfeature [punk] [metapost={category=punk,preroll=punkpreroll}] + \definefontfeature [punkrandom] [metapost={category=punk,preroll=punkpreroll,variants=5}] + \definefontfeature [punkbold] [metapost={category=punk,preroll=punkpreroll,weight=2}] + \definefontfeature [punkslanted] [metapost={category=punk,preroll=punkpreroll,slant=.15}] + \definefontfeature [punkboldslanted] [metapost={category=punk,preroll=punkpreroll,slant=.15,weight=2}] + \definefontfeature [punkveryslanted] [metapost={category=punk,preroll=punkpreroll,slant=-.15}] + \definefontfeature [punksqueezed] [metapost={category=punk,preroll=punkpreroll,squeeze=.5}] + \definefontfeature [punkextended] [metapost={category=punk,preroll=punkpreroll,extend=1.3}] + + \definefontsynonym [punkbase] [\truefontname{Serif}] + + \starttypescript [\s!serif] [punk] + \definefontsynonym [\s!Serif] [punkbase] [\s!features=punk] + \definefontsynonym [\s!SerifSlanted] [punkbase] [\s!features=punkslanted] + \definefontsynonym [\s!SerifBold] [punkbase] [\s!features=punkbold] + \definefontsynonym [\s!SerifBoldSlanted][punkbase] [\s!features=punkboldslanted] + \definefontsynonym [\s!SerifItalic] [\s!SerifSlanted] + \definefontsynonym [\s!SerifBoldItalic] [\s!SerifBoldSlanted] + \stoptypescript + + \starttypescript [punk] + \definetypeface [punk] [\s!rm] [\s!serif] [punk] [\s!default] + \stoptypescript + +\stoptypescriptcollection + diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv index 697037b43e2..ee11d83899c 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv +++ b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-stix.mkiv @@ -14,6 +14,18 @@ %D We provide typescripts for version one and two of the stix fonts. There is a %D xits variant based on the first (not opentype) release that also provides %D bidirectional math. +%D +%D Users should be aware of the fact that the stix filenames keep changing so if +%D something fails, make sure you have the files and that the names below match +%D those on your system. (In \TEX\ distributions there's 2 and Two and math can have +%D -Regular appended or not. +%D +%D There's now also: +%D +%D stixtwotext-medium.otf +%D stixtwotext-mediumitalic.otf +%D stixtwotext-semibold.otf +%D stixtwotext-semibolditalic.otf \definefontfeature [stixtwomath] @@ -43,15 +55,15 @@ % version two \starttypescript [\s!math] [stixtwo] [\s!name] - \definefontsynonym[MathRoman][\s!file:stix2math.otf] [\s!features={\s!math\mathsizesuffix,stixtwomath,mathextra},\s!goodies=stix-two-math] + \definefontsynonym[MathRoman][\s!file:stixtwomath-regular.otf] [\s!features={\s!math\mathsizesuffix,stixtwomath,mathextra},\s!goodies=stix-two-math] \stoptypescript \starttypescript [\s!serif] [stixtwo] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym[\s!Serif] [\s!file:stix2text-regular.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBold] [\s!file:stix2text-bold.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifItalic] [\s!file:stix2text-italic.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBoldItalic][\s!file:stix2text-bolditalic.otf][\s!features=\s!default] + \definefontsynonym[\s!Serif] [\s!file:stixtwotext-regular.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBold] [\s!file:stixtwotext-bold.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifItalic] [\s!file:stixtwotext-italic.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBoldItalic][\s!file:stixtwotext-bolditalic.otf][\s!features=\s!default] \stoptypescript \starttypescript[stixtwo] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-texgyre.mkiv index 72d3b358844..01cbb869df7 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/type-imp-texgyre.mkiv +++ b/Master/texmf-dist/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] diff --git a/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg b/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg index b37ab1277c9..88d3a8d45fa 100644 --- a/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg +++ b/Master/texmf-dist/tex/context/fonts/mkiv/xits-math.lfg @@ -14,6 +14,7 @@ local italics = { -- [0x1D44E] = 0.99, -- a (fraction of quad) -- [0x1D44F] = 100, -- b (font points) [0x1D453] = -0.0375, -- f + -- todo: ssty 1/2 } } -- cgit v1.2.3