stable 2006.04.10 20:04

1 files changed, 14 insertions, 5 deletions

diff --git a/tex/context/base/x-newpml.tex b/tex/context/base/x-newpml.tex
index e22aa3392..30b520610 100644
--- a/tex/context/base/x-newpml.tex
+++ b/tex/context/base/x-newpml.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-pmu,
+%D   [       file=xtag-pml,
 %D        version=2001.06.10,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Units,
@@ -13,6 +13,8 @@
 
 \writestatus{loading}{Context XML Macros (units)}
 
+\usemodule[newmml]
+
 %D Quick and dirty in||line units:
 %D
 %D \startbuffer
@@ -75,10 +77,16 @@
 \defineXMLargument [iphys] \inlinemathematics
 \defineXMLargument [dphys] \displaymathematics
 
-\defineXMLenvironment
-  [unit]
-  {\ignorespaces}
-  {\removeunwantedspaces}
+\defineXMLcommand [unit] {\directsetup{pml:unit}}
+
+\startsetups pml:unit
+    \flushXMLstackwith\plustwo\relax
+\stopsetups
+
+% \defineXMLenvironment
+%   [unit]
+%   {\ignorespaces}
+%   {\removeunwantedspaces}
 
 \defineXMLsingular
   [unit]
@@ -131,6 +139,7 @@
 \defineXMLsingular [Day]        {\handlePMLunit\Day}
 \defineXMLsingular [Hour]       {\handlePMLunit\Hour}
 \defineXMLsingular [Min]        {\handlePMLunit\Min}
+\defineXMLsingular [Minute]     {\handlePMLunit\Min}
 \defineXMLsingular [Second]     {\handlePMLunit\Sec}
 \defineXMLsingular [Rad]        {\handlePMLunit\Rad}
 \defineXMLsingular [Deg]        {\handlePMLunit\Deg}