diff options
author | Norbert Preining <norbert@preining.info> | 2022-04-19 03:00:52 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-04-19 03:00:52 +0000 |
commit | b0321ddd75259a36e909f25b3abc711dc1732c28 (patch) | |
tree | 9d7eac714004161e47b1bd11a37c3401c7a245ba /macros/latex/contrib/adjmulticol | |
parent | a7538780c749168835167a8d30aa65779c89407a (diff) |
CTAN sync 202204190300
Diffstat (limited to 'macros/latex/contrib/adjmulticol')
-rw-r--r-- | macros/latex/contrib/adjmulticol/README | 4 | ||||
-rw-r--r-- | macros/latex/contrib/adjmulticol/adjmulticol.dtx | 38 | ||||
-rw-r--r-- | macros/latex/contrib/adjmulticol/adjmulticol.pdf | bin | 265207 -> 266054 bytes | |||
-rw-r--r-- | macros/latex/contrib/adjmulticol/sample.pdf | bin | 53058 -> 53024 bytes |
4 files changed, 27 insertions, 15 deletions
diff --git a/macros/latex/contrib/adjmulticol/README b/macros/latex/contrib/adjmulticol/README index c3c9fcbe51..82761b3e43 100644 --- a/macros/latex/contrib/adjmulticol/README +++ b/macros/latex/contrib/adjmulticol/README @@ -13,4 +13,6 @@ Changes: v1.2 Bug fix: now adjmulticols works inside a box too. - v1.3 Big fix: disappearing material in one column output
\ No newline at end of file + v1.3 Big fix: disappearing material in one column output + + v1.4 New version of bug fix with one column
\ No newline at end of file diff --git a/macros/latex/contrib/adjmulticol/adjmulticol.dtx b/macros/latex/contrib/adjmulticol/adjmulticol.dtx index 9ce7012f03..66d2f060e5 100644 --- a/macros/latex/contrib/adjmulticol/adjmulticol.dtx +++ b/macros/latex/contrib/adjmulticol/adjmulticol.dtx @@ -308,7 +308,7 @@ %</gobble> %<style>\ProvidesPackage{adjmulticol} %<*style> -[2022/03/27 v1.3 Adjusted margins for multicolumn layout] +[2022/04/17 v1.4 Adjusted margins for multicolumn layout] % \end{macrocode} % % @@ -364,6 +364,7 @@ % % \begin{macro}{\adjmulticols} % \changes{v1.3}{2022/03/27}{Do not try to balance one-column version} +% \changes{v1.4}{2022/04/17}{Change the balancing of one-column} % We have three mandatory arguments instead of one for |multicols|: % the number of columns, the left margin delta and the right margin % delta: @@ -392,8 +393,7 @@ I therefore use 10 columns instead}% \col@number10 \fi \ifnum\col@number=\@ne\relax - \let\balance@columns@out - \multi@column@out + \let\balance@columns\adjmc@process@ne@column \fi % \end{macrocode} % @@ -500,19 +500,13 @@ % % % \begin{macro}{\adjmc@page@sofar} +% \changes{v1.4}{2022/04/17}{No longer copying boxes for one column +% version} % We redefine |\page@sofar| to change the margins and allow for % one-column output: % \begin{macrocode} \def\adjmc@page@sofar{% % \end{macrocode} -% If we have one column, the standard mechanisms leave empty space -% instead of the first column. Ok, we use the fact that there is a -% copy of the first column in |\mult@firstbox|\dots -% \begin{macrocode} - \ifnum\col@number=\@ne - \setbox\mult@rightbox\box\mult@firstbox - \fi -% \end{macrocode} % We redefine |\multicol@leftmargin| to introduce the shift of the % box. We save the old code in |\adjmc@saved@leftmargin| % \begin{macrocode} @@ -534,15 +528,28 @@ % \end{macrocode} % % \end{macro} +% +% \begin{macro}{\adjmc@process@ne@column} +% \changes{v1.4}{2022/04/17}{Added macro} +% If we have one column, we do not need to balance it. Mostly stolen +% from |multicol.sty| +% \begin{macrocode} +\def\adjmc@process@ne@column{% + \setbox\mult@firstbox\copy\mult@box} +% \end{macrocode} % % +% \end{macro} +% %\subsection{Not Balancing Columns} %\label{sec:not_balance} % % The starred versions do not balance the columns. % % \begin{macro}{\adjmulticols*} -% This follows the code of the \textsf{multicols} package: +% \changes{v1.4}{2022/04/17}{Special code for one column version} +% This follows the code of the \textsf{multicols} package with the +% special check for one column: % \begin{macrocode} \newenvironment{adjmulticols*}{% \ifinner @@ -551,8 +558,11 @@ not make sense.\MessageBreak Going to balance anyway}% \else - \let\balance@columns@out - \multi@column@out + \ifnum\col@number=\@ne\relax + \let\balance@columns\adjmc@process@ne@column + \else + \let\balance@columns@out\multi@column@out + \fi \fi \adjmulticols}{% \vfill diff --git a/macros/latex/contrib/adjmulticol/adjmulticol.pdf b/macros/latex/contrib/adjmulticol/adjmulticol.pdf Binary files differindex 05999ddfdc..7e8514791d 100644 --- a/macros/latex/contrib/adjmulticol/adjmulticol.pdf +++ b/macros/latex/contrib/adjmulticol/adjmulticol.pdf diff --git a/macros/latex/contrib/adjmulticol/sample.pdf b/macros/latex/contrib/adjmulticol/sample.pdf Binary files differindex af96fd4aa2..b063dffc00 100644 --- a/macros/latex/contrib/adjmulticol/sample.pdf +++ b/macros/latex/contrib/adjmulticol/sample.pdf |