summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4130 -> 4127 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/mlib-pdf.lua27
-rw-r--r--tex/context/base/mult-fun.lua3
-rw-r--r--tex/context/base/status-files.pdfbin24632 -> 24635 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin228251 -> 228090 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 21 insertions, 15 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index fd4d7d417..433685999 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.12.22 15:54}
+\newcontextversion{2013.12.22 19:05}
%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 93b162f8d..6fddaff80 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 193177d14..8e82668fb 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{2013.12.22 15:54}
+\edef\contextversion{2013.12.22 19:05}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/mlib-pdf.lua b/tex/context/base/mlib-pdf.lua
index f10d28bf8..6bb08bd1d 100644
--- a/tex/context/base/mlib-pdf.lua
+++ b/tex/context/base/mlib-pdf.lua
@@ -17,7 +17,9 @@ local formatters = string.formatters
local report_metapost = logs.reporter("metapost")
-local mplib, context = mplib, context
+local trace_variables = false trackers.register("metapost.variables",function(v) trace_variables = v end)
+
+local mplib, context = mplib, context
local allocate = utilities.storage.allocate
@@ -282,14 +284,14 @@ local p_boolean = P("false") * Cc(false) + P("true") * Cc(true)
local p_set = Ct(number^1)
local p_path = Ct(Ct(number * number^-5)^1)
-local variable =
- P("1:") * key * p_number
- + P("2:") * key * p_string
- + P("3:") * key * p_boolean
- + S("4568") * P(":") * key * p_set
- + P("7:") * key * p_path
-
-local pattern_key = Cf ( Carg(1) * (Cg(variable * newline^0)^0), rawset)
+-- local variable =
+-- P("1:") * key * p_number
+-- + P("2:") * key * p_string
+-- + P("3:") * key * p_boolean
+-- + S("4568") * P(":") * key * p_set
+-- + P("7:") * key * p_path
+--
+-- local pattern_key = Cf ( Carg(1) * (Cg(variable * newline^0)^0), rawset)
local variable =
P("1:") * p_number
@@ -336,7 +338,7 @@ function commands.mprunvar(key,n) -- should be defined in another lib
end
end
-function metapost.untagvariable(str,variables)
+function metapost.untagvariable(str,variables) -- will be redone
if variables == false then
return lpegmatch(pattern_lst,str)
else
@@ -351,9 +353,12 @@ end
function metapost.processspecial(str)
local code = loadstring(str)
if code then
+ if trace_variables then
+ report_metapost("executing special code: %s",str)
+ end
code()
else
- report_metapost("invalid special: %s",str)
+ report_metapost("invalid special code: %s",str)
end
end
diff --git a/tex/context/base/mult-fun.lua b/tex/context/base/mult-fun.lua
index fea1b0cc0..2101b95e9 100644
--- a/tex/context/base/mult-fun.lua
+++ b/tex/context/base/mult-fun.lua
@@ -100,6 +100,7 @@ return {
--
"decorated", "redecorated", "undecorated",
--
- "passvariable", "tostring", "format", "formatted",
+ "passvariable", "passarrayvariable", "tostring", "format", "formatted",
+ "startpassingvariable", "stoppassingvariable",
},
}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d89b1518c..ffa1b6e2c 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 3f518e547..11aabfd82 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 268282011..bf787ba6d 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/13 15:54:26
+-- merge date : 12/22/13 19:05:41
do -- begin closure to overcome local limits and interference