summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2011-09-05 15:55:00 +0200
committerHans Hagen <pragma@wxs.nl>2011-09-05 15:55:00 +0200
commit65c90323df2358c3ebbdbc4ae50cb49b8fd215cf (patch)
tree930a3ba38befa1f9e9f1955570fead36cbe344ed
parentbadccab09dc517f6131c4f2c1b144ad91448798b (diff)
downloadcontext-65c90323df2358c3ebbdbc4ae50cb49b8fd215cf.tar.gz
beta 2011.09.05 15:55
-rw-r--r--tex/context/base/context-version.pdfbin4093 -> 4092 bytes
-rw-r--r--tex/context/base/context-version.pngbin105439 -> 105679 bytes
-rw-r--r--tex/context/base/status-files.pdfbin23933 -> 23922 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin162206 -> 162216 bytes
-rw-r--r--tex/context/base/strc-flt.mkiv6
5 files changed, 3 insertions, 3 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index b847b4a30..900d76a23 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 7cf2dffdf..81513ef96 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 62373b642..520f214af 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 98c96d877..ca6ebc34e 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files 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