From cb51203b1c95abfcde154919683561a27a28a7e5 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 25 Nov 2011 15:00:16 +0200 Subject: beta 2011.11.25 13:29 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4072 -> 4071 bytes tex/context/base/context-version.png | Bin 106136 -> 106330 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/lxml-xml.lua | 4 ++-- tex/context/base/status-files.pdf | Bin 24029 -> 24041 bytes tex/context/base/status-lua.pdf | Bin 168855 -> 168854 bytes tex/context/base/tabl-tab.mkiv | 2 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tex') 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 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 78e0d2ebb..95879f6e5 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png 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 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 9d8e7338c..7606145b6 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf 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 -- cgit v1.2.3