summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/strc-flt.mkii
diff options
context:
space:
mode:
authorMojca Miklavec <mojca.miklavec@gmail.com>2012-05-14 17:38:55 +0000
committerMojca Miklavec <mojca.miklavec@gmail.com>2012-05-14 17:38:55 +0000
commit15995e10bfc68edf79970c4ea4fbb6678566c46e (patch)
tree2de7ca2a83f2d37ef043ad7429a5cb945bb79ddb /Master/texmf-dist/tex/context/base/strc-flt.mkii
parentc9a39f716f1e5ec820ed3aab2c9aef25c5a9d730 (diff)
ConTeXt 2012.05.14 16:00
git-svn-id: svn://tug.org/texlive/trunk@26371 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/strc-flt.mkii')
-rw-r--r--Master/texmf-dist/tex/context/base/strc-flt.mkii18
1 files changed, 2 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/context/base/strc-flt.mkii b/Master/texmf-dist/tex/context/base/strc-flt.mkii
index 3d07cdc2064..26125c65f96 100644
--- a/Master/texmf-dist/tex/context/base/strc-flt.mkii
+++ b/Master/texmf-dist/tex/context/base/strc-flt.mkii
@@ -5,7 +5,7 @@
%D subtitle=Floating Bodies,
%D author=Hans Hagen,
%D date=\currentdate,
-%D copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
%C
%C This module is part of the \CONTEXT\ macro||package and is
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
@@ -519,9 +519,7 @@
\setvalue {\e!start#1\e!text}{\dotripleempty\docomplexstarttextblock[#1]}%
\setvalue {\e!stop#1\e!text}{\dostoptextfloat}%
\setvalue{\e!start\e!reserve#1\e!text}{\doquadrupleempty\docomplexstartreservetextblock[#1]}%
- \setvalue {\e!stop\e!reserve#1\e!text}{\dostoptextfloat}%
- \setvalue {\e!emptyone#1}{\doemptyblock{#1}}%
- \setvalue {\e!emptytwo#1}{\doemptyblock{#1}}}
+ \setvalue {\e!stop\e!reserve#1\e!text}{\dostoptextfloat}}
% \setupfloat[...][leftmargindistance=1cm,default={left,none}]
@@ -1436,18 +1434,6 @@
\fi
\fi}
-\def\dopreparesidecaption#1#2#3%
- {\scratchdimen\dimexpr\hsize-\wd\tempfloatbox-\@@bkmargin\relax % was \tfskipsize\relax
- \ifdim\wd\tempcaptionbox>\scratchdimen
- \ifdim\wd\tempcaptionbox<1.3\scratchdimen
- \scratchdimen0.8\scratchdimen
- \fi
- \fi
- \dosettempcaptionbox % \setbox\tempcaptionbox\vbox
- {\hsize\scratchdimen
- \doifnothing{\floatcaptionparameter\c!align}\raggedright % on purpose overloads align !
- \putcompletecaption{#2}{#3}}}
-
\newdimen\tempfloatheight
\newdimen\tempfloatwidth