diff options
Diffstat (limited to 'Master/texmf-dist/source/platex/base/nidanfloat.dtx')
-rw-r--r-- | Master/texmf-dist/source/platex/base/nidanfloat.dtx | 79 |
1 files changed, 69 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/platex/base/nidanfloat.dtx b/Master/texmf-dist/source/platex/base/nidanfloat.dtx index 9ed2c035681..87546cfca9b 100644 --- a/Master/texmf-dist/source/platex/base/nidanfloat.dtx +++ b/Master/texmf-dist/source/platex/base/nidanfloat.dtx @@ -3,7 +3,7 @@ % % Copyright 1994 ASCII Co. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -27,6 +27,13 @@ % \changes{v2.6}{2003/05/15}{\cs{@fstype}$B$r(B\cs{@fstyle}$B$H%?%$%W%_%9$7$F$$$?(B % $B$N$r=$@5!J$"$j$,$H$&!"@n>e!w9R6u1'Ch8&5f=j$5$s!K(B} % \changes{v2.7}{2005/12/09}{$BI,?\%U%)!<%^%C%H%U%!%$%k$r(BpLaTeX2e$B$+$i(BLaTeX2e$B$XJQ99(B} +% \changes{v2.8}{2017/05/01}{\cs{@rightfixht}$B$rDI2C(B} +% \changes{v2.8}{2017/05/01}{\cs{@outputbox}$B$r:n$k$H$-$N(B +% \texttt{to \cs{@fixht}}$B$N9b$5;XDj$r$d$a$?(B} +% \changes{v2.8}{2017/05/01}{\cs{vss}$B$N0LCV$r0\F0(B} +% \changes{v2.8}{2017/05/01}{$B1&%+%i%`MQ$N=hM}$r4]$4$HDI2C(B} +% \changes{v2.8}{2017/05/01}{$B1&%+%i%`$G$O(B\cs{@rightfixht}$B$N9b$5$G(B +% $BAH$_N)$F!"(B\cs{@colht}$B$b99?7$9$k$h$&$K$7$?(B} % \fi % % \iffalse @@ -35,7 +42,7 @@ \ProvidesFile{nidanfloat.dtx} %</driver> %<core>\ProvidesPackage{nidanfloat}% - [2005/12/09 v2.7 Put double-floats at top/bottom within twocolumn mode] + [2017/05/01 v2.8 Put double-floats at top/bottom within twocolumn mode] % %<*driver> \documentclass{jltxdoc} @@ -431,7 +438,7 @@ \global\advance\@colroom-\dp\z@ \fi % \end{macrocode} -% $B:G8e$K!"(B|@inert|$B%U%i%0$r??$K$9$k!#(B +% $B:G8e$K!"(B|@insert|$B%U%i%0$r??$K$9$k!#(B % \begin{macrocode} \@inserttrue \fi @@ -685,9 +692,18 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\@rightfixht} +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B +% |\@rightfixht|$B$O!"1&%+%i%`$N9b$5$r3JG<$9$k$N$KMQ$$$k!#(B +% \changes{v2.8}{2017/05/01}{\cs{@rightfixht}$B$rDI2C(B} +% \begin{macrocode} +\global\newdimen\@rightfixht +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@combinefloats} % \changes{v2.4}{2001/07/23}{\cs{boxmaxdepth}$B$r(B\cs{maxdepth}$B$K$7$J$$$h$&$K$7$?(B} -% |@combinefloats|$B$O!"%+%i%`C10L$G!"%F%-%9%H$H%U%m!<%H$r%^!<%8$9$k!#(B +% |\@combinefloats|$B$O!"%+%i%`C10L$G!"%F%-%9%H$H%U%m!<%H$r%^!<%8$9$k!#(B % $B$3$N%^%/%m$O1&%+%i%`$N$H$-$K<B9T$9$k!#(B % \begin{macrocode} \def\@combinefloats{% @@ -725,15 +741,17 @@ % $B$^$?!"%\%C%/%9#0$NFbMF$r:8%+%i%`$KLa$9!#(B % \changes{v2.4}{2001/02/19}{$B9T4V$,B7$o$J$$ItJ,$r=$@5(B} % \changes{v2.4}{2001/02/19}{$BCl$,=P$J$$$N$r=$@5(B} +% \changes{v2.8}{2017/05/01}{\cs{@outputbox}$B$r:n$k$H$-$N(B +% \texttt{to \cs{@fixht}}$B$N9b$5;XDj$r$d$a$?(B} % \begin{macrocode} \advance\@fixht-\maxdepth \@tempdima\baselineskip \advance\@tempdima-\topskip - \setbox\@outputbox=\vbox to\@fixht{% + \setbox\@outputbox=\vbox{% \ifvoid\@leftcolumn \else \unvbox\@leftcolumn\vskip\@tempdima \fi\relax - \unvbox\@outputbox\vss}% + \unvbox\@outputbox}% \vss moved from here % \end{macrocode} % \changes{v2.5}{2001/09/14}{\cs{vsplit}$B;~!"(Binfinite$B%(%i!<$K$J$k$N$r=$@5(B} % |\@leftcolumn|$B$r:n@.$9$k$H$-$KMQ$$$F$$$?(B|\vss|$B$,(B @@ -741,14 +759,45 @@ % ! Infinite glue shrinkage found in box being split. %\end{verbatim} % $B$N%(%i!<$r5/$3$9$3$H$,$"$k$N$G:o=|$7$?!#(B +% +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$k=$@5(B}$B!'(B +% $B$3$N>l=j$N$9$0>e$K$"$k%3!<%I$N(B|\unvbox\@outputbox|$B$ND>8e$K$"$C$?(B|vss|$B$r(B +% $B$3$A$i$K;}$C$F$-$^$7$?!#(B +% \changes{v2.8}{2017/05/01}{\cs{vss}$B$N0LCV$r0\F0(B} % \begin{macrocode} - \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@}% + \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@\vss}% to here (2017/05/01) \fi % \end{macrocode} -% $B:81&!"$=$l$>$l%F%-%9%H$H%+%i%`I}%U%m!<%H$rAH$_N)$F$k!#(B +% $B:8%+%i%`$N%F%-%9%H%5%$%:$K:8%+%i%`$KF~$k%U%m!<%H$N9b$5$r2C$($k$3$H$G!"(B +% $B:8%+%i%`$N9b$5$r(B|\@fixht|$B$K3JG<$7$^$9!#(B % \begin{macrocode} \@fixht\ht\@leftcolumn \advance\@fixht\dp\@leftcolumn \advance\@fixht\@floatht +% \end{macrocode} +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B +% $B1&%+%i%`$K$D$$$F$bF1MM$K=hM}$7$^$9!#$3$l$G!"8E$/$+$i$"$C$?(B +% $B1&%+%i%`$H%U%m!<%H$,=E$J$k%P%0$r2r>C$7$^$7$?!#(B +% \changes{v2.8}{2017/05/01}{$B1&%+%i%`MQ$N=hM}$r4]$4$HDI2C(B} +% \begin{macrocode} + \@rightfixht\ht\@outputbox \advance\@rightfixht\dp\@outputbox + \@chkdblfloatht \@tempdima\@floatht + \R@chkfloatht \advance\@tempdima\@floatht + \advance\@rightfixht\@tempdima + \ifdim\@rightfixht>\textheight + \@rightfixht\textheight + \advance\@rightfixht-\@tempdima + \advance\@rightfixht\maxdepth + \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth + \setbox\z@=\vsplit\@outputbox to\@rightfixht + \advance\@rightfixht-\maxdepth + \unvbox\@outputbox + \setbox\@outputbox=\vbox to\@rightfixht{\unvbox\z@\vss}% + \fi + \@rightfixht\ht\@outputbox + \advance\@rightfixht\dp\@outputbox \advance\@rightfixht\@floatht +% \end{macrocode} +% $B:81&!"$=$l$>$l%F%-%9%H$H%+%i%`I}%U%m!<%H$rAH$_N)$F$k!#(B +% \begin{macrocode} \ifx\L@toplist\@empty\else\L@cflt\fi \ifx\L@botlist\@empty\else\L@cflb\fi \ifx\R@toplist\@empty\else\R@cflt\fi @@ -770,7 +819,13 @@ % \begin{macro}{\R@cflt} % \begin{macro}{\R@cflb} % $B:8%+%i%`$H1&%+%i%`$rAH$_N)$F$k$N$KMQ$$$k!#(B +% +% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kDI2C(B}$B!'(B +% $B:8%+%i%`$G$O(B|\@fixht|$B!"1&%+%i%`$G$O(B|\@rightfixht|$B$N9b$5$K$J$k$h$&$K(B +% $B$7$^$9!#$^$?!"(B|\@colht|$B$r$3$l$i$N9b$5$K99?7$7$^$9!#(B % \changes{v2.3}{2000/12/20}{\cs{gdef}$B$r(B\cs{global}\cs{let}$B$KJQ99(B} +% \changes{v2.8}{2017/05/01}{$B1&%+%i%`$G$O(B\cs{@rightfixht}$B$N9b$5$G(B +% $BAH$_N)$F!"(B\cs{@colht}$B$b99?7$9$k$h$&$K$7$?(B} % \begin{macrocode} \def\L@cflt{% \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@toplist @@ -780,6 +835,7 @@ \vss}% \let\@elt\relax \xdef\@freelist{\@freelist\L@toplist}\global\let\L@toplist\@empty + \@colht\@fixht } \def\L@cflb{% \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@botlist @@ -789,24 +845,27 @@ \vss}% \let\@elt\relax \xdef\@freelist{\@freelist\L@botlist}\global\let\L@botlist\@empty + \@colht\@fixht } \def\R@cflt{% \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@toplist - \setbox\@outputbox\vbox to\@fixht{\boxmaxdepth\maxdepth + \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth \unvbox\@tempboxa \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@outputbox \vss}% \let\@elt\relax \xdef\@freelist{\@freelist\R@toplist}\global\let\R@toplist\@empty + \@colht\@rightfixht } \def\R@cflb{% \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@botlist - \setbox\@outputbox\vbox to\@fixht{\boxmaxdepth\maxdepth + \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth \unvbox\@outputbox \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep \vss}% \let\@elt\relax \xdef\@freelist{\@freelist\R@botlist}\global\let\R@botlist\@empty + \@colht\@rightfixht } % \end{macrocode} % \end{macro} |