texlive[62935] Master/texmf-dist: adjmulticol (28mar22)
commits+karl at tug.org
commits+karl at tug.org
Wed Apr 6 00:06:33 CEST 2022
Revision: 62935
http://tug.org/svn/texlive?view=revision&revision=62935
Author: karl
Date: 2022-04-06 00:06:33 +0200 (Wed, 06 Apr 2022)
Log Message:
-----------
adjmulticol (28mar22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/adjmulticol/README
trunk/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
trunk/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
Modified: trunk/Master/texmf-dist/doc/latex/adjmulticol/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/adjmulticol/README 2022-04-05 22:05:48 UTC (rev 62934)
+++ trunk/Master/texmf-dist/doc/latex/adjmulticol/README 2022-04-05 22:06:33 UTC (rev 62935)
@@ -11,4 +11,6 @@
v1.1 Changed calculations for unicolumn layout
which might previously lead to loss of text
- v1.2 Bug fix: now adjmulticols works inside a box too.
\ No newline at end of file
+ v1.2 Bug fix: now adjmulticols works inside a box too.
+
+ v1.3 Big fix: disappearing material in one column output
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx 2022-04-05 22:05:48 UTC (rev 62934)
+++ trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx 2022-04-05 22:06:33 UTC (rev 62935)
@@ -1,6 +1,6 @@
% \iffalse
%
-%% Copyright 2020, Boris Veytsman <borisv at lk.net>
+%% Copyright 2022, Boris Veytsman <borisv at lk.net>
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3 of this license or (at your option) any
@@ -87,7 +87,7 @@
%%
%<*gobble>
% \fi
-% \CheckSum{184}
+% \CheckSum{0}
%
%
%% \CharacterTable
@@ -126,7 +126,7 @@
% \GetFileInfo{adjmulticol.sty}
%
% \title{Adjusting Margins for Multicolumn and Unicolumn
-% Output\thanks{\copyright Boris Veytsman, 2020} \thanks{Note: This
+% Output\thanks{\copyright Boris Veytsman, 2022} \thanks{Note: This
% package is released under terms which affect its use in commercial
% applications. Please see the details at the top of the source file}}
% \author{Boris Veytsman}
@@ -308,7 +308,7 @@
%</gobble>
%<style>\ProvidesPackage{adjmulticol}
%<*style>
-[2020/03/06 v1.2 Adjusted margins for multicolumn layout]
+[2022/03/27 v1.3 Adjusted margins for multicolumn layout]
% \end{macrocode}
%
%
@@ -363,6 +363,7 @@
%\label{sec:start}
%
% \begin{macro}{\adjmulticols}
+% \changes{v1.3}{2022/03/27}{Do not try to balance one-column version}
% We have three mandatory arguments instead of one for |multicols|:
% the number of columns, the left margin delta and the right margin
% delta:
@@ -390,6 +391,10 @@
\MessageBreak
I therefore use 10 columns instead}%
\col at number10 \fi
+ \ifnum\col at number=\@ne\relax
+ \let\balance at columns@out
+ \multi at column@out
+ \fi
% \end{macrocode}
%
%
@@ -466,6 +471,7 @@
%
% \begin{macro}{\endadjmulticols}
% \changes{v1.2}{2020/03/06}{Redefined macro}
+% \changes{v1.3}{2022/03/27}{Added \cs{vfill} for one-column environment}
% Here we use the standard environment end. Note that it uses
% |\@checkend|, so we need to redefine it to fool the
% check. We need to do it globally to work inside a box too.
@@ -473,6 +479,7 @@
\def\endadjmulticols{%
\global\let\@ADJMC at checkend\@checkend
\gdef\@checkend##1{}%
+ \ifnum\col at number=\@ne\relax\vfill\fi
\endmulticols
\global\let\@checkend\@ADJMC at checkend}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty 2022-04-05 22:05:48 UTC (rev 62934)
+++ trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty 2022-04-05 22:06:33 UTC (rev 62935)
@@ -20,7 +20,7 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% Copyright 2020, Boris Veytsman <borisv at lk.net>
+%% Copyright 2022, Boris Veytsman <borisv at lk.net>
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3 of this license or (at your option) any
@@ -107,7 +107,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{adjmulticol}
-[2020/03/06 v1.2 Adjusted margins for multicolumn layout]
+[2022/03/27 v1.3 Adjusted margins for multicolumn layout]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{multicol}}
\ProcessOptions\relax
\RequirePackage{multicol}
@@ -133,6 +133,10 @@
\MessageBreak
I therefore use 10 columns instead}%
\col at number10 \fi
+ \ifnum\col at number=\@ne\relax
+ \let\balance at columns@out
+ \multi at column@out
+ \fi
\ifx\@footnotetext\mult at footnotetext\else
\let\orig at footnotetext\@footnotetext
\let\@footnotetext\mult at footnotetext
@@ -163,6 +167,7 @@
\def\endadjmulticols{%
\global\let\@ADJMC at checkend\@checkend
\gdef\@checkend##1{}%
+ \ifnum\col at number=\@ne\relax\vfill\fi
\endmulticols
\global\let\@checkend\@ADJMC at checkend}
\let\adjmc at page@sofar at orig=\page at sofar
More information about the tex-live-commits
mailing list.