adjmulticol (19apr22)

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

6 files changed, 37 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/adjmulticol/README b/Master/texmf-dist/doc/latex/adjmulticol/README
index c3c9fcbe51b..82761b3e430 100644
--- a/Master/texmf-dist/doc/latex/adjmulticol/README
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf b/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
index 05999ddfdc4..7e8514791de 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 af96fd4aa2a..b063dffc004 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 9ce7012f039..66d2f060e59 100644
--- a/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
+++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty b/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
index 4f1ca459598..ac0af67c76c 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}
-[2022/03/27 v1.3 Adjusted margins for multicolumn layout]
+[2022/04/17 v1.4 Adjusted margins for multicolumn layout]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{multicol}}
 \ProcessOptions\relax
 \RequirePackage{multicol}
@@ -134,8 +134,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
      \ifx\@footnotetext\mult@footnotetext\else
        \let\orig@footnotetext\@footnotetext
@@ -172,9 +171,6 @@
   \global\let\@checkend\@ADJMC@checkend}
 \let\adjmc@page@sofar@orig=\page@sofar
 \def\adjmc@page@sofar{%
-  \ifnum\col@number=\@ne
-  \setbox\mult@rightbox\box\mult@firstbox
-  \fi
    \adjmc@saved@leftmargin=\multicol@leftmargin
    \if@twoside
       \ifodd\c@page
@@ -187,6 +183,8 @@
   \fi
    \adjmc@page@sofar@orig
    \multicol@leftmargin=\adjmc@saved@leftmargin}
+\def\adjmc@process@ne@column{%
+  \setbox\mult@firstbox\copy\mult@box}
 \newenvironment{adjmulticols*}{%
    \ifinner
      \PackageWarning{multicol}%
@@ -194,8 +192,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/Master/tlpkg/tlpsrc/hitex.tlpsrc b/Master/tlpkg/tlpsrc/hitex.tlpsrc
index 7ff96c3aa74..ec52f196d57 100644
--- a/Master/tlpkg/tlpsrc/hitex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hitex.tlpsrc
@@ -4,7 +4,7 @@ tlpsetvar fmtcomm cm,hyphen-base
 #
 execute AddFormat name=hitex engine=hitex patterns=language.def \
   options="-etex -ltx hitex.ini" \
-  fmttriggers=${fmtcomm},etex,plain
+  fmttriggers=${fmtcomm},etex,knuth-lib,plain
 #
 execute AddFormat name=hilatex engine=hitex patterns=language.dat \
   options="-etex -ltx hilatex.ini" \