From 1fc962547ed3e07cb88a1d7f1604448a942b82b0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 Jan 2013 23:22:29 +0000 Subject: adjmulticol 1.1 (23jan13) git-svn-id: svn://tug.org/texlive/trunk@28936 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/adjmulticol/adjmulticol.sty | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/adjmulticol') diff --git a/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty b/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty index 2c473785bc2..8f984067d61 100644 --- a/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty +++ b/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty @@ -107,7 +107,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{adjmulticol} -[2011/02/23 v1.0 Adjusted margins for multicolumn layout] +[2012/01/20 v1.1 Adjusted margins for multicolumn layout] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{multicol}} \ProcessOptions\relax \RequirePackage{multicol} @@ -133,10 +133,6 @@ \MessageBreak I therefore use 10 columns instead}% \col@number10 \fi - \def\Needspace{\PackageWarning{adjmulticol}% - {The command \noexpand\Needspace is disabled}% - {The command \noexpand\Needspace is not compatible with our - output routine}} \ifx\@footnotetext\mult@footnotetext\else \let\orig@footnotetext\@footnotetext \let\@footnotetext\mult@footnotetext @@ -150,6 +146,20 @@ \advance\linewidth by -\adjmc@outer\relax \let\page@sofar=\adjmc@page@sofar \mult@@cols#1[#2]} +\def\set@mult@vsize#1{% + \vsize\@colroom + \@tempdima\baselineskip + \advance\@tempdima-\topskip + \advance\vsize\@tempdima + \vsize\col@number\vsize + \advance\vsize-\@tempdima + \ifnum\col@number>1\relax + \advance\vsize\col@number\baselineskip + \else + \advance\vsize-2\baselineskip + \fi + #1\advance\vsize + \c@collectmore\baselineskip} \def\endadjmulticols{% \def\@currenvir{multicols}% \endmulticols} -- cgit v1.2.3