1 files changed, 98 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/context/base/context.mkii b/Master/texmf-dist/tex/context/base/context.mkii
index 4be60cbfcbc..7312bdcf562 100644
--- a/Master/texmf-dist/tex/context/base/context.mkii
+++ b/Master/texmf-dist/tex/context/base/context.mkii
@@ -11,30 +11,67 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+\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.
+
+\edef\contextformat {\jobname}
+\edef\contextversion{2011.05.18 18:04}
+
+%D For those who want to use this:
+
+\let\fmtname   \contextformat
+\let\fmtversion\contextversion
+
+%D Loading:
+
+\edef\mksuffix   {mkii}
+\edef\contextmark{MKII}
+
+\ifx\normalinput\undefined \let\normalinput\input \fi
+
+\def\loadcorefile#1{\normalinput#1\relax}
+\def\loadmarkfile#1{\normalinput#1.\mksuffix\relax}
+\def\loadmkiifile#1{\normalinput#1\relax}
+\def\loadmkivfile#1{}
+
 %D First we load the system modules. These implement a lot of
 %D manipulation macros. The first one loads \PLAIN\ \TEX, as
 %D minimal as possible.
 
-\loadcorefile{syst-ini}
-\loadcorefile{syst-pln}
+\loadmarkfile{syst-ini}
+
+%D Some checking (more primitives are now defined):
 
-\loadcorefile{norm-tex}
-\loadcorefile{norm-etx}
-\loadcorefile{norm-ptx}
-\loadcorefile{norm-xtx}
-\loadcorefile{norm-ctx}
+\ifdefined\defaultinterface   \else \def\defaultinterface  {english}         \fi
+%ifdefined\messageinterface   \else \let\messageinterface  \defaultinterface \fi
+\ifdefined\defaultlanguagetag \else \def\defaultlanguagetag{en}              \fi
+
+%D More core code.
+
+\loadmarkfile{syst-pln}
+
+\loadmarkfile{norm-tex}
+\loadmarkfile{norm-etx}
+\loadmarkfile{norm-ptx}
+\loadmarkfile{norm-xtx}
+\loadmarkfile{norm-ctx}
 
 \loadmarkfile{catc-ini}
-\loadcorefile{catc-act}
-\loadcorefile{catc-def}
-\loadcorefile{catc-ctx}
-\loadcorefile{catc-sym}
+\loadmarkfile{catc-act}
+\loadmarkfile{catc-def}
+\loadmarkfile{catc-ctx}
+\loadmarkfile{catc-sym}
+\loadmarkfile{catc-xml}
 
 \loadmarkfile{syst-gen}
 \loadmarkfile{syst-ext}
 \loadmarkfile{syst-new}
 \loadmarkfile{syst-con}
-\loadcorefile{syst-ltx}
 \loadmarkfile{thrd-trg}  % based on: David Carlisle
 
 \loadmarkfile{syst-fnt}
@@ -58,14 +95,19 @@
 \loadmarkfile{supp-fil}
 \loadmarkfile{supp-dir}
 
+%D This is for mkii bibtex users who expect \LATEX\ commands.
+
+\loadmarkfile{supp-lat}
+
 %D After this we're ready for the multi||lingual interface
 %D modules.
 
 \loadmarkfile{mult-ini}
-\loadcorefile{mult-fst}
-\loadcorefile{mult-sys}
-\loadcorefile{mult-def}
+\loadmarkfile{mult-fst}
+\loadmarkfile{mult-sys}
+\loadmarkfile{mult-def}
 \loadmarkfile{mult-chk}
+\loadmarkfile{mult-aux}
 
 %D Now we're ready for some general support modules. These
 %D modules implement some basic typesetting functionality.
@@ -73,18 +115,18 @@
 \loadmarkfile{core-var}
 \loadmarkfile{core-env}
 
-\loadcorefile{supp-box}
+\loadmarkfile{supp-box}
 \loadmarkfile{supp-mrk}
-\loadcorefile{supp-vis}
-\loadcorefile{supp-fun}
+\loadmarkfile{supp-vis}
+\loadmarkfile{supp-fun}
 %loadmarkfile{supp-eps}
 \loadmarkfile{supp-spe}
 \loadmarkfile{supp-ran}
 \loadmarkfile{supp-mps}
 \loadmarkfile{supp-tpi}
 \loadmarkfile{supp-mat}
-\loadcorefile{supp-ali}
-\loadcorefile{supp-num}
+\loadmarkfile{supp-ali}
+\loadmarkfile{supp-num}
 
 %D Verbatim typesetting is implemented in a separate class of
 %D modules. The pretty typesetting modules are loaded at run
@@ -104,16 +146,15 @@
 \loadmarkfile{core-fil}
 \loadmarkfile{core-con}
 
-%D We already need some synonyms (patterns). At runtime this
-%D file will be reloaded.
+%D We already need some synonyms (patterns).
 
-\loadcorefile{cont-fil}
+\loadmarkfile{cont-fil}
 
 %D \CONTEXT\ does not implement its own table handling. We
 %D just go for the best there is and load \TABLE. Just to be
 %D sure we do it here, before we redefine \type{|}.
 
-\loadcorefile{thrd-tab}  % based on: Michael Wichura / will be reimplemented
+\loadmarkfile{thrd-tab} % based on: Michael Wichura's TaBlE
 
 %D Here comes the last support modules. They take care of
 %D some language specific things.
@@ -124,7 +165,7 @@
 %D load additional definition modules when needed.
 
 \loadmarkfile{regi-ini}
-\loadcorefile{regi-syn}
+\loadmarkfile{regi-syn}
 \loadmarkfile{enco-ini}
 %loadmarkfile{filt-ini}
 \loadmarkfile{hand-ini}
@@ -154,19 +195,19 @@
 \loadmarkfile{lang-mis}
 \loadmarkfile{lang-url}
 
-\loadcorefile{lang-ger}
-\loadcorefile{lang-ita}
-\loadcorefile{lang-sla}
-\loadcorefile{lang-alt}
-\loadcorefile{lang-ana}
-\loadcorefile{lang-art}
-\loadcorefile{lang-bal}
-\loadcorefile{lang-cel}
-\loadcorefile{lang-grk}
-\loadcorefile{lang-ind}
-\loadcorefile{lang-ura}
-\loadcorefile{lang-vn}
-\loadcorefile{lang-cyr}
+\loadmarkfile{lang-ger}
+\loadmarkfile{lang-ita}
+\loadmarkfile{lang-sla}
+\loadmarkfile{lang-alt}
+\loadmarkfile{lang-ana}
+\loadmarkfile{lang-art}
+\loadmarkfile{lang-bal}
+\loadmarkfile{lang-cel}
+\loadmarkfile{lang-grk}
+\loadmarkfile{lang-ind}
+\loadmarkfile{lang-ura}
+\loadmarkfile{lang-vn}
+\loadmarkfile{lang-cyr}
 
 \loadmarkfile{typo-ini}
 
@@ -278,6 +319,7 @@
 
 \loadmarkfile{type-ini}
 \loadmarkfile{type-set}
+\loadmarkfile{type-def}
 
 %D Properties. Don't ask.
 
@@ -334,7 +376,7 @@
 
 %D Language specific spacing.
 
-\loadcorefile{lang-spa}
+\loadmarkfile{lang-spa}
 
 %D Bibliographies:
 
@@ -344,21 +386,21 @@
 %D These macros are loaded last since they overload and|/|or
 %D extend previously defined ones.
 
-\loadcorefile{xtag-ini}
-\loadcorefile{xtag-ext}
-\loadcorefile{xtag-exp}
-\loadcorefile{xtag-pre}
-\loadcorefile{xtag-xsd}
-\loadcorefile{xtag-rng}
+\loadmarkfile{xtag-ini}
+\loadmarkfile{xtag-ext}
+\loadmarkfile{xtag-exp}
+\loadmarkfile{xtag-pre}
+\loadmarkfile{xtag-xsd}
+\loadmarkfile{xtag-rng}
 
 %D How about this:
 
-\loadcorefile{meta-xml}
+\loadmarkfile{meta-xml}
 
 %D \TEX\ related logo's are always typeset in a special way.
 %D Here they come:
 
-\loadcorefile{cont-log}
+\loadmarkfile{cont-log}
 
 %D This one overloads af few things:
 
@@ -385,7 +427,12 @@
 %D \item \type{cont-fil}: filename and module synonyms
 %D \stopitemize
 
-% %D Except from english, no hyphenation patterns are loaded
-% %D yet. Users can specify their needs in the next module:
-%
-% \input cont-usr
+\setupcurrentlanguage[\defaultlanguagetag]
+
+\setupencoding[default=ec]
+
+\usetypescript[fallback][\defaultencoding]
+
+\setupbodyfont[rm,12pt]
+
+\errorstopmode \dump \endinput