texlive[63073] Master: adjmulticol (19apr22)
commits+karl at tug.org
commits+karl at tug.org
Tue Apr 19 00:41:37 CEST 2022
Revision: 63073
http://tug.org/svn/texlive?view=revision&revision=63073
Author: karl
Date: 2022-04-19 00:41:37 +0200 (Tue, 19 Apr 2022)
Log Message:
-----------
adjmulticol (19apr22)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/adjmulticol/README
trunk/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
trunk/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
Modified: trunk/Master/texmf-dist/doc/latex/adjmulticol/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/adjmulticol/README 2022-04-18 12:31:58 UTC (rev 63072)
+++ trunk/Master/texmf-dist/doc/latex/adjmulticol/README 2022-04-18 22:41:37 UTC (rev 63073)
@@ -13,4 +13,6 @@
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
Modified: trunk/Master/texmf-dist/doc/latex/adjmulticol/adjmulticol.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/adjmulticol/sample.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx 2022-04-18 12:31:58 UTC (rev 63072)
+++ trunk/Master/texmf-dist/source/latex/adjmulticol/adjmulticol.dtx 2022-04-18 22:41:37 UTC (rev 63073)
@@ -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 at number10 \fi
\ifnum\col at number=\@ne\relax
- \let\balance at columns@out
- \multi at column@out
+ \let\balance at columns\adjmc at process@ne at column
\fi
% \end{macrocode}
%
@@ -500,19 +500,13 @@
%
%
% \begin{macro}{\adjmc at page@sofar}
+% \changes{v1.4}{2022/04/17}{No longer copying boxes for one column
+% version}
% We redefine |\page at sofar| to change the margins and allow for
% one-column output:
% \begin{macrocode}
\def\adjmc at 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 at firstbox|\dots
-% \begin{macrocode}
- \ifnum\col at number=\@ne
- \setbox\mult at rightbox\box\mult at firstbox
- \fi
-% \end{macrocode}
% We redefine |\multicol at leftmargin| to introduce the shift of the
% box. We save the old code in |\adjmc at saved@leftmargin|
% \begin{macrocode}
@@ -534,8 +528,19 @@
% \end{macrocode}
%
% \end{macro}
+%
+% \begin{macro}{\adjmc at process@ne at 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 at process@ne at column{%
+ \setbox\mult at firstbox\copy\mult at box}
+% \end{macrocode}
%
%
+% \end{macro}
+%
%\subsection{Not Balancing Columns}
%\label{sec:not_balance}
%
@@ -542,7 +547,9 @@
% 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 at columns@out
- \multi at column@out
+ \ifnum\col at number=\@ne\relax
+ \let\balance at columns\adjmc at process@ne at column
+ \else
+ \let\balance at columns@out\multi at column@out
+ \fi
\fi
\adjmulticols}{%
\vfill
Modified: trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty 2022-04-18 12:31:58 UTC (rev 63072)
+++ trunk/Master/texmf-dist/tex/latex/adjmulticol/adjmulticol.sty 2022-04-18 22:41:37 UTC (rev 63073)
@@ -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 at number10 \fi
\ifnum\col at number=\@ne\relax
- \let\balance at columns@out
- \multi at column@out
+ \let\balance at columns\adjmc at process@ne at column
\fi
\ifx\@footnotetext\mult at footnotetext\else
\let\orig at footnotetext\@footnotetext
@@ -172,9 +171,6 @@
\global\let\@checkend\@ADJMC at checkend}
\let\adjmc at page@sofar at orig=\page at sofar
\def\adjmc at page@sofar{%
- \ifnum\col at number=\@ne
- \setbox\mult at rightbox\box\mult at firstbox
- \fi
\adjmc at saved@leftmargin=\multicol at leftmargin
\if at twoside
\ifodd\c at page
@@ -187,6 +183,8 @@
\fi
\adjmc at page@sofar at orig
\multicol at leftmargin=\adjmc at saved@leftmargin}
+\def\adjmc at process@ne at column{%
+ \setbox\mult at firstbox\copy\mult at box}
\newenvironment{adjmulticols*}{%
\ifinner
\PackageWarning{multicol}%
@@ -194,8 +192,11 @@
not make sense.\MessageBreak
Going to balance anyway}%
\else
- \let\balance at columns@out
- \multi at column@out
+ \ifnum\col at number=\@ne\relax
+ \let\balance at columns\adjmc at process@ne at column
+ \else
+ \let\balance at columns@out\multi at column@out
+ \fi
\fi
\adjmulticols}{%
\vfill
Modified: trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc 2022-04-18 12:31:58 UTC (rev 63072)
+++ trunk/Master/tlpkg/tlpsrc/hitex.tlpsrc 2022-04-18 22:41:37 UTC (rev 63073)
@@ -4,7 +4,7 @@
#
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" \
More information about the tex-live-commits
mailing list.