summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-02-08 23:20:14 +0200
committerMarius <mariausol@gmail.com>2012-02-08 23:20:14 +0200
commit620e890d8993f2a1120b5069f97b01ca1841f50f (patch)
treead2eedc20957ae084469b807748af76736aa0ae3
parent7b47df8cbaae8690f14d306c633b2b2db053f66a (diff)
downloadcontext-620e890d8993f2a1120b5069f97b01ca1841f50f.tar.gz
beta 2012.02.08 21:58
-rw-r--r--tex/context/base/anch-bck.mkvi3
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4064 -> 4070 bytes
-rw-r--r--tex/context/base/context-version.pngbin104373 -> 105345 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24294 -> 24313 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin171613 -> 171617 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 7 insertions, 6 deletions
diff --git a/tex/context/base/anch-bck.mkvi b/tex/context/base/anch-bck.mkvi
index 7dd190657..bfe18a5cb 100644
--- a/tex/context/base/anch-bck.mkvi
+++ b/tex/context/base/anch-bck.mkvi
@@ -548,7 +548,7 @@
\startMPpositionmethod{mpos:par:columnset}
\MPparcounter\MPn\MPbself\relax
-\def\regionanchor{\MPr\MPbself}%
+\edef\regionanchor{\MPr\MPbself}%
\ifx\regionanchor\empty
\regionpositioningfalse
\else
@@ -563,6 +563,7 @@
\includeMPgraphic{\MPvar{mp}} ;
\stopMPpositiongraphic
\MPpositiongraphic{mpos:par}{}%
+\regionpositioningfalse
\stopMPpositionmethod
%D \starttyping
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index fb4ee485d..32a8c39ac 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.02.08 21:04}
+\newcontextversion{2012.02.08 21:58}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index ebf6aa3c3..9d29b2868 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{2012.02.08 21:04}
+\newcontextversion{2012.02.08 21:58}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index f1efd3a17..64f82f314 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-version.png b/tex/context/base/context-version.png
index 08b891640..1f8958f7b 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index e62b4e583..de0c56634 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.02.08 21:04}
+\edef\contextversion{2012.02.08 21:58}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index eaa4c3a3c..240244f40 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.02.08 21:04}
+\edef\contextversion{2012.02.08 21:58}
%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 44799888e..92f846922 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 b46e426d3..baeec7fb3 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 3763c896b..5ea4b6bc2 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 : 02/08/12 21:04:08
+-- merge date : 02/08/12 21:58:28
do -- begin closure to overcome local limits and interference