14 files changed, 26 insertions, 14 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 36e08264d..802ab384e 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -13,7 +13,7 @@
 
 % it's about time to clean up this file ...
 
-\newcontextversion{2007.02.21 11:55}
+\newcontextversion{2007.03.22 13:34}
 
 %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.tex b/tex/context/base/context.tex
index b9a4d7f9c..7e9949446 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -42,7 +42,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2007.02.21 11:55}
+\edef\contextversion{2007.03.22 13:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index 7ef8597ea..d4a574738 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -501,7 +501,7 @@
 \defineblankmethod      [\v!none] {\global\blankresettrue}
 \defineblankmethod  [\v!joinedup] {\ifvmode\nointerlineskip\fi}
 
-\defineblankmethod [\v!always] {\redowhitespace} % experimental
+\defineblankmethod [\v!always]    {\redowhitespace} % experimental
 
 % happens often, so we speed this up:
 %
diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex
index 803798b08..4b48ad5b5 100644
--- a/tex/context/base/font-ini.tex
+++ b/tex/context/base/font-ini.tex
@@ -1451,6 +1451,7 @@
      \expandafter\dogetglobalfontparameter
    \fi}
 
+\let\@@fontresource\empty
 \let\@@fontencoding\empty
 \let\@@fontmapping \empty
 \let\@@fonthandling\empty
@@ -1838,11 +1839,12 @@
 %   {\edef\fontdata{\truefontdata{\truefontname{#1}}}%
 %    \expanded{\getparameters[\@@currentfontfile][\fontdata]}}
 
-\def\getfontfileparameters#1%
+\def\getfontfileparameters#1% can be simpler for mkii
   {\edef\@@truefontname{\truefontname{#1}}%
    \edef\currentfontfileencoding{\truefontdata\@@truefontname\s!encoding}%
    \edef\currentfontfilemapping {\truefontdata\@@truefontname\s!mapping }%
    \edef\currentfontfilehandling{\truefontdata\@@truefontname\s!handling}%
+   \edef\currentfontfileresource{\truefontdata\@@truefontname\s!resource}%
    \edef\currentfontfilefeatures{\truefontdata\@@truefontname\s!features}}
 
 %D \macros
@@ -3564,11 +3566,12 @@
 
 %D The font specific features are bound to the filename.
 
-\def\updatefontparameters
+\def\updatefontparameters % can be simpler for mkii (and mkiv no font encoding)
   {\edef\@@fontencoding{\truefontdata\fontfile    \s!encoding}%
    \edef\@@fontmapping {\truefontdata\fontfile    \s!mapping }%
    \edef\@@fonthandling{\truefontdata\somefontname\s!handling}%
    \edef\@@fontfeatures{\truefontdata\fontfile    \s!features}%
+   \edef\@@fontresource{\truefontdata\fontfile    \s!resource}%
    \edef\@@fontskewchar{\truefontdata\fontfile    \s!skewchar}}
 
 \def\setfontcharacteristics
diff --git a/tex/context/base/math-ini.tex b/tex/context/base/math-ini.tex
index 1c9cc651f..1957ab0d7 100644
--- a/tex/context/base/math-ini.tex
+++ b/tex/context/base/math-ini.tex
@@ -33,7 +33,7 @@
 \def\@mt@{@mt@} % math token
 \def\@mc@{@mc@} % math collection
 
-\def\@@mathlimopcomm#1{\mathop{#1}\limits}
+\def\@@mathlimopcomm#1{\mathop{#1}} %no \limits
 \def\@@mathnolopcomm#1{\mathop{#1}\nolimits}
 \def\@@mathboxcomm  #1{\leavevmode\hbox{$\m@th#1$}}
 
diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex
index 572cd827a..2b2cefe99 100644
--- a/tex/context/base/mult-sys.tex
+++ b/tex/context/base/mult-sys.tex
@@ -162,6 +162,7 @@
 \definesystemconstant  {skewchar}
 \definesystemconstant  {hyphenchar}
 \definesystemconstant  {encoding}
+\definesystemconstant  {resource}
 \definesystemconstant  {mapping}
 \definesystemconstant  {language}
 \definesystemconstant  {patterns}
diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex
index ce0fedeba..52d943f84 100644
--- a/tex/context/base/s-abr-01.tex
+++ b/tex/context/base/s-abr-01.tex
@@ -19,6 +19,9 @@
 
 \protect
 
+\logo [MKII]    {MkII}
+\logo [MKIV]    {MkIV}
+
 \logo [ACROBAT]    {Acro\-bat}
 \logo [AFM]        {afm}
 \logo [ALEPH]      {Aleph} % {\mathematics{\aleph}}
@@ -65,6 +68,8 @@
 \logo [EMTEX]      {em\TeX}
 \logo [ENCTEX]     {enc\TeX}
 \logo [EPS]        {eps}
+\logo [ENCODING]   {enc}
+\logo [MAPPING]    {map}
 \logo [EXAMPLEX]   {examplex}
 \logo [EXAMPLET]   {examplet}
 \logo [EXAMPLER]   {exampler}
@@ -118,6 +123,7 @@
 \logo [LUATEX]     {Lua\TeX}
 \logo [LUATOOLS]   {luatools}
 \logo [MACOSX]     {MacOSX}
+\logo [MACROTEX]   {Macro\TeX}
 \logo [MAKEMPY]    {MakeMPY}
 \logo [MAPS]       {Maps}
 \logo [MATHML]     {MathML}
@@ -192,7 +198,7 @@
 \logo [TEXUTIL]    {\TeX util}
 \logo [TEXWORK]    {\TeX work}
 \logo [TEXFONT]    {\TeX font}
-\logo [TEXTOOLS]   {textools}
+\logo [TEXTOOLS]   {\TeX tools}
 \logo [TRUETYPE]   {TrueType}
 \logo [TTF]        {ttf}
 \logo [TYPEONE]    {Type1}
@@ -210,6 +216,7 @@
 \logo [TIFF]       {tiff}
 \logo [TIF]        {tif}
 \logo [TPIC]       {tpic}
+\logo [TPM]        {tpm}
 \logo [TUGBOAT]    {Tug\-Boat}
 \logo [TUGNEWS]    {Tug\-News}
 \logo [TUG]        {tug}
@@ -226,6 +233,7 @@
 \logo [WEBC]       {web2c}
 \logo [WEB]        {web}
 \logo [WINNT]      {WinNT}
+\logo [WIKI]       {Wiki}
 \logo [WINNX]      {Win9x}
 \logo [WWW]        {www}
 \logo [WYSIWYG]    {wysiwyg}
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 54713192c..f091f739c 100644
--- a/tex/context/interface/keys-cz.xml
+++ b/tex/context/interface/keys-cz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2007.03.19 11:20">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2007.03.22 13:34">
 
   <cd:variables>
     <cd:variable name="one" value="jedna"/>
diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml
index 7b799eac0..b60b842c3 100644
--- a/tex/context/interface/keys-de.xml
+++ b/tex/context/interface/keys-de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2007.03.19 11:20">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2007.03.22 13:34">
 
   <cd:variables>
     <cd:variable name="one" value="eins"/>
diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml
index 0d8f3528a..bc8148d95 100644
--- a/tex/context/interface/keys-en.xml
+++ b/tex/context/interface/keys-en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2007.03.19 11:20">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2007.03.22 13:34">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index 06c0774ec..0859ed2e1 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2007.03.19 11:20">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2007.03.22 13:34">
 
   <cd:variables>
     <cd:variable name="one" value="un"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index d84a86351..9ae368785 100644
--- a/tex/context/interface/keys-it.xml
+++ b/tex/context/interface/keys-it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2007.03.19 11:20">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2007.03.22 13:34">
 
   <cd:variables>
     <cd:variable name="one" value="uno"/>
diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml
index c98d0a752..f2c07448a 100644
--- a/tex/context/interface/keys-nl.xml
+++ b/tex/context/interface/keys-nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2007.03.19 11:20">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2007.03.22 13:34">
 
   <cd:variables>
     <cd:variable name="one" value="een"/>
diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml
index 4d83f5903..9e803d217 100644
--- a/tex/context/interface/keys-ro.xml
+++ b/tex/context/interface/keys-ro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2007.03.19 11:20">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2007.03.22 13:34">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>