context update

git-svn-id: svn://tug.org/texlive/trunk@2444 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 22 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/context/base/m-units.tex b/Master/texmf-dist/tex/context/base/m-units.tex
index 35f870bbf62..50b1a48997e 100644
--- a/Master/texmf-dist/tex/context/base/m-units.tex
+++ b/Master/texmf-dist/tex/context/base/m-units.tex
@@ -59,6 +59,11 @@
       1: folositi \string\Degrees\space\string\Celsius\space in locul \string\Celsius !
 \stopmessages
 
+\startmessages  french  library: units
+  title: unités
+      1: utilisez \string\Degrees\space\string\Celsius\space à la place de \string\Celsius !
+\stopmessages
+
 \unprotect
 
 %D This runtime loadable module implements a way of defining
@@ -185,9 +190,9 @@
 \def\dodimensionpower#1%
   {\iftextdimensions\expandafter\high\else\expandafter^\fi{#1}}
 
-\def\ustartmathmode      {\iftextdimensions\else\startmathmode      \fi}
-\def\ustopmathmode       {\iftextdimensions\else\stopmathmode       \fi}
-\def\umathematicstypeface{\iftextdimensions\else\mathematicstypeface\fi}
+\def\ustartmathmode      {\iftextdimensions\else\expandafter\startmathmode      \fi}
+\def\ustopmathmode       {\iftextdimensions\else\expandafter\stopmathmode       \fi}
+\def\umathematicstypeface{\iftextdimensions\else\expandafter\mathematicstypeface\fi}
 
 %D In forced text mode, we ignore spacing in monospaced fonts.
 
@@ -197,8 +202,8 @@
 \def\dodimensionspace
   {\iftextdimensions
      \begingroup
-     \setbox0=\hbox{i}%
-     \setbox2=\hbox{m}%
+     \setbox0\hbox{i}%
+     \setbox2\hbox{m}%
      \ifdim\wd0=\wd2
        \endgroup
        \@EAEAEA\gobbleoneargument
@@ -217,7 +222,7 @@
    \let\dimensionsuffix\dimension
    \let\dimensionpower \dimension
    \global\nesteddimensionfalse
-   \setbox0=\hbox{\ustartmathmode#1\ustopmathmode}%
+   \setbox\scratchbox\hbox{\ustartmathmode#1\ustopmathmode}% pre-roll
    \global\let\thedimensionprefix\savedthedimensionprefix
    \global\let\thedimensionpower \savedthedimensionpower
    \endgroup
@@ -233,8 +238,13 @@
      \ustartmathmode\dimensiontypeface
    \else
      \ustartmathmode\dimensiontypeface
-     \ifdim\scratchdimen=\dimensionsignal\relax
-       \ifspaceddimensions\udimensionhalfspace\fi
+     \ifspaceddimensions
+       \ifdim\scratchdimen=\dimensionsignal\relax
+         \udimensionhalfspace
+\else\ifdim\scratchdimen=\dimensionpowersignal\relax
+  \udimensionhalfspace
+\fi
+       \fi
      \fi
    \fi
    \umathematicstypeface\thedimensionprefix#1%
@@ -263,6 +273,7 @@
    \global\let\thedimensionprefix\empty
    \global\let\thedimensionpower\empty}
 
+
 %D \macros
 %D   {dontbreakdimension,
 %D    dimensionprefix, dimensionaddfix,
@@ -271,8 +282,8 @@
 %D
 %D Here are some auxilliary macros.
 
-\def\dontbreakdimension%
-  {\scratchdimen=\lastskip
+\def\dontbreakdimension
+  {\scratchdimen\lastskip
    \unskip
    \nobreak
    \hskip\scratchdimen
@@ -641,7 +652,7 @@
 \setuplabeltext
   [\s!en]
   [u:vac=alternating current,
-   u:vdc=different current]
+   u:vdc=direct current]
 
 \setuplabeltext
   [\s!de]