diff options
Diffstat (limited to 'tex/context/fonts/mkiv')
40 files changed, 1009 insertions, 93 deletions
diff --git a/tex/context/fonts/mkiv/antykwa-math.lfg b/tex/context/fonts/mkiv/antykwa-math.lfg index 2965332e4..debf5d1ed 100644 --- a/tex/context/fonts/mkiv/antykwa-math.lfg +++ b/tex/context/fonts/mkiv/antykwa-math.lfg @@ -147,7 +147,7 @@ return { { name = "sy-anttlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true { name = "sy-anttlz.tfm", vector = "extensible-jmn-private", skewchar=0x30 }, { name = "file:AntykwaTorunskaLight-Regular", vector = "tex-ex-braces", backmap = false }, - { name = "ex-anttl.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyone }, + { name = "ex-anttl.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, }, ["antykwa-cond-math"] = { { name = "file:LatinModern-Math", features = "virtualmath-antykwa-cond", main = true, parameters = false }, @@ -160,9 +160,9 @@ return { { name = "sy-anttcrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true { name = "sy-anttcrz.tfm", vector = "extensible-jmn-private", skewchar=0x30 }, { name = "file:AntykwaTorunskaCond-Regular", vector = "tex-ex-braces", backmap = false }, - { name = "ex-anttcr.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyone }, + { name = "ex-anttcr.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, }, - ["antykwa-lightcond-math"] = { + ["antykwa-light-cond-math"] = { { name = "file:LatinModern-Math", features = "virtualmath-antykwa-lightcond", main = true, parameters = false }, -- { name = "rm-anttcl.tfm", vector = "tex-mr", skewchar=0x7F }, @@ -173,7 +173,7 @@ return { { name = "sy-anttclz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true, ignore = uglyones }, -- jmn = true { name = "sy-anttclz.tfm", vector = "extensible-jmn-private", skewchar=0x30 }, { name = "file:AntykwaTorunskaCondLight-Regular", vector = "tex-ex-braces", backmap = false }, - { name = "ex-anttcl.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyone }, + { name = "ex-anttcl.tfm", vector = "tex-ex", extension = true, badones = badones, ignore = uglyones }, } }, addmissing = helpers.addmissing, diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg index aa35c7b5a..2852c6449 100644 --- a/tex/context/fonts/mkiv/bonum-math.lfg +++ b/tex/context/fonts/mkiv/bonum-math.lfg @@ -125,10 +125,10 @@ return { tweak = "extendaccents", }, { - tweak = "flattenaccents", - squeeze = 0.8, - height = 0.9, - offset = 0.1, + tweak = "flattenaccents", + }, + { + tweak = "fixaccents", -- after flatten (zero width intefrerence) }, { tweak = "radicaldegreeanchors", @@ -149,10 +149,9 @@ return { -- ["0x7C.parts.bottom"] = { bottomright = -0.15 }, -- vertical bar }, }, - - { - tweak = "fixaccents", - }, +-- { +-- tweak = "fixaccents", +-- }, -- First we set the dimensions of the initial accent which started out as zero but we want -- a proper width. { diff --git a/tex/context/fonts/mkiv/cambria-math.lfg b/tex/context/fonts/mkiv/cambria-math.lfg index 9ad2c3afc..3b8e12cd9 100644 --- a/tex/context/fonts/mkiv/cambria-math.lfg +++ b/tex/context/fonts/mkiv/cambria-math.lfg @@ -70,6 +70,9 @@ return { tweak = "extendaccents", }, { + tweak = "fixaccents", + }, + { tweak = "radicaldegreeanchors", list = { [0x221A] = { location = "left", hfactor = -0.15, vfactor = .75 }, @@ -82,9 +85,6 @@ return { ["0x221A.parts.bottom"] = { location = "left", hfactor = -0.1, vfactor = 0.95 }, } }, - { - tweak = "fixaccents", - }, -- First we set the dimensions of the initial accent which started out as zero but we want -- a proper width. { diff --git a/tex/context/fonts/mkiv/concrete-math.lfg b/tex/context/fonts/mkiv/concrete-math.lfg index 53972ab05..142778015 100644 --- a/tex/context/fonts/mkiv/concrete-math.lfg +++ b/tex/context/fonts/mkiv/concrete-math.lfg @@ -74,6 +74,12 @@ return { }, }, { + tweak = "extendaccents", + }, + { + tweak = "flattenaccents", + }, + { tweak = "radicaldegreeanchors", list = { ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 1.075 }, diff --git a/tex/context/fonts/mkiv/dejavu-math.lfg b/tex/context/fonts/mkiv/dejavu-math.lfg index f3e1011ad..c97765122 100644 --- a/tex/context/fonts/mkiv/dejavu-math.lfg +++ b/tex/context/fonts/mkiv/dejavu-math.lfg @@ -106,6 +106,9 @@ return { } }, { + tweak = "flattenaccents", + }, + { tweak = "fixaccents", }, -- First we set the dimensions of the initial accent which started out as zero but we want diff --git a/tex/context/fonts/mkiv/dejavu-text.lfg b/tex/context/fonts/mkiv/dejavu-text.lfg new file mode 100644 index 000000000..ba6458eaf --- /dev/null +++ b/tex/context/fonts/mkiv/dejavu-text.lfg @@ -0,0 +1,58 @@ +return { + name = "dejavu-text", + version = "1.00", + comment = "Goodies that complement dejavu.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "DejaVuSerif", + "DejaVuSerif-Bold", + }, + data = { + ["f"] = { + [")"] = 100, + ["}"] = 100, + ["]"] = 100, + ["|"] = 150, + ["\\"] = 175, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "DejaVuSerif-Italic", + "DejaVuSerif-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 140, + ["}"] = 140, + ["]"] = 140, + ["|"] = 100, + ["\\"] = 200, + ["!"] = 100, + ["?"] = 100, + ["*"] = 250, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 100, + }, + ["["] = { + ["f"] = 100, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/ebgaramond-math.lfg b/tex/context/fonts/mkiv/ebgaramond-math.lfg index bf9a2e027..d2ef73f55 100644 --- a/tex/context/fonts/mkiv/ebgaramond-math.lfg +++ b/tex/context/fonts/mkiv/ebgaramond-math.lfg @@ -13,6 +13,7 @@ return { OverbarRuleThickness = 60, UnderbarRuleThickness = 60, AccentTopShiftUp = -25, -- was 075 + FlattenedAccentBaseHeight = 620, -- 420 in font (maybe some misunderstanding in the font regarding accents and heights) FlattenedAccentTopShiftUp = -25, -- was 075 AccentBaseDepth = 75, DelimiterPercent = 90, @@ -146,8 +147,11 @@ return { tweak = "extendaccents", }, { - tweak = "radicaldegreeanchors", - list = { + tweak = "flattenaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 1.0 }, } }, diff --git a/tex/context/fonts/mkiv/ebgaramond-text.lfg b/tex/context/fonts/mkiv/ebgaramond-text.lfg new file mode 100644 index 000000000..824728460 --- /dev/null +++ b/tex/context/fonts/mkiv/ebgaramond-text.lfg @@ -0,0 +1,59 @@ +return { + name = "ebgaramond-text", + version = "1.00", + comment = "Goodies that complement ebgaramond.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "EBGaramond-Regular", + }, + data = { + ["f"] = { + [")"] = 80, + ["}"] = 100, + ["]"] = 100, + ["|"] = 100, + ["\\"] = 120, + ["!"] = 100, + ["?"] = 100, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "EBGaramond-Italic", + "EBGaramond-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 120, + ["}"] = 120, + ["]"] = 120, + ["|"] = 120, + ["\\"] = 120, + ["!"] = 75, + ["?"] = 75, + ["*"] = 120, + }, + ["("] = { + ["f"] = 120, + }, + ["{"] = { + ["f"] = 120, + }, + ["["] = { + ["f"] = 120, + }, + ["|"] = { + ["f"] = 120, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/erewhon-math.lfg b/tex/context/fonts/mkiv/erewhon-math.lfg index 68a088d3f..223927184 100644 --- a/tex/context/fonts/mkiv/erewhon-math.lfg +++ b/tex/context/fonts/mkiv/erewhon-math.lfg @@ -73,6 +73,9 @@ return { }, }, { + tweak = "flattenaccents", + }, + { tweak = "radicaldegreeanchors", list = { ["0x221A.parts.bottom"] = { location = "left", hfactor = .1, vfactor = 1.025 }, diff --git a/tex/context/fonts/mkiv/erewhon-text.lfg b/tex/context/fonts/mkiv/erewhon-text.lfg new file mode 100644 index 000000000..46a3aa842 --- /dev/null +++ b/tex/context/fonts/mkiv/erewhon-text.lfg @@ -0,0 +1,81 @@ +return { + name = "erewhon-text", + version = "1.00", + comment = "Goodies that complement erewhon.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "Erewhon-Regular", + -- "Erewhon-Bold", + }, + data = { + ["f"] = { + [")"] = 100, + ["}"] = 100, + ["]"] = 100, + ["|"] = 100, + ["\\"] = 75, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "Erewhon-Bold", + }, + data = { + ["f"] = { + [")"] = 25, + ["}"] = 50, + ["]"] = 25, + ["|"] = 50, + ["\\"] = 75, + ["!"] = 50, + ["?"] = 50, + ["*"] = 50, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "Erewhon-Italic", + "Erewhon-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 125, + ["\\"] = 125, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + ["@"] = 100, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 100, + }, + ["["] = { + ["f"] = 100, + }, + ["|"] = { + ["f"] = 130, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/euler-math.lfg b/tex/context/fonts/mkiv/euler-math.lfg index 1c4659786..23d92b047 100644 --- a/tex/context/fonts/mkiv/euler-math.lfg +++ b/tex/context/fonts/mkiv/euler-math.lfg @@ -78,6 +78,9 @@ return { -- add the accent fixes -- fixslashes? { + tweak = "flattenaccents", + }, + { tweak = "checkspacing", }, { diff --git a/tex/context/fonts/mkiv/kpfonts-math.lfg b/tex/context/fonts/mkiv/kpfonts-math.lfg index 5896323b4..1b2eea45f 100644 --- a/tex/context/fonts/mkiv/kpfonts-math.lfg +++ b/tex/context/fonts/mkiv/kpfonts-math.lfg @@ -102,7 +102,9 @@ return { ["0x221A.parts.bottom"] = { location = "left", hfactor = .0, vfactor = 0.65 }, } }, - + { + tweak = "flattenaccents", + }, { tweak = "addscripts", }, diff --git a/tex/context/fonts/mkiv/kpfonts-text.lfg b/tex/context/fonts/mkiv/kpfonts-text.lfg new file mode 100644 index 000000000..6a14bec54 --- /dev/null +++ b/tex/context/fonts/mkiv/kpfonts-text.lfg @@ -0,0 +1,57 @@ +return { + name = "kpfonts-text", + version = "1.00", + comment = "Goodies that complement kpfonts.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "KpRoman-Regular", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["*"] = 50, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "KpRoman-Italic", + "KpRoman-SemiboldItalic", + }, + data = { + ["f"] = { + [")"] = 150, + ["}"] = 50, + ["]"] = 50, + ["|"] = 125, + ["\\"] = 125, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + ["@"] = 100, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 100, + }, + ["["] = { + ["f"] = 100, + }, + ["|"] = { + ["f"] = 130, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/libertinus-math.lfg b/tex/context/fonts/mkiv/libertinus-math.lfg index ac15d6674..0b8ca42ad 100644 --- a/tex/context/fonts/mkiv/libertinus-math.lfg +++ b/tex/context/fonts/mkiv/libertinus-math.lfg @@ -87,6 +87,9 @@ return { tweak = "extendaccents", }, { + tweak = "flattenaccents", + }, + { tweak = "fixaccents", }, -- First we set the dimensions of the initial accent which started out as zero but we want diff --git a/tex/context/fonts/mkiv/libertinus-text.lfg b/tex/context/fonts/mkiv/libertinus-text.lfg new file mode 100644 index 000000000..76afb51cd --- /dev/null +++ b/tex/context/fonts/mkiv/libertinus-text.lfg @@ -0,0 +1,59 @@ +return { + name = "libertinus-text", + version = "1.00", + comment = "Goodies that complement libertinus.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "LibertinusSerif-Regular", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 100, + ["\\"] = 50, + ["*"] = 50, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "LibertinusSerif-Italic", + "LibertinusSerif-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 125, + ["\\"] = 125, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + ["@"] = 100, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 100, + }, + ["["] = { + ["f"] = 100, + }, + ["|"] = { + ["f"] = 130, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/lucida-math.lfg b/tex/context/fonts/mkiv/lucida-math.lfg index 50dce6907..1e5391d6a 100644 --- a/tex/context/fonts/mkiv/lucida-math.lfg +++ b/tex/context/fonts/mkiv/lucida-math.lfg @@ -15,6 +15,7 @@ return { parameters = { FractionRuleThickness = 55, -- AccentBaseDepth = 250, + FlattenedAccentBaseHeight = 710,-- not present in font, set too small by 1. DelimiterPercent = 90, DelimiterShortfall = 400, SuperscriptBottomMaxWithSubscript = 325, @@ -126,16 +127,19 @@ return { tweak = "extendaccents", }, { - tweak = "radicaldegreeanchors", - list = { + tweak = "flattenaccents", + }, + { + tweak = "fixaccents", + }, + { + tweak = "radicaldegreeanchors", + list = { ["0x221A.variants.3"] = { location = "left", hfactor = 0, vfactor = .55 }, ["0x221A.variants.4"] = { location = "left", hfactor = 0, vfactor = .50 }, ["0x221A.parts.bottom"] = { location = "left", hfactor = 0, vfactor = .85 }, } }, - { - tweak = "fixaccents", - }, -- First we set the dimensions of the initial accent which started out as zero but we want -- a proper width. Not in lucida -- Then we deal with all offsets and heights in one go. So we treat the initial accent diff --git a/tex/context/fonts/mkiv/lucida-text.lfg b/tex/context/fonts/mkiv/lucida-text.lfg new file mode 100644 index 000000000..cd32aee2b --- /dev/null +++ b/tex/context/fonts/mkiv/lucida-text.lfg @@ -0,0 +1,69 @@ +return { + name = "lucida-text", + version = "1.00", + comment = "Goodies that complement lucida.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "LucidaBrightOT", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 70, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "LucidaBrightOT-Demibold", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 70, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + { + name = "kern", + type = "kern", + fonts = { + "LucidaBrightOT-Italic", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 20, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + { + name = "kern", + type = "kern", + fonts = { + "LucidaBrightOT-DemiboldItalic", + }, + data = { + ["f"] = { + [")"] = 70, + ["}"] = 40, + ["]"] = 70, + ["\\"] = 100, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/modern-math.lfg b/tex/context/fonts/mkiv/modern-math.lfg index e2560f0f1..fb9c8fd4b 100644 --- a/tex/context/fonts/mkiv/modern-math.lfg +++ b/tex/context/fonts/mkiv/modern-math.lfg @@ -144,14 +144,17 @@ return { tweak = "extendaccents", }, { + tweak = "flattenaccents", + }, + { + tweak = "fixaccents", + }, + { tweak = "radicaldegreeanchors", list = { ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.05 }, } }, - { - tweak = "fixaccents", - }, -- First we set the dimensions of the initial accent which started out as zero but we want -- a proper width. { diff --git a/tex/context/fonts/mkiv/modern-text.lfg b/tex/context/fonts/mkiv/modern-text.lfg new file mode 100644 index 000000000..20bdcc60b --- /dev/null +++ b/tex/context/fonts/mkiv/modern-text.lfg @@ -0,0 +1,62 @@ +return { + name = "modern-text", + version = "1.00", + comment = "Goodies that complement latin modern.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + -- "LMRoman-Regular", + "LMRoman10-Regular", + "LMRoman10-Bold", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 100, + ["\\"] = 50, + ["?"] = 50, + ["*"] = 50, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "LMRoman-Italic", + "LMRoman-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 125, + ["\\"] = 125, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + ["@"] = 100, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 100, + }, + ["["] = { + ["f"] = 100, + }, + ["|"] = { + ["f"] = 130, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/newcomputermodern-math.lfg b/tex/context/fonts/mkiv/newcomputermodern-math.lfg index bb881eda0..9e5e6ab3a 100644 --- a/tex/context/fonts/mkiv/newcomputermodern-math.lfg +++ b/tex/context/fonts/mkiv/newcomputermodern-math.lfg @@ -1,3 +1,5 @@ +local common = fonts.goodies.load("common-math.lfg") +local presets = common.mathematics.tweaks.presets -- In order to be able to use beta math fonts, we use our own file name and -- always remap. As this font is experimental we don't spend too much time -- on it now. Even then, we migth stick to design sizes only. @@ -66,10 +68,12 @@ return { end return o * target.parameters.factor end, - NoLimitSupFactor = 0, - NoLimitSubFactor = 1200, - DelimiterPercent = 90, - DelimiterShortfall = 400, + NoLimitSupFactor = 0, + NoLimitSubFactor = 1200, + DelimiterPercent = 90, + DelimiterShortfall = 400, + AccentTopShiftUp = -60, + FlattenedAccentTopShiftUp = -60, SubscriptBaselineDropMin = 50, -- 200 in font (multiplied by 0.59999/2.39868) SubscriptShiftDown = 150, -- 247 in font (multiplied to be consistent with cm) SubscriptShiftDownWithSuperscript = 247, -- relates to the previous one (see math-act) @@ -91,6 +95,18 @@ return { smaller = true, fake = 0.6, }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { }, + presets.rsfsuprighttoscript { }, + presets.moderntocalligraphic { }, + presets.eulertocalligraphic { }, + presets.xitsarabic { rscale = 0.80 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.4, icfactor = 0.8 }, -- the icfactor is due to the very slanted integral. + presets.wipeanchors { }, + presets.wipeitalics { }, { tweak = "kerns", list = { @@ -115,6 +131,9 @@ return { }, }, { + tweak = "flattenaccents", + }, + { tweak = "checkspacing", }, { diff --git a/tex/context/fonts/mkiv/newcomputermodern-text.lfg b/tex/context/fonts/mkiv/newcomputermodern-text.lfg new file mode 100644 index 000000000..24991642a --- /dev/null +++ b/tex/context/fonts/mkiv/newcomputermodern-text.lfg @@ -0,0 +1,63 @@ +return { + name = "newcomputermodern-text", + version = "1.00", + comment = "Goodies that complement newcomputermodern.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "NewCM10-Book", + "NewCM10", + "NewCM10-Bold", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 100, + ["\\"] = 75, + ["?"] = 50, + ["*"] = 50, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "NewCM10-BookItalic", + "NewCM10-BoldItalic", + "NewCM10-Italic", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 125, + ["\\"] = 100, + ["!"] = 100, + ["?"] = 100, + ["*"] = 50, + ["@"] = 100, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 100, + }, + ["["] = { + ["f"] = 100, + }, + ["|"] = { + ["f"] = 130, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/pagella-math.lfg b/tex/context/fonts/mkiv/pagella-math.lfg index 230f81c9c..a9b3ea4bb 100644 --- a/tex/context/fonts/mkiv/pagella-math.lfg +++ b/tex/context/fonts/mkiv/pagella-math.lfg @@ -40,9 +40,26 @@ return { feature = "euleroverpagella", filename = "euler-math.otf", list = { - { source = { first = 0x02100, last = 0x02BFF } }, - { source = { first = 0x1D400, last = 0x1D7FF } }, - { source = { first = 0x1D538, last = 0x1D550 } }, + { source = "lowercasenormal", target = "lowercaseitalic" }, + { source = "lowercasebold", target = "lowercasebolditalic" }, + { source = "lowercasegreeknormal", target = "lowercasegreekitalic" }, + { source = "lowercasegreekbold", target = "lowercasegreekbolditalic" }, + { source = "uppercasenormal", target = "uppercaseitalic" }, + { source = "uppercasebold", target = "uppercasebolditalic" }, + { source = "uppercasegreeknormal", target = "uppercasegreekitalic" }, + { source = "uppercasegreekbold", target = "uppercasegreekbolditalic" }, + { source = "lowercasenormal", target = "lowercasenormal" }, + { source = "lowercasebold", target = "lowercasebold" }, + { source = "lowercasegreeknormal", target = "lowercasegreeknormal" }, + { source = "lowercasegreekbold", target = "lowercasegreekbold" }, + { source = "uppercasenormal", target = "uppercasenormal" }, + { source = "uppercasebold", target = "uppercasebold" }, + { source = "uppercasegreeknormal", target = "uppercasegreeknormal" }, + { source = "uppercasegreekbold", target = "uppercasegreekbold" }, + { source = "digitsnormal", target = "digitsnormal" }, + -- + { source = { first = 0x02100, last = 0x02BFF } }, -- symbols + { source = { first = 0x1D400, last = 0x1D7FF } }, -- various alphabets }, }, { @@ -94,12 +111,15 @@ return { tweak = "extendaccents", }, { - tweak = "radicaldegreeanchors", - list = { + tweak = "radicaldegreeanchors", + list = { ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.0, vfactor = 1.1 }, } }, { + tweak = "flattenaccents", + }, + { tweak = "fixaccents", }, -- First we set the dimensions of the initial accent which started out as zero but we want diff --git a/tex/context/fonts/mkiv/schola-math.lfg b/tex/context/fonts/mkiv/schola-math.lfg index 2e36f0825..58eb1a6ea 100644 --- a/tex/context/fonts/mkiv/schola-math.lfg +++ b/tex/context/fonts/mkiv/schola-math.lfg @@ -78,12 +78,15 @@ return { tweak = "extendaccents", }, { - tweak = "radicaldegreeanchors", - list = { + tweak = "radicaldegreeanchors", + list = { ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.1 }, } }, { + tweak = "flattenaccents", + }, + { tweak = "fixaccents", }, -- First we set the dimensions of the initial accent which started out as zero but we want diff --git a/tex/context/fonts/mkiv/stixtwo-math.lfg b/tex/context/fonts/mkiv/stixtwo-math.lfg index c0c97862f..ebacf7a81 100644 --- a/tex/context/fonts/mkiv/stixtwo-math.lfg +++ b/tex/context/fonts/mkiv/stixtwo-math.lfg @@ -13,7 +13,11 @@ return { copyright = "ConTeXt development team", mathematics = { alternates = { - calligraphic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, + lambdabar = { feature = 'cv01', value = 1, comment = "Mathematical Alternative Lambda Bar" }, + ramshorn = { feature = 'cv02', value = 1, comment = "Mathematical Alternative Rams Horn" }, + emptyset = { feature = 'cv03', value = 1, comment = "Mathematical Alternative Empty Set" }, + setminus = { feature = 'cv04', value = 1, comment = "Mathematical Alternative Setminus" }, + calligraphic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, -- We do this differently italic = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, barred = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Barred Characters" }, -- hbar, lambdabar etc primes = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Primes" }, -- larger/lower primes, minute etc @@ -23,9 +27,26 @@ return { upright = { feature = 'ss08', value = 1, comment = "Mathematical Alternative Upright Symbols" }, -- upright integrals etc. negated = { feature = 'ss09', value = 1, comment = "Mathematical Alternative Negated Symbols" }, relation = { feature = 'ss10', value = 1, comment = "Mathematical Alternative Relations" }, - negatedset = { feature = 'ss09', value = 1, comment = "Mathematical Alternative Negated Set Symbols" }, - -- todo = { feature = 'ss14', value = 1, comment = "" }, + negatedset = { feature = 'ss11', value = 1, comment = "Mathematical Alternative Negated Set Symbols" }, + propfrown = { feature = 'ss12', value = 1, comment = "Mathematical Alternative Proportional and Frown" }, + negsine = { feature = 'ss13', value = 1, comment = "Mathematical Alternative Negated Sine Wave" }, + intprod = { feature = 'ss14', value = 1, comment = "Mathematical Alternative Interior Products" }, + capcup = { feature = 'ss15', value = 1, comment = "Mathematical Alternative Intersection and Union with serif" }, circled = { feature = 'ss16', value = 1, comment = "Mathematical Alternative Circled Operators" }, + simvar = { feature = 'ss20', value = 1, comment = "Mathematical Alternative Similar and some more unrelated" }, + -- demo features: + negated8774 = { + feature = 'ss09', + value = 1, + comment = "Mathematical Alternative Negated 8774", + list = { [8774] = true }, + }, + negated8775 = { + feature = 'ss09', + value = 1, + comment = "Mathematical Alternative Negated 8775", + list = { [8775] = true }, + }, }, parameters = { AccentBaseDepth = 30, @@ -115,7 +136,9 @@ return { ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.00 }, } }, - + { + tweak = "flattenaccents", + }, { tweak = "fixaccents", }, diff --git a/tex/context/fonts/mkiv/stixtwo-text.lfg b/tex/context/fonts/mkiv/stixtwo-text.lfg new file mode 100644 index 000000000..2a3b46a78 --- /dev/null +++ b/tex/context/fonts/mkiv/stixtwo-text.lfg @@ -0,0 +1,60 @@ +return { + name = "stixtwo-text", + version = "1.00", + comment = "Goodies that complement stix two.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "STIXTwoText-Regular", + "STIXTwoText-Bold", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 100, + ["\\"] = 100, + ["*"] = 50, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "STIXTwoText-Italic", + "STIXTwoText-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 50, + ["}"] = 50, + ["]"] = 50, + ["|"] = 125, + ["\\"] = 125, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + ["@"] = 100, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 100, + }, + ["["] = { + ["f"] = 100, + }, + ["|"] = { + ["f"] = 130, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/termes-math.lfg b/tex/context/fonts/mkiv/termes-math.lfg index 364ea8369..504249878 100644 --- a/tex/context/fonts/mkiv/termes-math.lfg +++ b/tex/context/fonts/mkiv/termes-math.lfg @@ -81,6 +81,12 @@ return { tweak = "extendaccents", }, { + tweak = "flattenaccents", + }, + { + tweak = "fixaccents", + }, + { tweak = "radicaldegreeanchors", list = { [0x221A] = { location = "left", hfactor = 0.0, vfactor = 0.6 }, @@ -88,9 +94,6 @@ return { ["0x221A.parts.bottom"] = { location = "left", hfactor = 0.05, vfactor = 1.1 }, } }, - { - tweak = "fixaccents", - }, -- First we set the dimensions of the initial accent which started out as zero but we want -- a proper width. { diff --git a/tex/context/fonts/mkiv/texgyre-text.lfg b/tex/context/fonts/mkiv/texgyre-text.lfg new file mode 100644 index 000000000..947d730cd --- /dev/null +++ b/tex/context/fonts/mkiv/texgyre-text.lfg @@ -0,0 +1,185 @@ +return { + name = "texgyre-text", + version = "1.00", + comment = "Goodies that complement the texgyre fonts.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + -- we have three optional methods for filtering: + fonts = { + "TeXGyreBonum-Regular", + "TeXGyreBonum-Bold", + }, + -- fonts = { + -- ["TeXGyreBonum-Regular"] = true, + -- }, + -- fonts = "TeXGyreBonum-*", + data = { + ["f"] = { + [")"] = 100, + ["}"] = 100, + ["]"] = 100, + ["|"] = 100, + ["\\"] = 120, + ["!"] = 100, + ["?"] = 100, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "TeXGyreBonum-Italic", + "TeXGyreBonum-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 140, + ["}"] = 140, + ["]"] = 140, + ["|"] = 100, + ["\\"] = 150, + ["!"] = 100, + ["?"] = 100, + }, + ["("] = { + ["f"] = 190, + }, + ["{"] = { + ["f"] = 190, + }, + ["["] = { + ["f"] = 190, + }, + } + }, + { + name = "kern", + type = "kern", + fonts = { + "TeXGyreTermes-Regular", + "TeXGyreTermes-Bold", + }, + data = { + ["f"] = { + [")"] = 75, + ["}"] = 75, + ["]"] = 75, + ["|"] = 75, + ["\\"] = 110, + ["!"] = 75, + ["?"] = 75, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "TeXGyreTermes-Italic", + "TeXGyreTermes-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 75, + ["}"] = 75, + ["]"] = 75, + ["|"] = 75, + ["\\"] = 200, + ["!"] = 75, + ["?"] = 75, + }, + ["("] = { + ["f"] = 75, + }, + ["{"] = { + ["f"] = 75, + }, + ["["] = { + ["f"] = 75, + }, + ["|"] = { + ["f"] = 150, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "TeXGyrePagella-Italic", + "TeXGyrePagella-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 120, + ["}"] = 120, + ["]"] = 120, + ["|"] = 120, + ["\\"] = 120, + ["!"] = 75, + ["?"] = 75, + ["*"] = 120, + }, + ["("] = { + ["f"] = 120, + }, + ["{"] = { + ["f"] = 120, + }, + ["["] = { + ["f"] = 120, + }, + ["|"] = { + ["f"] = 120, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "TeXGyreSchola-Regular", + "TeXGyreSchola-Bold", + }, + data = { + ["f"] = { + [")"] = 120, + ["}"] = 120, + ["]"] = 120, + -- ["|"] = 50, + ["\\"] = 100, + ["!"] = 100, + ["?"] = 100, + ["*"] = 75, + ["@"] = 75, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "TeXGyreSchola-Italic", + "TeXGyreSchola-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 120, + ["}"] = 120, + ["]"] = 120, + ["|"] = 120, + ["\\"] = 120, + ["!"] = 75, + ["?"] = 75, + ["*"] = 120, + ["@"] = 75, + }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/type-imp-dejavu.mkiv b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv index 49b788a73..70fc8ae8d 100644 --- a/tex/context/fonts/mkiv/type-imp-dejavu.mkiv +++ b/tex/context/fonts/mkiv/type-imp-dejavu.mkiv @@ -16,16 +16,16 @@ \definefontfeature[dejavu-condensed-mono][extend=.8] -\starttypescriptcollection[xxdejavu] +\starttypescriptcollection[dejavu] \doifunknownfontfeature {dejavu-math-bold} {\definefontfeature[dejavu-math-bold][boldened]} \starttypescript [\s!serif] [dejavu] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym [\s!Serif] [\s!name:dejavuserif] [\s!features=\s!default,\s!fallbacks=\s!Serif] - \definefontsynonym [\s!SerifBold] [\s!name:dejavuserifbold] [\s!features=\s!default,\s!fallbacks=\s!SerifBold] - \definefontsynonym [\s!SerifItalic] [\s!name:dejavuserifitalic] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic] - \definefontsynonym [\s!SerifBoldItalic] [\s!name:dejavuserifbolditalic] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic] + \definefontsynonym [\s!Serif] [\s!name:dejavuserif] [\s!features=\s!default,\s!fallbacks=\s!Serif,\s!goodies=dejavu-text] + \definefontsynonym [\s!SerifBold] [\s!name:dejavuserifbold] [\s!features=\s!default,\s!fallbacks=\s!SerifBold,\s!goodies=dejavu-text] + \definefontsynonym [\s!SerifItalic] [\s!name:dejavuserifitalic] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic,\s!goodies=dejavu-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!name:dejavuserifbolditalic] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic,\s!goodies=dejavu-text] \stoptypescript \starttypescript [\s!sans] [dejavu] [\s!name] diff --git a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv index 42575a61c..46c73956f 100644 --- a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv +++ b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv @@ -73,10 +73,10 @@ \starttypescript [\s!serif] [ebgaramond] \setups[font:fallback:serif] - \definefontsynonym [\s!Serif] [\s!file:ebgaramond-regular] [\s!features=eb-garamond-normal] - \definefontsynonym [\s!SerifItalic] [\s!file:ebgaramond-italic] [\s!features=eb-garamond-normal] - \definefontsynonym [\s!SerifBold] [\s!file:ebgaramond-bold] [\s!features=eb-garamond-normal] - \definefontsynonym [\s!SerifBoldItalic][\s!file:ebgaramond-bolditalic][\s!features=eb-garamond-normal] + \definefontsynonym [\s!Serif] [\s!file:ebgaramond-regular] [\s!features=eb-garamond-normal,\s!goodies=ebgaramond-text] + \definefontsynonym [\s!SerifItalic] [\s!file:ebgaramond-italic] [\s!features=eb-garamond-normal,\s!goodies=ebgaramond-text] + \definefontsynonym [\s!SerifBold] [\s!file:ebgaramond-bold] [\s!features=eb-garamond-normal,\s!goodies=ebgaramond-text] + \definefontsynonym [\s!SerifBoldItalic][\s!file:ebgaramond-bolditalic][\s!features=eb-garamond-normal,\s!goodies=ebgaramond-text] \definefontsynonym [\s!SerifCaps] [\s!Serif] [\s!features=eb-garamond-smallcaps] \stoptypescript diff --git a/tex/context/fonts/mkiv/type-imp-erewhon.mkiv b/tex/context/fonts/mkiv/type-imp-erewhon.mkiv index c536caa0e..660b4c58a 100644 --- a/tex/context/fonts/mkiv/type-imp-erewhon.mkiv +++ b/tex/context/fonts/mkiv/type-imp-erewhon.mkiv @@ -23,11 +23,11 @@ \doifunknownfontfeature {erewhon-math-bold} {\definefontfeature[erewhon-math-bold][boldened]} \starttypescript [\s!serif] [erewhon] - \definefontsynonym [\s!Serif] [\s!file:Erewhon-Regular] [\s!features=\s!default] - \definefontsynonym [\s!SerifItalic] [\s!file:Erewhon-Italic] [\s!features=\s!default] + \definefontsynonym [\s!Serif] [\s!file:Erewhon-Regular] [\s!features=\s!default,\s!goodies=erewhon-text] + \definefontsynonym [\s!SerifItalic] [\s!file:Erewhon-Italic] [\s!features=\s!default,\s!goodies=erewhon-text] \definefontsynonym [\s!SerifSlanted] [\s!file:Erewhon-RegularSlanted][\s!features=\s!default] - \definefontsynonym [\s!SerifBold] [\s!file:Erewhon-Bold] [\s!features=\s!default] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:Erewhon-BoldItalic] [\s!features=\s!default] + \definefontsynonym [\s!SerifBold] [\s!file:Erewhon-Bold] [\s!features=\s!default,\s!goodies=erewhon-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:Erewhon-BoldItalic] [\s!features=\s!default,\s!goodies=erewhon-text] \definefontsynonym [\s!SerifBoldSlanted][\s!file:Erewhon-BoldSlanted] [\s!features=\s!default] \stoptypescript diff --git a/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv b/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv index c8e92d20b..bc7de3ae7 100644 --- a/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv +++ b/tex/context/fonts/mkiv/type-imp-kpfonts.mkiv @@ -34,10 +34,10 @@ \stoptypescript \starttypescript [\s!serif] [kpfonts,kpfonts-sans,kpfonts-nt] - \definefontsynonym [\s!Serif] [\s!file:KpRoman-Regular.otf] - \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-SemiBold.otf] - \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-Italic.otf] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-SemiboldItalic.otf] + \definefontsynonym [\s!Serif] [\s!file:KpRoman-Regular.otf][\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifBold] [\s!file:KpRoman-SemiBold.otf][\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifItalic] [\s!file:KpRoman-Italic.otf][\s!goodies=kpfonts-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:KpRoman-SemiboldItalic.otf][\s!goodies=kpfonts-text] \definefontsynonym [\s!SerifSlanted] [\s!SerifItalic] \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] \stoptypescript diff --git a/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv index f5082f784..a995bc42f 100644 --- a/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv +++ b/tex/context/fonts/mkiv/type-imp-latinmodern.mkiv @@ -121,12 +121,12 @@ \starttypescript [\s!serif] [modern,latin-modern] \loadfontgoodies[lm] - \definefontsynonym [LMRoman-Regular] [\s!file:lmroman10-regular] [\s!features=\s!default] - \definefontsynonym [LMRoman-Bold] [\s!file:lmroman10-bold] [\s!features=\s!default] + \definefontsynonym [LMRoman-Regular] [\s!file:lmroman10-regular] [\s!features=\s!default,\s!goodies=modern-text] + \definefontsynonym [LMRoman-Bold] [\s!file:lmroman10-bold] [\s!features=\s!default,\s!goodies=modern-text] \definefontsynonym [LMRoman-Demi] [\s!file:lmromandemi10-regular] [\s!features=\s!default] - \definefontsynonym [LMRoman-Italic] [\s!file:lmroman10-italic] [\s!features=\s!default] + \definefontsynonym [LMRoman-Italic] [\s!file:lmroman10-italic] [\s!features=\s!default,\s!goodies=modern-text] \definefontsynonym [LMRoman-Oblique] [\s!file:lmromanslant10-regular] [\s!features=\s!default] - \definefontsynonym [LMRoman-BoldItalic] [\s!file:lmroman10-bolditalic] [\s!features=\s!default] + \definefontsynonym [LMRoman-BoldItalic] [\s!file:lmroman10-bolditalic] [\s!features=\s!default,\s!goodies=modern-text] \definefontsynonym [LMRoman-BoldOblique] [\s!file:lmromanslant10-bold] [\s!features=\s!default] \definefontsynonym [LMRoman-DemiOblique] [\s!file:lmromandemi10-oblique] [\s!features=\s!default] \definefontsynonym [LMRoman-CapsRegular] [\s!file:lmroman10-CapsRegular] [\s!features=\s!default] diff --git a/tex/context/fonts/mkiv/type-imp-libertinus.mkiv b/tex/context/fonts/mkiv/type-imp-libertinus.mkiv index 97e3b3493..36d2666f7 100644 --- a/tex/context/fonts/mkiv/type-imp-libertinus.mkiv +++ b/tex/context/fonts/mkiv/type-imp-libertinus.mkiv @@ -24,11 +24,11 @@ \doifunknownfontfeature {libertinus-math-bold} {\definefontfeature[libertinus-math-bold][boldened]} \starttypescript [\s!serif] [libertinus] - \definefontsynonym [LibertinusSerif-Regular] [\s!file:libertinusserif-regular] - \definefontsynonym [LibertinusSerif-Italic] [\s!file:libertinusserif-italic] + \definefontsynonym [LibertinusSerif-Regular] [\s!file:libertinusserif-regular][\s!goodies=libertinus-text] + \definefontsynonym [LibertinusSerif-Italic] [\s!file:libertinusserif-italic][\s!goodies=libertinus-text] \definefontsynonym [LibertinusSerif-Slanted] [\s!file:libertinusserif-italic] - \definefontsynonym [LibertinusSerif-Bold] [\s!file:libertinusserif-bold] - \definefontsynonym [LibertinusSerif-BoldItalic] [\s!file:libertinusserif-bolditalic] + \definefontsynonym [LibertinusSerif-Bold] [\s!file:libertinusserif-bold][\s!goodies=libertinus-text] + \definefontsynonym [LibertinusSerif-BoldItalic] [\s!file:libertinusserif-bolditalic][\s!goodies=libertinus-text] \definefontsynonym [LibertinusSerif-BoldSlanted] [\s!file:libertinusserif-bolditalic] \stoptypescript diff --git a/tex/context/fonts/mkiv/type-imp-lucida.mkiv b/tex/context/fonts/mkiv/type-imp-lucida.mkiv index 186854efc..44230b55d 100644 --- a/tex/context/fonts/mkiv/type-imp-lucida.mkiv +++ b/tex/context/fonts/mkiv/type-imp-lucida.mkiv @@ -35,10 +35,10 @@ \stoptypescript \starttypescript [\s!serif] [lucida,lucidaot,lucidadk,lucidaot-nt,lucida-nt] - \definefontsynonym [\s!Serif] [\s!file:LucidaBrightOT.otf] - \definefontsynonym [\s!SerifBold] [\s!file:LucidaBrightOT-Demi.otf] - \definefontsynonym [\s!SerifItalic] [\s!file:LucidaBrightOT-Italic.otf] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:LucidaBrightOT-DemiItalic.otf] + \definefontsynonym [\s!Serif] [\s!file:LucidaBrightOT.otf][\s!goodies=lucida-text] + \definefontsynonym [\s!SerifBold] [\s!file:LucidaBrightOT-Demi.otf][\s!goodies=lucida-text] + \definefontsynonym [\s!SerifItalic] [\s!file:LucidaBrightOT-Italic.otf][\s!goodies=lucida-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:LucidaBrightOT-DemiItalic.otf][\s!goodies=lucida-text] \definefontsynonym [\s!SerifSlanted] [\s!SerifItalic] \definefontsynonym [\s!SerifBoldSlanted] [\s!SerifBoldItalic] \stoptypescript diff --git a/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv b/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv index 65a84ec5f..b6bb26c76 100644 --- a/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv +++ b/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv @@ -25,10 +25,10 @@ \starttypescript [\s!serif] [newcomputermodern] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym [\s!Serif] [\s!file:newcm10-regular.otf] [\s!features=\s!default,\s!fallbacks=\s!Serif] - \definefontsynonym [\s!SerifBold] [\s!file:newcm10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBold] - \definefontsynonym [\s!SerifItalic] [\s!file:newcm10-italic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:newcm10-bolditalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic] + \definefontsynonym [\s!Serif] [\s!file:newcm10-regular.otf] [\s!features=\s!default,\s!fallbacks=\s!Serif,\s!goodies=newcomputermodern-text] + \definefontsynonym [\s!SerifBold] [\s!file:newcm10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBold,\s!goodies=newcomputermodern-text] + \definefontsynonym [\s!SerifItalic] [\s!file:newcm10-italic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic,\s!goodies=newcomputermodern-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:newcm10-bolditalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic,\s!goodies=newcomputermodern-text] \stoptypescript \starttypescript [\s!sans] [newcomputermodern] [\s!name] @@ -55,10 +55,10 @@ \starttypescript [\s!serif] [newcomputermodern-book] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym [\s!Serif] [\s!file:newcm10-book.otf] [\s!features=\s!default,\s!fallbacks=\s!Serif] - \definefontsynonym [\s!SerifBold] [\s!file:newcm10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBold] - \definefontsynonym [\s!SerifItalic] [\s!file:newcm10-bookitalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:newcm10-bolditalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic] + \definefontsynonym [\s!Serif] [\s!file:newcm10-book.otf] [\s!features=\s!default,\s!fallbacks=\s!Serif,\s!goodies=newcomputermodern-text] + \definefontsynonym [\s!SerifBold] [\s!file:newcm10-bold.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBold,\s!goodies=newcomputermodern-text] + \definefontsynonym [\s!SerifItalic] [\s!file:newcm10-bookitalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifItalic,\s!goodies=newcomputermodern-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:newcm10-bolditalic.otf] [\s!features=\s!default,\s!fallbacks=\s!SerifBoldItalic,\s!goodies=newcomputermodern-text] \stoptypescript \starttypescript [\s!sans] [newcomputermodern-book] [\s!name] diff --git a/tex/context/fonts/mkiv/type-imp-stix.mkiv b/tex/context/fonts/mkiv/type-imp-stix.mkiv index 3ac0b7257..d1bad9a2e 100644 --- a/tex/context/fonts/mkiv/type-imp-stix.mkiv +++ b/tex/context/fonts/mkiv/type-imp-stix.mkiv @@ -58,10 +58,10 @@ \starttypescript [\s!serif] [stix,stixtwo,xits] [\s!name] \setups[\s!font:\s!fallback:\s!serif] - \definefontsynonym[\s!Serif] [\s!file:stixtwotext-regular.ttf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBold] [\s!file:stixtwotext-bold.ttf] [\s!features=\s!default] - \definefontsynonym[\s!SerifItalic] [\s!file:stixtwotext-italic.ttf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBoldItalic][\s!file:stixtwotext-bolditalic.ttf][\s!features=\s!default] + \definefontsynonym[\s!Serif] [\s!file:stixtwotext-regular.ttf] [\s!features=\s!default,\s!goodies=stixtwo-text] + \definefontsynonym[\s!SerifBold] [\s!file:stixtwotext-bold.ttf] [\s!features=\s!default,\s!goodies=stixtwo-text] + \definefontsynonym[\s!SerifItalic] [\s!file:stixtwotext-italic.ttf] [\s!features=\s!default,\s!goodies=stixtwo-text] + \definefontsynonym[\s!SerifBoldItalic][\s!file:stixtwotext-bolditalic.ttf][\s!features=\s!default,\s!goodies=stixtwo-text] \stoptypescript \starttypescript[stix,stixtwo,xits,stix-nt,stixtwo-nt] diff --git a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv index a3f3952c7..c4f28fcc4 100644 --- a/tex/context/fonts/mkiv/type-imp-texgyre.mkiv +++ b/tex/context/fonts/mkiv/type-imp-texgyre.mkiv @@ -67,10 +67,10 @@ \definetypescriptprefix [n:chancery] [TeXGyreChorus] \starttypescript [\s!serif,\s!sans] [adventor,bonum,bookman,heros,helvetica,pagella,palatino,schola,schoolbook,termes,times] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-regular] [\s!features=\s!default] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-italic] [\s!features=\s!default] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bold] [\s!features=\s!default] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bolditalic] [\s!features=\s!default] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-regular] [\s!features=\s!default,\s!goodies=texgyre-text] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-italic] [\s!features=\s!default,\s!goodies=texgyre-text] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bold] [\s!features=\s!default,\s!goodies=texgyre-text] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bolditalic] [\s!features=\s!default,\s!goodies=texgyre-text] \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Caps] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-regular] [\s!features=\s!smallcaps] \definefontsynonym [\typescriptprefix{n:\typescripttwo}-ItalicCaps] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-italic] [\s!features=\s!smallcaps] \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldCaps] [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bold] [\s!features=\s!smallcaps] diff --git a/tex/context/fonts/mkiv/type-imp-xcharter.mkiv b/tex/context/fonts/mkiv/type-imp-xcharter.mkiv index 6b6e5fc4e..7d1a88241 100644 --- a/tex/context/fonts/mkiv/type-imp-xcharter.mkiv +++ b/tex/context/fonts/mkiv/type-imp-xcharter.mkiv @@ -19,11 +19,11 @@ \doifunknownfontfeature {xcharter-math-bold} {\definefontfeature[xcharter-math-bold][boldened]} \starttypescript [\s!serif] [xcharter] [\s!name] - \definefontsynonym [\s!Serif] [\s!file:XCharter-Roman] [\s!features=\s!default] - \definefontsynonym [\s!SerifItalic] [\s!file:XCharter-Italic] [\s!features=\s!default] + \definefontsynonym [\s!Serif] [\s!file:XCharter-Roman] [\s!features=\s!default,\s!goodies=xcharter-text] + \definefontsynonym [\s!SerifItalic] [\s!file:XCharter-Italic] [\s!features=\s!default,\s!goodies=xcharter-text] \definefontsynonym [\s!SerifSlanted] [\s!file:XCharter-Slanted] [\s!features=\s!default] - \definefontsynonym [\s!SerifBold] [\s!file:XCharter-Bold] [\s!features=\s!default] - \definefontsynonym [\s!SerifBoldItalic] [\s!file:xcharter-BoldItalic] [\s!features=\s!default] + \definefontsynonym [\s!SerifBold] [\s!file:XCharter-Bold] [\s!features=\s!default,\s!goodies=xcharter-text] + \definefontsynonym [\s!SerifBoldItalic] [\s!file:xcharter-BoldItalic] [\s!features=\s!default,\s!goodies=xcharter-text] \definefontsynonym [\s!SerifBoldSlanted][\s!file:XCharter-BoldSlanted][\s!features=\s!default] \stoptypescript diff --git a/tex/context/fonts/mkiv/xcharter-math.lfg b/tex/context/fonts/mkiv/xcharter-math.lfg index 3c349ee88..e2ed3e116 100644 --- a/tex/context/fonts/mkiv/xcharter-math.lfg +++ b/tex/context/fonts/mkiv/xcharter-math.lfg @@ -66,6 +66,9 @@ return { } }, { + tweak = "flattenaccents", + }, + { tweak = "checkspacing", }, { diff --git a/tex/context/fonts/mkiv/xcharter-text.lfg b/tex/context/fonts/mkiv/xcharter-text.lfg new file mode 100644 index 000000000..a836695fd --- /dev/null +++ b/tex/context/fonts/mkiv/xcharter-text.lfg @@ -0,0 +1,62 @@ +return { + name = "xcharter-text", + version = "1.00", + comment = "Goodies that complement Xcharter.", + author = "Mikael Sundqvist & Hans Hagen", + copyright = "ConTeXt development team", + extensions = { + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "XCharter-Roman", + "XCharter-Bold", + }, + data = { + ["f"] = { + [")"] = 125, + ["}"] = 125, + ["]"] = 125, + -- ["|"] = 100, + ["\\"] = 50, + ["*"] = 50, + ["?"] = 50, + ["!"] = 50, + ["\\"] = 125, + }, + } + }, + { + name = "kern", -- adds to kerns + type = "kern", + fonts = { + "XCharter-Italic", + "XCharter-BoldItalic", + }, + data = { + ["f"] = { + [")"] = 150, + ["}"] = 150, + ["]"] = 150, + ["\\"] = 125, + ["!"] = 100, + ["?"] = 100, + ["*"] = 100, + ["@"] = 100, + }, + ["("] = { + ["f"] = 100, + }, + ["{"] = { + ["f"] = 150, + }, + ["["] = { + ["f"] = 100, + }, + ["|"] = { + ["f"] = 130, + }, + } + }, + } +} |