adjmulticol (28mar22)

git-svn-id: svn://tug.org/texlive/trunk@62935 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 21 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/adjmulticol/README b/Master/texmf-dist/doc/latex/adjmulticol/README
index 62d899f95b6..c3c9fcbe51b 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/README
+++ b/Master/texmf-dist/doc/latex/adjmulticol/README
@@ -11,4 +11,6 @@ Changes:
    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
diff --git a/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf b/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
index d2709950d5e..05999ddfdc4 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
+++ b/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
diff --git a/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf b/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
index a55f9bf1c21..af96fd4aa2a 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
+++ b/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
diff --git a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
index 12c5e4ca73d..9ce7012f039 100644
--- a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
+++ b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %
-%% Copyright 2020, Boris Veytsman <borisv@lk.net>
+%% Copyright 2022, Boris Veytsman <borisv@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@number10 \fi
+     \ifnum\col@number=\@ne\relax
+     \let\balance@columns@out
+         \multi@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@checkend\@checkend
   \gdef\@checkend##1{}%
+  \ifnum\col@number=\@ne\relax\vfill\fi
   \endmulticols
   \global\let\@checkend\@ADJMC@checkend}
 %    \end{macrocode}   
diff --git a/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty b/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
index 7b9ee5bbefb..4f1ca459598 100644
--- a/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
+++ b/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
@@ -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@lk.net>
+%% Copyright 2022, Boris Veytsman <borisv@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@number10 \fi
+     \ifnum\col@number=\@ne\relax
+     \let\balance@columns@out
+         \multi@column@out
+     \fi
      \ifx\@footnotetext\mult@footnotetext\else
        \let\orig@footnotetext\@footnotetext
        \let\@footnotetext\mult@footnotetext
@@ -163,6 +167,7 @@
 \def\endadjmulticols{%
   \global\let\@ADJMC@checkend\@checkend
   \gdef\@checkend##1{}%
+  \ifnum\col@number=\@ne\relax\vfill\fi
   \endmulticols
   \global\let\@checkend\@ADJMC@checkend}
 \let\adjmc@page@sofar@orig=\page@sofar