diff options
Diffstat (limited to 'tex/context/fonts/mkiv/garamond-math.lfg')
| -rw-r--r-- | tex/context/fonts/mkiv/garamond-math.lfg | 231 |
1 files changed, 98 insertions, 133 deletions
diff --git a/tex/context/fonts/mkiv/garamond-math.lfg b/tex/context/fonts/mkiv/garamond-math.lfg index a0a0700f5..9537f52b9 100644 --- a/tex/context/fonts/mkiv/garamond-math.lfg +++ b/tex/context/fonts/mkiv/garamond-math.lfg @@ -42,19 +42,20 @@ return { { tweak = "addmirrors", }, - presets.matheulercalligraphic { rscale = 0.95 }, - presets.mathrsfscript { rscale = 0.95 }, - presets.mathxitsarabic { rscale = 0.80 }, - { - tweak = "oldstylemath", - factor = 0, - }, + presets.scripttocalligraphic { }, + presets.rsfstoscript { rscale = 0.95 }, + presets.rsfsuprighttoscript { rscale = 0.95 }, + presets.moderntocalligraphic { rscale = 0.95 }, + presets.eulertocalligraphic { rscale = 0.95 }, + presets.xitsarabic { rscale = 0.80 }, + presets.fallbacks { }, + presets.moveitalics { correct = true }, + presets.moveitalics { correct = true, letters = true }, + presets.moveintegrals { factor = 1.5 }, + presets.wipeitalics { }, { tweak = "simplifykerns", }, - presets.moveitalics { - correct = true - }, { tweak = "topanchors", list = { @@ -62,15 +63,10 @@ return { }, }, { - tweak = "limits", - factor = 1.5, - list = mathematics.tweaks.subsets.integrals, - }, - { tweak = "dimensions", list = { -- for older entries, see bottom of file - [0x1D453] = { width = 1.1, }, -- italic f + [0x1D453] = { width = 1.1 }, -- italic f }, }, { @@ -140,10 +136,10 @@ return { [mathematics.tweaks.subsets.f] = -.25, [0x1D70C] = -.25, -- italic \rho }, - -- "uppercaseitalic" = { - -- [mathematics.tweaks.subsets.f] = -.25, - -- [0x1D70C] = -.25, -- italic \rho - -- }, + -- ["uppercaseitalic"] = { + -- [mathematics.tweaks.subsets.f] = -.25, + -- [0x1D70C] = -.25, -- italic \rho + -- }, }, }, -- Accents are a mess. We migrate the extensibles from the combiners to the base accent @@ -160,10 +156,10 @@ return { { tweak = "dimensions", list = { - -- [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat - -- [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde - -- [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve - -- [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck + -- [0x00302] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widehat + -- [0x00303] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widetilde + -- [0x00306] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widebreve + -- [0x0030C] = { width = 1.4, anchor = 1.20, xoffset = .10 }, -- widecheck }, }, -- Then we deal with all offsets and heights in one go. So we treat the initial accent @@ -192,39 +188,6 @@ return { { tweak = "copyaccents", }, - -- So far for the accents. - { - -- For non-italic alphabets we remove italic correction. - -- This one is/will become obsolete - -- tweak = "wipeitalics", - list = { - "digitsbold", - "digitsdoublestruck", - "digitsmonospace", - "digitsnormal", - "digitssansserifbold", - "digitssansserifnormal", - -- "lowercasebold", - "lowercaseboldfraktur", - "lowercasedoublestruck", - "lowercasefraktur", - "lowercasemonospace", - -- "lowercasenormal", - "lowercasesansserifbold", - -- "lowercasesansserifnormal", - -- "lowercasegreeknormal", - -- "uppercasebold", - "uppercaseboldfraktur", - "uppercasedoublestruck", - "uppercasefraktur", - "uppercasegreekbold", - "uppercasegreeknormal", - "uppercasegreeksansserifbold", - "uppercasemonospace", - "uppercasesansserifbold", - "uppercasesanserifnormal", -- some remain - }, - }, { tweak = "checkspacing", }, @@ -251,6 +214,12 @@ return { tweak = "addfourier", variant = 1, }, + -- this is the mkiv section + { + tweak = "emulatelmtx", + feature = "emulatelmtx", + comment = "this is for mkiv", + }, { tweak = "diagnose", }, @@ -272,82 +241,78 @@ return { }, } +-- For now we keep these commented as they show where we came from. +-- { +-- tweak = "dimensions", +-- list = { +-- -- offset width italic +-- -- -- [0x00060] = { yoffset = -0.1 }, -- grave +-- -- -- [0x000B4] = { yoffset = -0.1 }, -- acute +-- -- [0x002C6] = { yoffset = -0.1 }, -- hat +-- -- [0x002DC] = { yoffset = -0.1 }, -- tilde +-- -- -- [0x000AF] = { yoffset = -0.1 }, -- bar +-- -- [0x002D8] = { yoffset = -0.15 }, -- breve +-- -- [0x002D9] = { yoffset = -0.15 }, -- dot +-- -- -- [0x000A8] = { yoffset = -0.1 }, -- ddot +-- -- [0x020DB] = { yoffset = -0.115 }, -- dddot +-- -- [0x002C7] = { yoffset = -0.1 }, -- check +-- -- [0x020D7] = { yoffset = -0.1 }, -- vec +-- -- [0x00300] = { yoffset = -0.12 , all = true }, -- widegrave +-- -- [0x00301] = { yoffset = -0.12 , all = true }, -- wideacute +-- -- [0x00302] = { yoffset = -0.12 , all = true }, -- widehat +-- -- [0x00303] = { yoffset = -0.12 , all = true }, -- widetilde +-- -- [0x00304] = { yoffset = -0.12 , all = true }, -- widebar +-- -- [0x00306] = { yoffset = -0.12 , all = true }, -- widebreve +-- -- [0x00307] = { yoffset = -0.12 , all = true }, -- widedot +-- -- [0x00308] = { yoffset = -0.12 , all = true }, -- wideddot +-- -- -- [0x020DB] = { yoffset = -0.1 , all = true }, -- widedddot +-- -- [0x0030A] = { yoffset = -0.12 , all = true }, -- widering +-- -- [0x0030C] = { yoffset = -0.12 , all = true }, -- widecheck --- Some old entries: - - -- { - -- tweak = "dimensions", - -- list = { - -- -- offset width italic - -- -- -- [0x00060] = { yoffset = -0.1 }, -- grave - -- -- -- [0x000B4] = { yoffset = -0.1 }, -- acute - -- -- [0x002C6] = { yoffset = -0.1 }, -- hat - -- -- [0x002DC] = { yoffset = -0.1 }, -- tilde - -- -- -- [0x000AF] = { yoffset = -0.1 }, -- bar - -- -- [0x002D8] = { yoffset = -0.15 }, -- breve - -- -- [0x002D9] = { yoffset = -0.15 }, -- dot - -- -- -- [0x000A8] = { yoffset = -0.1 }, -- ddot - -- -- [0x020DB] = { yoffset = -0.115 }, -- dddot - -- -- [0x002C7] = { yoffset = -0.1 }, -- check - -- -- [0x020D7] = { yoffset = -0.1 }, -- vec - - -- -- [0x00300] = { yoffset = -0.12 , all = true }, -- widegrave - -- -- [0x00301] = { yoffset = -0.12 , all = true }, -- wideacute - -- -- [0x00302] = { yoffset = -0.12 , all = true }, -- widehat - -- -- [0x00303] = { yoffset = -0.12 , all = true }, -- widetilde - -- -- [0x00304] = { yoffset = -0.12 , all = true }, -- widebar - -- -- [0x00306] = { yoffset = -0.12 , all = true }, -- widebreve - -- -- [0x00307] = { yoffset = -0.12 , all = true }, -- widedot - -- -- [0x00308] = { yoffset = -0.12 , all = true }, -- wideddot - -- -- -- [0x020DB] = { yoffset = -0.1 , all = true }, -- widedddot - -- -- [0x0030A] = { yoffset = -0.12 , all = true }, -- widering - -- -- [0x0030C] = { yoffset = -0.12 , all = true }, -- widecheck - - -- -- [0x002C6] = { scale =.85, yoffset = .1, width = .85, height = .935 }, -- hat - - -- [0x00393] = { xoffset = 0.05, width = 1.05, italic = 0.075 }, -- \Gamma - -- -- [0x003A6] = { xoffset = 0.05, width = 1.05, italic = 0 }, -- \Phi difficult! - -- [0x003A8] = { xoffset = 0.05, width = 1.05, italic = 0.075 }, -- \Psi - -- [0x02113] = { width = 1, italic = 0.075 }, -- \ell - -- [0x1D436] = { width = 1, italic = 0.05 }, -- C - -- [0x1D43D] = { xoffset = 0.3, width = 1.4, italic = 0.1 }, -- J - -- [0x1D44B] = { width = 1, italic = 0.05 }, -- X - -- [0x1D44F] = { width = 1, italic = 0, }, -- b - -- [0x1D450] = { width = 1.1, italic = 0 }, -- c - -- [0x1D451] = { width = 1, italic = 0.05, }, -- d - -- [0x1D452] = { width = 1.1, italic = 0.05 }, -- e - -- [0x00066] = { width = 1.4, italic = 0.0, }, -- f - -- [0x1D453] = { xoffset = 0.15, width = 1.15, italic = 0.1, }, -- f - -- [0x1D454] = { xoffset = 0.1, width = 1.2, italic = 0.1 }, -- g - -- [0x0210E] = { width = 1.1, italic = 0, }, -- h - -- [0x1D457] = { xoffset = 0.2, width = 1.25, italic = 0.05 }, -- j - -- [0x1D458] = { width = 1, italic = 0, }, -- k - -- [0x1D459] = { width = 1, italic = 0.05 }, -- l - -- [0x1D45D] = { xoffset = 0.15, width = 1.15, italic = 0, }, -- p - -- [0x1D45E] = { width = 1.05, italic = 0 }, -- q - -- [0x1D45F] = { width = 1.05, italic = 0 }, -- r - -- [0x1D461] = { width = 1, italic = 0.1 }, -- t - -- [0x1D465] = { xoffset = 0.05, width = 1.1, italic = 0.05 }, -- x - -- [0x1D466] = { xoffset = 0.2, width = 1.2, italic = 0, }, -- y - -- [0x1D6FD] = { xoffset = 0.05, width = 1.1, italic = 0.05 }, -- \beta - -- [0x1D6FE] = { width = 1.05, italic = 0 }, -- \gamma - -- [0x1D6FF] = { width = 1, italic = 0.1 }, -- \delta - -- [0x1D716] = { width = 1.1, italic = 0 }, -- \epsilon - -- [0x1D700] = { width = 1.1, italic = 0 }, -- \varepsilon - -- [0x1D701] = { width = 1, italic = 0.15 }, -- \zeta - -- [0x1D703] = { width = 1, italic = 0.1 }, -- \theta - -- [0x1D705] = { width = 1, italic = 0.1 }, -- \kappa - -- [0x1D706] = { xoffset = 0.05, width = 1.1, italic = 0 }, -- \lambda - -- [0x1D707] = { xoffset = 0.05, width = 1.05, italic = 0 }, -- \mu - -- [0x1D708] = { width = 1.1, italic = 0 }, -- \nu - -- [0x1D709] = { width = 1.1, italic = 0 }, -- \xi - -- [0x1D70B] = { width = 1.05, italic = 0 }, -- \pi - -- [0x1D70C] = { xoffset = 0.2, width = 1.2, italic = 0 }, -- \rho - -- [0x1D70E] = { width = 1, italic = 0.1 }, -- \sigma - -- [0x1D70F] = { xoffset = 0.05, width = 1.05, italic = 0.1 }, -- \tau - -- [0x1D712] = { xoffset = 0.15, width = 1.2, italic = 0.05 }, -- \chi - -- [0x1D713] = { xoffset = 0.05, width = 1.05, italic = 0.05 }, -- \psi - -- }, - -- }, +-- -- [0x002C6] = { scale =.85, yoffset = .1, width = .85, height = .935 }, -- hat +-- [0x00393] = { xoffset = 0.05, width = 1.05, italic = 0.075 }, -- \Gamma +-- -- [0x003A6] = { xoffset = 0.05, width = 1.05, italic = 0 }, -- \Phi difficult! +-- [0x003A8] = { xoffset = 0.05, width = 1.05, italic = 0.075 }, -- \Psi +-- [0x02113] = { width = 1, italic = 0.075 }, -- \ell +-- [0x1D436] = { width = 1, italic = 0.05 }, -- C +-- [0x1D43D] = { xoffset = 0.3, width = 1.4, italic = 0.1 }, -- J +-- [0x1D44B] = { width = 1, italic = 0.05 }, -- X +-- [0x1D44F] = { width = 1, italic = 0, }, -- b +-- [0x1D450] = { width = 1.1, italic = 0 }, -- c +-- [0x1D451] = { width = 1, italic = 0.05, }, -- d +-- [0x1D452] = { width = 1.1, italic = 0.05 }, -- e +-- [0x00066] = { width = 1.4, italic = 0.0, }, -- f +-- [0x1D453] = { xoffset = 0.15, width = 1.15, italic = 0.1, }, -- f +-- [0x1D454] = { xoffset = 0.1, width = 1.2, italic = 0.1 }, -- g +-- [0x0210E] = { width = 1.1, italic = 0, }, -- h +-- [0x1D457] = { xoffset = 0.2, width = 1.25, italic = 0.05 }, -- j +-- [0x1D458] = { width = 1, italic = 0, }, -- k +-- [0x1D459] = { width = 1, italic = 0.05 }, -- l +-- [0x1D45D] = { xoffset = 0.15, width = 1.15, italic = 0, }, -- p +-- [0x1D45E] = { width = 1.05, italic = 0 }, -- q +-- [0x1D45F] = { width = 1.05, italic = 0 }, -- r +-- [0x1D461] = { width = 1, italic = 0.1 }, -- t +-- [0x1D465] = { xoffset = 0.05, width = 1.1, italic = 0.05 }, -- x +-- [0x1D466] = { xoffset = 0.2, width = 1.2, italic = 0, }, -- y +-- [0x1D6FD] = { xoffset = 0.05, width = 1.1, italic = 0.05 }, -- \beta +-- [0x1D6FE] = { width = 1.05, italic = 0 }, -- \gamma +-- [0x1D6FF] = { width = 1, italic = 0.1 }, -- \delta +-- [0x1D716] = { width = 1.1, italic = 0 }, -- \epsilon +-- [0x1D700] = { width = 1.1, italic = 0 }, -- \varepsilon +-- [0x1D701] = { width = 1, italic = 0.15 }, -- \zeta +-- [0x1D703] = { width = 1, italic = 0.1 }, -- \theta +-- [0x1D705] = { width = 1, italic = 0.1 }, -- \kappa +-- [0x1D706] = { xoffset = 0.05, width = 1.1, italic = 0 }, -- \lambda +-- [0x1D707] = { xoffset = 0.05, width = 1.05, italic = 0 }, -- \mu +-- [0x1D708] = { width = 1.1, italic = 0 }, -- \nu +-- [0x1D709] = { width = 1.1, italic = 0 }, -- \xi +-- [0x1D70B] = { width = 1.05, italic = 0 }, -- \pi +-- [0x1D70C] = { xoffset = 0.2, width = 1.2, italic = 0 }, -- \rho +-- [0x1D70E] = { width = 1, italic = 0.1 }, -- \sigma +-- [0x1D70F] = { xoffset = 0.05, width = 1.05, italic = 0.1 }, -- \tau +-- [0x1D712] = { xoffset = 0.15, width = 1.2, italic = 0.05 }, -- \chi +-- [0x1D713] = { xoffset = 0.05, width = 1.05, italic = 0.05 }, -- \psi +-- }, +-- }, |