1 files changed, 102 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/context/base/context.mkiv b/Master/texmf-dist/tex/context/base/context.mkiv
index 8f3586dea98..fcbe7872c35 100644
--- a/Master/texmf-dist/tex/context/base/context.mkiv
+++ b/Master/texmf-dist/tex/context/base/context.mkiv
@@ -5,7 +5,7 @@
 %D       subtitle=\CONTEXT\ Format Generation,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
-%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
@@ -19,8 +19,11 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
+%D The order of loading will change when all modules have been cleaned
+%D up and the dependencies are more consistent.
+
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.05.18 18:04}
+\edef\contextversion{2012.05.14 16:00}
 
 %D For those who want to use this:
 
@@ -54,8 +57,8 @@
 
 %D We just quit if new functionality is expected.
 
-\ifnum\luatexversion<60 % also change message
-    \writestatus{!!!!}{Your luatex binary is too old, you need at least version 0.60!}
+\ifnum\luatexversion<70 % also change message
+    \writestatus{!!!!}{Your luatex binary is too old, you need at least version 0.70!}
     \expandafter\end
 \fi
 
@@ -64,7 +67,7 @@
 
 \newtoks\contextversiontoks \contextversiontoks\expandafter{\contextversion}
 
-%D Now the more fundamnetal code gets defined.
+%D Now the more fundamental code gets defined.
 
 \loadmarkfile{norm-ctx}
 \loadmarkfile{syst-pln}
@@ -92,7 +95,10 @@
 \loadmarkfile{syst-fnt}
 \loadmarkfile{syst-rtp}
 
-\loadmarkfile{supp-fil}
+\loadmkvifile{file-ini}
+\loadmkvifile{file-res}
+\loadmkvifile{file-lib}
+
 \loadmarkfile{supp-dir}
 
 \loadmarkfile{char-ini}
@@ -100,11 +106,11 @@
 \loadmarkfile{char-act}
 
 \loadmarkfile{mult-ini}
-%loadmarkfile{mult-fst} % obsolete
 \loadmarkfile{mult-sys}
 \loadmarkfile{mult-def}
 \loadmarkfile{mult-chk}
 \loadmarkfile{mult-aux}
+\loadmkvifile{mult-dim}
 
 \loadmarkfile{cldf-int} % interface
 
@@ -120,6 +126,9 @@
 \loadmarkfile{layo-ini}
 
 \loadmarkfile{node-ini}
+
+\loadmarkfile{cldf-bas} % basics / depends on nodes
+
 \loadmarkfile{node-fin}
 \loadmarkfile{node-mig}
 \loadmarkfile{node-par}
@@ -140,17 +149,20 @@
 \loadmarkfile{supp-box}
 
 \loadmarkfile{supp-vis}
-\loadmarkfile{supp-fun}
+\loadmarkfile{supp-fun} % close to obsolete
 
 \loadmarkfile{supp-ran}
 \loadmarkfile{supp-mat}
 \loadmarkfile{supp-ali}
-\loadmarkfile{supp-num}
+\loadmarkfile{supp-num} % replaced
 
 \loadmarkfile{typo-ini}
 
 \loadmarkfile{page-ins}
-\loadmarkfile{core-fil}
+
+\loadmkvifile{file-syn}
+\loadmkvifile{file-mod}
+
 \loadmarkfile{core-con}
 
 \loadmarkfile{cont-fil}
@@ -164,11 +176,12 @@
 
 \loadmarkfile{unic-ini}
 
-\loadmarkfile{core-gen}
 \loadmarkfile{core-uti}
 \loadmarkfile{core-two}
+\loadmarkfile{core-dat}
 
 \loadmarkfile{colo-ini}
+\loadmarkfile{colo-grp} % optional
 \loadmarkfile{colo-ext}
 
 \loadmarkfile{node-bck} % overloads anch-pgr (experimental and undocumented)
@@ -180,39 +193,46 @@
 \loadmarkfile{lang-def}
 \loadmarkfile{lang-wrd} % can be optional
 
+\loadmkvifile{file-job} % why so late?
+
 \loadmarkfile{symb-ini}
 
 \loadmarkfile{sort-ini}
 
 \loadmkvifile{pack-mis}
 \loadmarkfile{pack-rul}
+\loadmarkfile{pack-mrl}
+\loadmkvifile{pack-bck}
+\loadmarkfile{pack-fen}
 
 \loadmarkfile{lxml-ini}
 \loadmarkfile{lxml-sor}
 
-\loadmarkfile{strc-ini}
+\loadmkvifile{typo-prc}
+
+\loadmkvifile{strc-ini}
 \loadmarkfile{strc-tag}
 \loadmarkfile{strc-doc}
 \loadmarkfile{strc-num}
 \loadmarkfile{strc-mar}
-\loadmarkfile{strc-prc}
 \loadmarkfile{strc-sbe}
-\loadmarkfile{strc-lst}
+\loadmkvifile{strc-lst}
 \loadmarkfile{strc-sec}
 \loadmarkfile{strc-pag} % hm, depends on core-num
 \loadmarkfile{strc-ren}
 \loadmarkfile{strc-xml}
 \loadmarkfile{strc-def} % might happen later
-\loadmarkfile{strc-ref}
+\loadmkvifile{strc-ref}
 \loadmarkfile{strc-reg}
-\loadmarkfile{strc-lev} % experiment
+\loadmkvifile{strc-lev} % experiment
 
+\loadmarkfile{spac-ali}
 \loadmarkfile{spac-hor}
 \loadmarkfile{spac-ver}
-\loadmarkfile{spac-ali}
+\loadmarkfile{spac-lin}
 \loadmarkfile{spac-pag}
-\loadmarkfile{spac-fnt}
 \loadmarkfile{spac-par}
+%loadmarkfile{spac-adj} % no longer needed
 \loadmarkfile{spac-def}
 \loadmarkfile{spac-grd}
 
@@ -223,37 +243,50 @@
 
 \loadmarkfile{pack-obj}
 
-\loadmarkfile{strc-itm}
-\loadmarkfile{strc-des}
+\loadmkvifile{strc-itm}
+
+\loadmkvifile{strc-con}
+\loadmkvifile{strc-des}
+\loadmkvifile{strc-enu}
+
+\loadmarkfile{strc-ind}
+\loadmarkfile{strc-lab}
 \loadmarkfile{strc-syn}
 
 \loadmarkfile{core-sys}
 
+\loadmarkfile{page-var}
+\loadmkvifile{page-otr}
 \loadmarkfile{page-ini}
+\loadmarkfile{page-fac}
+\loadmarkfile{page-brk}
+\loadmarkfile{page-col}
+\loadmarkfile{page-inf}
+\loadmarkfile{page-grd}
 \loadmarkfile{page-flt}
 \loadmarkfile{page-bck}
 \loadmarkfile{page-not}
 \loadmarkfile{page-one}
 \loadmarkfile{page-lay}
-\loadmarkfile{page-txt}
-\loadmarkfile{page-sid}
+\loadmkvifile{page-box}
+\loadmkvifile{page-txt}
+\loadmarkfile{page-sid} % when
 
-\loadmarkfile{strc-flt}
+\loadmkvifile{strc-flt}
 
 \loadmarkfile{page-mis}
+\loadmkvifile{page-mbk}
 \loadmarkfile{page-mul}
 \loadmarkfile{page-set}
 \loadmarkfile{pack-lyr}
 \loadmarkfile{pack-pos}
-\loadmarkfile{page-mak}
+\loadmkvifile{page-mak}
 
 \loadmarkfile{page-lin}
 \loadmarkfile{page-par}
-%loadmarkfile{page-mar} % also commented code in anch-pgr.mkiv
+\loadmarkfile{typo-pag}
 \loadmarkfile{typo-mar}
 
-\loadmarkfile{core-job} % why so late?
-
 \loadmarkfile{buff-ini}
 \loadmarkfile{buff-ver}
 \loadmarkfile{buff-par}
@@ -289,35 +322,53 @@
 \loadmarkfile{tabl-nte}
 \loadmarkfile{tabl-ltb}
 \loadmarkfile{tabl-tsp}
+\loadmkvifile{tabl-xtb}
 
 \loadmarkfile{java-ini}
 
 \loadmkvifile{scrn-fld}
 \loadmkvifile{scrn-hlp}
 
-\loadmarkfile{char-enc}
-\loadmarkfile{font-ini}
+\loadmarkfile{char-enc} % will move up
+
+\loadmkvifile{font-lib}
+\loadmkvifile{font-fil}
+\loadmkvifile{font-var}
+\loadmkvifile{font-fea}
+\loadmkvifile{font-mat}
+\loadmkvifile{font-ini}
+\loadmkvifile{font-sym}
+\loadmkvifile{font-sty}
+\loadmkvifile{font-set}
+
+\loadmkvifile{font-emp}
+\loadmarkfile{font-pre}
 \loadmarkfile{font-unk}
 \loadmarkfile{font-tra}
 \loadmarkfile{font-uni}
-\loadmarkfile{font-col}
+\loadmkvifile{font-col}
 \loadmarkfile{font-gds}
 
+\loadmarkfile{lxml-css}
+
+\loadmarkfile{spac-chr} % depends on fonts
+
 \loadmarkfile{blob-ini} % not to be used, we only use a helper
 
 \loadmarkfile{typo-cln}
 \loadmarkfile{typo-spa}
 \loadmarkfile{typo-krn}
+\loadmkvifile{typo-itc}
 \loadmarkfile{typo-dir}
 \loadmarkfile{typo-brk}
 \loadmarkfile{typo-cap}
 \loadmarkfile{typo-dig}
 \loadmarkfile{typo-rep}
+\loadmkvifile{typo-txt}
+\loadmarkfile{typo-par}
 
-\loadmarkfile{type-ini}
+\loadmkvifile{type-ini}
 \loadmarkfile{type-set}
-\loadmarkfile{type-def}
-\loadmarkfile{type-lua}
 
 \loadmarkfile{scrp-ini}
 
@@ -330,14 +381,18 @@
 \loadmarkfile{meta-fun}
 \loadmarkfile{meta-pag}
 
+\loadmarkfile{page-mrk} % depends on mp
+
 \loadmarkfile{page-flw}
 \loadmarkfile{page-spr}
 \loadmarkfile{page-plg}
 \loadmarkfile{page-str}
 
-\loadmarkfile{anch-pgr} % overloads tabl-tbl
+\loadmarkfile{anch-pgr} % can be moved up (nicer for dependencies)
+\loadmkvifile{anch-bck}
+\loadmarkfile{anch-tab} % overloads tabl-tbl
 \loadmarkfile{anch-bar}
-\loadmarkfile{anch-snc}
+%loadmarkfile{anch-snc} % when needed this one will be redone
 
 \loadmarkfile{math-ini}
 \loadmarkfile{math-pln}
@@ -351,21 +406,27 @@
 \loadmarkfile{math-del}
 \loadmarkfile{math-inl}
 \loadmarkfile{math-dis}
-\loadmarkfile{math-lan}
+%loadmarkfile{math-lan}
+
+\loadmarkfile{phys-dim}
 
 \loadmarkfile{strc-mat}
 
 \loadmarkfile{chem-ini}
 \loadmarkfile{chem-str}
 
+\loadmarkfile{typo-scr}
+
 \loadmarkfile{core-fnt}
 \loadmarkfile{node-rul}
 \loadmarkfile{node-spl}
 
-\loadmarkfile{strc-not}
-\loadmarkfile{strc-lnt}
+\loadmkvifile{strc-not}
+\loadmkvifile{strc-lnt}
 
 \loadmarkfile{core-mis}
+\loadmarkfile{pack-com}
+\loadmarkfile{typo-del}
 
 \loadmarkfile{grph-trf}
 \loadmarkfile{grph-inc}
@@ -407,8 +468,8 @@
 \loadmarkfile{back-pdf} % actually, this one should load the next three
 \loadmarkfile{mlib-pdf}
 \loadmarkfile{mlib-pps}
-\loadmarkfile{grph-epd}
 \loadmarkfile{meta-pdf}
+\loadmarkfile{grph-epd}
 
 \loadmarkfile{back-exp}
 
@@ -426,4 +487,6 @@
     \ctxlua{statistics.savefmtstatus("\jobname","\contextversion","context.mkiv")}% can become automatic
 \to \everydump
 
+% \tracingall
+
 \errorstopmode \dump \endinput