adjmulticol (7mar20)

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

7 files changed, 22 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/adjmulticol/README b/Master/texmf-dist/doc/latex/adjmulticol/README
index dc6820bf030..62d899f95b6 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/README
+++ b/Master/texmf-dist/doc/latex/adjmulticol/README
@@ -1,5 +1,4 @@
        Adjusting Margins for Multicolumn and Unicolumn Output
-			     Version 1.1
 
 This package provides an extension of the multicol package with the
 option to change the margins for multicolumn and unicolumn layout.
@@ -12,3 +11,4 @@ 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
diff --git a/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf b/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
index 0b7277dfff6..d2709950d5e 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 b8ef62610a5..a55f9bf1c21 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/doc/latex/adjmulticol/Makefile b/Master/texmf-dist/source/latex/adjmulticol/Makefile
index 2be57354582..471ef1d5db3 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/Makefile
+++ b/Master/texmf-dist/source/latex/adjmulticol/Makefile
@@ -3,7 +3,7 @@
 #
 # This file is in public domain
 #
-# $Id: Makefile,v 2.3 2011-02-22 22:46:46 boris Exp $
+# $Id$
 #
 
 PACKAGE=adjmulticol
@@ -55,9 +55,9 @@ distclean: veryclean
 # Archive for the distribution. Includes typeset documentation
 #
 archive:  all clean
-	tar -czvf $(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude CVS .
+	COPYFILE_DISABLE=1 tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip'  --exclude CVS --exclude '.git*' $(PACKAGE); mv ../$(PACKAGE).tgz .
 
 zip:  all clean
 	${MAKE} $(PACKAGE).sty
 	$(RM) *.log
-	zip -r  $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x "*.ins" -x CVS -x 'CVS/*'
\ No newline at end of file
+	zip -r  $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x "*.ins" -x CVS -x 'CVS/*'
diff --git a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
index 90881468efe..12c5e4ca73d 100644
--- a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
+++ b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
@@ -1,7 +1,6 @@
 % \iffalse
-% $Id: adjmulticol.dtx,v 2.12 2013-01-23 18:10:07 boris Exp $
 %
-%% Copyright 2011, Boris Veytsman <borisv@lk.net>
+%% Copyright 2020, 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 
@@ -88,7 +87,7 @@
 %%
 %<*gobble> 
 % \fi
-% \CheckSum{176}
+% \CheckSum{184}
 %
 %
 %% \CharacterTable
@@ -127,7 +126,7 @@
 % \GetFileInfo{adjmulticol.sty}
 % 
 % \title{Adjusting Margins for Multicolumn and Unicolumn
-% Output\thanks{\copyright Boris Veytsman, 2011} \thanks{Note: This
+% Output\thanks{\copyright Boris Veytsman, 2020} \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}
@@ -309,7 +308,7 @@
 %</gobble>
 %<style>\ProvidesPackage{adjmulticol}
 %<*style>
-[2012/01/20 v1.1 Adjusted margins for multicolumn layout]
+[2020/03/06 v1.2 Adjusted margins for multicolumn layout]
 %    \end{macrocode}
 %
 %
@@ -466,13 +465,16 @@
 %\label{sec:end}
 %
 % \begin{macro}{\endadjmulticols}
+% \changes{v1.2}{2020/03/06}{Redefined macro}
 %   Here we use the standard environment end.  Note that it uses
-%   |\@checkend|, so we need to redefine |\@currenvir| to fool the
-%   check. 
+%   |\@checkend|, so we need to redefine it to fool the
+%   check.  We need to do it globally to work inside a box too.  
 %    \begin{macrocode}
 \def\endadjmulticols{%
-  \def\@currenvir{multicols}%
-  \endmulticols}
+  \global\let\@ADJMC@checkend\@checkend
+  \gdef\@checkend##1{}%
+  \endmulticols
+  \global\let\@checkend\@ADJMC@checkend}
 %    \end{macrocode}   
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.ins b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.ins
index 21ee6cc73b4..cc89efce684 100644
--- a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.ins
+++ b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.ins
@@ -1,7 +1,7 @@
 %
 % Doctrip file for seqsplit
 % This file is in public domain
-% $Id: adjmulticol.ins,v 2.0 2011-02-22 16:38:54 boris Exp $
+% $Id$
 %
 \def\batchfile{adjmulticol.ins}
 \input docstrip
diff --git a/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty b/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
index 8f984067d61..7b9ee5bbefb 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 2011, Boris Veytsman <borisv@lk.net>
+%% Copyright 2020, 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}
-[2012/01/20 v1.1 Adjusted margins for multicolumn layout]
+[2020/03/06 v1.2 Adjusted margins for multicolumn layout]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{multicol}}
 \ProcessOptions\relax
 \RequirePackage{multicol}
@@ -161,8 +161,10 @@
     #1\advance\vsize
         \c@collectmore\baselineskip}
 \def\endadjmulticols{%
-  \def\@currenvir{multicols}%
-  \endmulticols}
+  \global\let\@ADJMC@checkend\@checkend
+  \gdef\@checkend##1{}%
+  \endmulticols
+  \global\let\@checkend\@ADJMC@checkend}
 \let\adjmc@page@sofar@orig=\page@sofar
 \def\adjmc@page@sofar{%
   \ifnum\col@number=\@ne