diff options
Diffstat (limited to 'tex/context/fonts')
-rw-r--r-- | tex/context/fonts/mkiv/antykwa-math.lfg | 70 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/bonum-math.lfg | 9 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/cambria-math.lfg | 7 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/common-math.lfg | 26 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/iwona-math.lfg | 72 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/kurier-math.lfg | 83 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/modern-math.lfg | 2 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/newcomputermodern-math.lfg | 4 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/type-imp-antykwa.mkiv | 29 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/type-imp-iwona.mkiv | 121 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/type-imp-kurier.mkiv | 29 | ||||
-rw-r--r-- | tex/context/fonts/mkiv/type-imp-lucida.mkiv | 4 |
12 files changed, 275 insertions, 181 deletions
diff --git a/tex/context/fonts/mkiv/antykwa-math.lfg b/tex/context/fonts/mkiv/antykwa-math.lfg index 112a3f9a7..fe259e909 100644 --- a/tex/context/fonts/mkiv/antykwa-math.lfg +++ b/tex/context/fonts/mkiv/antykwa-math.lfg @@ -1,5 +1,23 @@ -local msam = { name = "msam10.tfm", vector = "tex-ma" } -local msbm = { name = "msbm10.tfm", vector = "tex-mb" } +local badones = { + summationtext = .25, + producttext = .25, + integraltext = .25, + uniontext = .25, + intersectiontext = .25, + unionmultitext = .25, + logicalandtext = .25, + logicalortext = .25, + summationdisplay = .25, + productdisplay = .25, + integraldisplay = .25, + uniondisplay = .25, + intersectiondisplay = .25, + unionmultidisplay = .25, + logicalanddisplay = .25, + logicalordisplay = .25, + coproducttext = .25, + coproductdisplay = .25, +} return { name = "antykwa-math", @@ -17,40 +35,48 @@ return { }, virtuals = { ["antykwa-math"] = { - { name = "file:AntykwaTorunska-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa", main = true, parameters = false }, + -- + { name = "rm-anttr.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttri.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttri.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttr.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttbi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttb.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-anttr.tfm", vector = "tex-ex", extension = true, badones = badones }, }, ["antykwa-light-math"] = { - { name = "file:AntykwaTorunskaLight-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa-light", main = true, parameters = false }, + -- + { name = "rm-anttl.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttli.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttli.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttl.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttri.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttr.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-anttl.tfm", vector = "tex-ex", extension = true, badones = badones }, }, ["antykwa-cond-math"] = { - { name = "file:AntykwaTorunskaCond-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa-cond", main = true, parameters = false }, + -- + { name = "rm-anttcr.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttcri.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttcri.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttcrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttcr.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttcbi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttcb.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttcrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-anttcr.tfm", vector = "tex-ex", extension = true, badones = badones }, }, ["antykwa-lightcond-math"] = { - { name = "file:AntykwaTorunskaCondLight-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-antykwa-lightcond", main = true, parameters = false }, + -- + { name = "rm-anttcl.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-anttcli.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-anttcli.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-anttclz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-anttcl.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-anttcri.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-anttcr.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-anttclz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-anttcl.tfm", vector = "tex-ex", extension = true, badones = badones }, } } } diff --git a/tex/context/fonts/mkiv/bonum-math.lfg b/tex/context/fonts/mkiv/bonum-math.lfg index 30a49da80..e3fd4119d 100644 --- a/tex/context/fonts/mkiv/bonum-math.lfg +++ b/tex/context/fonts/mkiv/bonum-math.lfg @@ -204,6 +204,13 @@ return { }, }, { + -- The v could have a bit more sidebearing + tweak = "dimensions", + list = { + ["0x1D463"] = { width = 1.075, }, -- italic v + }, + }, + { tweak = "addprivates", }, { @@ -300,4 +307,4 @@ return { 1, 3, 5, 7 }, }, -}
\ No newline at end of file +} diff --git a/tex/context/fonts/mkiv/cambria-math.lfg b/tex/context/fonts/mkiv/cambria-math.lfg index 84c4d0070..a855a2513 100644 --- a/tex/context/fonts/mkiv/cambria-math.lfg +++ b/tex/context/fonts/mkiv/cambria-math.lfg @@ -32,6 +32,7 @@ return { presets.moveitalics { correct = true, letters = true }, presets.moveintegrals { factor = 1.5}, -- needs checking presets.wipeitalics { }, + presets.pagellaradical { }, { tweak = "simplifykerns", }, @@ -89,9 +90,9 @@ return { { tweak = "dimensions", list = { - [0x00302] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widehat - [0x00303] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widetilde - [0x00306] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widebreve + [0x00302] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widehat + [0x00303] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widetilde + [0x00306] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widebreve [0x0030C] = { width = 2, anchor = 1.5, xoffset = .25 }, -- widecheck }, }, diff --git a/tex/context/fonts/mkiv/common-math.lfg b/tex/context/fonts/mkiv/common-math.lfg index 5074c83ec..45e46d865 100644 --- a/tex/context/fonts/mkiv/common-math.lfg +++ b/tex/context/fonts/mkiv/common-math.lfg @@ -275,6 +275,32 @@ return { }, } end, + pagellaradical = function(parameters) + return { + tweak = "tweaks", + feature = "pagellaradical", + list = { + { + tweak = "replacealphabets", + list = { + { + source = { first = 0x0221A }, -- sqrt + filename = "texgyrepagella-math.otf", + inherit = { + RadicalRuleThickness = true, + }, + }, + }, + }, + -- { + -- tweak = "parameters", + -- list = { + -- RadicalRuleThickness = 122.88, -- 60*2048/1000 + -- }, + -- }, + }, + } + end, }, }, }, diff --git a/tex/context/fonts/mkiv/iwona-math.lfg b/tex/context/fonts/mkiv/iwona-math.lfg index f2fb69341..bc402ea33 100644 --- a/tex/context/fonts/mkiv/iwona-math.lfg +++ b/tex/context/fonts/mkiv/iwona-math.lfg @@ -1,5 +1,23 @@ -local msam = { name = "msam10.tfm", vector = "tex-ma" } -local msbm = { name = "msbm10.tfm", vector = "tex-mb" } +local badones = { + summationtext = .25, + producttext = .25, + integraltext = .25, + uniontext = .25, + intersectiontext = .25, + unionmultitext = .25, + logicalandtext = .25, + logicalortext = .25, + summationdisplay = .25, + productdisplay = .25, + integraldisplay = .25, + uniondisplay = .25, + intersectiondisplay = .25, + unionmultidisplay = .25, + logicalanddisplay = .25, + logicalordisplay = .25, + coproducttext = .25, + coproductdisplay = .25, +} return { name = "iwona-math", @@ -17,41 +35,49 @@ return { }, virtuals = { ["iwona-math"] = { - { name = "file:Iwona-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona", main = true, parameters = false }, + -- + { name = "rm-iwonar.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonari.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonari.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonarz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonar.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonami.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonam.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonarz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonar.tfm", vector = "tex-ex", extension = true, badones = badones }, }, ["iwona-light-math"] = { - { name = "file:IwonaLight-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona-light", main = true, parameters = false }, + -- + { name = "rm-iwonal.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonali.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonali.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonalz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonal.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonari.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonar.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonalz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonal.tfm", vector = "tex-ex", extension = true, badones = badones }, }, ["iwona-medium-math"] = { - { name = "file:IwonaMedium-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona-medium", main = true, parameters = false }, + -- + { name = "rm-iwonam.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonami.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonami.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonamz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonam.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonabi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonab.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonamz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonam.tfm", vector = "tex-ex", extension = true, badones = badones }, }, ["iwona-heavy-math"] = { - { name = "file:IwonaHeavy-Regular", features = "virtualmath", main = true }, + { name = "file:LatinModern-Math", features = "virtualmath-iwona-heavy", main = true, parameters = false }, + -- + { name = "rm-iwonah.tfm", vector = "tex-mr", skewchar=0x7F }, { name = "mi-iwonahi.tfm", vector = "tex-mi", skewchar=0x7F }, { name = "mi-iwonahi.tfm", vector = "tex-it", skewchar=0x7F }, - { name = "sy-iwonahz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true } , - { name = "ex-iwonah.tfm", vector = "tex-ex", extension = true } , - msam, - msbm, + { name = "mi-iwonahi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-iwonah.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-iwonahz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-iwonah.tfm", vector = "tex-ex", extension = true, badones = badones }, } - } + }, } } diff --git a/tex/context/fonts/mkiv/kurier-math.lfg b/tex/context/fonts/mkiv/kurier-math.lfg new file mode 100644 index 000000000..bee2e08e4 --- /dev/null +++ b/tex/context/fonts/mkiv/kurier-math.lfg @@ -0,0 +1,83 @@ +local badones = { + summationtext = .25, + producttext = .25, + integraltext = .25, + uniontext = .25, + intersectiontext = .25, + unionmultitext = .25, + logicalandtext = .25, + logicalortext = .25, + summationdisplay = .25, + productdisplay = .25, + integraldisplay = .25, + uniondisplay = .25, + intersectiondisplay = .25, + unionmultidisplay = .25, + logicalanddisplay = .25, + logicalordisplay = .25, + coproducttext = .25, + coproductdisplay = .25, +} + +return { + name = "kurier-math", + version = "1.00", + comment = "Goodies that complement kurier math.", + author = "Hans Hagen", + copyright = "ConTeXt development team", + mathematics = { + mapfiles = { + "kurier-rm.map", + "kurier-mi.map", + "kurier-sy.map", + "kurier-ex.map", + "mkiv-base.map", + }, + virtuals = { + ["kurier-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier", main = true, parameters = false }, + -- + { name = "rm-kurierr.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kurierri.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kurierri.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kuriermi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierm.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kurierrz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierr.tfm", vector = "tex-ex", extension = true, badones = badones }, + }, + ["kurier-light-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier-light", main = true, parameters = false }, + -- + { name = "rm-kurierl.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kurierli.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kurierli.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kurierri.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierr.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kurierlz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierl.tfm", vector = "tex-ex", extension = true, badones = badones }, + }, + ["kurier-medium-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier-medium", main = true, parameters = false }, + -- + { name = "rm-kurierm.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kuriermi.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kuriermi.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierh.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kuriermz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierm.tfm", vector = "tex-ex", extension = true, badones = badones }, + }, + ["kurier-heavy-math"] = { + { name = "file:LatinModern-Math", features = "virtualmath-kurier-heavy", main = true, parameters = false }, + -- + { name = "rm-kurierh.tfm", vector = "tex-mr", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-mi", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-it", skewchar=0x7F }, + { name = "mi-kurierhi.tfm", vector = "tex-bi", skewchar=0x7F }, + { name = "rm-kurierh.tfm", vector = "tex-bf", skewchar=0x7F }, + { name = "sy-kurierhz.tfm", vector = "tex-sy", skewchar=0x30, parameters = true }, + { name = "ex-kurierh.tfm", vector = "tex-ex", extension = true, badones = badones }, + } + }, + } +} diff --git a/tex/context/fonts/mkiv/modern-math.lfg b/tex/context/fonts/mkiv/modern-math.lfg index fadd13da7..4af740789 100644 --- a/tex/context/fonts/mkiv/modern-math.lfg +++ b/tex/context/fonts/mkiv/modern-math.lfg @@ -219,7 +219,7 @@ return { ["0x7D.variants.*"] = { topright = -0.25, bottomright = -0.25 }, -- right brace variants ["0x29.parts.top"] = { topright = -0.3, }, -- right parenthesis top ["0x29.parts.bottom"] = { bottomright = -0.3 }, -- right parenthesis bottom - ["0x29.variants.*"] = { topright = -0.25, bottomright = -0.25 }, -- right parenthesis variants + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants diff --git a/tex/context/fonts/mkiv/newcomputermodern-math.lfg b/tex/context/fonts/mkiv/newcomputermodern-math.lfg index 4eb557221..cae69aecc 100644 --- a/tex/context/fonts/mkiv/newcomputermodern-math.lfg +++ b/tex/context/fonts/mkiv/newcomputermodern-math.lfg @@ -101,9 +101,9 @@ return { ["0x7D.parts.top"] = { topright = -0.25 }, -- right brace top ["0x7D.parts.bottom"] = { bottomright = -0.25 }, -- right brace bottom ["0x7D.variants.*"] = { topright = -0.25, bottomright = -0.25 }, -- right brace variants - ["0x29.parts.top"] = { topright = -0.3, }, -- right parenthesis top + ["0x29.parts.top"] = { topright = -0.3, }, -- right parenthesis top ["0x29.parts.bottom"] = { bottomright = -0.3 }, -- right parenthesis bottom - ["0x29.variants.*"] = { topright = -0.25, bottomright = -0.25 }, -- right parenthesis variants + ["0x29.variants.*"] = { topright = -0.15, bottomright = -0.15 }, -- right parenthesis variants ["0x221A.parts.top"] = { topright = 0.2, }, -- right radical top ["0x221A.parts.bottom"] = { bottomright = 0.2 }, -- right radical bottom ["0x221A.variants.*"] = { topright = 0.2, bottomright = 0.2 }, -- right radical variants diff --git a/tex/context/fonts/mkiv/type-imp-antykwa.mkiv b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv index ba5895c8e..15a2f39b6 100644 --- a/tex/context/fonts/mkiv/type-imp-antykwa.mkiv +++ b/tex/context/fonts/mkiv/type-imp-antykwa.mkiv @@ -3,7 +3,7 @@ %D version=2010.06.21, %D title=\CONTEXT\ Typescript Macros, %D subtitle=Antykwa Torunska, -%D author=Mojca Miklavec \& Hans Hagen, +%D author=Mojca Miklavec \& Hans Hagen \& Mikael Sundqvist, %D date=\currentdate, %D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C @@ -13,7 +13,12 @@ \starttypescriptcollection[antykwa-torunska] - \starttypescript [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] + \definefontfeature[virtualmath-antykwa] [virtualmath][virtualweight=antykwa] + \definefontfeature[virtualmath-antykwa-cond] [virtualmath][virtualweight=antykwa-cond] + \definefontfeature[virtualmath-antykwa-light] [virtualmath][virtualweight=antykwa-light] + \definefontfeature[virtualmath-antykwa-lightcond][virtualmath][virtualweight=antykwa-lightcond] + + \starttypescript [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-lightcond,antykwa-torunska-lightcond] \definetypeface[\typescriptone][\s!rm][\s!serif][\typescriptone] [\s!default] \definetypeface[\typescriptone][\s!ss][\s!sans] [modern] [\s!default] [\s!rscale=1.05] \definetypeface[\typescriptone][\s!tt][\s!mono] [modern] [\s!default] [\s!rscale=1.05] @@ -21,7 +26,7 @@ \quittypescriptscanning \stoptypescript - \starttypescript [\s!serif] [antykwa,antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] + \starttypescript [\s!serif] [antykwa,antykwa-torunska,antykwa-light,antykwa-torunska-light,antykwa-cond,antykwa-torunska-cond,antykwa-lightcond,antykwa-torunska-lightcond] \definefontsynonym [AntykwaTorunska-Regular] [\s!file:AntykwaTorunska-Regular] [\s!features=\s!default] \definefontsynonym [AntykwaTorunska-Italic] [\s!file:AntykwaTorunska-Italic] [\s!features=\s!default] \definefontsynonym [AntykwaTorunska-Bold] [\s!file:AntykwaTorunska-Bold] [\s!features=\s!default] @@ -62,17 +67,17 @@ \definefontsynonym[\s!MathRoman][antykwamath@antykwa-math] \stoptypescript - \starttypescript [\s!math][antykwa-torunska-light][\s!all] + \starttypescript [\s!math][antykwa-light,antykwa-torunska-light][\s!all] \loadfontgoodies[antykwa-math] \definefontsynonym[\s!MathRoman][antykwalightmath@antykwa-light-math] \stoptypescript - \starttypescript [\s!math][antykwa-torunska-cond][\s!all] + \starttypescript [\s!math][antykwa-cond,antykwa-torunska-cond][\s!all] \loadfontgoodies[antykwa-math] \definefontsynonym[\s!MathRoman][antykwacondmath@antykwa-cond-math] \stoptypescript - \starttypescript [\s!math][antykwa-torunska-lightcond][\s!all] + \starttypescript [\s!math][antykwa-lightcond,antykwa-torunska-lightcond][\s!all] \loadfontgoodies[antykwa-math] \definefontsynonym[\s!MathRoman][antykwalightcondmath@antykwa-lightcond-math] \stoptypescript @@ -87,7 +92,7 @@ \definefontsynonym [\s!SerifCaps] [AntykwaTorunska-Cap] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-light] [\s!name] + \starttypescript [\s!serif] [antykwa-light,antykwa-torunska-light] [\s!name] \definefontsynonym [\s!Serif] [AntykwaTorunska-Light] \definefontsynonym [\s!SerifBold] [AntykwaTorunska-Medium] \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-LightItalic] @@ -97,7 +102,7 @@ \definefontsynonym [\s!SerifCaps] [AntykwaTorunska-LightCap] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-cond] [\s!name] + \starttypescript [\s!serif] [antykwa-cond,antykwa-torunska-cond] [\s!name] \definefontsynonym [\s!Serif] [AntykwaTorunska-CondRegular] \definefontsynonym [\s!SerifBold] [AntykwaTorunska-CondBold] \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-CondItalic] @@ -107,7 +112,7 @@ \definefontsynonym [\s!SerifCaps] [AntykwaTorunska-CondCap] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-lightcond] [\s!name] + \starttypescript [\s!serif] [antykwa-lightcond,antykwa-torunska-lightcond] [\s!name] \definefontsynonym [\s!Serif] [AntykwaTorunska-CondLight] \definefontsynonym [\s!SerifBold] [AntykwaTorunska-CondMedium] \definefontsynonym [\s!SerifItalic] [AntykwaTorunska-CondLightItalic] @@ -144,7 +149,7 @@ \definefontsynonym [SerifCapsCond] [AntykwaTorunska-CondCap] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-light] [\s!name] + \starttypescript [\s!serif] [antykwa-light,antykwa-torunska-light] [\s!name] \definefontsynonym [SerifRegular] [Serif] \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-LightCap] \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-MediumCap] @@ -171,7 +176,7 @@ \definefontsynonym [SerifCapsCond] [AntykwaTorunska-CondLightCap] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-cond] [\s!name] + \starttypescript [\s!serif] [antykwa-cond,antykwa-torunska-cond] [\s!name] \definefontsynonym [SerifRegular] [Serif] \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-CondCap] \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-CondBoldCap] @@ -198,7 +203,7 @@ \definefontsynonym [SerifCapsExp] [AntykwaTorunska-Cap] \stoptypescript - \starttypescript [\s!serif] [antykwa-torunska-lightcond] [\s!name] + \starttypescript [\s!serif] [antykwa-lightcond,antykwa-torunska-lightcond] [\s!name] \definefontsynonym [SerifRegular] [Serif] \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-CondLightCap] \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-CondMediumCap] diff --git a/tex/context/fonts/mkiv/type-imp-iwona.mkiv b/tex/context/fonts/mkiv/type-imp-iwona.mkiv index 88cb7e719..8b67b7be9 100644 --- a/tex/context/fonts/mkiv/type-imp-iwona.mkiv +++ b/tex/context/fonts/mkiv/type-imp-iwona.mkiv @@ -3,7 +3,7 @@ %D version=2010.06.21, %D title=\CONTEXT\ Typescript Macros, %D subtitle=Iwona, -%D author=Mojca Miklavec \& Hans Hagen, +%D author=Mojca Miklavec \& Hans Hagen \& Mikael Sundqvist, %D date=\currentdate, %D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C @@ -13,10 +13,10 @@ \starttypescriptcollection[iwona] - % maybe this will change in Iwona-Math-Letters and Iwona-Math-Letters-Italic - - % These names are a depressing mess. They have changed over time and are - % still not consistent. I'd expect Bold-Regular and Bold-Italic. + \definefontfeature[virtualmath-iwona] [virtualmath][virtualweight=iwona] + \definefontfeature[virtualmath-iwona-light] [virtualmath][virtualweight=iwona-light] + \definefontfeature[virtualmath-iwona-medium][virtualmath][virtualweight=iwona-medium] + \definefontfeature[virtualmath-iwona-heavy] [virtualmath][virtualweight=iwona-heavy] \starttypescript [\s!sans] [iwona-light,iwona,iwona-medium,iwona-heavy,iwona-light-cond,iwona-cond,iwona-medium-cond,iwona-heavy-cond] @@ -31,17 +31,6 @@ \definefontsynonym [Iwona-Heavy-Regular] [\s!file:IwonaHeavy-Regular] [\s!features=\s!default] \definefontsynonym [Iwona-Heavy-Italic] [\s!file:IwonaHeavy-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-CapsRegular] [\s!file:Iwona-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsItalic] [\s!file:Iwona-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsBold] [\s!file:Iwona-Bold] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsBoldItalic] [\s!file:Iwona-BoldItalic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsLight] [\s!file:IwonaLight-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsLight-Italic] [\s!file:IwonaLight-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsMedium] [\s!file:IwonaMedium-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsMedium-Italic] [\s!file:IwonaMedium-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsHeavy] [\s!file:IwonaHeavy-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsHeavy-Italic] [\s!file:IwonaHeavy-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CondRegular] [\s!file:IwonaCond-Regular] [\s!features=\s!default] \definefontsynonym [Iwona-CondItalic] [\s!file:IwonaCond-Italic] [\s!features=\s!default] \definefontsynonym [Iwona-CondBold] [\s!file:IwonaCond-Bold] [\s!features=\s!default] @@ -53,29 +42,18 @@ \definefontsynonym [Iwona-CondHeavy-Regular] [\s!file:IwonaCondHeavy-Regular] [\s!features=\s!default] \definefontsynonym [Iwona-CondHeavy-Italic] [\s!file:IwonaCondHeavy-Italic] [\s!features=\s!default] - \definefontsynonym [Iwona-CapsCondRegular] [\s!file:IwonaCond-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondItalic] [\s!file:IwonaCond-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondBold] [\s!file:IwonaCond-Bold] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondBoldItalic] [\s!file:IwonaCond-BoldItalic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondLight-Regular] [\s!file:IwonaCondLight-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondLight-Italic] [\s!file:IwonaCondLight-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondMedium-Regular][\s!file:IwonaCondMedium-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondMedium-Italic] [\s!file:IwonaCondMedium-Italic] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondHeavy-Regular] [\s!file:IwonaCondHeavy-Regular] [\s!features=\s!smallcaps] - \definefontsynonym [Iwona-CapsCondHeavy-Italic] [\s!file:IwonaCondHeavy-Italic] [\s!features=\s!smallcaps] - \stoptypescript % [all] is redundant \starttypescript [\s!math][iwona][\s!all] - \definefontsynonym[\s!MathRoman][iwonamath@iwona-math] + \definefontsynonym[\s!MathRoman] [iwonamath@iwona-math] \stoptypescript \starttypescript [\s!math][iwona-light][\s!all] - \definefontsynonym[\s!MathRoman][iwonalightmath@iwona-light-math] + \definefontsynonym[\s!MathRoman] [iwonalightmath@iwona-light-math] \stoptypescript \starttypescript [\s!math][iwona-medium][\s!all] - \definefontsynonym[\s!MathRoman][iwonamediummath@iwona-medium-math] + \definefontsynonym[\s!MathRoman] [iwonamediummath@iwona-medium-math] \stoptypescript \starttypescript [\s!math][iwona-heavy][\s!all] \definefontsynonym[\s!MathRoman][iwonaheavymath@iwona-heavy-math] @@ -91,18 +69,6 @@ \definefontsynonym [\s!SansItalic] [Iwona-Light-Italic] \definefontsynonym [\s!SansBold] [Iwona-Medium-Regular] \definefontsynonym [\s!SansBoldItalic] [Iwona-Medium-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsLight] - \definefontsynonym [SansItalicCaps] [Iwona-CapsLightItalic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsMedium] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsMediumItalic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-light-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsLight-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsLight-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsMedium-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsMedium-Italic] \stoptypescript \starttypescript [\s!sans] [iwona] [\s!name] @@ -111,18 +77,6 @@ \definefontsynonym [\s!SansItalic] [Iwona-Italic] \definefontsynonym [\s!SansBold] [Iwona-Bold] \definefontsynonym [\s!SansBoldItalic] [Iwona-BoldItalic] - \definefontsynonym [SansCaps] [Iwona-CapsRegular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsItalic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsBold] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsBoldItalic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsRegular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsItalic] - \definefontsynonym [\s!SansBold] [Iwona-CapsBold] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsBoldItalic] \stoptypescript \starttypescript [\s!sans] [iwona-medium] [\s!name] @@ -131,18 +85,6 @@ \definefontsynonym [\s!SansItalic] [Iwona-Medium-Italic] \definefontsynonym [\s!SansBold] [Iwona-Heavy-Regular] \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsMedium-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-medium-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsHeavy-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsMedium-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsHeavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsHeavy-Italic] \stoptypescript \starttypescript [\s!sans] [iwona-heavy] [\s!name] @@ -151,18 +93,6 @@ \definefontsynonym [\s!SansItalic] [Iwona-Heavy-Italic] \definefontsynonym [\s!SansBold] [Iwona-Heavy-Regular] \definefontsynonym [\s!SansBoldItalic] [Iwona-Heavy-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsHeavy-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-heavy-caps] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [SansCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsHeavy-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsHeavy-Italic] \stoptypescript \starttypescript [\s!sans] [iwona-light-cond] [\s!name] @@ -171,19 +101,8 @@ \definefontsynonym [\s!SansItalic] [Iwona-CondLight-Italic] \definefontsynonym [\s!SansBold] [Iwona-CondMedium-Regular] \definefontsynonym [\s!SansBoldItalic] [Iwona-CondMedium-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsCondLight-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsCondLight-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsCondMedium-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondMedium-Italic] \stoptypescript - \starttypescript [\s!sans] [iwona-light-cond-caps,iwona-light-caps-cond] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsCondLight-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsCondLight-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsCondMedium-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondMedium-Italic] - \stoptypescript \starttypescript [\s!sans] [iwona-cond] [\s!name] \setups[\s!font:\s!fallback:\s!sans] @@ -191,18 +110,6 @@ \definefontsynonym [\s!SansItalic] [Iwona-CondItalic] \definefontsynonym [\s!SansBold] [Iwona-CondBold] \definefontsynonym [\s!SansBoldItalic] [Iwona-CondBoldItalic] - \definefontsynonym [SansCaps] [Iwona-CapsCondRegular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsCondItalic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsCondBold] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondBoldItalic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-cond-caps,iwona-caps-cond] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsCondRegular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsCondItalic] - \definefontsynonym [\s!SansBold] [Iwona-CapsCondBold] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondBoldItalic] \stoptypescript \starttypescript [\s!sans] [iwona-medium-cond] [\s!name] @@ -211,18 +118,6 @@ \definefontsynonym [\s!SansItalic] [Iwona-CondMedium-Italic] \definefontsynonym [\s!SansBold] [Iwona-CondHeavy-Regular] \definefontsynonym [\s!SansBoldItalic] [Iwona-CondHeavy-Italic] - \definefontsynonym [SansCaps] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [SansItalicCaps] [Iwona-CapsCondMedium-Italic] - \definefontsynonym [SansBoldCaps] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [SansBoldItalicCaps] [Iwona-CapsCondHeavy-Italic] - \stoptypescript - - \starttypescript [\s!sans] [iwona-medium-cond-caps,iwona-medium-caps-cond] [\s!name] - \setups[\s!font:\s!fallback:\s!sans] - \definefontsynonym [\s!Sans] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [\s!SansItalic] [Iwona-CapsCondMedium-Italic] - \definefontsynonym [\s!SansBold] [Iwona-CapsCondHeavy-Regular] - \definefontsynonym [\s!SansBoldItalic] [Iwona-CapsCondHeavy-Italic] \stoptypescript \starttypescript [iwona,iwona-light,iwona-heavy,iwona-medium] diff --git a/tex/context/fonts/mkiv/type-imp-kurier.mkiv b/tex/context/fonts/mkiv/type-imp-kurier.mkiv index eb54aa68d..0bf1a43ca 100644 --- a/tex/context/fonts/mkiv/type-imp-kurier.mkiv +++ b/tex/context/fonts/mkiv/type-imp-kurier.mkiv @@ -3,7 +3,7 @@ %D version=2021.10.24, %D title=\CONTEXT\ Typescript Macros, %D subtitle=Kurier, -%D author=Hans Hagen, +%D author=Hans Hagen & Mikael Sundqvist, %D date=\currentdate, %D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] %C @@ -13,6 +13,11 @@ \starttypescriptcollection [kurier] + \definefontfeature[virtualmath-kurier] [virtualmath][virtualweight=kurier] + \definefontfeature[virtualmath-kurier-light] [virtualmath][virtualweight=kurier-light] + \definefontfeature[virtualmath-kurier-medium][virtualmath][virtualweight=kurier-medium] + \definefontfeature[virtualmath-kurier-heavy] [virtualmath][virtualweight=kurier-heavy] + \starttypescript [\s!sans] [kurier-light,kurier,kurier-medium] \definefontsynonym [Kurier-Light] [\s!file:kurierlightregular] [\s!features=\s!default] \definefontsynonym [Kurier-LightItalic] [\s!file:kurierlightitalic] [\s!features=\s!default] @@ -39,6 +44,26 @@ \definefontsynonym [Kurier-CondHeavyItalic] [\s!file:kuriercondheavyitalic] [\s!features=\s!default] \stoptypescript + \starttypescript [\s!math][kurier][\s!all] + \definefontsynonym[\s!MathRoman] [kuriermath@kurier-math] + \definefontsynonym[\s!MathRomanBold][kuriermediummath@kurier-medium-math] + \stoptypescript + \starttypescript [\s!math][kurier-light][\s!all] + \definefontsynonym[\s!MathRoman][kurierlightmath@kurier-light-math] + \definefontsynonym[\s!MathRomanBold][kuriermath@kurier-math] + \stoptypescript + \starttypescript [\s!math][kurier-medium][\s!all] + \definefontsynonym[\s!MathRoman] [kuriermediummath@kurier-medium-math] + \definefontsynonym[\s!MathRomanBold][kurierheavymath@kurier-heavy-math] + \stoptypescript + \starttypescript [\s!math][kurier-heavy][\s!all] + \definefontsynonym[\s!MathRoman][kurierheavymath@kurier-heavy-math] + \stoptypescript + + \starttypescript [\s!math] [kurier,kurier-light,kurier-medium,kurier-heavy] [\s!all] + \loadfontgoodies[kurier-math] + \stoptypescript + \starttypescript [\s!sans] [kurier-light] \setups[\s!font:\s!fallback:\s!sans] \definefontsynonym [\s!Sans] [Kurier-Light] @@ -91,7 +116,7 @@ \definetypeface [\typescriptone] [\s!ss] [\s!sans] [\typescriptone] [\s!default] \definetypeface [\typescriptone] [\s!rm] [\s!serif] [modern] [\s!default] \definetypeface [\typescriptone] [\s!tt] [\s!mono] [modern] [\s!default] - \definetypeface [\typescriptone] [\s!mm] [\s!math] [modern] [\s!default] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default][text=ss] \quittypescriptscanning \stoptypescript diff --git a/tex/context/fonts/mkiv/type-imp-lucida.mkiv b/tex/context/fonts/mkiv/type-imp-lucida.mkiv index 1e4c35abc..186854efc 100644 --- a/tex/context/fonts/mkiv/type-imp-lucida.mkiv +++ b/tex/context/fonts/mkiv/type-imp-lucida.mkiv @@ -77,8 +77,8 @@ \starttypescript [\s!math] [lucida,lucidaot,lucidadk] \definefontsynonym [\s!MathRoman] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math] -% \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-math] - \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math] + % \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT-Demi.otf] [\s!features={\s!math\mathsizesuffix,mathlucida,mathextra},\s!goodies=lucida-math] + \definefontsynonym [\s!MathRomanBold] [\s!file:LucidaBrightMathOT.otf] [\s!features={\s!math\mathsizesuffix,lucida-math-bold,mathlucida,lucida:mathextra,mathextra},\s!goodies=lucida-math] \stoptypescript \starttypescript [\s!math] [lucidaot-nt,lucida-nt] |