From 65c90323df2358c3ebbdbc4ae50cb49b8fd215cf Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 5 Sep 2011 15:55:00 +0200 Subject: beta 2011.09.05 15:55 --- tex/context/base/context-version.pdf | Bin 4093 -> 4092 bytes tex/context/base/context-version.png | Bin 105439 -> 105679 bytes tex/context/base/status-files.pdf | Bin 23933 -> 23922 bytes tex/context/base/status-lua.pdf | Bin 162206 -> 162216 bytes tex/context/base/strc-flt.mkiv | 6 +++--- 5 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index b847b4a30..900d76a23 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 7cf2dffdf..81513ef96 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/status-files.pdf b/tex/context/base/status-files.pdf index 62373b642..520f214af 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 98c96d877..ca6ebc34e 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/strc-flt.mkiv b/tex/context/base/strc-flt.mkiv index 96287a24a..fbedab659 100644 --- a/tex/context/base/strc-flt.mkiv +++ b/tex/context/base/strc-flt.mkiv @@ -594,8 +594,8 @@ % the global settings. \unexpanded\def\docomplexplacefloat[#1][#2]% [#3]#4% - {\edef\currentfloat{#1}% TODO: IF UNDEFINED THEN FALLBACK TO figure - \doifnothing\currentfloat{\let\currentfloat\v!figure}% + {\edef\currentfloat{#1}% + \doifnothing\currentfloat{\let\currentfloat\v!figure}% hack \doifelsenothing{#2} {\edef\floatlocation{\floatparameter\c!default}} {\edef\floatlocation{#2}}% @@ -626,7 +626,7 @@ \v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge,% \v!text,\v!opposite}% \v!page -\long\def\dodocomplexplacefloat[#1][#2][#3]#4% +\unexpanded\def\dodocomplexplacefloat[#1][#2][#3]#4% {\flushnotes \flushsidefloats % here ! \ifsomefloatwaiting -- cgit v1.2.3