summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-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-help.lmx1
-rw-r--r--tex/context/base/context-version.pdfbin4083 -> 4080 bytes
-rw-r--r--tex/context/base/context-version.pngbin106124 -> 106343 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/l-url.lua2
-rw-r--r--tex/context/base/status-files.pdfbin24459 -> 24439 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin190370 -> 190368 bytes
-rw-r--r--tex/context/base/x-dir-05.mkiv4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 9 insertions, 8 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 2219a1944..0c72e4e56 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.08.09 17:17}
+\newcontextversion{2012.08.09 20:28}
%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 1b23be6db..7a27bd400 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.08.09 17:17}
+\newcontextversion{2012.08.09 20:28}
%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-help.lmx b/tex/context/base/context-help.lmx
index 5401fb65d..939b70cb6 100644
--- a/tex/context/base/context-help.lmx
+++ b/tex/context/base/context-help.lmx
@@ -19,6 +19,7 @@
</script>
<title><?lua pv('title') ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <!-- <base target="context-help" /> -->
<style type="text/css">
<!--
<?lmx-include context.css ?>
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 4ed7baa36..43761cd4d 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 33390a965..5836cbe59 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 5b9915753..aa77123ed 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.08.09 17:17}
+\edef\contextversion{2012.08.09 20:28}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 0061b73f0..00e71bd40 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{2012.08.09 17:17}
+\edef\contextversion{2012.08.09 20:28}
%D For those who want to use this:
diff --git a/tex/context/base/l-url.lua b/tex/context/base/l-url.lua
index dfd7905ad..647b3b6f3 100644
--- a/tex/context/base/l-url.lua
+++ b/tex/context/base/l-url.lua
@@ -257,7 +257,7 @@ url.escape = escapestring
function url.query(str)
if type(str) == "string" then
- return lpegmatch(splitquery,str)
+ return lpegmatch(splitquery,str) or ""
else
return str
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ecc283532..176821a2f 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 129ade8a0..2764e6bc5 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/x-dir-05.mkiv b/tex/context/base/x-dir-05.mkiv
index de1d3fa5f..379b3220a 100644
--- a/tex/context/base/x-dir-05.mkiv
+++ b/tex/context/base/x-dir-05.mkiv
@@ -52,13 +52,13 @@
\stopluacode
\def\getfilestatevariable#1#2%
- {\ctxlua{commands.getfilestatevariable("#1","#2")}}
+ {\ctxcommand{getfilestatevariable("#1","#2")}}
\def\savefilestate
{\dodoubleargument\dosavefilestate}
\def\dosavefilestate[#1][#2]%
- {\ctxlua{commands.savefilestate("#1","#2")}%
+ {\ctxcommand{savefilestate("#1","#2")}%
\setxvariables
[#1]
[name={#2},
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 0ca0f4732..f3c201b25 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/09/12 17:17:04
+-- merge date : 08/09/12 20:28:34
do -- begin closure to overcome local limits and interference