summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4111 -> 4121 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/pack-rul.lua2
-rw-r--r--tex/context/base/status-files.pdfbin24641 -> 24602 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin228352 -> 228407 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 4 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 37b2b5f93..a98e7b765 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{2014.01.07 16:18}
+\newcontextversion{2014.01.07 17:03}
%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 1dc1e987c..adb050050 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 fd307776f..e7be5d9f9 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2014.01.07 16:18}
+\edef\contextversion{2014.01.07 17:03}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/pack-rul.lua b/tex/context/base/pack-rul.lua
index b9fa141fc..c8ed0722b 100644
--- a/tex/context/base/pack-rul.lua
+++ b/tex/context/base/pack-rul.lua
@@ -96,7 +96,7 @@ function commands.doreshapeframedbox(n)
for h in traverse_id(hlist_code,list) do
local l = getlist(h)
if l then
- local subtype = getsubtype(n)
+ local subtype = getsubtype(h)
if subtype == box_code or subtype == line_code then
l = hpack(l,maxwidth,'exactly',getfield(h,"dir")) -- multiple return values
setfield(h,"list",l)
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index faae634a5..395022905 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.pdf b/tex/context/base/status-lua.pdf
index efc32104d..2fdf82591 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/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 dd63e4481..a3a2de5b1 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 : 01/07/14 16:18:39
+-- merge date : 01/07/14 17:03:56
do -- begin closure to overcome local limits and interference