diff options
| author | Marius <mariausol@gmail.com> | 2013-08-12 16:20:13 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2013-08-12 16:20:13 +0300 |
| commit | 37dde1469604535dfceeb5587e0b3639c200d2f0 (patch) | |
| tree | c3c25276a2952c82ec349a0c8085cf1b672560a2 /tex | |
| parent | 8d46be8aeafb810a989daa316c7ed124cdcdbfb0 (diff) | |
| download | context-37dde1469604535dfceeb5587e0b3639c200d2f0.tar.gz | |
beta 2013.08.11 20:23
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4107 -> 4100 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/l-os.lua | 8 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24690 -> 24684 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.log | 2 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
7 files changed, 11 insertions, 5 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 2349ff109..93735e540 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.08.11 15:18} +\newcontextversion{2013.08.11 20:23} %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 Binary files differindex 7d5de0531..125257c7a 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 61558be00..9fe4e4230 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.08.11 15:18} +\edef\contextversion{2013.08.11 20:23} \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 3838b5524..8bfcf786c 100644 --- a/tex/context/base/l-os.lua +++ b/tex/context/base/l-os.lua @@ -127,7 +127,13 @@ function io.popen (...) ioflush() return iopopen(...) end function os.resultof(command) local handle = io.popen(command,"r") - return handle and handle:read("*all") or "" + if handle then + local result = handle:read("*all") or "" + handle:close() + return result + else + return "" + end end if not io.fileseparator then diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 11a18cb39..89c95cbff 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index 8e5dda733..ca1929218 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.08.11 15:18 MKIV beta fmt: 2013.8.11 int: english/english +ConTeXt ver: 2013.08.11 20:23 MKIV beta fmt: 2013.8.11 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 2ff4f9c60..ae02ce928 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 : 08/11/13 15:18:39 +-- merge date : 08/11/13 20:23:33 do -- begin closure to overcome local limits and interference |