summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/buff-ver.mkiv4
-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.pdfbin4076 -> 4073 bytes
-rw-r--r--tex/context/base/context-version.pngbin106332 -> 106429 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/grph-inc.mkiv2
-rw-r--r--tex/context/base/page-imp.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24079 -> 24068 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin169716 -> 169721 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 8 insertions, 10 deletions
diff --git a/tex/context/base/buff-ver.mkiv b/tex/context/base/buff-ver.mkiv
index 2e8311fc2..36f9130ef 100644
--- a/tex/context/base/buff-ver.mkiv
+++ b/tex/context/base/buff-ver.mkiv
@@ -141,8 +141,8 @@
\installcommandhandler \??tp {typing} \??tp
\appendtoks
- \setuevalue{\e!start#1}{\dostarttyping{\currenttyping}}%
- \setuevalue{\e!stop #1}{\dostoptyping {\currenttyping}}%
+ \setuevalue{\e!start\currenttyping}{\dostarttyping{\currenttyping}}%
+ \setuevalue{\e!stop \currenttyping}{\dostoptyping {\currenttyping}}%
\normalexpanded{\definelinenumbering[\currenttyping]}%
\to \everydefinetyping
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 0466969b7..c5c0ef7df 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{2011.12.22 14:43}
+\newcontextversion{2011.12.22 16:52}
%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 40cf787a2..80810ec48 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{2011.12.22 14:43}
+\newcontextversion{2011.12.22 16:52}
%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 3e856f3ca..3e0fcb290 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 4069ff91e..2725c5338 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 45d5a131d..8aabd179f 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{2011.12.22 14:43}
+\edef\contextversion{2011.12.22 16:52}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 48c8dcea9..4be4b8ba2 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{2011.12.22 14:43}
+\edef\contextversion{2011.12.22 16:52}
%D For those who want to use this:
diff --git a/tex/context/base/grph-inc.mkiv b/tex/context/base/grph-inc.mkiv
index 4c664321a..c5a41152c 100644
--- a/tex/context/base/grph-inc.mkiv
+++ b/tex/context/base/grph-inc.mkiv
@@ -138,7 +138,7 @@
\appendtoks \resetexternalfigures \to \everyoverlay
\appendtoks \resetexternalfigures \to \everybeforepagebody % not really needed
-\def\resetfigureusersettings
+\def\resetfigureusersettings % if we use a command handler we can simply define a new instance
{%
\let\@@efmethod \empty
\let\@@eflabel \empty
diff --git a/tex/context/base/page-imp.mkiv b/tex/context/base/page-imp.mkiv
index b6eebdfcf..d18f78140 100644
--- a/tex/context/base/page-imp.mkiv
+++ b/tex/context/base/page-imp.mkiv
@@ -67,8 +67,6 @@
\unexpanded\def\invokepagehandler#1%
{\expandcheckedcsname{\??pp:h:}{#1}\v!normal}
-\let\pagehandler\invokepagehandler % only provided for downward compatibility
-
\def\page_shipouts_handle
{\csname\??pp:h:\ifcsname\??pp:h:\v_page_target_method\endcsname
\v_page_target_method
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index b597325e1..1874b20e4 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 87ecffba8..c26902eb9 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 ff3fe655a..062252518 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 : 12/22/11 14:43:04
+-- merge date : 12/22/11 16:52:48
do -- begin closure to overcome local limits and interference