summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metapost/context/base/mp-mlib.mpiv8
-rw-r--r--metapost/context/base/mp-tool.mpii8
-rw-r--r--metapost/context/base/mp-tool.mpiv8
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4112 -> 4110 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24768 -> 24772 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
9 files changed, 16 insertions, 16 deletions
diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mp-mlib.mpiv
index 81b09d6dc..abf0eb974 100644
--- a/metapost/context/base/mp-mlib.mpiv
+++ b/metapost/context/base/mp-mlib.mpiv
@@ -281,9 +281,9 @@ enddef ;
let mfun_label = label ;
let mfun_thelabel = thelabel ;
-def useplainlabels =
- let label = plain_label ;
- let thelabel = plain_thelabel ;
+def useplainlabels = % somehow let doesn't work for all code
+ def label = plain_label enddef ;
+ def thelabel = plain_thelabel enddef ;
enddef ;
def usemetafunlabels =
@@ -291,7 +291,7 @@ def usemetafunlabels =
let thelabel = mfun_thelabel ;
enddef ;
-plain_compatibity_data := plain_compatibity_data & "save label, thelabel ;" & "useplainlabels ;" ;
+plain_compatibility_data := plain_compatibility_data & "save label, thelabel ;" & "useplainlabels ;" ;
% next comes own own:
diff --git a/metapost/context/base/mp-tool.mpii b/metapost/context/base/mp-tool.mpii
index 2819a1f66..f363f655e 100644
--- a/metapost/context/base/mp-tool.mpii
+++ b/metapost/context/base/mp-tool.mpii
@@ -100,14 +100,14 @@ enddef ;
%D Plain compatibility
-string plain_compatibity_data ; plain_compatibity_data := "" ;
+string plain_compatibility_data ; plain_compatibility_data := "" ;
-def startplaincompatibity =
+def startplaincompatibility =
begingroup ;
- scantokens plain_compatibity_data ;
+ scantokens plain_compatibility_data ;
enddef ;
-def stopplaincompatibity =
+def stopplaincompatibility =
endgroup ;
enddef ;
diff --git a/metapost/context/base/mp-tool.mpiv b/metapost/context/base/mp-tool.mpiv
index b47f5e8bf..7f6972bf2 100644
--- a/metapost/context/base/mp-tool.mpiv
+++ b/metapost/context/base/mp-tool.mpiv
@@ -66,14 +66,14 @@ enddef ;
%D Plain compatibility:
-string plain_compatibity_data ; plain_compatibity_data := "" ;
+string plain_compatibility_data ; plain_compatibility_data := "" ;
-def startplaincompatibity =
+def startplaincompatibility =
begingroup ;
- scantokens plain_compatibity_data ;
+ scantokens plain_compatibility_data ;
enddef ;
-def stopplaincompatibity =
+def stopplaincompatibility =
endgroup ;
enddef ;
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6c39a564d..6a5d7b63e 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.08.24 13:59}
+\newcontextversion{2013.08.25 14:06}
%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 55ce97c90..53c81e050 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 39b48487d..98b890181 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.08.24 13:59}
+\edef\contextversion{2013.08.25 14:06}
\edef\contextkind {beta}
%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 863d58a34..1ce9862cb 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.log b/tex/context/base/status-lua.log
index f4469c869..d812cd3cd 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
(cont-yes.mkiv
-ConTeXt ver: 2013.08.24 13:59 MKIV beta fmt: 2013.8.24 int: english/english
+ConTeXt ver: 2013.08.25 14:06 MKIV beta fmt: 2013.8.25 int: english/english
system > 'cont-new.mkiv' loaded
(cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b39d4a8f3..bf1ea0aab 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 : 08/24/13 13:59:18
+-- merge date : 08/25/13 14:06:17
do -- begin closure to overcome local limits and interference