summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/marginfix
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-07 21:25:56 +0000
committerKarl Berry <karl@freefriends.org>2020-05-07 21:25:56 +0000
commit00717441b34ded06d449a36c65eb37c2450cca72 (patch)
tree1d64849a0a9b96eaf30cdd01f450d72541830457 /Master/texmf-dist/tex/latex/marginfix
parent1a52ee4251e2b2e1f1669a14319a600e0c5f24c9 (diff)
marginfix (7may20)
git-svn-id: svn://tug.org/texlive/trunk@55058 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/marginfix')
-rw-r--r--Master/texmf-dist/tex/latex/marginfix/marginfix.sty24
1 files changed, 5 insertions, 19 deletions
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{%
- %<debug>\showbox\@outputbox
- %<debug>\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
}%
- %<debug>\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