summaryrefslogtreecommitdiff
path: root/tex/context/base/page-set.mkiv
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2010-04-09 11:49:00 +0200
committerHans Hagen <pragma@wxs.nl>2010-04-09 11:49:00 +0200
commita5d3707be9e544069a94b3c8d7b51c7b31e506e5 (patch)
tree61a4efc87be96d39acbefd9f24774a31739dbd74 /tex/context/base/page-set.mkiv
parentc63da592cc7ecde38ec1749525c072e79adebdcf (diff)
downloadcontext-a5d3707be9e544069a94b3c8d7b51c7b31e506e5.tar.gz
beta 2010.04.09 11:49
Diffstat (limited to 'tex/context/base/page-set.mkiv')
-rw-r--r--tex/context/base/page-set.mkiv13
1 files changed, 8 insertions, 5 deletions
diff --git a/tex/context/base/page-set.mkiv b/tex/context/base/page-set.mkiv
index ca256d97c..e75f7528b 100644
--- a/tex/context/base/page-set.mkiv
+++ b/tex/context/base/page-set.mkiv
@@ -1329,13 +1329,15 @@
\global\setbox\floatbox\lastbox}%
\fi}
+% for the moment resave is still needed here
+
\def\OTRSETsavebox#1% clean up the skips
{\OTRSETunpreparebox{#1}%
- \dosavefloat}
+ \dofloatssave{text}}
\def\OTRSETresavebox#1% clean up the skips
{\OTRSETunpreparebox{#1}%
- \doresavefloat}
+ \dofloatsresave{text}}
\def\OTRSETflushfloatbox % nog verder doorvoeren en meer info in marge
{\iftestfloatbox\ruledhbox\fi{\box\floatbox}}
@@ -1345,10 +1347,11 @@
\def\OTRSETsavebox##1{\!!doneafalse}%
\doloop
{\ifsomefloatwaiting
-\OTRSETskipstart
- \dogetfloat
- \ifdim\wd\floatbox>\zeropoint
+ \OTRSETskipstart
+ \dofloatsgetinfo{text}%
+ \ifdim\floatwidth>\zeropoint
\!!doneatrue
+ \dofloatsflush{text}{1}%
\dp\floatbox\zeropoint
\OTRSETstoreincolumnslot{TBLR}\floatbox
\if!!donea