1 files changed, 63 insertions, 15 deletions
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 0214c2bfa..389d784e4 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -11,6 +11,17 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% Here is some timing (2015-04-01) luajittex format generation:
+%
+% 2.6 sec : normal make
+% 2.0 sec : with terminal output piped to file
+% 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.
+
 % Welcome to context, pronounced as kontekst (rather dutch) and not as
 % conτεχt.
 
@@ -28,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.01.03 00:40}
+\edef\contextversion{2015.05.15 23:03}
 \edef\contextkind   {current}
 
 %D For those who want to use this:
@@ -99,6 +110,9 @@
 % From here on we have \unexpanded being \normalprotected, as we already had
 % \unexpanded long before etex came around.
 
+\loadmarkfile{luat-ini}
+\loadmarkfile{toks-ini}
+
 \loadmarkfile{syst-aux}
 \loadmarkfile{syst-lua}
 \loadmarkfile{syst-con}
@@ -106,15 +120,20 @@
 \loadmarkfile{syst-fnt}
 \loadmarkfile{syst-rtp}
 
+\loadmarkfile{luat-usr}
+
+% \loadmarkfile{luat-ini} % moved up
+% \loadmarkfile{toks-ini} % moved up
+
 \loadmkvifile{file-ini}
 \loadmkvifile{file-res}
 \loadmkvifile{file-lib}
 
 \loadmarkfile{supp-dir}
 
-\loadmarkfile{char-ini}
-\loadmarkfile{char-utf}
-\loadmarkfile{char-act}
+\loadmarkfile{char-utf} % generic code (i.e. not much tex) ... could become unic-ini
+\loadmarkfile{char-ini} % tex / context specific
+\loadmarkfile{char-act} % even more specific
 
 \loadmarkfile{mult-ini}
 \loadmarkfile{mult-sys}
@@ -126,9 +145,10 @@
 
 \loadmarkfile{cldf-int} % interface
 
-\loadmarkfile{luat-ini}
+% \loadmarkfile{luat-ini}
 
-\loadmarkfile{toks-ini}
+\loadmarkfile{toks-tra}
+%loadmarkfile{toks-map} % obsolete, never used
 
 \loadmarkfile{attr-ini}
 
@@ -143,7 +163,6 @@
 
 \loadmarkfile{node-fin}
 \loadmarkfile{node-mig}
-\loadmarkfile{typo-bld} % par builders
 %loadmarkfile{node-pag}
 
 \loadmarkfile{back-ini}
@@ -171,6 +190,9 @@
 %loadmarkfile{supp-num} % obsolete
 
 \loadmarkfile{typo-ini}
+\loadmarkfile{typo-bld} % par builders
+
+\loadmarkfile{typo-inj}
 
 \loadmkvifile{file-syn}
 \loadmkvifile{file-mod}
@@ -184,6 +206,7 @@
 \loadmarkfile{hand-ini}
 
 \loadmarkfile{lang-ini}
+\loadmarkfile{lang-hyp}
 \loadmarkfile{lang-lab}
 
 \loadmarkfile{unic-ini}
@@ -221,6 +244,8 @@
 
 \loadmkvifile{typo-prc}
 
+\loadmarkfile{anch-pos}
+
 \loadmkvifile{strc-ini}
 \loadmarkfile{strc-tag}
 \loadmarkfile{strc-doc}
@@ -234,7 +259,7 @@
 \loadmarkfile{strc-xml}
 \loadmarkfile{strc-def} % might happen later
 \loadmkvifile{strc-ref}
-\loadmarkfile{strc-reg}
+%loadmarkfile{strc-reg}
 \loadmkvifile{strc-lev} % experiment
 
 \loadmarkfile{spac-ali}
@@ -246,9 +271,14 @@
 \loadmarkfile{spac-par}
 %loadmarkfile{spac-adj} % no longer needed
 \loadmarkfile{spac-def}
+
+\doiffileelse{spac-prf.mkvi}
+    {\loadmkvifile{spac-prf}}
+    {\loadmkivfile{spac-prf}}
+
 \loadmarkfile{spac-grd}
 
-\loadmarkfile{anch-pos}
+%loadmarkfile{anch-pos}
 
 \loadmkvifile{scrn-ini}
 \loadmkvifile{scrn-ref}
@@ -296,7 +326,9 @@
 \loadmarkfile{pack-pos}
 \loadmkvifile{page-mak}
 
-\loadmarkfile{page-lin}
+\loadmarkfile{strc-reg} % uses mixed columns
+
+\loadmkvifile{page-lin}
 \loadmarkfile{page-par}
 \loadmarkfile{typo-pag}
 \loadmarkfile{typo-mar}
@@ -357,6 +389,7 @@
 \loadmkvifile{font-sel}
 
 \loadmarkfile{typo-tal}
+\loadmarkfile{typo-par} % par builders (uses fonts)
 
 \loadmarkfile{tabl-com}
 \loadmarkfile{tabl-pln}
@@ -383,6 +416,7 @@
 \loadmarkfile{trac-jus}
 
 \loadmarkfile{typo-cln}
+\loadmarkfile{typo-wrp}
 \loadmarkfile{typo-spa}
 \loadmarkfile{typo-krn}
 \loadmkvifile{typo-itc}
@@ -394,6 +428,9 @@
 \loadmkvifile{typo-txt}
 \loadmarkfile{typo-drp}
 \loadmarkfile{typo-fln}
+\loadmarkfile{typo-sus}
+\loadmarkfile{typo-lig}
+\loadmarkfile{typo-chr}
 
 \loadmkvifile{type-ini}
 \loadmarkfile{type-set}
@@ -401,11 +438,11 @@
 \loadmarkfile{scrp-ini}
 
 \loadmarkfile{lang-wrd} % can be optional (discussion with mm sideeffect)
-%loadmarkfile{lang-rep} % can be optional (bt 2013 side effect)
+\loadmarkfile{lang-rep} % can be optional (bt 2013 side effect)
 
 \loadmarkfile{prop-ini} % only for downward compatibility
 
-\loadmarkfile{mlib-ctx}
+\loadmarkfile{mlib-ctx} % messy order
 
 \loadmarkfile{meta-ini}
 \loadmarkfile{meta-tex}
@@ -427,7 +464,7 @@
 \loadmarkfile{anch-bar}
 %loadmarkfile{anch-snc} % when needed this one will be redone
 
-\loadmarkfile{math-ini}
+\loadmarkfile{math-ini} % way after font-pre !
 \loadmarkfile{math-pln}
 \loadmarkfile{math-for}
 \loadmarkfile{math-def} % also saves some meanings
@@ -476,8 +513,17 @@
 
 \loadmarkfile{lang-spa} % will become obsolete
 
-\loadmarkfile{bibl-bib}
-\loadmarkfile{bibl-tra}
+% old bibtex support: (will be m-oldbibtex.mkiv)
+
+% \loadmarkfile{bibl-bib}
+% \loadmarkfile{bibl-tra}
+
+% new bibtex support:
+
+\loadmarkfile{publ-ini}
+\loadmarkfile{publ-tra}
+\loadmarkfile{publ-xml}
+\loadmarkfile{publ-old}
 
 %loadmarkfile{x-xtag}  % no longer preloaded
 
@@ -508,6 +554,8 @@
 
 \loadmarkfile{back-exp}
 
+\loadmarkfile{cont-run} % the main runner (used in cont-yes.mkiv)
+
 \setupcurrentlanguage[\defaultlanguagetag]
 
 \prependtoks