diff options
Diffstat (limited to 'tex/context/fonts')
22 files changed, 253 insertions, 55 deletions
diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg index 56262eb32..aa35c7b5a 100644 --- a/tex/context/fonts/mkiv/bonum-math.lfg +++ b/tex/context/fonts/mkiv/bonum-math.lfg @@ -233,6 +233,13 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + -- minus = true, -- we have an extensible + fraction = { height = .244, yoffset = .757 }, + radical = { height = .244, yoffset = .754 }, + stacker = { height = .244, yoffset = .757 }, + }, + { -- This tweak is only needed for the funny arrows and these now get properly -- centered. (Could actually be done in the engine). tweak = "addarrows", diff --git a/tex/context/fonts/mkiv/cambria-math.lfg b/tex/context/fonts/mkiv/cambria-math.lfg index a855a2513..9ad2c3afc 100644 --- a/tex/context/fonts/mkiv/cambria-math.lfg +++ b/tex/context/fonts/mkiv/cambria-math.lfg @@ -131,6 +131,26 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + minus = { + leftoffset = .0925, + rightoffset = .0925, + }, + fraction = { + height = .204, + yoffset = .796, + }, + radical = { + height = .204, + yoffset = .796, + -- leftoffset = .075, + }, + stacker = { + height = .204, + yoffset = .796, + }, + }, + { tweak = "wipecues", }, { diff --git a/tex/context/fonts/mkiv/common-math-jmn.lfg b/tex/context/fonts/mkiv/common-math-jmn.lfg index bcbe77962..1ebb7db39 100644 --- a/tex/context/fonts/mkiv/common-math-jmn.lfg +++ b/tex/context/fonts/mkiv/common-math-jmn.lfg @@ -55,6 +55,10 @@ return { local sfm = ps("flat rule middle piece") local sfr = ps("flat rule right piece") + local mrl = ps("minus rule left piece") + local mrm = ps("minus rule middle piece") + local mrr = ps("minus rule right piece") + local dfl = ps("flat double rule left piece") local dfm = ps("flat double rule middle piece") local dfr = ps("flat double rule right piece") @@ -66,6 +70,7 @@ return { local dar = ps("double arrow right piece") local rad = ps("radical bar extender") + local frc = ps("fraction bar extender") local antykwa = characters[srm] @@ -104,11 +109,13 @@ return { builders.jointwo(main,0x27FA,dal,joinrelfactor,dar) if antykwa then - builders.horibar(main,0x203E,srm,srl,srr,0x02212) -- overbar underbar fraction (we take 90/91/92 too!) - -- builders.horibar(main,0x203E,srm,srl,srr,0x0002D) -- overbar underbar fraction (we take 90/91/92 too!) - builders.rootbar(main,rad,srm,srr,0x02212) -- radical + builders.horibar(main,0x2212,mrm,mrl,mrr,0x2212,true,srm,srl,srr) -- minus + builders.horibar(main,0x203E,srm,srl,srr,0x2212) -- overbar underbar fraction (we take 90/91/92 too!) + builders.horibar(main,frc,srm,srl,srr,0x2212) -- fraction + builders.rootbar(main,rad,srm,srr,0x2212) -- radical else - builders.horibar(main,0x203E,0xFE073) -- overbar underbar + builders.horibar(main,0x2212,false,false,false,0x2212,true) -- minus + builders.horibar(main,0x203E,false,false,false,0x02212) end local ffactor = antykwa and 1 or 1 diff --git a/tex/context/fonts/mkiv/concrete-math.lfg b/tex/context/fonts/mkiv/concrete-math.lfg index b69ee0103..53972ab05 100644 --- a/tex/context/fonts/mkiv/concrete-math.lfg +++ b/tex/context/fonts/mkiv/concrete-math.lfg @@ -87,6 +87,13 @@ return { advance = 0.6, }, { + tweak = "replacerules", + minus = true, + fraction = { height = .2, yoffset = .8 }, + radical = { height = .2, yoffset = .8, leftoffset = .2 }, + stacker = { height = .2, yoffset = .8 }, + }, + { tweak = "addactuarian", }, { diff --git a/tex/context/fonts/mkiv/dejavu-math.lfg b/tex/context/fonts/mkiv/dejavu-math.lfg index 03f869288..f3e1011ad 100644 --- a/tex/context/fonts/mkiv/dejavu-math.lfg +++ b/tex/context/fonts/mkiv/dejavu-math.lfg @@ -145,6 +145,13 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + -- minus = true, -- we have an extensible + fraction = { height = .254, yoffset = .746 }, + radical = { height = .254, yoffset = .746, yscale = .912 }, + stacker = { height = .254, yoffset = .746 }, + }, + { tweak = "wipecues", }, { diff --git a/tex/context/fonts/mkiv/ebgaramond-math.lfg b/tex/context/fonts/mkiv/ebgaramond-math.lfg index f6f552dfe..bf9a2e027 100644 --- a/tex/context/fonts/mkiv/ebgaramond-math.lfg +++ b/tex/context/fonts/mkiv/ebgaramond-math.lfg @@ -174,20 +174,23 @@ return { }, { tweak = "replacerules", + minus = { + leftoffset = .075, + rightoffset = .075, + }, fraction = { - template = "minus", -- 0x2212, - xoffset = 0.075, - yoffset = 0.9, - -- width = 0.85, - -- height = 0.1, + height = .2, + yoffset = .8, }, radical = { - template = "minus", -- 0x2212, - xoffset = 0.075, - yoffset = 0.9, - yscale = 0.975, - -- width = 0.85, - -- height = 0.1, + height = .2, + yoffset = .8, + leftoffset = .075, + yscale = .9775, + }, + stacker = { + height = .2, + yoffset = .8, }, }, { diff --git a/tex/context/fonts/mkiv/erewhon-math.lfg b/tex/context/fonts/mkiv/erewhon-math.lfg index 54cc687fa..68a088d3f 100644 --- a/tex/context/fonts/mkiv/erewhon-math.lfg +++ b/tex/context/fonts/mkiv/erewhon-math.lfg @@ -90,6 +90,28 @@ return { { tweak = "addrules", }, +{ + tweak = "replacerules", + -- minus = { + -- height = 0.188, + -- yoffset = 0.812, + -- leftoffset = 0.2, + -- rightoffset = 0.2, + -- }, + fraction = { + height = .188, + yoffset = .812, + }, + radical = { + height = .188, + yoffset = .812, + leftoffset = 0.075, + }, + stacker = { + height = .188, + yoffset = .812, + }, +}, { tweak = "addactuarian", }, diff --git a/tex/context/fonts/mkiv/kpfonts-math.lfg b/tex/context/fonts/mkiv/kpfonts-math.lfg index 67ad3841f..5896323b4 100644 --- a/tex/context/fonts/mkiv/kpfonts-math.lfg +++ b/tex/context/fonts/mkiv/kpfonts-math.lfg @@ -112,6 +112,28 @@ return { { tweak = "addrules", }, +{ + tweak = "replacerules", + -- minus = { + -- height = 0.1818, + -- yoffset = 0.818, + -- leftoffset = 0.2, + -- rightoffset = 0.2, + -- }, + fraction = { + height = .1818, + yoffset = .818, + }, + radical = { + height = .1818, + yoffset = .818, + leftoffset = 0.075, + }, + stacker = { + height = .1818, + yoffset = .818, + }, +}, { -- This will be fixed. Check if new version comes out! tweak = "addbars", diff --git a/tex/context/fonts/mkiv/libertinus-math.lfg b/tex/context/fonts/mkiv/libertinus-math.lfg index 6f707ed2b..ac15d6674 100644 --- a/tex/context/fonts/mkiv/libertinus-math.lfg +++ b/tex/context/fonts/mkiv/libertinus-math.lfg @@ -139,6 +139,29 @@ return { advance = 0.5, }, { + tweak = "replacerules", + minus = { + height = .176, + yoffset = .825, + leftoffset = .065, + rightoffset = .065, + }, + fraction = { + height = .176, + yoffset = .825, + }, + radical = { + height = .140, + yoffset = .800, + leftoffset = .075, + yscale = .950, + }, + stacker = { + height = .176, + yoffset = .825, + }, + }, + { tweak = "addactuarian", }, { diff --git a/tex/context/fonts/mkiv/lucida-math.lfg b/tex/context/fonts/mkiv/lucida-math.lfg index 28510ac2d..50dce6907 100644 --- a/tex/context/fonts/mkiv/lucida-math.lfg +++ b/tex/context/fonts/mkiv/lucida-math.lfg @@ -64,14 +64,14 @@ return { keep = true, list = { { source = "latinsupplement" }, - -- { source = "latinextendeda" }, - -- { source = "latinextendedadditional" }, - -- { source = "latinextendedb" }, - -- { source = "latinextendedc" }, - -- { source = "latinextendedd" }, - -- { source = "latinextendede" }, - -- { source = "latinextendedf" }, - -- { source = "latinextendedg" }, + -- { source = "latinextendeda" }, + -- { source = "latinextendedadditional" }, + -- { source = "latinextendedb" }, + -- { source = "latinextendedc" }, + -- { source = "latinextendedd" }, + -- { source = "latinextendede" }, + -- { source = "latinextendedf" }, + -- { source = "latinextendedg" }, }, }, { @@ -189,6 +189,27 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + minus = { + leftoffset = .2, + rightoffset = .2, + }, + fraction = { + height = .2, + yoffset = .825, + }, + radical = { + height = .2, + yoffset = .825, + leftoffset = .075, + yscale = .940, + }, + stacker = { + height = .2, + yoffset = .825, + }, + }, + { tweak = "addactuarian", }, { diff --git a/tex/context/fonts/mkiv/modern-math.lfg b/tex/context/fonts/mkiv/modern-math.lfg index 4af740789..e2560f0f1 100644 --- a/tex/context/fonts/mkiv/modern-math.lfg +++ b/tex/context/fonts/mkiv/modern-math.lfg @@ -324,6 +324,13 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + -- minus = true, -- we have an extensible + fraction = { height = .15, yoffset = .85 }, + radical = { height = .15, yoffset = .85 }, + stacker = { height = .15, yoffset = .85 }, + }, + { tweak = "addbars", advance = 0.52, }, @@ -346,6 +353,8 @@ return { feature = "emulatelmtx", comment = "this is for mkiv", }, +-- { tweak = "inspect", slot = 0x2212 }, +-- { tweak = "inspect", slot = 0x003D }, }, }, bigslots = { diff --git a/tex/context/fonts/mkiv/newcomputermodern-math.lfg b/tex/context/fonts/mkiv/newcomputermodern-math.lfg index cae69aecc..bb881eda0 100644 --- a/tex/context/fonts/mkiv/newcomputermodern-math.lfg +++ b/tex/context/fonts/mkiv/newcomputermodern-math.lfg @@ -113,7 +113,7 @@ return { ["0x27EB.variants.*"] = { topright = -0.3, bottomright = -0.3 }, }, - }, + }, { tweak = "checkspacing", }, @@ -130,6 +130,13 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + -- minus = true, -- we have an extensible + fraction = { height = .15, yoffset = .85 }, + radical = { height = .15, yoffset = .85 }, + stacker = { height = .15, yoffset = .85 }, + }, + { tweak = "addfourier", variant = 1, }, diff --git a/tex/context/fonts/mkiv/pagella-math.lfg b/tex/context/fonts/mkiv/pagella-math.lfg index c1d0c7dd5..230f81c9c 100644 --- a/tex/context/fonts/mkiv/pagella-math.lfg +++ b/tex/context/fonts/mkiv/pagella-math.lfg @@ -154,7 +154,7 @@ return { [0x27EB] = { topright = -0.2, bottomright = -0.2 }, ["0x27EB.variants.*"] = { topright = -0.3, bottomright = -0.3 }, -- - [0x00393] = { bottomright = -0.20, }, -- upright Gamma + [0x0393] = { bottomright = -0.20, }, -- upright Gamma -- ["0x222B.parts.bottom"] = { bottomright = -0.20 }, -- int ["0x222C.parts.bottom"] = { bottomright = -0.15 }, -- iint @@ -185,6 +185,13 @@ return { advance = 0.2, }, { + tweak = "replacerules", + minus = { rightoffset = .045 }, + fraction = { height = .2, yoffset = .8, rightoffset = .04 }, + radical = { height = .2, yoffset = .8, rightoffset = .04 }, + stacker = { height = .2, yoffset = .8, rightoffset = .04 }, + }, + { tweak = "addactuarian", }, { diff --git a/tex/context/fonts/mkiv/schola-math.lfg b/tex/context/fonts/mkiv/schola-math.lfg index e4a3ad397..2e36f0825 100644 --- a/tex/context/fonts/mkiv/schola-math.lfg +++ b/tex/context/fonts/mkiv/schola-math.lfg @@ -117,6 +117,13 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + -- minus = true, -- we have an extensible + fraction = { height = .25, yoffset = .75 }, + radical = { height = .25, yoffset = .75 }, + stacker = { height = .25, yoffset = .75 }, + }, + { tweak = "addbars", advance = 0.27, }, diff --git a/tex/context/fonts/mkiv/stixtwo-math.lfg b/tex/context/fonts/mkiv/stixtwo-math.lfg index b6b1757b6..c0c97862f 100644 --- a/tex/context/fonts/mkiv/stixtwo-math.lfg +++ b/tex/context/fonts/mkiv/stixtwo-math.lfg @@ -168,6 +168,29 @@ return { advance = 0.4, }, { + tweak = "replacerules", + minus = { + height = .233, + yoffset = .768, + -- leftoffset = .2, + -- rightoffset = .2, + }, + fraction = { + height = .233, + yoffset = .768, + }, + radical = { + height = .233, + yoffset = .768, + leftoffset = .05, + rightoffset = .05, + }, + stacker = { + height = .233, + yoffset = .768, + }, + }, + { tweak = "addactuarian", }, { diff --git a/tex/context/fonts/mkiv/termes-math.lfg b/tex/context/fonts/mkiv/termes-math.lfg index d9c53ee28..364ea8369 100644 --- a/tex/context/fonts/mkiv/termes-math.lfg +++ b/tex/context/fonts/mkiv/termes-math.lfg @@ -123,6 +123,13 @@ return { tweak = "addrules", }, { + tweak = "replacerules", + -- minus = true, -- we have an extensible + fraction = { height = .2, yoffset = .8 }, + radical = { height = .2, yoffset = .8 }, + stacker = { height = .2, yoffset = .8 }, + }, + { tweak = "addbars", advance = 0.3, }, diff --git a/tex/context/fonts/mkiv/type-imp-antykwa.mkiv b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv index f5e3158f4..f2fd100d0 100644 --- a/tex/context/fonts/mkiv/type-imp-antykwa.mkiv +++ b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv @@ -14,14 +14,7 @@ \starttypescriptcollection[antykwa-torunska] \startsetups[antykwa] - % \setupmathfraction[\c!rule=\v!symbol,\c!middle="0203E]% - % \setupmathradical [\c!rule=\v!symbol,\c!top ="FE010]% - % \setupmathfence [\c!alternative=1]% - \letmathfractionparameter\c!rule\v!symbol - \setmathfractionparameter\c!middle{"203E}% - \letmathradicalparameter \c!rule\v!symbol - \setmathradicalparameter \c!top{\radicalbarextenderuc}% - \setmathfenceparameter \c!alternative{1}% + \setmathfenceparameter\c!alternative{1}% \stopsetups % cond => -cont as in iwona diff --git a/tex/context/fonts/mkiv/type-imp-concrete.mkiv b/tex/context/fonts/mkiv/type-imp-concrete.mkiv index abf9b2cb1..c383a27fe 100644 --- a/tex/context/fonts/mkiv/type-imp-concrete.mkiv +++ b/tex/context/fonts/mkiv/type-imp-concrete.mkiv @@ -19,7 +19,7 @@ %\definefontfeature[none-slanted-concrete] [none] [slant=.2] \doifunknownfontfeature {concrete-math-bold} {\definefontfeature[concrete-math-bold][boldened]} - \doifunknownfontfeature {concrete-text-bold} {\definefontfeature[concrete-text-bold][boldened-15]} + \doifunknownfontfeature {concrete-text-bold} {\definefontfeature[concrete-text-bold][boldened-10]} \starttypescript [\s!serif] [concrete] \definefontsynonym [\s!Serif] [LMTypewriterVarWd-Regular] [\s!features={\s!default,concrete-text-bold}] diff --git a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv index 966e50ba8..42575a61c 100644 --- a/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv +++ b/tex/context/fonts/mkiv/type-imp-ebgaramond.mkiv @@ -65,13 +65,9 @@ \starttypescriptcollection[ebgaramond] - \startsetups[ebgaramond] - \letmathfractionparameter\c!rule\v!symbol - \setmathfractionparameter\c!middle{"203E}% - \letmathradicalparameter \c!rule\v!symbol - \setmathradicalparameter \c!top{\radicalbarextenderuc}% - % \setmathfenceparameter \c!alternative{1}% - \stopsetups +% \startsetups[ebgaramond] +% % \setmathfenceparameter \c!alternative{1}% +% \stopsetups \doifunknownfontfeature {ebgaramond-math-bold} {\definefontfeature[ebgaramond-math-bold][boldened]} diff --git a/tex/context/fonts/mkiv/type-imp-iwona.mkiv b/tex/context/fonts/mkiv/type-imp-iwona.mkiv index 528cb3208..01d859071 100644 --- a/tex/context/fonts/mkiv/type-imp-iwona.mkiv +++ b/tex/context/fonts/mkiv/type-imp-iwona.mkiv @@ -14,13 +14,7 @@ \starttypescriptcollection[iwona] \startsetups[iwona] - % \setupmathfence [\c!alternative=1]% - \setmathfenceparameter \c!alternative{1}% -% \letmathfractionparameter\c!rule\v!symbol -% \setmathfractionparameter\c!middle{"203E}% -% \letmathradicalparameter \c!rule\v!symbol -% \setmathradicalparameter \c!top{\radicalbarextenderuc}% -% \setmathfenceparameter \c!alternative{1}% + \setmathfenceparameter\c!alternative{1}% \stopsetups \startsetups[iwona-light] \directsetup{antykwa}\stopsetups diff --git a/tex/context/fonts/mkiv/type-imp-kurier.mkiv b/tex/context/fonts/mkiv/type-imp-kurier.mkiv index af1e2a28d..0ff7852fc 100644 --- a/tex/context/fonts/mkiv/type-imp-kurier.mkiv +++ b/tex/context/fonts/mkiv/type-imp-kurier.mkiv @@ -14,13 +14,7 @@ \starttypescriptcollection [kurier] \startsetups[kurier] - % \setupmathfence [\c!alternative=1]% - \setmathfenceparameter \c!alternative{1}% -% \letmathfractionparameter\c!rule\v!symbol -% \setmathfractionparameter\c!middle{"203E}% -% \letmathradicalparameter \c!rule\v!symbol -% \setmathradicalparameter \c!top{\radicalbarextenderuc}% -% \setmathfenceparameter \c!alternative{1}% + \setmathfenceparameter\c!alternative{1}% \stopsetups \startsetups[kurier-light] \directsetup{antykwa}\stopsetups diff --git a/tex/context/fonts/mkiv/xcharter-math.lfg b/tex/context/fonts/mkiv/xcharter-math.lfg index 193c0fd1b..3c349ee88 100644 --- a/tex/context/fonts/mkiv/xcharter-math.lfg +++ b/tex/context/fonts/mkiv/xcharter-math.lfg @@ -77,6 +77,28 @@ return { { tweak = "addrules", }, +{ + tweak = "replacerules", + -- minus = { + -- height = 0.188, + -- yoffset = 0.812, + -- leftoffset = 0.2, + -- rightoffset = 0.2, + -- }, + fraction = { + height = .188, + yoffset = .812, + }, + radical = { + height = .188, + yoffset = .812, + leftoffset = 0.2,-- no effect? + }, + stacker = { + height = .188, + yoffset = .812, + }, +}, { tweak = "addactuarian", }, |