texlive[48281] Master/texmf-dist: marginfit (26jul18)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 26 23:45:01 CEST 2018
Revision: 48281
http://tug.org/svn/texlive?view=revision&revision=48281
Author: karl
Date: 2018-07-26 23:45:01 +0200 (Thu, 26 Jul 2018)
Log Message:
-----------
marginfit (26jul18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/marginfit/README
trunk/Master/texmf-dist/doc/latex/marginfit/marginfit.pdf
trunk/Master/texmf-dist/source/latex/marginfit/marginfit.dtx
trunk/Master/texmf-dist/source/latex/marginfit/marginfit.ins
trunk/Master/texmf-dist/tex/latex/marginfit/marginfit.sty
Modified: trunk/Master/texmf-dist/doc/latex/marginfit/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/marginfit/README 2018-07-26 21:44:37 UTC (rev 48280)
+++ trunk/Master/texmf-dist/doc/latex/marginfit/README 2018-07-26 21:45:01 UTC (rev 48281)
@@ -7,7 +7,7 @@
the wrong side as well as those that stick out of the bottom of the page. This
package provides a drop-in replacement solution.
-Copyright 2017 Maurice Leclaire <leclaire at in.tum.de>
+Copyright 2017, 2018 Maurice Leclaire <leclaire at in.tum.de>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
Modified: trunk/Master/texmf-dist/doc/latex/marginfit/marginfit.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/marginfit/marginfit.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/marginfit/marginfit.dtx 2018-07-26 21:44:37 UTC (rev 48280)
+++ trunk/Master/texmf-dist/source/latex/marginfit/marginfit.dtx 2018-07-26 21:45:01 UTC (rev 48281)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 2017 Maurice Leclaire <leclaire at in.tum.de>
+% Copyright 2017, 2018 Maurice Leclaire <leclaire at in.tum.de>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -21,7 +21,7 @@
%
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{marginfit}[2017/07/07 v1.0 Fit Margin Paragraphs]
+%<package>\ProvidesPackage{marginfit}[2018/06/08 v1.1 Fit Margin Paragraphs]
%
%<*driver>
\documentclass{ltxdoc}
@@ -516,13 +516,19 @@
%
% \begin{macro}{\@makecol}
% We redefine \verb|\@makecol| and add the procedure to append a margin to the
-% current column. First, the original \verb|\@makecol| is executed. If we have
-% margin material, we decide on which side the margin column will be and add it
-% to that side.
+% current column. First, the original \verb|\@makecol| is executed. Then, the
+% width of \verb|\@outputbox| is set to \verb|\columnwidth| (added in v1.1).
+% \changes{v1.1}{2018/06/07}{Fix width of \texttt{\symbol{`\\}@outputbox}}
+% This is necessary as a \verb|\parshape| that overflows on the right will
+% enlarge \verb|\@outputbox|. If we have margin material, we decide on which
+% side the margin column will be and add it to that side. A check for onesided
+% documents was added in v1.1.
+% \changes{v1.1}{2018/06/08}{Margin placement in onesided documents}
% \begin{macrocode}
\let\marginfit at makecol\@makecol
\def\@makecol{%
\marginfit at makecol%
+ \wd\@outputbox\columnwidth%
\ifvoid\marginfit at insert\else%
\setbox\@outputbox\vbox to\@colht {%
\hbox to\columnwidth {%
@@ -533,10 +539,14 @@
\marginfit at rightmargin%
\fi%
\else%
- \ifodd\c at page%
+ \if at twoside%
+ \ifodd\c at page%
+ \marginfit at rightmargin%
+ \else%
+ \marginfit at leftmargin%
+ \fi%
+ \else%
\marginfit at rightmargin%
- \else%
- \marginfit at leftmargin%
\fi%
\fi%
}%
Modified: trunk/Master/texmf-dist/source/latex/marginfit/marginfit.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/marginfit/marginfit.ins 2018-07-26 21:44:37 UTC (rev 48280)
+++ trunk/Master/texmf-dist/source/latex/marginfit/marginfit.ins 2018-07-26 21:45:01 UTC (rev 48281)
@@ -3,7 +3,7 @@
\usedir{tex/latex/marginfit}
\preamble
-Copyright 2017 Maurice Leclaire <leclaire at in.tum.de>
+Copyright 2017, 2018 Maurice Leclaire <leclaire at in.tum.de>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
Modified: trunk/Master/texmf-dist/tex/latex/marginfit/marginfit.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marginfit/marginfit.sty 2018-07-26 21:44:37 UTC (rev 48280)
+++ trunk/Master/texmf-dist/tex/latex/marginfit/marginfit.sty 2018-07-26 21:45:01 UTC (rev 48281)
@@ -6,7 +6,7 @@
%%
%% marginfit.dtx (with options: `package')
%%
-%% Copyright 2017 Maurice Leclaire <leclaire at in.tum.de>
+%% Copyright 2017, 2018 Maurice Leclaire <leclaire at in.tum.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -24,7 +24,7 @@
%% and the derived file marginfit.sty.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{marginfit}[2017/07/07 v1.0 Fit Margin Paragraphs]
+\ProvidesPackage{marginfit}[2018/06/08 v1.1 Fit Margin Paragraphs]
\newinsert\marginfit at insert
\count\marginfit at insert0
\skip\marginfit at insert\z@
@@ -120,6 +120,7 @@
\let\marginfit at makecol\@makecol
\def\@makecol{%
\marginfit at makecol%
+ \wd\@outputbox\columnwidth%
\ifvoid\marginfit at insert\else%
\setbox\@outputbox\vbox to\@colht {%
\hbox to\columnwidth {%
@@ -130,10 +131,14 @@
\marginfit at rightmargin%
\fi%
\else%
- \ifodd\c at page%
+ \if at twoside%
+ \ifodd\c at page%
+ \marginfit at rightmargin%
+ \else%
+ \marginfit at leftmargin%
+ \fi%
+ \else%
\marginfit at rightmargin%
- \else%
- \marginfit at leftmargin%
\fi%
\fi%
}%
More information about the tex-live-commits
mailing list