summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2016-01-13 10:15:08 +0100
committerContext Git Mirror Bot <phg42.2a@gmail.com>2016-01-13 10:15:08 +0100
commitc813b4d16dd51bd181736729517ad422980e3fc6 (patch)
tree88727c04622c84055892a24d0e292ce9bd68ccd7 /tex
parentd8ce86dda9acef1bc636ad145aaaa2ae13b0f08a (diff)
downloadcontext-c813b4d16dd51bd181736729517ad422980e3fc6.tar.gz
2016-01-13 09:44:00
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context-version.pdfbin4166 -> 4170 bytes
-rw-r--r--tex/context/base/mkiv/cont-new.mkiv2
-rw-r--r--tex/context/base/mkiv/context.mkiv2
-rw-r--r--tex/context/base/mkiv/status-files.pdfbin8943 -> 9084 bytes
-rw-r--r--tex/context/base/mkiv/status-lua.pdfbin258685 -> 258685 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
6 files changed, 3 insertions, 3 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 725401c5a..88adbe0e3 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 37cf7f8e6..4e779764e 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2016.01.12 22:41}
+\newcontextversion{2016.01.13 09:42}
%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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 85629ab15..36cd352e7 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2016.01.12 22:41}
+\edef\contextversion{2016.01.13 09:42}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 8601106d9..3e70489b1 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
Binary files differ
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index ab004eed3..1933879fd 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 9f7707504..ba5fbc8fc 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 01/12/16 22:41:48
+-- merge date : 01/13/16 09:42:02
do -- begin closure to overcome local limits and interference