summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2012-01-05 19:27:34 +0100
committerHans Hagen <pragma@wxs.nl>2012-01-05 19:27:34 +0100
commite1d36a6e6b05f55536e0c4c125e881c681e18bc1 (patch)
treeabccd55b33c01b8c43752c09fa0fdbfb2b2774a3 /tex
parentf784af77ded9f791caa3cdb7864d6696de61bca6 (diff)
downloadcontext-e1d36a6e6b05f55536e0c4c125e881c681e18bc1.tar.gz
beta 2011.11.25 13:29
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-version.pdfbin4072 -> 4071 bytes
-rw-r--r--tex/context/base/context-version.pngbin106136 -> 106330 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/lxml-xml.lua4
-rw-r--r--tex/context/base/status-files.pdfbin24029 -> 24041 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin168855 -> 168854 bytes
-rw-r--r--tex/context/base/tabl-tab.mkiv2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
11 files changed, 8 insertions, 8 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 449e28a29..17812ba50 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.11.25 11:31}
+\newcontextversion{2011.11.25 13:29}
%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 f97d3a50e..15caf079d 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.11.25 11:31}
+\newcontextversion{2011.11.25 13:29}
%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 bf90441be..230e099a6 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 78e0d2ebb..95879f6e5 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 b0e1ab46d..fbc493e89 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.11.25 11:31}
+\edef\contextversion{2011.11.25 13:29}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index fbf188c58..1f739713f 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.11.25 11:31}
+\edef\contextversion{2011.11.25 13:29}
%D For those who want to use this:
diff --git a/tex/context/base/lxml-xml.lua b/tex/context/base/lxml-xml.lua
index b216d7866..d87ad8b1b 100644
--- a/tex/context/base/lxml-xml.lua
+++ b/tex/context/base/lxml-xml.lua
@@ -163,9 +163,9 @@ end
--
local function text(collected) -- hybrid
- if collected and #collected > 0 then
+ if collected then -- no # test here !
local e = collected[1] or collected
- return (e and xmltotext(e)) or ""
+ return e and xmltotext(e) or ""
else
return ""
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 428859ac8..0830f1414 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 9d8e7338c..7606145b6 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv
index d7e842a62..421a9d0ba 100644
--- a/tex/context/base/tabl-tab.mkiv
+++ b/tex/context/base/tabl-tab.mkiv
@@ -1657,7 +1657,7 @@
\long\def\dosettablehead[#1][#2]#3\end{\setvalue{@@tablehead#1}{\tablenoalign{\global\settrue\hassometablehead}#3}}
\long\def\dosettabletail[#1][#2]#3\end{\setvalue{@@tabletail#1}{\tablenoalign{\global\settrue\hassometabletail}#3}}
-%D Redudant \type{\HL}'s are removed automatically, so
+%D Redundant \type{\HL}'s are removed automatically, so
%D mid||lines can be used without problems.
%D The order of the next macros is more or less random. First
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ae62e048a..8d287bcbb 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 : 11/25/11 11:31:56
+-- merge date : 11/25/11 13:29:31
do -- begin closure to overcome local limits and interference