From cf8cda07d335043205a1feb15c64067481a3b621 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Mon, 31 Jan 2011 00:25:52 +0200
Subject: beta 2011.01.23 22:05
---
tex/context/base/cont-new.mkii | 2 +-
tex/context/base/cont-new.mkiv | 2 +-
tex/context/base/context.mkii | 5 +-
tex/context/base/context.mkiv | 1 -
tex/context/base/context.tex | 2 +-
tex/context/base/norm-ltx.tex | 177 ----------------------------
tex/context/base/supp-lat.mkii | 59 ++++++++++
tex/context/base/syst-ltx.mkii | 59 ----------
tex/generic/context/luatex-fonts-merged.lua | 2 +-
9 files changed, 67 insertions(+), 242 deletions(-)
delete mode 100644 tex/context/base/norm-ltx.tex
create mode 100644 tex/context/base/supp-lat.mkii
delete mode 100644 tex/context/base/syst-ltx.mkii
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 167b5a3c7..07c33cbd0 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.01.23 21:48}
+\newcontextversion{2011.01.23 22:05}
%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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index b876710be..cfc6ddc10 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2011.01.23 21:48}
+\newcontextversion{2011.01.23 22:05}
%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/context.mkii b/tex/context/base/context.mkii
index 93a5873e8..6a662eb1c 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -35,7 +35,6 @@
\loadmarkfile{syst-ext}
\loadmarkfile{syst-new}
\loadmarkfile{syst-con}
-\loadcorefile{syst-ltx}
\loadmarkfile{thrd-trg} % based on: David Carlisle
\loadmarkfile{syst-fnt}
@@ -59,6 +58,10 @@
\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.
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index e76b34bc6..0b6d06639 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -51,7 +51,6 @@
\loadmarkfile{syst-aux}
\loadmarkfile{syst-lua}
\loadmarkfile{syst-con}
-\loadcorefile{syst-ltx}
\loadmarkfile{syst-fnt}
\loadmarkfile{syst-str}
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index bab5325eb..d72dfcf76 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.01.23 21:48}
+\edef\contextversion{2011.01.23 22:05}
%D For those who want to use this:
diff --git a/tex/context/base/norm-ltx.tex b/tex/context/base/norm-ltx.tex
deleted file mode 100644
index a779735dd..000000000
--- a/tex/context/base/norm-ltx.tex
+++ /dev/null
@@ -1,177 +0,0 @@
-%D \module
-%D [ file=norm-ltx,
-%D version=2009.03.19,
-%D title=\CONTEXT\ Norm Macros,
-%D subtitle=\LUATEX,
-%D author=Hans Hagen,
-%D date=\currentdate,
-%D copyright=PRAGMA]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D This file will become obsolete!
-
-% luatex primitives (incomplete)
-
-\let \normalUdelcode = \Udelcode
-\let \normalUdelcodenum = \Udelcodenum
-\let \normalUdelimiter = \Udelimiter
-\let \normalUmathaccent = \Umathaccent
-\let \normalUmathaccents = \Umathaccents
-\let \normalUmathaxis = \Umathaxis
-\let \normalUmathbinbinspacing = \Umathbinbinspacing
-\let \normalUmathbinclosespacing = \Umathbinclosespacing
-\let \normalUmathbininnerspacing = \Umathbininnerspacing
-\let \normalUmathbinopenspacing = \Umathbinopenspacing
-\let \normalUmathbinopspacing = \Umathbinopspacing
-\let \normalUmathbinordspacing = \Umathbinordspacing
-\let \normalUmathbinpunctspacing = \Umathbinpunctspacing
-\let \normalUmathbinrelspacing = \Umathbinrelspacing
-\let \normalUmathbotaccent = \Umathbotaccent
-\let \normalUmathchar = \Umathchar
-\let \normalUmathchardef = \Umathchardef
-\let \normalUmathcharnum = \Umathcharnum
-\let \normalUmathclosebinspacing = \Umathclosebinspacing
-\let \normalUmathcloseclosespacing = \Umathcloseclosespacing
-\let \normalUmathcloseinnerspacing = \Umathcloseinnerspacing
-\let \normalUmathcloseopenspacing = \Umathcloseopenspacing
-\let \normalUmathcloseopspacing = \Umathcloseopspacing
-\let \normalUmathcloseordspacing = \Umathcloseordspacing
-\let \normalUmathclosepunctspacing = \Umathclosepunctspacing
-\let \normalUmathcloserelspacing = \Umathcloserelspacing
-\let \normalUmathcode = \Umathcode
-\let \normalUmathcodenum = \Umathcodenum
-\let \normalUmathconnectoroverlapmin = \Umathconnectoroverlapmin
-\let \normalUmathfractiondelsize = \Umathfractiondelsize
-\let \normalUmathfractiondenomdown = \Umathfractiondenomdown
-\let \normalUmathfractiondenomvgap = \Umathfractiondenomvgap
-\let \normalUmathfractionnumup = \Umathfractionnumup
-\let \normalUmathfractionnumvgap = \Umathfractionnumvgap
-\let \normalUmathfractionrule = \Umathfractionrule
-\let \normalUmathinnerbinspacing = \Umathinnerbinspacing
-\let \normalUmathinnerclosespacing = \Umathinnerclosespacing
-\let \normalUmathinnerinnerspacing = \Umathinnerinnerspacing
-\let \normalUmathinneropenspacing = \Umathinneropenspacing
-\let \normalUmathinneropspacing = \Umathinneropspacing
-\let \normalUmathinnerordspacing = \Umathinnerordspacing
-\let \normalUmathinnerpunctspacing = \Umathinnerpunctspacing
-\let \normalUmathinnerrelspacing = \Umathinnerrelspacing
-\let \normalUmathlimitabovebgap = \Umathlimitabovebgap
-\let \normalUmathlimitabovekern = \Umathlimitabovekern
-\let \normalUmathlimitabovevgap = \Umathlimitabovevgap
-\let \normalUmathlimitdownbgap = \Umathlimitdownbgap
-\let \normalUmathlimitdownkern = \Umathlimitdownkern
-\let \normalUmathlimitdownvgap = \Umathlimitdownvgap
-\let \normalUmathopbinspacing = \Umathopbinspacing
-\let \normalUmathopclosespacing = \Umathopclosespacing
-\let \normalUmathopenbinspacing = \Umathopenbinspacing
-\let \normalUmathopenclosespacing = \Umathopenclosespacing
-\let \normalUmathopeninnerspacing = \Umathopeninnerspacing
-\let \normalUmathopenopenspacing = \Umathopenopenspacing
-\let \normalUmathopenopspacing = \Umathopenopspacing
-\let \normalUmathopenordspacing = \Umathopenordspacing
-\let \normalUmathopenpunctspacing = \Umathopenpunctspacing
-\let \normalUmathopenrelspacing = \Umathopenrelspacing
-\let \normalUmathoperatorsize = \Umathoperatorsize
-\let \normalUmathopinnerspacing = \Umathopinnerspacing
-\let \normalUmathopopenspacing = \Umathopopenspacing
-\let \normalUmathopopspacing = \Umathopopspacing
-\let \normalUmathopordspacing = \Umathopordspacing
-\let \normalUmathoppunctspacing = \Umathoppunctspacing
-\let \normalUmathoprelspacing = \Umathoprelspacing
-\let \normalUmathordbinspacing = \Umathordbinspacing
-\let \normalUmathordclosespacing = \Umathordclosespacing
-\let \normalUmathordinnerspacing = \Umathordinnerspacing
-\let \normalUmathordopenspacing = \Umathordopenspacing
-\let \normalUmathordopspacing = \Umathordopspacing
-\let \normalUmathordordspacing = \Umathordordspacing
-\let \normalUmathordpunctspacing = \Umathordpunctspacing
-\let \normalUmathordrelspacing = \Umathordrelspacing
-\let \normalUmathoverbarkern = \Umathoverbarkern
-\let \normalUmathoverbarrule = \Umathoverbarrule
-\let \normalUmathoverbarvgap = \Umathoverbarvgap
-\let \normalUmathoverdelimiterbgap = \Umathoverdelimiterbgap
-\let \normalUmathoverdelimitervgap = \Umathoverdelimitervgap
-\let \normalUmathpunctbinspacing = \Umathpunctbinspacing
-\let \normalUmathpunctclosespacing = \Umathpunctclosespacing
-\let \normalUmathpunctinnerspacing = \Umathpunctinnerspacing
-\let \normalUmathpunctopenspacing = \Umathpunctopenspacing
-\let \normalUmathpunctopspacing = \Umathpunctopspacing
-\let \normalUmathpunctordspacing = \Umathpunctordspacing
-\let \normalUmathpunctpunctspacing = \Umathpunctpunctspacing
-\let \normalUmathpunctrelspacing = \Umathpunctrelspacing
-\let \normalUmathquad = \Umathquad
-\let \normalUmathradicaldegreeafter = \Umathradicaldegreeafter
-\let \normalUmathradicaldegreebefore = \Umathradicaldegreebefore
-\let \normalUmathradicaldegreeraise = \Umathradicaldegreeraise
-\let \normalUmathradicalkern = \Umathradicalkern
-\let \normalUmathradicalrule = \Umathradicalrule
-\let \normalUmathradicalvgap = \Umathradicalvgap
-\let \normalUmathrelbinspacing = \Umathrelbinspacing
-\let \normalUmathrelclosespacing = \Umathrelclosespacing
-\let \normalUmathrelinnerspacing = \Umathrelinnerspacing
-\let \normalUmathrelopenspacing = \Umathrelopenspacing
-\let \normalUmathrelopspacing = \Umathrelopspacing
-\let \normalUmathrelordspacing = \Umathrelordspacing
-\let \normalUmathrelpunctspacing = \Umathrelpunctspacing
-\let \normalUmathrelrelspacing = \Umathrelrelspacing
-\let \normalUmathspaceafterscript = \Umathspaceafterscript
-\let \normalUmathstackdenomdown = \Umathstackdenomdown
-\let \normalUmathstacknumup = \Umathstacknumup
-\let \normalUmathstackvgap = \Umathstackvgap
-\let \normalUmathsubshiftdown = \Umathsubshiftdown
-\let \normalUmathsubshiftdrop = \Umathsubshiftdrop
-\let \normalUmathsubsupshiftdown = \Umathsubsupshiftdown
-\let \normalUmathsubsupvgap = \Umathsubsupvgap
-\let \normalUmathsubtopmax = \Umathsubtopmax
-\let \normalUmathsupbottommin = \Umathsupbottommin
-\let \normalUmathsupshiftdrop = \Umathsupshiftdrop
-\let \normalUmathsupshiftup = \Umathsupshiftup
-\let \normalUmathsupsubbottommax = \Umathsupsubbottommax
-\let \normalUmathunderbarkern = \Umathunderbarkern
-\let \normalUmathunderbarrule = \Umathunderbarrule
-\let \normalUmathunderbarvgap = \Umathunderbarvgap
-\let \normalUmathunderdelimiterbgap = \Umathunderdelimiterbgap
-\let \normalUmathunderdelimitervgap = \Umathunderdelimitervgap
-\let \normalUoverdelimiter = \Uoverdelimiter
-\let \normalUradical = \Uradical
-\let \normalUroot = \Uroot
-\let \normalUunderdelimiter = \Uunderdelimiter
-\let \normalattribute = \attribute
-\let \normalattributedef = \attributedef
-\let \normalcatcodetable = \catcodetable
-\let \normalclearmarks = \clearmarks
-\let \normalcrampeddisplaystyle = \crampeddisplaystyle
-\let \normalcrampedscriptscriptstyle = \crampedscriptscriptstyle
-\let \normalcrampedscriptstyle = \crampedscriptstyle
-\let \normalcrampedtextstyle = \crampedtextstyle
-\let \normalformatname = \formatname
-\let \normalifabsdim = \ifabsdim
-\let \normalifabsnum = \ifabsnum
-\let \normalifprimitive = \ifprimitive
-\let \normalinitcatcodetable = \initcatcodetable
-\let \normallatelua = \latelua
-\let \normalluaescapestring = \luaescapestring
-\let \normalluastartup = \luastartup
-\let \normalluatexdatestamp = \luatexdatestamp
-\let \normalluatexrevision = \luatexrevision
-\let \normalluatexversion = \luatexversion
-\let \normalnokerns = \nokerns
-\let \normalnoligs = \noligs
-\let \normalpageleftoffset = \pageleftoffset
-\let \normalpagetopoffset = \pagetopoffset
-\let \normalpostexhyphenchar = \postexhyphenchar
-\let \normalposthyphenchar = \posthyphenchar
-\let \normalpreexhyphenchar = \preexhyphenchar
-\let \normalprehyphenchar = \prehyphenchar
-\let \normalprimitive = \primitive
-\let \normalsavecatcodetable = \savecatcodetable
-\let \normalscantextokens = \scantextokens
-\let \normalsuppressfontnotfounderror = \suppressfontnotfounderror
-\let \normalsuppressifcsnameerror = \suppressifcsnameerror
-\let \normalsuppresslongerror = \suppresslongerror
-\let \normalsynctex = \synctex
-
-\endinput
diff --git a/tex/context/base/supp-lat.mkii b/tex/context/base/supp-lat.mkii
new file mode 100644
index 000000000..576121327
--- /dev/null
+++ b/tex/context/base/supp-lat.mkii
@@ -0,0 +1,59 @@
+%D \module
+%D [ file=syst-ltx,
+%D version=2009.10.13,
+%D title=\CONTEXT\ System Macros,
+%D subtitle=General,
+%D author=Hans Hagen,
+%D date=\currentdate,
+%D copyright=PRAGMA]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D The bib module assumes that sometimes this command is used but
+%D in \MKIV\ we no longer assume that.
+%D
+%D \macros
+%D {newcommand}
+%D
+%D This module replaces \type {t-bibltx} and implements the
+%D \LATEX\ newcommand (sort of). This command is not to be
+%D used directly but only is there for the occasional
+%D \BIBTEX\ file that uses it.
+%D
+%D \starttyping
+%D \newcommand\oeps {oeps}
+%D \newcommand\oeps[6] {oeps[#1]#6}
+%D \newcommand\oeps[6][whatever]{oeps[#1]#6}
+%D \stoptyping
+
+\unprotect
+
+\def\newcommand#1%
+ {\dotripleempty\donewcommand[#1]}
+
+\def\donewcommand
+ {\ifthirdargument
+ \expandafter\donewcommandtwo
+ \else\ifsecondargument
+ \expandafter\expandafter\expandafter\donewcommandone
+ \else
+ \expandafter\expandafter\expandafter\donewcommandzero
+ \fi\fi}
+
+\def\donewcommandzero[#1][#2][#3]%
+ {\long\def#1}
+
+\def\donewcommandone[#1][#2][#3]%
+ {\scratchtoks{\long\def#1}%
+ \dorecurse{#2}{\scratchtoks\expandafter{\the\scratchtoks######1}}%
+ \the\scratchtoks}
+
+\def\donewcommandtwo[#1][#2][#3]%
+ {\long\def#1{\doifnextcharelse[{\getvalue{>>\string#1>>}}{\getvalue{>>\string#1>>}[#3]}}%
+ \scratchtoks{\long\setvalue{>>\string#1>>}[##1]}%
+ \dostepwiserecurse{2}{#2}{1}{\scratchtoks\expandafter{\the\scratchtoks######1}}%
+ \the\scratchtoks}
+
+\protect \endinput
diff --git a/tex/context/base/syst-ltx.mkii b/tex/context/base/syst-ltx.mkii
deleted file mode 100644
index 576121327..000000000
--- a/tex/context/base/syst-ltx.mkii
+++ /dev/null
@@ -1,59 +0,0 @@
-%D \module
-%D [ file=syst-ltx,
-%D version=2009.10.13,
-%D title=\CONTEXT\ System Macros,
-%D subtitle=General,
-%D author=Hans Hagen,
-%D date=\currentdate,
-%D copyright=PRAGMA]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D The bib module assumes that sometimes this command is used but
-%D in \MKIV\ we no longer assume that.
-%D
-%D \macros
-%D {newcommand}
-%D
-%D This module replaces \type {t-bibltx} and implements the
-%D \LATEX\ newcommand (sort of). This command is not to be
-%D used directly but only is there for the occasional
-%D \BIBTEX\ file that uses it.
-%D
-%D \starttyping
-%D \newcommand\oeps {oeps}
-%D \newcommand\oeps[6] {oeps[#1]#6}
-%D \newcommand\oeps[6][whatever]{oeps[#1]#6}
-%D \stoptyping
-
-\unprotect
-
-\def\newcommand#1%
- {\dotripleempty\donewcommand[#1]}
-
-\def\donewcommand
- {\ifthirdargument
- \expandafter\donewcommandtwo
- \else\ifsecondargument
- \expandafter\expandafter\expandafter\donewcommandone
- \else
- \expandafter\expandafter\expandafter\donewcommandzero
- \fi\fi}
-
-\def\donewcommandzero[#1][#2][#3]%
- {\long\def#1}
-
-\def\donewcommandone[#1][#2][#3]%
- {\scratchtoks{\long\def#1}%
- \dorecurse{#2}{\scratchtoks\expandafter{\the\scratchtoks######1}}%
- \the\scratchtoks}
-
-\def\donewcommandtwo[#1][#2][#3]%
- {\long\def#1{\doifnextcharelse[{\getvalue{>>\string#1>>}}{\getvalue{>>\string#1>>}[#3]}}%
- \scratchtoks{\long\setvalue{>>\string#1>>}[##1]}%
- \dostepwiserecurse{2}{#2}{1}{\scratchtoks\expandafter{\the\scratchtoks######1}}%
- \the\scratchtoks}
-
-\protect \endinput
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 7285b2c5e..7fe9e32d7 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 01/23/11 21:48:38
+-- merge date : 01/23/11 22:05:38
do -- begin closure to overcome local limits and interference
--
cgit v1.2.3