From 4d53dc38c19047834e79f364a0e789de6b7e1da5 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Tue, 10 Sep 2013 19:20:24 +0300
Subject: beta 2013.09.10 18:06

---
 tex/context/base/cont-new.mkiv                     |   2 +-
 tex/context/base/context-version.pdf               | Bin 4115 -> 4108 bytes
 tex/context/base/context.mkiv                      |   2 +-
 tex/context/base/mlib-pdf.lua                      |  18 ++++++++++--------
 tex/context/base/status-files.pdf                  | Bin 24752 -> 24764 bytes
 tex/context/base/status-lua.log                    |   2 +-
 tex/generic/context/luatex/luatex-fonts-merged.lua |   2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'tex')

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index cfd7dfc93..1cd7ef578 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{2013.09.10 17:17}
+\newcontextversion{2013.09.10 18:06}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index a80e91311..dfd432aed 100644
Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index c82bdc27d..7a6459fbe 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.09.10 17:17}
+\edef\contextversion{2013.09.10 18:06}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mlib-pdf.lua b/tex/context/base/mlib-pdf.lua
index 1e3f4ef49..5e60999c1 100644
--- a/tex/context/base/mlib-pdf.lua
+++ b/tex/context/base/mlib-pdf.lua
@@ -292,14 +292,16 @@ metapost.urx       = 0
 metapost.ury       = 0
 
 function commands.mprunvar(key)
-    local value = variables and variables[key]
-    local vtype = type(value)
-    if tvalue == "table" then
-        context(concat(value," "))
-    elseif tvalue == "number" or tvalue == "boolean" then
-        context(concat(value,tostring(value)))
-    elseif tvalue == "string" then
-        context(concat(value," "))
+    local value = metapost.variables[key]
+    if value ~= nil then
+        local tvalue = type(value)
+        if tvalue == "table" then
+            context(concat(value," "))
+        elseif tvalue == "number" or tvalue == "boolean" then
+            context(tostring(value))
+        elseif tvalue == "string" then
+            context(value)
+        end
     end
 end
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 975b88348..229f9506b 100644
Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 8b1432edf..c10777f85 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.09.10 17:17 MKIV beta  fmt: 2013.9.10  int: english/english
+ConTeXt  ver: 2013.09.10 18:06 MKIV beta  fmt: 2013.9.10  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 4e5f1cfc6..4b07240c1 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/10/13 17:17:59
+-- merge date  : 09/10/13 18:06:22
 
 do -- begin closure to overcome local limits and interference
 
-- 
cgit v1.2.3