diff options
Diffstat (limited to 'tex')
21 files changed, 200 insertions, 89 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 90e3723f7..9fdbddad2 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2021.06.10 23:09} +\newcontextversion{2021.06.11 17:55} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 15405b852..23852307b 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2021.06.10 23:09} +\edef\contextversion{2021.06.11 17:55} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 69e142b5f..c633a8582 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2021.06.10 23:09} +\newcontextversion{2021.06.11 17:55} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 0eaaf8682..296d63924 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2021.06.10 23:09} +\edef\contextversion{2021.06.11 17:55} %D Kind of special: diff --git a/tex/context/base/mkiv/font-ttf.lua b/tex/context/base/mkiv/font-ttf.lua index a2732aa5f..8573d3a06 100644 --- a/tex/context/base/mkiv/font-ttf.lua +++ b/tex/context/base/mkiv/font-ttf.lua @@ -136,8 +136,10 @@ local function mergecomposites(glyphs,shapes) local y = p[2] nofpoints = nofpoints + 1 points[nofpoints] = { - xscale * x + xrotate * y + xoffset, - yscale * y + yrotate * x + yoffset, +-- xscale * x + xrotate * y + xoffset, +-- yscale * y + yrotate * x + yoffset, + xscale * x + yrotate * y + xoffset, + xrotate * x + yscale * y + yoffset, p[3] } end diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index a3e2f2115..364243963 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -85,6 +85,8 @@ return { "Umathaccent", "Umathaccentbaseheight", "Umathaccentvariant", + "Umathadapttoleft", + "Umathadapttoright", "Umathaxis", "Umathbinbinspacing", "Umathbinclosespacing", @@ -228,6 +230,7 @@ return { "Umathunderdelimitervariant", "Umathunderdelimitervgap", "Umathunderlinevariant", + "Umathvextensiblevariant", "Umiddle", "Unosubprescript", "Unosubscript", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex f1d723687..592ac1160 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex a8c81db5d..9ee55e834 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index 017357e88..e20c03d1b 100644 --- a/tex/context/base/mkxl/cont-new.mkxl +++ b/tex/context/base/mkxl/cont-new.mkxl @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2021.06.10 23:09} +\newcontextversion{2021.06.11 17:55} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index 1eb9519c2..cb9fcb0d2 100644 --- a/tex/context/base/mkxl/context.mkxl +++ b/tex/context/base/mkxl/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \immutable\edef\contextformat {\jobname} -\immutable\edef\contextversion{2021.06.10 23:09} +\immutable\edef\contextversion{2021.06.11 17:55} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/font-chk.lmt b/tex/context/base/mkxl/font-chk.lmt index 269e14e81..f14e89aeb 100644 --- a/tex/context/base/mkxl/font-chk.lmt +++ b/tex/context/base/mkxl/font-chk.lmt @@ -42,7 +42,6 @@ local fontdata = fonthashes.identifiers local fontcharacters = fonthashes.characters local currentfont = font.current -local addcharacters = font.addcharacters local definers = fonts.definers local helpers = fonts.helpers diff --git a/tex/context/base/mkxl/font-tex.lmt b/tex/context/base/mkxl/font-tex.lmt index c960953a7..c1908dc48 100644 --- a/tex/context/base/mkxl/font-tex.lmt +++ b/tex/context/base/mkxl/font-tex.lmt @@ -84,6 +84,30 @@ local function setboxglyph(specification) end end +function fonts.helpers.setboxdirectly(font,unicode,box) -- hash based on wd/ht/dp + if box then + local tfmdata = fontdata[font] + local glyphboxes = (tfmdata.glyphboxes or 0) + 1 + tfmdata.glyphboxes = glyphboxes + local private = newprivateslot(formatters["BG:%05X"](glyphboxes)) + local newdata = { + width = box.width or 0, + height = box.height or 0, + depth = box.depth or 0, + unicode = unicode, + objnum = tex.saveboxresource(box,nil,nil,true), + } + local specification = { + code = newdata + } + tfmdata.characters[private] = newdata + addcharacters(font, { characters = { [private] = newdata } }) + fonts.dropins.swapone("box",tfmdata,specification,private) + checkenabled() + return private + end +end + local boxes = table.setmetatableindex("table") function fonts.helpers.registerglyphbox(specification) diff --git a/tex/context/base/mkxl/lpdf-emb.lmt b/tex/context/base/mkxl/lpdf-emb.lmt index 35e5cae18..f66753e9b 100644 --- a/tex/context/base/mkxl/lpdf-emb.lmt +++ b/tex/context/base/mkxl/lpdf-emb.lmt @@ -271,9 +271,9 @@ end if minindex > maxindex then minindex = maxindex end - if next(copies) then - inspect(copies) - end + -- if next(copies) then + -- inspect(copies) + -- end return indices, copies, minindex, maxindex end diff --git a/tex/context/base/mkxl/math-del.mkxl b/tex/context/base/mkxl/math-del.mkxl index 538883bfc..8f2596359 100644 --- a/tex/context/base/mkxl/math-del.mkxl +++ b/tex/context/base/mkxl/math-del.mkxl @@ -121,7 +121,9 @@ % \definemathdelimiter[integral][\c!symbol="222B] -\permanent\protected\def\integral{\int\Umathadaptsize} +\permanent\protected\def\integral{\int\Umathadapttoright} + +\aliased\let\Umathadaptsize\Umathadapttoright % \setupmathdelimiter[integral][rightoffset=-3mu,exact=yes,factor=2] % diff --git a/tex/context/base/mkxl/math-fnt.lmt b/tex/context/base/mkxl/math-fnt.lmt new file mode 100644 index 000000000..a3ac1aea3 --- /dev/null +++ b/tex/context/base/mkxl/math-fnt.lmt @@ -0,0 +1,50 @@ +if not modules then modules = { } end modules ['math-fnt'] = { + version = 1.001, + comment = "companion to math-ini.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local nuts = nodes.nuts +local tonut = nodes.tonut +local tonode = nodes.tonode +local nodepool = nuts.pool + +local vlist_code = nodes.nodecodes.vlist + +local new_hlist = nodepool.hlist +local new_vlist = nodepool.vlist +local new_glyph = nodepool.glyph + +local getattrlst = nuts.getattributelist +local setattrlst = nuts.setattributelist +local setwhd = nuts.setwhd +local getwhd = nuts.getwhd +local getid = nuts.getid + +local chardata = fonts.hashes.characters + +local function register_extensible(font,char,style,box) + local bx = tonut(box) + nodes.handlers.finalizelist(bx) + local id = getid(bx) + local al = getattrlst(bx) + local wd, ht, dp = getwhd(bx) + local private = fonts.helpers.setboxdirectly(font,chardata[font][char].unicode or char,box) + local g = new_glyph(font,private) + setattrlst(g,al) + local n = new_hlist(g) + setwhd(n,wd,ht,dp) + setattrlst(n,al) + if id == vlist_code then + h = new_vlist(n) + setwhd(n,wd,ht,dp) + setattrlst(n,al) + end + return tonode(n) +end + +experiments.register("math.extensibles", function(v) + callback.register("register_extensible", v and register_extensible or nil) +end) diff --git a/tex/context/base/mkxl/math-ini.mkxl b/tex/context/base/mkxl/math-ini.mkxl index c97cfbb77..df2bb7ccb 100644 --- a/tex/context/base/mkxl/math-ini.mkxl +++ b/tex/context/base/mkxl/math-ini.mkxl @@ -77,6 +77,7 @@ \registerctxluafile{math-fbk}{} \registerctxluafile{math-dir}{} \registerctxluafile{math-spa}{} +\registerctxluafile{math-fnt}{autosuffix} %D A starter: %D diff --git a/tex/context/base/mkxl/node-shp.lmt b/tex/context/base/mkxl/node-shp.lmt index a4171e379..983d2dbbe 100644 --- a/tex/context/base/mkxl/node-shp.lmt +++ b/tex/context/base/mkxl/node-shp.lmt @@ -30,6 +30,8 @@ local implement = interfaces.implement local actions = tasks.actions("shipouts") +handlers.finalizelist = actions + function handlers.finalizebox(box) actions(getbox(box)) -- nut end diff --git a/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv b/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv index 536c90ede..05c0bb342 100644 --- a/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv +++ b/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv @@ -41,10 +41,10 @@ \starttypescript [\s!mono] [newcomputermodern] [\s!name] \setups[\s!font:\s!fallback:\s!mono] - \definefontsynonym [\s!Mono] [\s!file:newcmmono10-regular.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] - \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] - \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-italic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] - \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-bolditalic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] + \definefontsynonym [\s!Mono] [\s!file:newcmmono10-regular.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] + \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] + \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-oblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-boldoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] \stoptypescript \starttypescript [\s!math][newcomputermodern] [\s!name] @@ -71,10 +71,10 @@ \starttypescript [\s!mono] [newcomputermodern-book] [\s!name] \setups[\s!font:\s!fallback:\s!mono] - \definefontsynonym [\s!Mono] [\s!file:newcmmono10-book.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] - \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] - \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-bookitalic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] - \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-bolditalic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] + \definefontsynonym [\s!Mono] [\s!file:newcmmono10-book.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] + \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] + \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-bookoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] + \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-boldoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] \stoptypescript \starttypescript [\s!math][newcomputermodern-book] [\s!name] diff --git a/tex/context/modules/mkiv/s-math-characters.lua b/tex/context/modules/mkiv/s-math-characters.lua index 1888dabb4..61b2c8808 100644 --- a/tex/context/modules/mkiv/s-math-characters.lua +++ b/tex/context/modules/mkiv/s-math-characters.lua @@ -15,6 +15,8 @@ local concat = table.concat local lower = string.lower local utfchar = utf.char local round = math.round +local setmetatableindex = table.setmetatableindex +local sortedhash = table.sortedhash local context = context @@ -110,6 +112,38 @@ function moduledata.math.characters.showlist(specification) end end else + +local function collectalllookups(tfmdata,script,language) + local all = setmetatableindex(function(t,k) local v = setmetatableindex("table") t[k] = v return v end) + local shared = tfmdata.shared + local rawdata = shared and shared.rawdata + if rawdata then + local features = rawdata.resources.features + if features.gsub then + for kind, feature in next, features.gsub do + local validlookups, lookuplist = fonts.handlers.otf.collectlookups(rawdata,kind,script,language) + if validlookups then + for i=1,#lookuplist do + local lookup = lookuplist[i] + local steps = lookup.steps + for i=1,lookup.nofsteps do + local coverage = steps[i].coverage + if coverage then + for k, v in next, coverage do + all[k][lookup.type][kind] = v + end + end + end + end + end + end + end + end + return all +end + +local alllookups = collectalllookups(tfmdata,"math","dflt") + context.showmathcharactersstart() for _, unicode in next, sorted do if not limited or unicode < upperlimit then @@ -125,8 +159,6 @@ function moduledata.math.characters.showlist(specification) local next_sizes = char.next local v_variants = char.vert_variants local h_variants = char.horiz_variants - local slookups = desc and desc.slookups - local mlookups = desc and desc.mlookups local mathclass = info.mathclass local mathspec = info.mathspec local mathsymbol = info.mathsymbol @@ -203,39 +235,26 @@ function moduledata.math.characters.showlist(specification) end context.showmathcharactersstopvvariants() end - if slookups or mlookups then - local variants = { } - if slookups then - for lookupname, lookupdata in next, slookups do - local lookuptype = lookuptypes[lookupname] - if lookuptype == "substitution" then - variants[lookupdata] = "sub" - elseif lookuptype == "alternate" then - for i=1,#lookupdata do - variants[lookupdata[i]] = "alt" - end - end + local lookups = alllookups[unicode] + if lookups then + local variants = { } + local singles = lookups.gsub_single + local alternates = lookups.gsub_alternate + if singles then + for lookupname, code in next, singles do + variants[code] = lookupname end end - if mlookups then - for lookupname, lookuplist in next, mlookups do - local lookuptype = lookuptypes[lookupname] - for i=1,#lookuplist do - local lookupdata = lookuplist[i] - local lookuptype = lookuptypes[lookupname] - if lookuptype == "substitution" then - variants[lookupdata] = "sub" - elseif lookuptype == "alternate" then - for i=1,#lookupdata do - variants[lookupdata[i]] = "alt" - end - end + if singles then + for lookupname, codes in next, alternates do + for i=1,#codes do + variants[codes[i]] = lookupname .. " : " .. i end end end context.showmathcharactersstartlookupvariants() local i = 0 - for variant, lookuptype in table.sortedpairs(variants) do + for variant, lookuptype in sortedhash(variants) do i = i + 1 context.showmathcharacterslookupvariant(i,f_unicode(variant),variant,lookuptype) end diff --git a/tex/context/modules/mkiv/s-math-repertoire.mkiv b/tex/context/modules/mkiv/s-math-repertoire.mkiv index 90d0b09d3..fb4780834 100644 --- a/tex/context/modules/mkiv/s-math-repertoire.mkiv +++ b/tex/context/modules/mkiv/s-math-repertoire.mkiv @@ -11,15 +11,19 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +\enabletrackers[pages.timing] + +\enableexperiments[fonts.compact] + \usemodule[s][math-characters] -% context --jit --global --bodyfont=lucidaot --result=math-repertoire-lucidaot s-math-repertoire.mkiv -% context --jit --global --bodyfont=cambria --result=math-repertoire-cambria s-math-repertoire.mkiv -% context --jit --global --bodyfont=xits --result=math-repertoire-xits s-math-repertoire.mkiv -% context --jit --global --bodyfont=modern --result=math-repertoire-modern s-math-repertoire.mkiv -% context --jit --global --bodyfont=pagella --result=math-repertoire-pagella s-math-repertoire.mkiv -% context --jit --global --bodyfont=termes --result=math-repertoire-termes s-math-repertoire.mkiv -% context --jit --global --bodyfont=bonum --result=math-repertoire-bonum s-math-repertoire.mkiv +% context --global --bodyfont=lucidaot --result=math-repertoire-lucidaot s-math-repertoire.mkiv +% context --global --bodyfont=cambria --result=math-repertoire-cambria s-math-repertoire.mkiv +% context --global --bodyfont=xits --result=math-repertoire-xits s-math-repertoire.mkiv +% context --global --bodyfont=modern --result=math-repertoire-modern s-math-repertoire.mkiv +% context --global --bodyfont=pagella --result=math-repertoire-pagella s-math-repertoire.mkiv +% context --global --bodyfont=termes --result=math-repertoire-termes s-math-repertoire.mkiv +% context --global --bodyfont=bonum --result=math-repertoire-bonum s-math-repertoire.mkiv \startmodule[math-repertoire] @@ -232,12 +236,12 @@ \setbox\scratchbox\hbox to \scratchdimen{\hss\charactercolor\char#2}% \backgroundline[backgroundcolorx]{\box\scratchbox}% \else - \setbox\scratchbox\hbox to 1em{\hss\charactercolor\char#2}% + \setbox\scratchbox\hbox to \emwidth{\hss\charactercolor\char#2}% \scratchdimen\wd\scratchbox \backgroundline[backgroundcolory]{\box\scratchbox}% \fi\fi \hskip-\scratchdimen - \baselinecolor\vrule width \scratchdimen height .05ex depth .05ex + \baselinecolor\vrule width \scratchdimen height .05\exheight depth .05\exheight \endgroup}% \fi} @@ -265,7 +269,8 @@ \unexpanded\def\showmathcharacterssetbodyfonts#1% {\edef\showmathcharactersbodyfonts{#1}% - \def\doshowmathcharacterssetbodyfonts##1{\setupbodyfont[##1,12pt]}% \usebodyfont[##1,12pt]% +% \def\doshowmathcharacterssetbodyfonts##1{\setupbodyfont[##1,12pt]}% \usebodyfont[##1,12pt]% + \def\doshowmathcharacterssetbodyfonts##1{\usebodyfont[##1,12pt]}% \processcommacommand[\showmathcharactersbodyfonts]\doshowmathcharacterssetbodyfonts} \unexpanded\def\showmathcharactersbodyfontschars#1% @@ -278,7 +283,8 @@ \startstandardmakeup % we use baselinecolor so that we have a transparency on page 1 \setupalign[middle] \vfil - \dontleavehmode \scale[height=.3\textheight]{\strut\color[textcolor]{\fontclass}} +% \dontleavehmode \scale[height=.3\textheight]{\strut\color[textcolor]{\fontclass}} + \dontleavehmode \scale[width=.75\textwidth]{\strut\color[textcolor]{\fontclass}} \vfil \dontleavehmode \scale[height=.1\textheight]{\strut\color[baselinecolor]{\currentdate}} \vfil @@ -326,10 +332,10 @@ [page] [preset=leftbottom,offset=5mm] {\somedata[align=normal,width=5cm] - {\strut width \hfill \the\dimexpr#1sp\par - \strut height\hfill \the\dimexpr#2sp\par - \strut depth \hfill \the\dimexpr#3sp\par - \strut italic\hfill \the\dimexpr#4sp}}} + {\strut width \hfill \the\dimexpr#1\scaledpoint\par + \strut height\hfill \the\dimexpr#2\scaledpoint\par + \strut depth \hfill \the\dimexpr#3\scaledpoint\par + \strut italic\hfill \the\dimexpr#4\scaledpoint}}} \unexpanded\def\showmathcharactersentryresource#1% {} % {virtual: #1\par} @@ -346,13 +352,13 @@ {\egroup\egroup} \unexpanded\def\showmathcharactersnextentry#1#2#3% - {\ifnum#1>1 \vskip1ex \fi + {\ifnum#1>1 \vskip\exheight \fi \dontleavehmode\somedata [align=normal,width=4cm] {\strut\showmathcharacterstxt{#2}\hfill\showmathcharacterschr{2}{#3}}\par} \unexpanded\def\showmathcharactersnextcycle#1% - {\ifnum#1>1 \vskip1ex \fi + {\ifnum#1>1 \vskip\exheight \fi \dontleavehmode\somedata [align=normal,width=4cm] {\strut\showmathcharacterstxt{cycle}}\par} @@ -372,13 +378,13 @@ \bgroup\hbox\bgroup} \unexpanded\def\showmathcharactersvvariantsentry#1#2#3% - {\ifnum#1>1 \vskip1ex \fi + {\ifnum#1>1 \vskip\exheight \fi \dontleavehmode\somedata [align=middle,width=4cm] {\strut\showmathcharacterstxt{#2}\hfilll\showmathcharacterschr{2}{#3}}} \unexpanded\def\showmathcharactershvariantsentry#1#2#3% - {\ifnum#1>1 \hskip1ex \else \dontleavehmode \fi + {\ifnum#1>1 \hskip\exheight \else \dontleavehmode \fi \somedata [align={none,middle},height=2cm] {\strut\showmathcharacterstxt{#2}\vfilll\showmathcharacterschr{2}{#3}}} @@ -428,7 +434,7 @@ {\egroup\egroup} \unexpanded\def\showmathcharacterslookupvariant#1#2#3#4% - {\ifnum#1>1 \vskip1ex \fi + {\ifnum#1>1 \vskip\exheight \fi \somedata [align=normal,width=7cm] {\showmathcharacterstxt{#4:} \showmathcharacterstxt{#2}\hfill\showmathcharacterschr{4}{#3}}} @@ -453,28 +459,31 @@ \continueifinputfile{s-math-repertoire.mkiv} -\showmathcharacterssetbodyfonts{lucidaot,cambria,xits,stixtwo,modern,pagella,termes,bonum,schola,dejavu} +% \showmathcharacterssetbodyfonts{lucidaot,cambria,xits,stixtwo,modern,pagella,termes,bonum,schola,dejavu} +% \showmathcharacterssetbodyfonts{newcomputermodern-book,lucidaot,cambria,stixtwo,modern,pagella,termes,bonum,schola,dejavu} +\showmathcharacterssetbodyfonts{newcomputermodern-book,stixtwo,modern,pagella,termes,bonum,schola,dejavu} \starttext \doifelse {\getdocumentargument{bodyfont}} {} { - % \setupbodyfont[cambria, 12pt] - % \setupbodyfont[modern, 12pt] - % \setupbodyfont[lmvirtual, 12pt] - % \setupbodyfont[pxvirtual, 12pt] - % \setupbodyfont[txvirtual, 12pt] - % \setupbodyfont[palatino, 10pt] - % \setupbodyfont[mathtimes, 12pt] - % \setupbodyfont[stix, 12pt] - % \setupbodyfont[xits, 12pt] - % \setupbodyfont[lucida, 12pt] - % \setupbodyfont[lucidaot, 12pt] - % \setupbodyfont[pagella, 12pt] - % \setupbodyfont[bonum, 12pt] - % \setupbodyfont[schola, 12pt] - % \setupbodyfont[dejavu, 12pt] - \setupbodyfont[lucidaot, 12pt] + % \setupbodyfont[cambria, 12pt] + % \setupbodyfont[modern, 12pt] + % \setupbodyfont[lmvirtual, 12pt] + % \setupbodyfont[pxvirtual, 12pt] + % \setupbodyfont[txvirtual, 12pt] + % \setupbodyfont[palatino, 10pt] + % \setupbodyfont[mathtimes, 12pt] + % \setupbodyfont[stix, 12pt] + % \setupbodyfont[xits, 12pt] + % \setupbodyfont[lucida, 12pt] + % \setupbodyfont[lucidaot, 12pt] + % \setupbodyfont[pagella, 12pt] + % \setupbodyfont[bonum, 12pt] + % \setupbodyfont[schola, 12pt] + % \setupbodyfont[dejavu, 12pt] + % \setupbodyfont[lucidaot, 12pt] + \setupbodyfont[newcomputermodern-book, 12pt] } { diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 5dc6b3f44..06039f3b7 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 2021-06-10 23:09 +-- merge date : 2021-06-11 17:55 do -- begin closure to overcome local limits and interference @@ -15215,8 +15215,8 @@ local function mergecomposites(glyphs,shapes) local y=p[2] nofpoints=nofpoints+1 points[nofpoints]={ - xscale*x+xrotate*y+xoffset, - yscale*y+yrotate*x+yoffset, + xscale*x+yrotate*y+xoffset, + xrotate*x+yscale*y+yoffset, p[3] } end |