adjmulticol (7mar20)

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

3 files changed, 75 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/adjmulticol/Makefile b/Master/texmf-dist/source/latex/adjmulticol/Makefile
new file mode 100644
index 00000000000..471ef1d5db3
--- /dev/null
+++ b/Master/texmf-dist/source/latex/adjmulticol/Makefile
@@ -0,0 +1,63 @@
+#
+# Makefile for adjmulticol package
+#
+# This file is in public domain
+#
+# $Id$
+#
+
+PACKAGE=adjmulticol
+SAMPLES = sample.tex
+
+all:  $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf} 
+
+
+%.pdf:  %.dtx   $(PACKAGE).sty
+	pdflatex $<
+	- bibtex $*
+	pdflatex $<
+	- makeindex -s gind.ist -o $*.ind $*.idx
+	- makeindex -s gglo.ist -o $*.gls $*.glo
+	pdflatex $<
+	while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
+	do pdflatex $<; done
+
+
+%.pdf:  %.tex   $(PACKAGE).sty
+	pdflatex $<
+	- bibtex $*
+	pdflatex $<
+	while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
+	do pdflatex $<; done
+
+
+%.sty:   %.ins %.dtx  
+	pdflatex $<
+
+
+
+.PRECIOUS:  $(PACKAGE).cfg $(PACKAGE).sty
+
+
+clean:
+	$(RM)  $(PACKAGE).sty *.log *.aux \
+	*.cfg *.glo *.idx *.toc \
+	*.ilg *.ind *.out *.lof \
+	*.lot *.bbl *.blg *.gls \
+	*.dvi *.ps *.tgz *.zip
+
+veryclean: clean
+	$(RM) *.pdf
+
+distclean: veryclean
+
+#
+# Archive for the distribution. Includes typeset documentation
+#
+archive:  all clean
+	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/*'
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