From cd8105e9e0ce950c51668aff85bfac68772819c8 Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 14 Nov 2013 15:00:13 +0200 Subject: beta 2013.11.14 13:48 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4109 -> 4109 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/status-files.pdf | Bin 24550 -> 24551 bytes tex/context/base/status-lua.pdf | Bin 222373 -> 222484 bytes tex/context/base/util-you.lua | 4 ++-- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 6f32d508d..2ee902b0c 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.14 13:34} +\newcontextversion{2013.11.14 13:48} %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 6e701ac85..b747b6eac 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 e32ae7d2a..38b70c19f 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.14 13:34} +\edef\contextversion{2013.11.14 13:48} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index b1312a8fa..d38779180 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 b291e63b2..2743331e9 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/util-you.lua b/tex/context/base/util-you.lua index f54e57cd5..0f6a69da5 100644 --- a/tex/context/base/util-you.lua +++ b/tex/context/base/util-you.lua @@ -119,8 +119,8 @@ function youless.collect(specification) if host == "" then return end - if name then - data = table.load(name) or data + if filename ~= "" then + data = table.load(filename) or data end if variant == "kwh" then get(host,"m",1,data,true) diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index babbeb948..e187979ef 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/14/13 13:34:23 +-- merge date : 11/14/13 13:48:28 do -- begin closure to overcome local limits and interference -- cgit v1.2.3