beta 2011.09.05 23:49

13 files changed, 61 insertions, 15 deletions

diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mp-mlib.mpiv
index 5b88c3159..c7240e127 100644
--- a/metapost/context/base/mp-mlib.mpiv
+++ b/metapost/context/base/mp-mlib.mpiv
@@ -583,3 +583,30 @@ def bitmapimage(expr xresolution, yresolution, data) =
             withpostscript data ;
     )
 enddef ;
+
+% TODO:
+
+let property = picture ;
+
+vardef properties(text t) =
+    image(draw unitcircle t)
+enddef ;
+
+def withproperties expr p =
+    if colormodel p = 3 :
+        withcolor graypart p
+    elseif colormodel p = 5 :
+        withcolor (redpart p,greenpart p,bluepart p)
+    elseif colormodel p = 7 :
+        withcolor (cyanpart p,magentapart p,yellowpart p,blackpart p)
+    fi
+    % todo, when available in mp:
+    %
+    % withprescript prescript p
+    % withpostscript postscript p
+    %
+    % todo, penpart
+enddef ;
+
+% property p ; p = properties(withcolor (1,1,0,1)) ;
+% fill fullcircle scaled 20cm withproperties p ;
diff --git a/metapost/context/base/mp-tool.mp b/metapost/context/base/mp-tool.mp
index 4ada54429..480d9d186 100644
--- a/metapost/context/base/mp-tool.mp
+++ b/metapost/context/base/mp-tool.mp
@@ -2438,8 +2438,18 @@ enddef ;
 
 % new
 
-vardef colorpart(expr i) =
-  (redpart i, greenpart i,bluepart i)
+% vardef colorpart(expr i) =
+%   (redpart i, greenpart i,bluepart i)
+% enddef ;
+
+vardef colorpart(expr c) =
+    if colormodel c = 3 :
+        graypart c
+    elseif colormodel c = 5 :
+        (redpart c,greenpart c,bluepart c)
+    elseif colormodel c = 7 :
+        (cyanpart c,magentapart c,yellowpart c,blackpart c)
+    fi
 enddef ;
 
 % for david arnold:
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index f00ce074f..575b21253 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.09.05 19:28}
+\newcontextversion{2011.09.05 23:49}
 
 %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 d4898e038..764d14381 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.09.05 19:28}
+\newcontextversion{2011.09.05 23:49}
 
 %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 339636e41..9535172fd 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 2e43b5345..9aa06a1a6 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 22577f103..bc8810642 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.09.05 19:28}
+\edef\contextversion{2011.09.05 23:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 896cad28b..9e6170785 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.09.05 19:28}
+\edef\contextversion{2011.09.05 23:49}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index 3f001f606..c78464eab 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -663,8 +663,11 @@
     {\setfalse\mathematics_right_to_left}%
 \to \everysetupmathematics
 
+\unexpanded\def\mathematics_synchronize_direction
+  {\mathdir T\ifconditional\mathematics_right_to_left R\else L\fi T}
+
 \appendtoks
-  \mathdir T\ifconditional\mathematics_right_to_left R\else L\fi T
+    \mathematics_synchronize_direction
 %to \everymathematics % comes too late and I'm not in the mood for a mixed mode kludge now
 \to \everysetupmathematics
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index bb4639a86..c8a94ddc3 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 e46c09b6d..876b2a00b 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv
index b064e4987..8f6f5b94c 100644
--- a/tex/context/base/x-mathml.mkiv
+++ b/tex/context/base/x-mathml.mkiv
@@ -54,15 +54,21 @@
 \xmlmapvalue {mml:math:display} {block}   {\displaymathematics} % before this showed up
 \xmlmapvalue {mml:math:display} {inline}  {\inlinemathematics }
 
+\xmlmapvalue {mml:math:dir}     {ltr}     {\setfalse\mathematics_right_to_left\mathematics_synchronize_direction}
+\xmlmapvalue {mml:math:dir}     {rtl}     {\settrue \mathematics_right_to_left\mathematics_synchronize_direction}
+
 \startxmlsetups mml:math
-    \xmlval {mml:math:display} {\xmlatt{#1}{display}} {
-        \xmlval {mml:math:mode} {\xmlatt{#1}{mode}} {
-            \automathematics
+    \begingroup
+        \xmlval {mml:math:dir} {\xmlatt{#1}{dir}} {}
+        \xmlval {mml:math:display} {\xmlatt{#1}{display}} {
+            \xmlval {mml:math:mode} {\xmlatt{#1}{mode}} {
+                \automathematics
+            }
         }
-    }
-    {
-        \MMLhack\xmlflush{#1}
-    }
+        {
+            \MMLhack\xmlflush{#1}
+        }
+    \endgroup
 \stopxmlsetups
 
 \startxmlsetups mml:imath
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6221d92a8..928da0e83 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  : 09/05/11 19:28:27
+-- merge date  : 09/05/11 23:49:07
 
 do -- begin closure to overcome local limits and interference