diff options
author | Hans Hagen <pragma@wxs.nl> | 2021-02-18 11:28:41 +0100 |
---|---|---|
committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2021-02-18 11:28:41 +0100 |
commit | 298afdcdcb9d3c88fcc9abdbf17ac66f2f5006a1 (patch) | |
tree | 44bbefa57072479622fa253684ec3cb96258255f /tex | |
parent | 84aae20fa32c9a50ae1c63576573f52d010de43b (diff) | |
download | context-298afdcdcb9d3c88fcc9abdbf17ac66f2f5006a1.tar.gz |
2021-02-18 10:24:00
Diffstat (limited to 'tex')
30 files changed, 179 insertions, 131 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 166b632f8..dd2121312 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.02.17 13:30} +\newcontextversion{2021.02.18 10:21} %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 9291fb479..d35333376 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.02.17 13:30} +\edef\contextversion{2021.02.18 10:21} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii index 9f9892874..ef2da9e49 100644 --- a/tex/context/base/mkii/mult-fr.mkii +++ b/tex/context/base/mkii/mult-fr.mkii @@ -774,6 +774,8 @@ \setinterfaceconstant{deepnumbercommand}{commandeprofondenumero} \setinterfaceconstant{deeptextcommand}{commandeprofondetexte} \setinterfaceconstant{default}{defaut} +\setinterfaceconstant{defaultheight}{defaultheight} +\setinterfaceconstant{defaultwidth}{defaultwidth} \setinterfaceconstant{define}{define} \setinterfaceconstant{delay}{retard} \setinterfaceconstant{depth}{profondeur} @@ -1118,6 +1120,7 @@ \setinterfaceconstant{print}{imprimer} \setinterfaceconstant{printable}{imprimable} \setinterfaceconstant{process}{traiter} +\setinterfaceconstant{processors}{processors} \setinterfaceconstant{profile}{profil} \setinterfaceconstant{properties}{proprietes} \setinterfaceconstant{pubsep}{seppub} @@ -1131,6 +1134,7 @@ \setinterfaceconstant{reference}{reference} \setinterfaceconstant{referencemethod}{methodereference} \setinterfaceconstant{referenceprefix}{prefixereference} +\setinterfaceconstant{referencetext}{referencetext} \setinterfaceconstant{referencing}{referencement} \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{regiondedans} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 181bb0da5..8c5bfa011 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.02.17 13:30} +\newcontextversion{2021.02.18 10:21} %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 f63e4b1a6..219c00255 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.02.17 13:30} +\edef\contextversion{2021.02.18 10:21} %D Kind of special: diff --git a/tex/context/base/mkiv/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua index 12f7a31e6..b3abecbba 100644 --- a/tex/context/base/mkiv/luat-cod.lua +++ b/tex/context/base/mkiv/luat-cod.lua @@ -144,7 +144,7 @@ if LUATEXVERSION == nil then end if CONTEXTLMTXMODE == nil then - CONTEXTLMTXMODE = LUATEXENGINE == "luametatex" and 1 or 0 + CONTEXTLMTXMODE = 0 end if LUATEXFUNCTIONALITY == nil then diff --git a/tex/context/base/mkiv/luat-fmt.lua b/tex/context/base/mkiv/luat-fmt.lua index eb24378a4..fe97cf604 100644 --- a/tex/context/base/mkiv/luat-fmt.lua +++ b/tex/context/base/mkiv/luat-fmt.lua @@ -297,9 +297,9 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco luafile = quoted(scriptname), texfile = filename ~= "" and quoted(filename) or "", } - statistics.starttiming() + statistics.starttiming("make format") local result = runner(specification) - local runtime = statistics.stoptiming() + statistics.stoptiming("make format") if verbose then report_format() if binarypath and binarypath ~= "" then @@ -317,7 +317,7 @@ function environment.run_format(formatname,scriptname,filename,primaryflags,seco if secondaryflags ~= "" then report_format("secondary flags : %s",secondaryflags) end - report_format("run time : %.3f seconds",runtime) + report_format("run time : %0.3f seconds",statistics.elapsed("make format")) report_format("return value : %s",result == 0 and "okay" or "error") report_format() end diff --git a/tex/context/base/mkiv/luat-ini.lua b/tex/context/base/mkiv/luat-ini.lua index 39453b44c..dcca8cec7 100644 --- a/tex/context/base/mkiv/luat-ini.lua +++ b/tex/context/base/mkiv/luat-ini.lua @@ -31,7 +31,7 @@ LUATEXFUNCTIONALITY = status.development_id or 6346 LUATEXFORMATID = status.format_id or 0 JITSUPPORTED = false INITEXMODE = status.run_state == 0 -- initializing updating production -CONTEXTLMTXMODE = 1 +CONTEXTLMTXMODE = 0 status.ini_version = INITEXMODE -- for a while diff --git a/tex/context/base/mkiv/meta-imp-txt.mkiv b/tex/context/base/mkiv/meta-imp-txt.mkiv index e683c3766..c814d2cb0 100644 --- a/tex/context/base/mkiv/meta-imp-txt.mkiv +++ b/tex/context/base/mkiv/meta-imp-txt.mkiv @@ -25,7 +25,7 @@ \unprotect -\definesystemvariable {sh} % ShapedText .. todo: commandhandler +\ifdefined\??sh \else \definesystemvariable {sh} \fi % ShapedText .. todo: commandhandler \unexpanded\def\setupshapetexts {\dodoubleempty\getparameters[\??sh]} diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua index 4e4a901c0..7bfda80bc 100644 --- a/tex/context/base/mkiv/mult-fun.lua +++ b/tex/context/base/mkiv/mult-fun.lua @@ -201,5 +201,7 @@ return { -- "newcolor", "newrgbcolor", "newcmykcolor", "newnumeric", "newboolean", "newtransform", "newpath", "newpicture", "newstring", "newpair", + + "mpvar", }, } diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex f934bfab7..2e5da9719 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 4ec3a9778..dbed8e590 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/toks-ini.mkiv b/tex/context/base/mkiv/toks-ini.mkiv index c7d7bceb3..af22d5393 100644 --- a/tex/context/base/mkiv/toks-ini.mkiv +++ b/tex/context/base/mkiv/toks-ini.mkiv @@ -15,6 +15,6 @@ \unprotect -\registerctxluafile{toks-ini}{autosuffix} +\registerctxluafile{toks-ini}{} \protect \endinput diff --git a/tex/context/base/mkiv/trac-inf.lua b/tex/context/base/mkiv/trac-inf.lua index 3db912be1..e2736cfb6 100644 --- a/tex/context/base/mkiv/trac-inf.lua +++ b/tex/context/base/mkiv/trac-inf.lua @@ -129,10 +129,8 @@ local function stoptiming(instance) timer.loadtime = timer.loadtime + loadtime timer.timing = 0 timer.starttime = 0 - return loadtime end end - return 0 end local function benchmarktimer(instance) diff --git a/tex/context/base/mkxl/anch-bck.mklx b/tex/context/base/mkxl/anch-bck.mklx index c8f989624..36416c93d 100644 --- a/tex/context/base/mkxl/anch-bck.mklx +++ b/tex/context/base/mkxl/anch-bck.mklx @@ -11,6 +11,9 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% when tested for a while: \MPgetmultipars -> getmultipars +% when tested for a while: \MPvar -> mpvar + \writestatus{loading}{ConTeXt Anchoring Macros / Backgrounds} %D This module is quite okay but at some point I might add methods that use @@ -595,6 +598,7 @@ \startMPpositiongraphic{mpos:region}{fillcolor,filloffset,linecolor,gridcolor,linewidth,gridwidth,gridshift,lineradius,lineoffset} \includeMPgraphic{mpos:region:setup} ; \includeMPgraphic{mpos:region:extra} ; + % \getmultipars("self","anchor") ; \MPgetmultipars{\MPvar{self}}{\MPanchorid} ; \includeMPgraphic{\MPvar{mp}} ; \includeMPgraphic{mpos:region:anchor} ; @@ -666,13 +670,21 @@ lineoffset=5pt, linewidth=1pt] +% \startMPpositiongraphic{mpos:encircle}{linecolor,fillcolor,linewidth,lineoffset} +% getposboxes("self","anchor") ; +% if nofposboxes = 1 : +% posboxes[1] := posboxes[1] enlarged \MPvar{lineoffset} cornered \MPvar{lineoffset} ; +% fill posboxes[1] withcolor \MPvar{fillcolor} ; +% draw posboxes[1] withpen pencircle scaled \MPvar{linewidth} withcolor \MPvar{linecolor} ; +% fi ; +% \stopMPpositiongraphic + \startMPpositiongraphic{mpos:encircle}{linecolor,fillcolor,linewidth,lineoffset} - \MPgetposboxes{\MPvar{self}}{\MPanchorid} - % getposboxes("self","anchor") ; + getposboxes("self","anchor") ; if nofposboxes = 1 : - posboxes[1] := posboxes[1] enlarged \MPvar{lineoffset} cornered \MPvar{lineoffset} ; - fill posboxes[1] withcolor \MPvar{fillcolor} ; - draw posboxes[1] withpen pencircle scaled \MPvar{linewidth} withcolor \MPvar{linecolor} ; + posboxes[1] := (posboxes[1] enlarged mpvar "lineoffset") cornered mpvar "lineoffset" ; + fill posboxes[1] withcolor mpvar "fillcolor" ; + draw posboxes[1] withpen pencircle scaled mpvar "linewidth" withcolor mpvar "linecolor" ; fi ; \stopMPpositiongraphic @@ -682,12 +694,19 @@ lineoffset=.25ex, linewidth=1pt] +% \startMPpositiongraphic{mpos:connect}{linecolor,lineoffset,linewidth} +% boxlinewidth := \MPvar{linewidth} ; +% boxlineoffset := \MPvar{lineoffset} ; +% def boxlineoptions = withcolor \MPvar{linecolor} enddef ; +% getposboxes("from,to","anchor") ; +% connect_positions ; +% \stopMPpositiongraphic + \startMPpositiongraphic{mpos:connect}{linecolor,lineoffset,linewidth} - boxlinewidth := \MPvar{linewidth} ; - boxlineoffset := \MPvar{lineoffset} ; - def boxlineoptions = withcolor \MPvar{linecolor} enddef ; - \MPgetposboxes{\MPvar{from},\MPvar{to}}{\MPanchorid} - % getposboxes("from,to","anchor") ; + boxlinewidth := mpvar "linewidth" ; + boxlineoffset := mpvar "lineoffset" ; + def boxlineoptions = withcolor mpvar "linecolor" enddef ; + getposboxes("from,to","anchor") ; connect_positions ; \stopMPpositiongraphic diff --git a/tex/context/base/mkxl/anch-pgr.lmt b/tex/context/base/mkxl/anch-pgr.lmt index 0cf9ea9e4..5b750d80e 100644 --- a/tex/context/base/mkxl/anch-pgr.lmt +++ b/tex/context/base/mkxl/anch-pgr.lmt @@ -24,6 +24,7 @@ local lpegmatch = lpeg.match local jobpositions = job.positions local formatters = string.formatters local setmetatableindex = table.setmetatableindex +local settings_to_array = utilities.parsers.settings_to_array local enableaction = nodes.tasks.enableaction @@ -33,6 +34,8 @@ local context = context local implement = interfaces.implement local getmacro = tokens.getters.macro +local scanmpstring = mp.scan.string +local mpgnamespace = getmacro("??graphicvariable") local report_graphics = logs.reporter("backgrounds") local report_shapes = logs.reporter("backgrounds","shapes") @@ -57,6 +60,12 @@ graphics = graphics or { } local backgrounds = { } graphics.backgrounds = backgrounds +-- -- -- these can go -- -- -- + +backgrounds.point = f_point +backgrounds.pair = f_pair +backgrounds.path = f_path + -- -- -- local texsetattribute = tex.setattribute @@ -1183,9 +1192,29 @@ end backgrounds.fetchmultipar = fetchmultipar -backgrounds.point = f_point -backgrounds.pair = f_pair -backgrounds.path = f_path +local function getwhatever(action) + local tags = scanmpstring() + local anchor = scanmpstring() + local page = nil + if tags == "self" then + tags = getmacro(mpgnamespace .. getmacro("currentmpvariableclass") .. ":self",true) -- Isn't it already edef'd? + elseif type(tags) == "string" then + tags = settings_to_array(tags) + for i=1,#tags do + tags[i] = getmacro(mpgnamespace .. getmacro("currentmpvariableclass") .. ":" .. tags[i],true) -- Isn't it already edef'd? + end + end + if anchor == "anchor" then + anchor = getmacro("MPanchorid") -- brrr + end + if tags and anchor then + return action(tags,anchor,page) + end +end + +metapost.registerscript("getmultipars", function() + return getwhatever(fetchmultipar) +end) -- n anchor page @@ -1199,8 +1228,6 @@ implement { do - local scanstring = mp.scan.string - local f_template_a = formatters[ [[ path posboxes[], posregions[] ; numeric pospages[] ; @@ -1218,7 +1245,7 @@ do local function getposboxes(tags,anchor,page) -- no caching (yet) / page local collected = jobpositions.collected if type(tags) == "string" then - tags = utilities.parsers.settings_to_array(tags) + tags = settings_to_array(tags) end local list = { } local nofboxes = 0 @@ -1258,32 +1285,8 @@ do return f_template_a(nofboxes,list) end - local namespace - - -- metapost.registerscript("var", function() - -- local name = scanstring() - -- if not namespace then - -- namespace = getmacro("??graphicvariable") - -- end - -- return getmacro(namespace .. getmacro("currentmpvariableclass") .. ":" .. name) - -- end - metapost.registerscript("getposboxes", function() - local tags = scanstring() - local anchor = scanstring() - local page = nil - if tags == "self" then - if not namespace then - namespace = getmacro("??graphicvariable") - end - tags = getmacro(namespace .. getmacro("currentmpvariableclass") .. ":self") - end - if anchor == "anchor" then - anchor = getmacro("MPanchorid") -- brrr - end - if tags and anchor then - return getposboxes(tags,anchor,page) - end + return getwhatever(getposboxes) end) implement { @@ -1294,25 +1297,29 @@ do end -local doifelse = commands.doifelse +do -implement { - name = "doifelserangeonpage", - arguments = { "string", "string", "integer" }, - actions = function(first,last,page) - local c = jobpositions.collected - local f = c[first] - if f then - f = f.p - if f and f ~= true and page >= f then - local l = c[last] - if l then - l = l.p - doifelse(l and l ~= true and page <= l) - return + local doifelse = commands.doifelse + + implement { + name = "doifelserangeonpage", + arguments = { "string", "string", "integer" }, + actions = function(first,last,page) + local c = jobpositions.collected + local f = c[first] + if f then + f = f.p + if f and f ~= true and page >= f then + local l = c[last] + if l then + l = l.p + doifelse(l and l ~= true and page <= l) + return + end end end + doifelse(false) end - doifelse(false) - end -} + } + +end diff --git a/tex/context/base/mkxl/catc-ini.mkxl b/tex/context/base/mkxl/catc-ini.mkxl index 7f1a89f6c..5b33db981 100644 --- a/tex/context/base/mkxl/catc-ini.mkxl +++ b/tex/context/base/mkxl/catc-ini.mkxl @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\registerctxluafile{catc-ini}{} +\registerctxluafile{catc-ini}{autosuffix} \unprotect diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index 13ddba0fd..6f7a14b13 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.02.17 13:30} +\newcontextversion{2021.02.18 10:21} %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 68860f7e5..89cf5654a 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.02.17 13:30} +\immutable\edef\contextversion{2021.02.18 10:21} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/luat-ini.lmt b/tex/context/base/mkxl/luat-ini.lmt index cec0161e7..3bfd191b9 100644 --- a/tex/context/base/mkxl/luat-ini.lmt +++ b/tex/context/base/mkxl/luat-ini.lmt @@ -39,7 +39,7 @@ JITSUPPORTED = LUATEXENGINE == "luajittex" or jit INITEXMODE = status.ini_version -CONTEXTLMTXMODE = CONTEXTLMTXMODE or (LUATEXENGINE == "luametatex" and 1) or 0 +CONTEXTLMTXMODE = 1 function os.setlocale() -- no need for a message diff --git a/tex/context/base/mkxl/meta-ini.mkxl b/tex/context/base/mkxl/meta-ini.mkxl index 2100912d7..823d369f0 100644 --- a/tex/context/base/mkxl/meta-ini.mkxl +++ b/tex/context/base/mkxl/meta-ini.mkxl @@ -500,7 +500,7 @@ \let \m_meta_current_variable \empty \let \m_meta_current_variable_template\empty -\installcorenamespace{graphicvariable} +% \installcorenamespace{graphicvariable} % already set \def\meta_prepare_variable_default{\MPcolor{black}} % just to be sure we use a color but ... diff --git a/tex/context/base/mkxl/mlib-cnt.lmt b/tex/context/base/mkxl/mlib-cnt.lmt index 667384ed7..bddcb33b8 100644 --- a/tex/context/base/mkxl/mlib-cnt.lmt +++ b/tex/context/base/mkxl/mlib-cnt.lmt @@ -53,7 +53,8 @@ local bor = bit32.bor -- it's really time to ditch support for luajit local starttiming = statistics.starttiming local stoptiming = statistics.stoptiming -local elapsedtime = statistics.elapsedtime +local resettiming = statistics.resettiming +local elapsedtiming = statistics.elapsed local formatters = string.formatters local setmetatableindex = table.setmetatableindex @@ -250,6 +251,7 @@ end function mp.lmt_contours_start() + resettiming("lmt_contours") starttiming("lmt_contours") nofcontours = nofcontours + 1 @@ -546,14 +548,12 @@ end function mp.lmt_contours_stop() local p = getparameterset() - local e = stoptiming("lmt_contours") + stoptiming("lmt_contours") setcache(p) p.result = nil local f = p["function"] local l = p.functions - report("index %i, %0.3f seconds for: %s", - nofcontours, e, "[ " .. concat(l or { f } ," ] [ ") .. " ]" - ) + report("index %i, %0.3f seconds for: %s", nofcontours, elapsedtiming("lmt_contours"), "[ " .. concat(l or { f } ," ] [ ") .. " ]") end function mp.lmt_contours_bitmap_set() diff --git a/tex/context/base/mkxl/mlib-ctx.mkxl b/tex/context/base/mkxl/mlib-ctx.mkxl index 81fbffa85..fb069b6ea 100644 --- a/tex/context/base/mkxl/mlib-ctx.mkxl +++ b/tex/context/base/mkxl/mlib-ctx.mkxl @@ -13,6 +13,8 @@ \writestatus{loading}{MetaPost Library Graphics / Initializations} +\installcorenamespace{graphicvariable} + \registerctxluafile{mlib-fio}{autosuffix} \registerctxluafile{mlib-run}{autosuffix} \registerctxluafile{mlib-ctx}{autosuffix} diff --git a/tex/context/base/mkxl/mlib-lmp.lmt b/tex/context/base/mkxl/mlib-lmp.lmt index 19288b32b..2b3e910ba 100644 --- a/tex/context/base/mkxl/mlib-lmp.lmt +++ b/tex/context/base/mkxl/mlib-lmp.lmt @@ -88,3 +88,17 @@ registerscript("showhashentry", function() end end end) + +local getmacro = tokens.getters.macro +local mpgnamespace = getmacro("??graphicvariable") + +local scanmpstring = mp.scan.string + +local injectnumeric = mp.inject.numeric +local injectstring = mp.inject.string + +-- registerscript("mpv_numeric", function() injectnumeric (getmacro(mpgnamespace .. getmacro("currentmpvariableclass") .. ":" .. scanmpstring())) end) +-- registerscript("mpv_dimension", function() return getmacro(mpgnamespace .. getmacro("currentmpvariableclass") .. ":" .. scanmpstring()) end) +-- registerscript("mpv_string", function() injectstring (getmacro(mpgnamespace .. getmacro("currentmpvariableclass") .. ":" .. scanmpstring())) end) + +registerscript("mpvar", function() return getmacro(mpgnamespace .. getmacro("currentmpvariableclass") .. ":" .. scanmpstring(), true) end) -- Isn't it already edef'd? diff --git a/tex/context/base/mkxl/strc-sec.mkxl b/tex/context/base/mkxl/strc-sec.mkxl index 4e6464db4..7a3a64875 100644 --- a/tex/context/base/mkxl/strc-sec.mkxl +++ b/tex/context/base/mkxl/strc-sec.mkxl @@ -179,7 +179,7 @@ \glet\currentstructurecoding\s!tex \fi \iflocation \ifempty\currentstructurebookmark \orelse \ifx\currentstructurebookmark\currentstructuretitle \else - \showmessage\m!structures3{\currentstructurebookmark}% + \showmessage\m!structures3{{\currentstructurebookmark}}% \fi \fi \setnextinternalreference \storeinternalreference\currentstructurename{\the\locationcount}% diff --git a/tex/context/base/mkxl/trac-inf.lmt b/tex/context/base/mkxl/trac-inf.lmt index 301a56e9b..ebcd21e07 100644 --- a/tex/context/base/mkxl/trac-inf.lmt +++ b/tex/context/base/mkxl/trac-inf.lmt @@ -78,10 +78,8 @@ local function stoptiming(instance) timer.loadtime = timer.loadtime + loadtime timer.timing = 0 timer.starttime = 0 - return loadtime end end - return 0 end local function benchmarktimer(instance) diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml index eeca9f5a7..3a1e64452 100644 --- a/tex/context/interface/mkii/keys-fr.xml +++ b/tex/context/interface/mkii/keys-fr.xml @@ -780,6 +780,8 @@ <cd:constant name='deepnumbercommand' value='commandeprofondenumero'/> <cd:constant name='deeptextcommand' value='commandeprofondetexte'/> <cd:constant name='default' value='defaut'/> + <cd:constant name='defaultheight' value='defaultheight'/> + <cd:constant name='defaultwidth' value='defaultwidth'/> <cd:constant name='define' value='define'/> <cd:constant name='delay' value='retard'/> <cd:constant name='depth' value='profondeur'/> @@ -1124,6 +1126,7 @@ <cd:constant name='print' value='imprimer'/> <cd:constant name='printable' value='imprimable'/> <cd:constant name='process' value='traiter'/> + <cd:constant name='processors' value='processors'/> <cd:constant name='profile' value='profil'/> <cd:constant name='properties' value='proprietes'/> <cd:constant name='pubsep' value='seppub'/> @@ -1137,6 +1140,7 @@ <cd:constant name='reference' value='reference'/> <cd:constant name='referencemethod' value='methodereference'/> <cd:constant name='referenceprefix' value='prefixereference'/> + <cd:constant name='referencetext' value='referencetext'/> <cd:constant name='referencing' value='referencement'/> <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='regiondedans'/> diff --git a/tex/context/modules/mkiv/s-syntax.mkiv b/tex/context/modules/mkiv/s-syntax.mkiv index d9492af3e..658343ac5 100644 --- a/tex/context/modules/mkiv/s-syntax.mkiv +++ b/tex/context/modules/mkiv/s-syntax.mkiv @@ -42,49 +42,49 @@ \unexpanded\def\StartSyntax {\startlines % formatters - \let\Indent \module_syntax_Indent - \let\Sugar \module_syntax_Sugar - \let\Something \module_syntax_Something - \let\Lbrace \module_syntax_Lbrace - \let\Rbrace \module_syntax_Rbrace - \let\Lparent \module_syntax_Lparent - \let\Rparent \module_syntax_Rparent - \let\Lbracket \module_syntax_Lbracket - \let\Rbracket \module_syntax_Rbracket - \let\Or \module_syntax_Or - \let\Optional \module_syntax_Optional - \let\Means \module_syntax_Means - \let\Tex \module_syntax_Tex - \let\Literal \module_syntax_Literal - \let\Syntax \module_syntax_Syntax - \let\Next \module_syntax_Next - \let\Whatever \module_syntax_Whatever - \let\Quote \module_syntax_Quote - \let\Or \module_syntax_Or - \let\Means \module_syntax_Means - \let\FlaggedLiteral \module_syntax_FlaggedLiteral - \let\FlaggedSomething\module_syntax_FlaggedSomething + \enforced\let\Indent \module_syntax_Indent + \enforced\let\Sugar \module_syntax_Sugar + \enforced\let\Something \module_syntax_Something + \enforced\let\Lbrace \module_syntax_Lbrace + \enforced\let\Rbrace \module_syntax_Rbrace + \enforced\let\Lparent \module_syntax_Lparent + \enforced\let\Rparent \module_syntax_Rparent + \enforced\let\Lbracket \module_syntax_Lbracket + \enforced\let\Rbracket \module_syntax_Rbracket + \enforced\let\Or \module_syntax_Or + \enforced\let\Optional \module_syntax_Optional + \enforced\let\Means \module_syntax_Means + \enforced\let\Tex \module_syntax_Tex + \enforced\let\Literal \module_syntax_Literal + \enforced\let\Syntax \module_syntax_Syntax + \enforced\let\Next \module_syntax_Next + \enforced\let\Whatever \module_syntax_Whatever + \enforced\let\Quote \module_syntax_Quote + \enforced\let\Or \module_syntax_Or + \enforced\let\Means \module_syntax_Means + \enforced\let\FlaggedLiteral \module_syntax_FlaggedLiteral + \enforced\let\FlaggedSomething\module_syntax_FlaggedSomething % shortcuts - \let\FL \module_syntax_FlaggedLiteral - \let\FS \module_syntax_FlaggedSomething - \let\L \module_syntax_Literal - \let\S \module_syntax_Something - \let\M \module_syntax_Means - \let\N \module_syntax_Next - \let\O \module_syntax_Or - \let\Q \module_syntax_Quote - \let\LB \module_syntax_Lbrace - \let\RB \module_syntax_Rbrace - \let\LP \module_syntax_Lparent - \let\RP \module_syntax_Rparent - \let\LS \module_syntax_Lbracket - \let\RS \module_syntax_Rbracket - \let\{ \module_syntax_Lbrace - \let\} \module_syntax_Rbrace - \let\( \module_syntax_Lparent - \let\) \module_syntax_Rparent - \let\[ \module_syntax_Lbracket - \let\] \module_syntax_Rbracket + \enforced\let\FL \module_syntax_FlaggedLiteral + \enforced\let\FS \module_syntax_FlaggedSomething + \enforced\let\L \module_syntax_Literal + \enforced\let\S \module_syntax_Something + \enforced\let\M \module_syntax_Means + \enforced\let\N \module_syntax_Next + \enforced\let\O \module_syntax_Or + \enforced\let\Q \module_syntax_Quote + \enforced\let\LB \module_syntax_Lbrace + \enforced\let\RB \module_syntax_Rbrace + \enforced\let\LP \module_syntax_Lparent + \enforced\let\RP \module_syntax_Rparent + \enforced\let\LS \module_syntax_Lbracket + \enforced\let\RS \module_syntax_Rbracket + \enforced\let\{ \module_syntax_Lbrace + \enforced\let\} \module_syntax_Rbrace + \enforced\let\( \module_syntax_Lparent + \enforced\let\) \module_syntax_Rparent + \enforced\let\[ \module_syntax_Lbracket + \enforced\let\] \module_syntax_Rbracket % precaution \catcode`\#\othercatcode} diff --git a/tex/context/modules/mkiv/x-math-svg.lua b/tex/context/modules/mkiv/x-math-svg.lua index 8a6288167..818c7ad84 100644 --- a/tex/context/modules/mkiv/x-math-svg.lua +++ b/tex/context/modules/mkiv/x-math-svg.lua @@ -35,10 +35,10 @@ local pagedata = { } local statusname = "x-math-svg-status.lua" local pdfname = "x-math-svg.pdf" -local pdftosvg = os.which("mudraw") +local pdftosvg = os.which("mutool") local f_make_tex = formatters[ [[context --global kpse:x-math-svg.mkvi --inputfile="%s" --svgstyle="%s" --batch --noconsole --once --purgeall]] ] -local f_make_svg = formatters[ [[mudraw -o "math-%%d.svg" "%s" 1-9999]] ] +local f_make_svg = formatters[ [[mutool draw -o "math-%%d.svg" "%s" 1-9999]] ] ----- f_inline = formatters[ [[<div class='math-inline' style='vertical-align:%p'></div>]] ] local f_inline = formatters[ [[<div class='math-inline'></div>]] ] @@ -101,7 +101,7 @@ function svgmath.convert(filename,svgstyle) -- invalid filename return false, "invalid filename" elseif not pdftosvg then - return false, "mudraw is not installed" + return false, "mutool is not installed" end os.execute(f_make_tex(filename,svgstyle)) diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 390693ed0..86b9a07f8 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-02-17 13:30 +-- merge date : 2021-02-18 10:21 do -- begin closure to overcome local limits and interference |