From 68d77321826f2ce9a407f75aacb8e4a717a9e363 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 7 Mar 2020 21:39:53 +0000 Subject: adjmulticol (7mar20) git-svn-id: svn://tug.org/texlive/trunk@54157 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/adjmulticol/Makefile | 63 --------------------- Master/texmf-dist/doc/latex/adjmulticol/README | 2 +- .../doc/latex/adjmulticol/adjmulticol.pdf | Bin 252666 -> 248294 bytes Master/texmf-dist/doc/latex/adjmulticol/sample.pdf | Bin 51293 -> 51287 bytes .../texmf-dist/source/latex/adjmulticol/Makefile | 63 +++++++++++++++++++++ .../source/latex/adjmulticol/adjmulticol.dtx | 20 ++++--- .../source/latex/adjmulticol/adjmulticol.ins | 2 +- .../tex/latex/adjmulticol/adjmulticol.sty | 10 ++-- 8 files changed, 82 insertions(+), 78 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/adjmulticol/Makefile create mode 100644 Master/texmf-dist/source/latex/adjmulticol/Makefile (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/adjmulticol/Makefile b/Master/texmf-dist/doc/latex/adjmulticol/Makefile deleted file mode 100644 index 2be57354582..00000000000 --- a/Master/texmf-dist/doc/latex/adjmulticol/Makefile +++ /dev/null @@ -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 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 Binary files a/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf and b/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf differ diff --git a/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf b/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf index b8ef62610a5..a55f9bf1c21 100644 Binary files a/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf and b/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf differ 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 +%% Copyright 2020, Boris Veytsman %% 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 @@ % %