summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/adjmulticol
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-07 03:00:57 +0000
committerNorbert Preining <norbert@preining.info>2020-03-07 03:00:57 +0000
commit8012fbf3193a5d1699496b198c3bd448973557bd (patch)
treeae7b8f657130de7157724405a57edb37485e9e6c /macros/latex/contrib/adjmulticol
parent6749f197f068ccc7a12ea95ee2bbfca4942c1b13 (diff)
CTAN sync 202003070300
Diffstat (limited to 'macros/latex/contrib/adjmulticol')
-rw-r--r--macros/latex/contrib/adjmulticol/Makefile6
-rw-r--r--macros/latex/contrib/adjmulticol/README2
-rw-r--r--macros/latex/contrib/adjmulticol/adjmulticol.dtx20
-rw-r--r--macros/latex/contrib/adjmulticol/adjmulticol.ins2
-rw-r--r--macros/latex/contrib/adjmulticol/adjmulticol.pdfbin252666 -> 248294 bytes
-rw-r--r--macros/latex/contrib/adjmulticol/sample.pdfbin51293 -> 51287 bytes
6 files changed, 16 insertions, 14 deletions
diff --git a/macros/latex/contrib/adjmulticol/Makefile b/macros/latex/contrib/adjmulticol/Makefile
index 2be5735458..471ef1d5db 100644
--- a/macros/latex/contrib/adjmulticol/Makefile
+++ b/macros/latex/contrib/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/macros/latex/contrib/adjmulticol/README b/macros/latex/contrib/adjmulticol/README
index dc6820bf03..62d899f95b 100644
--- a/macros/latex/contrib/adjmulticol/README
+++ b/macros/latex/contrib/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/macros/latex/contrib/adjmulticol/adjmulticol.dtx b/macros/latex/contrib/adjmulticol/adjmulticol.dtx
index 90881468ef..12c5e4ca73 100644
--- a/macros/latex/contrib/adjmulticol/adjmulticol.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/adjmulticol/adjmulticol.ins b/macros/latex/contrib/adjmulticol/adjmulticol.ins
index 21ee6cc73b..cc89efce68 100644
--- a/macros/latex/contrib/adjmulticol/adjmulticol.ins
+++ b/macros/latex/contrib/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/macros/latex/contrib/adjmulticol/adjmulticol.pdf b/macros/latex/contrib/adjmulticol/adjmulticol.pdf
index 0b7277dfff..d2709950d5 100644
--- a/macros/latex/contrib/adjmulticol/adjmulticol.pdf
+++ b/macros/latex/contrib/adjmulticol/adjmulticol.pdf
Binary files differ
diff --git a/macros/latex/contrib/adjmulticol/sample.pdf b/macros/latex/contrib/adjmulticol/sample.pdf
index b8ef62610a..a55f9bf1c2 100644
--- a/macros/latex/contrib/adjmulticol/sample.pdf
+++ b/macros/latex/contrib/adjmulticol/sample.pdf
Binary files differ