From 8b678f473da7b81842dbc13b50c6303991570521 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 25 May 2019 11:48:47 +0200 Subject: 2019-05-25 10:53:00 --- tex/context/base/mkiv/context.mkiv | 79 +++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 39 deletions(-) (limited to 'tex/context/base/mkiv/context.mkiv') diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index f05092fe9..2550292e1 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -18,9 +18,9 @@ % 0.2 sec : format dumped % 0.2 sec : char-def/char-ini (no bytecode) % -% So a format still saves some 1.5 seconds (with luajjitex) startup and -% on network shares cq. when no files are cached by the os it's of course -% much worse. A zero run is .27 sec with luajittex. +%D So a format still saves some 1.5 seconds (with luajjitex) startup and on network +%D shares cq. when no files are cached by the os it's of course much worse. A zero +%D run is .27 sec with luajittex. In luametatex it's faster anyway (2.4 sec). % http://build.contextgarden.net/waterfall?tag=c/luatex @@ -29,20 +29,19 @@ \catcode`\{=1 \catcode`\}=2 \catcode`\#=6 -%D From the next string (which is set by the script that assembles the -%D distribution) later on we will calculate a number that can be used -%D by use modules to identify the feature level. Starting with version -%D 2004.8.30 the low level interface is english. Watch out and adapt -%D your styles an modules. +%D From the next string (which is set by the script that assembles the distribution) +%D later on we will calculate a number that can be used by use modules to identify +%D the feature level. Starting with version 2004.8.30 the low level interface is +%D english. Watch out and adapt your styles an modules. % \everypar{\writestatus{!!!!}{some spurious input in line \the\inputlineno}\wait} -%D The order of loading will change when all modules have been cleaned -%D up and the dependencies are more consistent. beware, the version number -%D has to match \type {YYYY.MM.DD HH:MM} format. +%D The order of loading will change when all modules have been cleaned up and the +%D dependencies are more consistent. Beware, the version number has to match \type +%D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2019.05.18 10:42} +\edef\contextversion{2019.05.25 10:45} \edef\contextkind {beta} %D Kind of special: @@ -61,31 +60,30 @@ \ifx\normalinput\undefined \let\normalinput\input \fi -\def\loadcorefile#1{\normalinput#1\relax} -\def\loadmarkfile#1{\normalinput#1.\mksuffix\relax} -\def\loadmkiifile#1{} -\def\loadmkivfile#1{\normalinput#1.mkiv\relax} -\def\loadmkvifile#1{\normalinput#1.mkvi\relax} +\def\loadmarkfile#1{\normalinput{#1.\mksuffix}} +\def\loadmkivfile#1{\normalinput{#1.mkiv}} +\def\loadmkvifile#1{\normalinput{#1.mkvi}} +%def\loadmkilfile#1{\normalinput{#1.mkil}} +%def\loadmklifile#1{\normalinput{#1.mkli}} -%D First we load the system modules. These implement a lot of -%D manipulation macros. We start with setting up some basic \TEX\ -%D machinery. +%D First we load the system modules. These implement a lot of manipulation macros. +%D We start with setting up some basic \TEX\ machinery. \loadmarkfile{syst-ini} +%D We just quit if new functionality is expected. + +\ifnum\luatexversion<110 % also change message + \writestatus{!!!!}{Your luatex binary is too old, you need at least version 1.10!} + \expandafter\end +\fi + %D Some checking (more primitives are now defined): \ifdefined\defaultinterface \else \def\defaultinterface {english} \fi %ifdefined\messageinterface \else \let\messageinterface \defaultinterface \fi \ifdefined\defaultlanguagetag \else \def\defaultlanguagetag{en} \fi -%D We just quit if new functionality is expected. - -\ifnum\luatexversion<109 % also change message - \writestatus{!!!!}{Your luatex binary is too old, you need at least version 1.09!} - \expandafter\end -\fi - %D There is only this way to pass the version info to \LUA\ (currently). Hm, we could %D now put it into the environment. @@ -116,8 +114,8 @@ % \tracecatcodetables -% From here on we have \unexpanded being \normalprotected, as we already had -% \unexpanded long before etex came around. +%D From here on we have \unexpanded being \normalprotected, as we already had +%D \type {\unexpanded} long before etex came around. \loadmarkfile{luat-ini} \loadmarkfile{toks-scn} @@ -135,13 +133,13 @@ \loadmkvifile{file-res} \loadmkvifile{file-lib} -\loadmarkfile{core-lmt} +\loadmarkfile{core-lmt} % lmtx -% needs more checking for clashes: -% -% no need to register, just execute once, slightly faster -% -% \doifelsefileexists{l-macro-imp-codes.lua}{\registerctxluafile{l-macro-imp-codes}{}}{} +%D This needs more checking for clashes: +%D +%D \starttyping +%D \doifelsefileexists{l-macro-imp-codes.lua}{\registerctxluafile{l-macro-imp-codes}{}}{} +%D \stoptyping \loadmarkfile{supp-dir} @@ -154,7 +152,6 @@ \loadmarkfile{mult-aux} \loadmarkfile{mult-def} \loadmarkfile{mult-chk} -%loadmarkfile{mult-aux} % moved up \loadmkvifile{mult-dim} \loadmarkfile{cldf-int} % interface @@ -182,9 +179,12 @@ \loadmarkfile{node-mig} %loadmarkfile{node-pag} -\loadmarkfile{driv-ini} +\loadmarkfile{driv-ini} % lmtx \loadmarkfile{back-ini} +\loadmarkfile{back-res} +\loadmarkfile{back-trf} +\loadmarkfile{back-out} \loadmarkfile{attr-col} \loadmarkfile{attr-lay} @@ -580,8 +580,9 @@ % now we hook in backend code (needs checking) \loadmarkfile{back-exp} - -\loadmarkfile{back-pdf} % actually, this one should load the next three using document.arguments.backend +\loadmarkfile{back-pdf} +\loadmarkfile{back-mps} +\loadmarkfile{back-lua} \loadmarkfile{mlib-pdf} \loadmarkfile{mlib-pps} -- cgit v1.2.3