From 236ca1f8c953cd7568e2aaa0d54c6fc61ca42a41 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Sat, 16 Nov 2013 14:00:13 +0200
Subject: beta 2013.11.16 12:43

---
 tex/context/base/cont-new.mkiv                     |   2 +-
 tex/context/base/context-version.pdf               | Bin 4111 -> 4110 bytes
 tex/context/base/context.mkiv                      |   2 +-
 tex/context/base/l-os.lua                          |   5 +++++
 tex/context/base/s-youless.mkiv                    |   2 +-
 tex/context/base/status-files.pdf                  | Bin 24718 -> 24704 bytes
 tex/context/base/status-lua.pdf                    | Bin 225239 -> 225378 bytes
 tex/generic/context/luatex/luatex-fonts-merged.lua |   2 +-
 8 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'tex')

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bf224192e..9c60edbab 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.11.15 15:04}
+\newcontextversion{2013.11.16 12:43}
 
 %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 693b8f2e0..b6340273b 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 59943c034..1bd3fa566 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.11.15 15:04}
+\edef\contextversion{2013.11.16 12:43}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/l-os.lua b/tex/context/base/l-os.lua
index 7f3fd7caf..44e0f53e1 100644
--- a/tex/context/base/l-os.lua
+++ b/tex/context/base/l-os.lua
@@ -222,6 +222,8 @@ local function guess()
     return os.resultof("echo $HOSTTYPE") or ""
 end
 
+-- os.bits = 32 | 64
+
 if platform ~= "" then
 
     os.platform = platform
@@ -230,6 +232,9 @@ elseif os.type == "windows" then
 
     -- we could set the variable directly, no function needed here
 
+    -- PROCESSOR_ARCHITECTURE : binary platform
+    -- PROCESSOR_ARCHITEW6432 : OS platform
+
     function os.resolvers.platform(t,k)
         local platform, architecture = "", os.getenv("PROCESSOR_ARCHITECTURE") or ""
         if find(architecture,"AMD64") then
diff --git a/tex/context/base/s-youless.mkiv b/tex/context/base/s-youless.mkiv
index ff0aee1f3..61cce6f79 100644
--- a/tex/context/base/s-youless.mkiv
+++ b/tex/context/base/s-youless.mkiv
@@ -97,7 +97,7 @@
                                             local dx = xoffset + h
                                             local dy = hour.watt/scale
                                             local dm = hour.maxwatt/scale
-                                            context("draw (%s,%s) -- (%s,%s) withcolor %s ; ",dx, 0,dx,dy,weekend and "darkyellow" or "darkblue")
+                                            context("draw (%s,%s) -- (%s,%s) withcolor %s ; ",dx, 0,dx,dy,weekend and "darkmagenta" or "darkblue")
                                             context("draw (%s,%s) -- (%s,%s) withcolor %s ; ",dx,dy,dx,dm,"darkgray")
                                         end
                                     end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ed2645e2f..06c64b71b 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.pdf b/tex/context/base/status-lua.pdf
index 95a20017d..9feec40c2 100644
Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e869d446a..b74bd350c 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/15/13 15:04:59
+-- merge date  : 11/16/13 12:43:39
 
 do -- begin closure to overcome local limits and interference
 
-- 
cgit v1.2.3