diff options
| author | Marius <mariausol@gmail.com> | 2011-09-05 17:00:12 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2011-09-05 17:00:12 +0300 |
| commit | e79e4cafd297a82d6cecbb5a3329e2d69ae4cfe8 (patch) | |
| tree | 417a2ea74d4f217fbbb084f75361c9c1832f65ea /tex/context/base | |
| parent | 55115d779b08fbd8970bd6e580cc255d7ab23ba6 (diff) | |
| download | context-e79e4cafd297a82d6cecbb5a3329e2d69ae4cfe8.tar.gz | |
beta 2011.09.05 15:55
Diffstat (limited to 'tex/context/base')
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4093 -> 4092 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 105439 -> 105679 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 23933 -> 23922 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 162206 -> 162216 bytes | |||
| -rw-r--r-- | tex/context/base/strc-flt.mkiv | 6 |
9 files changed, 7 insertions, 7 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index e7ca44ef5..95ea6930f 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.09.05 12:54} +\newcontextversion{2011.09.05 15:55} %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 2f892eae1..59a019ae0 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.09.05 12:54} +\newcontextversion{2011.09.05 15:55} %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 Binary files differindex b847b4a30..900d76a23 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 7cf2dffdf..81513ef96 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 74a27402b..456904e4b 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.09.05 12:54} +\edef\contextversion{2011.09.05 15:55} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 017f29af3..f243357a2 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.09.05 12:54} +\edef\contextversion{2011.09.05 15:55} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 62373b642..520f214af 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 98c96d877..ca6ebc34e 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf 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 |
