summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2013-11-10 13:40:13 +0200
committerMarius <mariausol@gmail.com>2013-11-10 13:40:13 +0200
commit7425449d374a84cde533bdb2ce5c76c62c1eb48c (patch)
treeb48535e1957ef4da706efc896ff2f0cac64c2151 /tex
parentb061ca19f9a8721105957f51448400425adaf7e8 (diff)
downloadcontext-7425449d374a84cde533bdb2ce5c76c62c1eb48c.tar.gz
beta 2013.11.10 12:23
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4108 -> 4113 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/mlib-pps.lua15
-rw-r--r--tex/context/base/status-files.pdfbin24551 -> 24537 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin222470 -> 222406 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 11 insertions, 10 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d23a87ebc..1ffe08bff 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.11.09 20:21}
+\newcontextversion{2013.11.10 12:23}
%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 462dc5b36..5218751b7 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 4537e32ea..6a68d8c85 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.11.09 20:21}
+\edef\contextversion{2013.11.10 12:23}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mlib-pps.lua b/tex/context/base/mlib-pps.lua
index 9f6cedad1..535c9ff9d 100644
--- a/tex/context/base/mlib-pps.lua
+++ b/tex/context/base/mlib-pps.lua
@@ -967,24 +967,25 @@ local function tx_process(object,prescript,before,after)
end
end
--- graphics
+-- graphics (we use the given index because pictures can be reused)
local graphics = { }
function metapost.intermediate.actions.makempy()
if #graphics > 0 then
makempy.processgraphics(graphics)
- graphics = { } -- ?
+ graphics = { } -- ? could be gt_reset
end
end
local function gt_analyze(object,prescript)
local gt_stage = prescript.gt_stage
- if gt_stage == "trial" then
- graphics[#graphics+1] = formatters["\\MPLIBgraphictext{%s}"](object.postscript or "")
- top.intermediate = true
- top.multipass = true
- metapost.multipass = true -- ugly
+ local gt_index = tonumber(prescript.gt_index)
+ if gt_stage == "trial" and not graphics[gt_index] then
+ graphics[gt_index] = formatters["\\MPLIBgraphictext{%s}"](object.postscript or "")
+ top.intermediate = true
+ top.multipass = true
+ metapost.multipass = true -- ugly
end
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index b240ea843..a48337cb2 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 31fd9f678..1d11c9fe1 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 2bfa77514..94a082a8c 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 : 11/09/13 20:21:53
+-- merge date : 11/10/13 12:23:28
do -- begin closure to overcome local limits and interference