texlive[54157] Master/texmf-dist: adjmulticol (7mar20)
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 7 22:39:54 CET 2020
Revision: 54157
http://tug.org/svn/texlive?view=revision&revision=54157
Author: karl
Date: 2020-03-07 22:39:53 +0100 (Sat, 07 Mar 2020)
Log Message:
-----------
adjmulticol (7mar20)
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/source/latex/adjmulticol/adjmulticol.ins
trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
Added Paths:
-----------
trunk/Master/texmf-dist/source/latex/adjmulticol/Makefile
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/adjmulticol/Makefile
Deleted: trunk/Master/texmf-dist/doc/latex/adjmulticol/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/adjmulticol/Makefile 2020-03-07 21:39:40 UTC (rev 54156)
+++ trunk/Master/texmf-dist/doc/latex/adjmulticol/Makefile 2020-03-07 21:39:53 UTC (rev 54157)
@@ -1,63 +0,0 @@
-#
-# Makefile for adjmulticol package
-#
-# This file is in public domain
-#
-# $Id: Makefile,v 2.3 2011-02-22 22:46:46 boris Exp $
-#
-
-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
- tar -czvf $(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude CVS .
-
-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
Modified: trunk/Master/texmf-dist/doc/latex/adjmulticol/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/adjmulticol/README 2020-03-07 21:39:40 UTC (rev 54156)
+++ trunk/Master/texmf-dist/doc/latex/adjmulticol/README 2020-03-07 21:39:53 UTC (rev 54157)
@@ -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 @@
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
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)
Added: trunk/Master/texmf-dist/source/latex/adjmulticol/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/latex/adjmulticol/Makefile (rev 0)
+++ trunk/Master/texmf-dist/source/latex/adjmulticol/Makefile 2020-03-07 21:39:53 UTC (rev 54157)
@@ -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/*'
Property changes on: trunk/Master/texmf-dist/source/latex/adjmulticol/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx 2020-03-07 21:39:40 UTC (rev 54156)
+++ trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx 2020-03-07 21:39:53 UTC (rev 54157)
@@ -1,7 +1,6 @@
% \iffalse
-% $Id: adjmulticol.dtx,v 2.12 2013-01-23 18:10:07 boris Exp $
%
-%% Copyright 2011, Boris Veytsman <borisv at lk.net>
+%% Copyright 2020, 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
@@ -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 at checkend\@checkend
+ \gdef\@checkend##1{}%
+ \endmulticols
+ \global\let\@checkend\@ADJMC at checkend}
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.ins 2020-03-07 21:39:40 UTC (rev 54156)
+++ trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.ins 2020-03-07 21:39:53 UTC (rev 54157)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty 2020-03-07 21:39:40 UTC (rev 54156)
+++ trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty 2020-03-07 21:39:53 UTC (rev 54157)
@@ -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 at lk.net>
+%% Copyright 2020, 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}
-[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 at collectmore\baselineskip}
\def\endadjmulticols{%
- \def\@currenvir{multicols}%
- \endmulticols}
+ \global\let\@ADJMC at checkend\@checkend
+ \gdef\@checkend##1{}%
+ \endmulticols
+ \global\let\@checkend\@ADJMC at checkend}
\let\adjmc at page@sofar at orig=\page at sofar
\def\adjmc at page@sofar{%
\ifnum\col at number=\@ne
More information about the tex-live-commits
mailing list.