11 files changed, 24 insertions, 23 deletions
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 70c21e5bd..76e3c7a54 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{2006.12.20 23:52}
+\edef\contextversion{2006.12.27 11:34}
 
 %D For those who want to use this:
 
@@ -152,8 +152,6 @@
 
 \loadcorefile{syst-rtp.tex}
 
-\loadcorefile{math-pln.tex}
-
 %D To enable selective loading, we say:
 
 \CONTEXTtrue
@@ -424,6 +422,7 @@
 
 %D Math.
 
+\loadcorefile{math-pln.tex}
 \loadcorefile{math-ini.tex}
 \loadcorefile{math-ext.tex}
 
diff --git a/tex/context/base/math-pln.tex b/tex/context/base/math-pln.tex
index 5ea7bc6fe..d9dfd3445 100644
--- a/tex/context/base/math-pln.tex
+++ b/tex/context/base/math-pln.tex
@@ -93,15 +93,16 @@
    \bracelu\leaders\vrule\!!height\ht\z@\!!depth\z@\hfill\bracerd
    \braceld\leaders\vrule\!!height\ht\z@\!!depth\z@\hfill\braceru$}
 
-\def\bye{\par\vfill\supereject\end}
+\ifx\bye\undefined \def\bye{\par\vfill\supereject\end} \fi
 
-\let\sp=^
-\let\sb=_
-\def\,{\mskip\thinmuskip}
-\def\>{\mskip\medmuskip}
-\def\;{\mskip\thickmuskip}
-\def\!{\mskip-\thinmuskip}
-\def\*{\discretionary{\thinspace\the\textfont2\char2}{}{}}
+\let\sp=^ % will become obsolete
+\let\sb=_ % will become obsolete
+
+\ifx\,\undefined \def\,{\mskip \thinmuskip } \fi
+\ifx\>\undefined \def\>{\mskip \medmuskip  } \fi
+\ifx\;\undefined \def\;{\mskip \thickmuskip} \fi
+\ifx\!\undefined \def\!{\mskip-\thinmuskip } \fi
+\ifx\*\undefined \def\*{\discretionary{\thinspace\the\textfont2\char2}{}{}} \fi
 
 % {\catcode`\'=\active \gdef'{^\bgroup\prim@s}}
 
@@ -379,7 +380,7 @@
     \doglobal\appendtoks
         \let_\activemathunderscore
         \let'\activemathquote
-    \to \everymath
+    \to \everymathematics
 \egroup
 
 % so far
diff --git a/tex/context/base/rlxtools.rlx b/tex/context/base/rlxtools.rlx
index da605f6ee..b230c6d5b 100644
--- a/tex/context/base/rlxtools.rlx
+++ b/tex/context/base/rlxtools.rlx
@@ -107,7 +107,7 @@
             texmfstart pstopdf --convert
             --inputpath=<rl:value name='path'/>
             --outputpath=<rl:value name='cache' default='.'/>
-            <rl:value name='file' method='nosuffix'/>.gif
+            <rl:value name='file' method='nosuffix'/>.tif
         </rl:step>
     </rl:manipulator>
 
@@ -118,7 +118,7 @@
             texmfstart pstopdf --convert
             --inputpath=<rl:value name='path'/>
             --outputpath=<rl:value name='cache' default='.'/>
-            <rl:value name='file' method='nosuffix'/>.gif
+            <rl:value name='file' method='nosuffix'/>.tiff
         </rl:step>
     </rl:manipulator>
 
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 8d8e2d891..3f0e6b4d2 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="2006.12.20 23:52">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.12.27 11: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 150127d86..2e58679f2 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="2006.12.20 23:52">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.12.27 11: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 124fcfac0..540cfca26 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="2006.12.20 23:52">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.12.27 11: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 056b2481e..dca4d35c3 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="2006.12.20 23:52">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.12.27 11: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 f7f399d46..7d2dd3177 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="2006.12.20 23:52">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.12.27 11: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 7bbd6244b..4ad171c09 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="2006.12.20 23:52">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.12.27 11: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 4f0be3252..059b0631b 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="2006.12.20 23:52">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.12.27 11:34">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>
diff --git a/web2c/context.cnf b/web2c/context.cnf
index 6abc73960..4e9425b6f 100644
--- a/web2c/context.cnf
+++ b/web2c/context.cnf
@@ -166,9 +166,7 @@ hash_extra.context       =  100000
 main_memory.context      = 2000000
 max_strings.context      =  300000
 nest_size.context        =     500
-obj_tab_size.context     =  300000
 pdf_mem_size.context     =  500000
-dest_names_size.context  =  300000
 param_size.context       =   10000
 pool_free.context        =   47500
 pool_size.context        = 2000000
@@ -178,6 +176,9 @@ string_vacancies.context =  125000
 trie_size.context        =  250000
 hyph_size.context        =    8191 % prime
 
+obj_tab_size.context     =  300000 % obsolete in 1.40+
+dest_names_size.context  =  300000 % obsolete in 1.40+
+
 main_memory.mpost        = 3000000
 pool_size.mpost          = 3000000
 max_strings.mpost        =  200000