diff options
Diffstat (limited to 'tex/context/fonts/mkiv')
| -rw-r--r-- | tex/context/fonts/mkiv/libertinus-math.lfg | 54 | ||||
| -rw-r--r-- | tex/context/fonts/mkiv/lucida-opentype-math.lfg | 44 | ||||
| -rw-r--r-- | tex/context/fonts/mkiv/stix-two-math.lfg | 14 | ||||
| -rw-r--r-- | tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv | 13 | ||||
| -rw-r--r-- | tex/context/fonts/mkiv/type-imp-stix.mkiv | 3 | ||||
| -rw-r--r-- | tex/context/fonts/mkiv/type-imp-xits.mkiv | 14 | ||||
| -rw-r--r-- | tex/context/fonts/mkiv/xits-math.lfg | 14 |
7 files changed, 108 insertions, 48 deletions
diff --git a/tex/context/fonts/mkiv/libertinus-math.lfg b/tex/context/fonts/mkiv/libertinus-math.lfg index 1cf22f4d0..3930ce8e2 100644 --- a/tex/context/fonts/mkiv/libertinus-math.lfg +++ b/tex/context/fonts/mkiv/libertinus-math.lfg @@ -16,54 +16,54 @@ return { NoLimitSubFactor = 1000, FractionRuleThickness = 50, OverbarRuleThickness = 50, - -- RadicalRuleThickness = 50, + -- RadicalRuleThickness = 50, UnderbarRuleThickness = 50, - -- AccentBaseHeight = 0, - -- AccentTopShiftUp = 0, - AccentBaseDepth = 10, + -- AccentTopShiftUp = 0, + AccentBaseDepth = 10, }, tweaks = { aftercopying = { { tweak = "version", - expected = "Version 6.8", + -- expected = "Version 6.8", + expected = "Version 7.040", }, { tweak = "dimensions", list = { - [0x00060] = { yoffset = -0.075 }, -- grave - [0x000B4] = { yoffset = -0.075 }, -- acute - [0x002C6] = { yoffset = -0.075 }, -- hat - [0x002DC] = { yoffset = -0.075 }, -- tilde - -- [0x000AF] = { yoffset = -0.1 }, -- bar - [0x002D8] = { yoffset = -0.075 }, -- breve - [0x002D9] = { yoffset = -0.05 }, -- dot - [0x000A8] = { yoffset = -0.02 }, -- ddot - [0x020DB] = { yoffset = -0.02 }, -- dddot - [0x002DA] = { yoffset = -0.1 }, -- ring - -- [0x002C7] = { yoffset = -0.1 }, -- check - [0x020D7] = { yoffset = -0.1 }, -- vec - [0x00300] = { yoffset = -0.1 , all=true }, -- widegrave - [0x00301] = { yoffset = -0.1 , all=true }, -- wideacute - [0x00302] = { yoffset = -0.1 , all=true }, -- widehat + [0x00060] = { yoffset = -0.075 }, -- grave + [0x000B4] = { yoffset = -0.075 }, -- acute + [0x002C6] = { yoffset = -0.075 }, -- hat + [0x002DC] = { yoffset = -0.075 }, -- tilde + -- [0x000AF] = { yoffset = -0.1 }, -- bar + [0x002D8] = { yoffset = -0.075 }, -- breve + [0x002D9] = { yoffset = -0.05 }, -- dot + [0x000A8] = { yoffset = -0.02 }, -- ddot + [0x020DB] = { yoffset = -0.02 }, -- dddot + [0x002DA] = { yoffset = -0.1 }, -- ring + -- [0x002C7] = { yoffset = -0.1 }, -- check + [0x020D7] = { yoffset = -0.1 }, -- vec + [0x00300] = { yoffset = -0.1 , all=true }, -- widegrave + [0x00301] = { yoffset = -0.1 , all=true }, -- wideacute + [0x00302] = { yoffset = -0.1 , all=true }, -- widehat [0x00303] = { yoffset = -0.09 , all=true }, -- widetilde - -- [0x00304] = { yoffset = -0.12 , all=true }, -- widebar + -- [0x00304] = { yoffset = -0.12 , all=true }, -- widebar [0x00306] = { yoffset = -0.05 , all=true }, -- widebreve [0x00307] = { yoffset = -0.02 , all=true }, -- widedot [0x00308] = { yoffset = -0.02 , 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.04 , all=true }, -- widecheck - [0x1D44F] = { 0, 1, 0, 1.5 }, -- b - [0x1D451] = { 0, 1, 0, 1.2 }, -- d - [0x0210E] = { 0, 1, 0, 1.5 }, -- h - [0x1D458] = { 0, 1, 0, 1.5 }, -- k + -- [0x1D44F] = { 0, 1, 0, 1.5 }, -- b (6.8) + -- [0x1D451] = { 0, 1, 0, 1.2 }, -- d (6.8) + -- [0x0210E] = { 0, 1, 0, 1.5 }, -- h (6.8) + -- [0x1D458] = { 0, 1, 0, 1.5 }, -- k (6.8) }, }, { tweak = "fixprimes", scale = 0.9, - -- smaller = true, + -- smaller = true, factor = 0.9, }, { diff --git a/tex/context/fonts/mkiv/lucida-opentype-math.lfg b/tex/context/fonts/mkiv/lucida-opentype-math.lfg index 769965386..6dc6eef2a 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 = { @@ -47,6 +47,29 @@ return { expected = "Version 1.802", }, { + tweak = "substitutes", + list = { + [0x2264] = "ss03", + [0x2265] = "ss03", + } + }, + -- \definefontfeature[mathlucida][copymathscripts=yes] + -- \definefontfeature[mathlucida][copymathscripts=yes,ss04=yes] + -- 0xFEOO should be chancery style, if present + { + tweak = "variants", + kind = "script", + feature = "ss04",-- this changes to chancery style for lucida + -- feature = false, -- use the saved ones (see typescript) + selector = 0xFE00, + }, + -- 0xFEO1 should be roundhand style, if present + { + tweak = "variants", + kind = "script", + selector = 0xFE01, + }, + { tweak = "dimensions", list = { -- these we fix here @@ -61,14 +84,14 @@ return { -- [0x23DD] = { depth = .6, yoffset = 0.4 }, }, }, - { - tweak = "fixprimes", - factor = 0.9, -- accent base height - -- smaller = true, -- replace multiples - scale = 1, -- glyph scale - -- fake = 0.65, -- replace multiples with this width proportion - -- keep = true, -- keep the text size prime (aka minute) - }, + { + 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 + -- keep = true, -- keep the text size prime (aka minute) + }, { tweak = "checkspacing", }, @@ -84,12 +107,11 @@ return { }, }, alternates = { - italic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, + textitalic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, arrow = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, operator = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Smaller Operators" }, calligraphic = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, zero = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Zero" }, - partial = { feature = 'ss20', value = 1, comment = "Mathematical Alternative Upright Partial Differential" }, }, bigslots = { 1, 2, 3, 4 diff --git a/tex/context/fonts/mkiv/stix-two-math.lfg b/tex/context/fonts/mkiv/stix-two-math.lfg index d698167aa..6943e86ad 100644 --- a/tex/context/fonts/mkiv/stix-two-math.lfg +++ b/tex/context/fonts/mkiv/stix-two-math.lfg @@ -32,6 +32,20 @@ return { tweak = "version", expected = "Version 2.12 b168", }, + -- 0xFEOO should be chancery style, if present + { + tweak = "variants", + kind = "script", + -- feature = false, -- use the saved ones (see typescript) + selector = 0xFE00, + }, + -- 0xFEO1 should be roundhand style, if present + { + tweak = "variants", + kind = "script", + feature = "ss01",-- this changes to roundhand style for stixtwo + selector = 0xFE01, + }, { tweak = "dimensions", list = { diff --git a/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv index 61002ff06..4ac23d4c1 100644 --- a/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv +++ b/tex/context/fonts/mkiv/type-imp-lucida-opentype.mkiv @@ -13,6 +13,12 @@ % NOTA BENE: class features and goodies get expanded! +\definefontfeature[mathlucida][copymathscripts=yes] % see lfg file + +% \definefontfeature[mathlucida][mathlucida][ss04=yes] % now we swap + +% \definefontfeature[mathlucida][ss03=yes] + \starttypescriptcollection[lucida-opentype] \starttypescript [lucidaot,lucidadk] @@ -23,8 +29,7 @@ \definetypeface [\typescriptone] [\s!hw] [\s!handwriting] [\typescriptone] [\s!default] [\s!features=\s!default] \definetypeface [\typescriptone] [\s!cg] [\s!calligraphy] [\typescriptone] [\s!default] [\s!features=\s!default] \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] - % for the moment here: - \setupmathrendering[\typescriptone][\s!it=\s!italic] + % no longer: \setupmathrendering[\typescriptone][\s!it=\s!italic] \quittypescriptscanning \stoptypescript @@ -65,8 +70,8 @@ \stoptypescript \starttypescript [\s!math] [lucidaot,lucidadk] - \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lucida-opentype-math] - \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=lucida-opentype-math] + \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-opentype-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-opentype-math] \stoptypescript \starttypescript [\s!handwriting] [lucidaot,lucidadk] diff --git a/tex/context/fonts/mkiv/type-imp-stix.mkiv b/tex/context/fonts/mkiv/type-imp-stix.mkiv index ee11d8389..3104603e1 100644 --- a/tex/context/fonts/mkiv/type-imp-stix.mkiv +++ b/tex/context/fonts/mkiv/type-imp-stix.mkiv @@ -31,6 +31,9 @@ [stixtwomath] [ss02=yes] % otherwise weird (non italic) g +\definefontfeature[stixtwomath][copymathscripts=yes] % see lfg file + + \starttypescriptcollection[stix] % version one diff --git a/tex/context/fonts/mkiv/type-imp-xits.mkiv b/tex/context/fonts/mkiv/type-imp-xits.mkiv index d3504bdbb..f2d3e83c3 100644 --- a/tex/context/fonts/mkiv/type-imp-xits.mkiv +++ b/tex/context/fonts/mkiv/type-imp-xits.mkiv @@ -17,18 +17,20 @@ % scheduled for release by the end of 2010. Version 1.2, which will include Type 1 % fonts for use with LaTeX, will follow in 2011. So, we are on our own anyway. +\definefontfeature[xitsmath][copymathscripts=yes] % see lfg file + \loadtypescriptfile[texgyre] \starttypescriptcollection[xits] \starttypescript [\s!math] [xits,xitsbidi] [\s!name] \loadfontgoodies[xits-math] - \definefontsynonym[\s!MathRoman ][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRoman L2R][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRoman R2L][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRomanBold ][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRomanBold L2R][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra},\s!goodies=xits-math] - \definefontsynonym[\s!MathRomanBold R2L][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra},\s!goodies=xits-math] + \definefontsynonym[\s!MathRoman ][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRoman L2R][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRoman R2L][\s!file:xitsmath-regular.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRomanBold ][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRomanBold L2R][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-l2r,mathextra,xitsmath},\s!goodies=xits-math] + \definefontsynonym[\s!MathRomanBold R2L][\s!file:xitsmath-bold.otf] [\s!features={\s!math\mathsizesuffix-r2l,mathextra,xitsmath},\s!goodies=xits-math] \stoptypescript \starttypescript [\s!serif] [xits] [\s!name] diff --git a/tex/context/fonts/mkiv/xits-math.lfg b/tex/context/fonts/mkiv/xits-math.lfg index 42a7052b9..6c4ac8b66 100644 --- a/tex/context/fonts/mkiv/xits-math.lfg +++ b/tex/context/fonts/mkiv/xits-math.lfg @@ -21,6 +21,20 @@ return { tweak = "version", expected = "Version 1.302", }, + -- 0xFEOO should be chancery style, if present + { + tweak = "variants", + kind = "script", + feature = "ss01",-- this changes to chancery style for xits + -- feature = false, -- use the saved ones (see typescript) + selector = 0xFE00, + }, + -- 0xFEO1 should be roundhand style, if present + { + tweak = "variants", + kind = "script", + selector = 0xFE01, + }, { tweak = "dimensions", list = { |