summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-01-24 23:22:29 +0000
committerKarl Berry <karl@freefriends.org>2013-01-24 23:22:29 +0000
commit1fc962547ed3e07cb88a1d7f1604448a942b82b0 (patch)
treea074c0725ccc24f51881fbdf48762584160e803e /Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
parentd5bb518a967be55cdbd34367102479e980ecd579 (diff)
adjmulticol 1.1 (23jan13)
git-svn-id: svn://tug.org/texlive/trunk@28936 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx')
-rw-r--r--Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx44
1 files changed, 24 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
index 9d4937786db..90881468efe 100644
--- a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
+++ b/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
@@ -1,5 +1,5 @@
% \iffalse
-% $Id: adjmulticol.dtx,v 2.8 2011-02-24 03:51:47 boris Exp $
+% $Id: adjmulticol.dtx,v 2.12 2013-01-23 18:10:07 boris Exp $
%
%% Copyright 2011, Boris Veytsman <borisv@lk.net>
%% This work may be distributed and/or modified under the
@@ -88,7 +88,7 @@
%%
%<*gobble>
% \fi
-% \CheckSum{149}
+% \CheckSum{176}
%
%
%% \CharacterTable
@@ -285,14 +285,6 @@
% the last page.
%
%
-% Since the package redefines output routines, it may behave strangely
-% if used with the packages that also redefine it or rely on the
-% |\pagegoal| and |\pagetotal| dimen registers. The command
-% |\Needspace| from \textsf{memoir} package~\cite{Wilson:Memoir}
-% is known to lead to loss of the text in some rare cases, and
-% therefore this command is disabled inside |adjmulticols|. Usually
-% one can get the same effect as this command by setting the
-% |\premulticols| to the desired value~\cite{Mittelbach06:Multicol}.
%
%\StopEventually{\clearpage
% \bibliography{adjmulticol}
@@ -317,7 +309,7 @@
%</gobble>
%<style>\ProvidesPackage{adjmulticol}
%<*style>
-[2011/02/23 v1.0 Adjusted margins for multicolumn layout]
+[2012/01/20 v1.1 Adjusted margins for multicolumn layout]
% \end{macrocode}
%
%
@@ -401,14 +393,6 @@
\col@number10 \fi
% \end{macrocode}
%
-% We alse disable |\Needspace| from \textsf{memoir}
-% package~\cite{Wilson:Memoir}:
-% \begin{macrocode}
- \def\Needspace{\PackageWarning{adjmulticol}%
- {The command \noexpand\Needspace is disabled}%
- {The command \noexpand\Needspace is not compatible with our
- output routine}}
-% \end{macrocode}
%
% As in the standard package we redefine the footnote making command:
% \begin{macrocode}
@@ -456,7 +440,27 @@
%
%
%
-%
+% \begin{macro}{\set@mult@vsize}
+% \changes{v1.1}{2013/01/20}{Redefined macro}
+% The formula for |\vsize| in multicols seem to work only for
+% column number above 2. Here we add special case of 1.
+% \begin{macrocode}
+\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}
+% \end{macrocode}
+% \end{macro}
%
%\subsection{Ending Environment}
%\label{sec:end}