summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2014-01-06 23:46:00 +0100
committerHans Hagen <pragma@wxs.nl>2014-01-06 23:46:00 +0100
commit5431f5e7843f5af15dfdbc266a22e248e8a722af (patch)
tree073cd146847b92c16ee1d20d11397cccd77b66a0
parentabc4c5b8c54f5768e2c494e7925dddb1d99850be (diff)
downloadcontext-5431f5e7843f5af15dfdbc266a22e248e8a722af.tar.gz
beta 2014.01.06 23:46
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4118 -> 4117 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-odv.lua4
-rw-r--r--tex/context/base/status-files.pdfbin24571 -> 24570 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin228214 -> 228311 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 5 insertions, 5 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 3cf861656..27aa3bcbe 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.06 18:10}
+\newcontextversion{2014.01.06 23:46}
%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 4c6547843..a80f8c240 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 902f30b6f..186a7074d 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.06 18:10}
+\edef\contextversion{2014.01.06 23:46}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/font-odv.lua b/tex/context/base/font-odv.lua
index 1fd95cd5e..7255c5be5 100644
--- a/tex/context/base/font-odv.lua
+++ b/tex/context/base/font-odv.lua
@@ -1600,8 +1600,8 @@ local tpm = twopart_mark[char]
if tpm then
local extra = copy_node(current)
char = tpm[1]
- setfield(current,"char",char)
- setfield(extra,"char",tpm[2])
+ current.char = char
+ extra.char = tpm[2]
head = insert_after(head,current,extra)
end
--
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index bf4f42428..7573c7b4d 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 aec1f33e0..03156b345 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 256373922..751d8b9d3 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/06/14 18:10:50
+-- merge date : 01/06/14 23:46:25
do -- begin closure to overcome local limits and interference