11 files changed, 32 insertions, 11 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 96cf4d33f..338c998fb 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.11.17 10:54}
+\newcontextversion{2011.11.17 11:19}
 
 %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 8edc7c983..0cdca1ccf 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.11.17 10:54}
+\newcontextversion{2011.11.17 11:19}
 
 %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-version.pdf b/tex/context/base/context-version.pdf
index fc19b09c1..a8b544a45 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 4785077a1..1a34834ef 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 42a8e89b2..6c222938a 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.11.17 10:54}
+\edef\contextversion{2011.11.17 11:19}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 24ea2a31d..4241bf3ca 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.11.17 10:54}
+\edef\contextversion{2011.11.17 11:19}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/phys-dim.lua b/tex/context/base/phys-dim.lua
index 37a6ef9aa..cdc7541a2 100644
--- a/tex/context/base/phys-dim.lua
+++ b/tex/context/base/phys-dim.lua
@@ -261,8 +261,9 @@ local short_prefixes_to_long = {
     Y  = "Yotta",
 }
 
-local short_units_to_long = {
+local short_units_to_long = { -- I'm not sure about casing
     m  = "Meter",
+    Hz = "Hertz",
     hz = "Hertz",
     u  = "Hour",
     h  = "Hour",
@@ -270,7 +271,12 @@ local short_units_to_long = {
     g  = "Gram",
     n  = "Newton",
     v  = "Volt",
+
     l  = "Liter",
+ -- w  = "Watt",
+    W  = "Watt",
+ -- a  = "Ampere",
+    A  = "Ampere",
 
     Litre = "Liter",
     Metre = "Meter",
diff --git a/tex/context/base/phys-dim.mkiv b/tex/context/base/phys-dim.mkiv
index 25a988798..b64865776 100644
--- a/tex/context/base/phys-dim.mkiv
+++ b/tex/context/base/phys-dim.mkiv
@@ -361,12 +361,12 @@
 \def\unitsbackspace  {\negthinspace}
 
 \def\installunitsseparator#1#2%
-  {\setvalue{\??un::#1}{#2}}
+  {\setvalue{\??un:1:#1}{#2}}
 
 \unexpanded\def\dounitsseparator
   {\edef\currentunitsseparator{\unitsparameter\c!separator}%
-   \csname\??un::%
-     \ifcsname\??un::\currentunitsseparator\endcsname\currentunitsseparator\else\v!normal\fi
+   \csname\??un:1:%
+     \ifcsname\??un:1:\currentunitsseparator\endcsname\currentunitsseparator\else\v!normal\fi
    \endcsname}
 
 \installunitsseparator\v!normal {\cdot}
@@ -375,6 +375,21 @@
 \installunitsseparator\v!small  {\unitssmallspace}
 \installunitsseparator\v!none   {}
 
+\def\installunitsspace#1#2%
+  {\setvalue{\??un:2:#1}{#2}}
+
+\unexpanded\def\dounitsspace
+  {\edef\currentunitsspace{\unitsparameter\c!space}%
+   \csname\??un:2:%
+     \ifcsname\??un:2:\currentunitsspace\endcsname\currentunitsspace\else\v!normal\fi
+   \endcsname}
+
+\installunitsspace\v!normal {\unitsbigspace}
+\installunitsspace\v!big    {\unitsbigspace}
+\installunitsspace\v!medium {\unitsmediumspace}
+\installunitsspace\v!small  {\unitssmallspace}
+\installunitsspace\v!none   {}
+
 \newtoks \everyunits % we keep the old \units command so we need a longer one
 
 \appendtoks
@@ -532,7 +547,7 @@
   {\ifcase\c_units_state % start
      \ifconditional\c_units_dospace
       % \ifdim\lastskip=\zeropoint
-         \unitsbigspace
+         \dounitsspace % \unitsbigspace
       % \else
       %   % too tricky ... we could remove and add
       % \fi
@@ -544,7 +559,7 @@
      {\dounitsseparator}%
    \or % prefix
    \or % number
-     \unitsbigspace
+     \dounitsspace % \unitsbigspace
    \fi
    \setfalse\c_units_dospace
    \units_start}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 11381ea9b..f1fbb0258 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 4fa0cafdb..c853d16be 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 614d75dea..d3b38421c 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 11/17/11 10:54:57
+-- merge date  : 11/17/11 11:19:34
 
 do -- begin closure to overcome local limits and interference