From 00717441b34ded06d449a36c65eb37c2450cca72 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 7 May 2020 21:25:56 +0000 Subject: marginfix (7may20) git-svn-id: svn://tug.org/texlive/trunk@55058 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/marginfix/marginfix.sty | 24 +++++----------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/marginfix') diff --git a/Master/texmf-dist/tex/latex/marginfix/marginfix.sty b/Master/texmf-dist/tex/latex/marginfix/marginfix.sty index 67cca5e511d..7accc5a907d 100644 --- a/Master/texmf-dist/tex/latex/marginfix/marginfix.sty +++ b/Master/texmf-dist/tex/latex/marginfix/marginfix.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{marginfix}% - [2013/09/08 v1.1 Fix Margin Paragraphs] + [2020/05/06 v1.2 Fix Margin Paragraphs] \makeatletter \newif\ifmfx@ypos \DeclareOption{ypos}{\mfx@ypostrue} @@ -101,25 +101,12 @@ \global\Mfx@marginheight\z@ } \def\MFX@attachmargin{% - %\showbox\@outputbox - %\showbox\Mfx@marginbox \setbox\Mfx@marginbox\vtop{% \vskip\z@\unvbox\Mfx@marginbox}% - %% \ifdim\ht\@outputbox<\ht\Mfx@marginbox - %% \setbox\Mfx@marginbox\vbox to \ht\@outputbox{% - %% \unvbox\Mfx@marginbox - %% \vskip\z@ shrink 1filll\relax - %% }% - %% \else - %% \setbox\Mfx@marginbox\vbox to \ht\@outputbox{% - %% \unvbox\Mfx@marginbox - %% \vfill - %% }% - %% \fi - \setbox\@outputbox\vbox{% to \ht\@outputbox{% + \setbox\@outputbox\vbox{% \begingroup - \setbox\@tempboxa\vbox{% to \ht\@outputbox{% - \hbox{% to \wd\@outputbox{% + \setbox\@tempboxa\vbox{% + \hbox{% \if\MFX@leftmargin \llap{\box\Mfx@marginbox\hskip\marginparsep}% \else @@ -134,7 +121,6 @@ \unskip \unvbox\@outputbox }% - %\showbox\@outputbox } \def\MFX@buildmargin{% \advance\Mfx@marginheight\@colroom @@ -296,7 +282,7 @@ \let\@elt\MFX@buildmargin@piece \MFX@run@clear\mfx@marginpieces \let\@elt\relax - \Mfx@piece@count\z@ + \global\Mfx@piece@count\z@ } \def\MFX@buildmargin@piece#1#2{% \ifdim\ht\Mfx@marginbox<#1\relax -- cgit v1.2.3