summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4119 -> 4107 bytes
-rw-r--r--tex/context/base/context.mkiv5
-rw-r--r--tex/context/base/status-files.pdfbin24835 -> 24829 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
6 files changed, 6 insertions, 5 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 4541bcf0f..91e6b0a33 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.30 19:49}
+\newcontextversion{2013.09.30 20:05}
%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 15bffc01e..7c4ff8329 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 2dba3c5e8..3a11a2738 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.30 19:49}
+\edef\contextversion{2013.09.30 20:05}
\edef\contextkind {beta}
%D For those who want to use this:
@@ -362,6 +362,7 @@
\loadmkvifile{font-col}
\loadmkvifile{font-gds}
\loadmkvifile{font-aux}
+\loadmkvifile{font-sel}
\loadmarkfile{typo-lan}
@@ -404,7 +405,7 @@
\loadmarkfile{meta-fun}
\loadmarkfile{meta-pag}
\loadmarkfile{meta-grd}
-%loadmarkfile{meta-fnt}
+\loadmarkfile{meta-fnt}
\loadmarkfile{page-mrk} % depends on mp
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index a44ff4b48..403a513c5 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 75b246b6f..521ff54aa 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.30 19:49 MKIV beta fmt: 2013.9.30 int: english/english
+ConTeXt ver: 2013.09.30 20:05 MKIV beta fmt: 2013.9.30 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 4a1087fbb..3e02295b2 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/30/13 19:49:15
+-- merge date : 09/30/13 20:05:55
do -- begin closure to overcome local limits and interference