adjmulticol 1.1 (23jan13)

git-svn-id: svn://tug.org/texlive/trunk@28936 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 46 insertions, 26 deletions

diff --git a/Master/texmf-dist/doc/latex/adjmulticol/README b/Master/texmf-dist/doc/latex/adjmulticol/README
index d2f5d284c16..dc6820bf030 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/README
+++ b/Master/texmf-dist/doc/latex/adjmulticol/README
@@ -1,8 +1,14 @@
        Adjusting Margins for Multicolumn and Unicolumn Output
-			     Version 1.0
+			     Version 1.1
 
 This package provides an extension of the multicol package with the
 option to change the margins for multicolumn and unicolumn layout.
 The package understands the difference between the even and odd
 margins for two side printing.
 
+
+Changes:
+
+   v1.1  Changed calculations for unicolumn layout
+         which might previously lead to loss of text
+
diff --git a/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf b/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
index 573e811c16e..0b7277dfff6 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
+++ b/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
diff --git a/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf b/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
index f84e1d00e0c..b8ef62610a5 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
+++ b/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
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}
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}