summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-09-19 21:34:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-09-19 21:34:00 +0200
commitde44bb7fe307baac7971cf7437fca0d2dbc4f8af (patch)
tree1f64ce2ae1532fd87992957fa2f26af11e21a4a5 /tex
parentec3453f29b8d1f76349e9d5d83ff42d2f3c4eb13 (diff)
downloadcontext-de44bb7fe307baac7971cf7437fca0d2dbc4f8af.tar.gz
beta 2013.09.19 21:34
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4109 -> 4105 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24775 -> 24774 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/context/base/util-tab.lua2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 6 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 4b542c0d8..ad20e4441 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.19 17:08}
+\newcontextversion{2013.09.19 21:34}
%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 bb4f0a3c8..0afdcfae2 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 8866ecfe9..5e71076b7 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.19 17:08}
+\edef\contextversion{2013.09.19 21:34}
\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 f161d6fe9..7a503129a 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 51d51e0b0..d9f80fc04 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.19 17:08 MKIV beta fmt: 2013.9.19 int: english/english
+ConTeXt ver: 2013.09.19 21:34 MKIV beta fmt: 2013.9.19 int: english/english
system > 'cont-new.mkiv' loaded
(cont-new.mkiv)
diff --git a/tex/context/base/util-tab.lua b/tex/context/base/util-tab.lua
index f04e2a300..6bba0850d 100644
--- a/tex/context/base/util-tab.lua
+++ b/tex/context/base/util-tab.lua
@@ -304,6 +304,7 @@ local f_hashed_table = formatters["[%q]="]
local f_indexed_string = formatters["[%s]=%q,"]
local f_indexed_number = formatters["[%s]=%s,"]
local f_indexed_boolean = formatters["[%s]=%l,"]
+local f_indexed_table = formatters["[%s]="]
local f_ordered_string = formatters["%q,"]
local f_ordered_number = formatters["%s,"]
@@ -347,6 +348,7 @@ function table.fastserialize(t,prefix)
elseif tv == "number" then
m = m + 1 r[m] = f_indexed_number(k,v)
elseif tv == "table" then
+ m = m + 1 r[m] = f_indexed_table(k)
fastserialize(v)
elseif tv == "boolean" then
m = m + 1 r[m] = f_indexed_boolean(k,v)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b90de920f..c6650e781 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/19/13 17:08:32
+-- merge date : 09/19/13 21:34:56
do -- begin closure to overcome local limits and interference