diff options
author | Karl Berry <karl@freefriends.org> | 2017-05-05 22:46:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-05-05 22:46:01 +0000 |
commit | aa9f58cd7bdffb2529e82e736476df8a7acaa70e (patch) | |
tree | 06ec5c8fe1bfee3f78c0f6c9bab26c25968c85a2 /Master/texmf-dist/tex/latex/platex-tools/pxftnright.sty | |
parent | 4ca61c73d74fbd1cbad127bc6048b53c32520b2b (diff) |
platex-tools (5may17)
git-svn-id: svn://tug.org/texlive/trunk@44208 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/platex-tools/pxftnright.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/platex-tools/pxftnright.sty | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxftnright.sty b/Master/texmf-dist/tex/latex/platex-tools/pxftnright.sty index f16fa403624..2b5d4382b41 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxftnright.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxftnright.sty @@ -16,13 +16,14 @@ % * \@makefntext is redefined % (incompatible with some pLaTeX classes) % * \footnotesep is not suitable for vertical typesetting -% (rather a problem of \strutbox in pLaTeX2e kernel?) +% when used with pLaTeX 2016/11/29 or earlier +% (rather a problem of \strutbox in pLaTeX2e kernel) % so, this package provides patches. % \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxftnright} - [2016/09/07 v1.0 footnote layout package for pLaTeX] + [2017/02/28 v1.1 footnote layout package for pLaTeX] %% save \@makefntext definition from pLaTeX class \@ifpackageloaded{ftnright}{% @@ -36,7 +37,7 @@ \RequirePackage{ftnright} %% patches for ftnright to work fine with pLaTeX -%% This code is based on pLaTeX2e 2016/09/03 community ed. +%% This code is based on pLaTeX2e 2017/04/08 community ed. \def\@startcolumn{% \ifx\@deferlist\@empty @@ -91,34 +92,41 @@ formatted page.}% \fi \fi +%%%%% change for pLaTeX (bottom float first) \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty \@combinefloats + \let\pltx@textbottom\@textbottom %%% pLaTeX + \if@firstcolumn\else + \ifvoid\footins\else + \setbox\@outputbox \vbox {% + \boxmaxdepth \@maxdepth + \unvbox \@outputbox + \@textbottom %%% pLaTeX + \vskip \skip\footins + \color@begingroup + \normalcolor + \footnoterule + \unvbox \footins + \color@endgroup + }% + \let\@textbottom\relax %%% pLaTeX + \fi + \fi +%%%%% \ifvbox\@kludgeins \@makespecialcolbox \else -%%%%% change for pLaTeX (import from \@makecol in plcore) - \setbox\@outputbox \vbox to\@colht {% - \boxmaxdepth\maxdepth - \@texttop - \dimen@ \dp\@outputbox - \unvbox \@outputbox - \iftdir\vbox{\hskip\z@}\fi - \vskip -\dimen@ - \@textbottom - \if@firstcolumn\else - \ifvoid\footins\else % for pLaTeX - \vskip \skip\footins - \color@begingroup - \normalcolor - \footnoterule - \unvbox \footins - \color@endgroup - \fi - \fi - }% -%%%%% + \setbox\@outputbox\vbox to\@colht + {\boxmaxdepth\maxdepth + \@texttop + \dimen@ \dp\@outputbox + \unvbox \@outputbox + \iftdir\vbox{\hskip\z@}\fi %%% pLaTeX + \vskip -\dimen@ + \@textbottom}% \fi + \let\@textbottom\pltx@textbottom %%% pLaTeX \global\maxdepth\@maxdepth } |