summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-04-19 03:00:52 +0000
committerNorbert Preining <norbert@preining.info>2022-04-19 03:00:52 +0000
commitb0321ddd75259a36e909f25b3abc711dc1732c28 (patch)
tree9d7eac714004161e47b1bd11a37c3401c7a245ba /macros/latex/contrib
parenta7538780c749168835167a8d30aa65779c89407a (diff)
CTAN sync 202204190300
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/adjmulticol/README4
-rw-r--r--macros/latex/contrib/adjmulticol/adjmulticol.dtx38
-rw-r--r--macros/latex/contrib/adjmulticol/adjmulticol.pdfbin265207 -> 266054 bytes
-rw-r--r--macros/latex/contrib/adjmulticol/sample.pdfbin53058 -> 53024 bytes
-rw-r--r--macros/latex/contrib/zwpagelayout/README8
-rw-r--r--macros/latex/contrib/zwpagelayout/adjustfoot.pdfbin88982 -> 91770 bytes
-rw-r--r--macros/latex/contrib/zwpagelayout/adjusthead.pdfbin88745 -> 91530 bytes
-rw-r--r--macros/latex/contrib/zwpagelayout/coversample.pdfbin65924 -> 68722 bytes
-rw-r--r--macros/latex/contrib/zwpagelayout/zwpagelayout.pdfbin475910 -> 501158 bytes
-rw-r--r--macros/latex/contrib/zwpagelayout/zwpagelayout.sty8
-rw-r--r--macros/latex/contrib/zwpagelayout/zwpagelayout.tex5
11 files changed, 38 insertions, 25 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
index 05999ddfdc..7e8514791d 100644
--- a/macros/latex/contrib/adjmulticol/adjmulticol.pdf
+++ b/macros/latex/contrib/adjmulticol/adjmulticol.pdf
Binary files differ
diff --git a/macros/latex/contrib/adjmulticol/sample.pdf b/macros/latex/contrib/adjmulticol/sample.pdf
index af96fd4aa2..b063dffc00 100644
--- a/macros/latex/contrib/adjmulticol/sample.pdf
+++ b/macros/latex/contrib/adjmulticol/sample.pdf
Binary files differ
diff --git a/macros/latex/contrib/zwpagelayout/README b/macros/latex/contrib/zwpagelayout/README
index 1a7f466f62..f41aade7fe 100644
--- a/macros/latex/contrib/zwpagelayout/README
+++ b/macros/latex/contrib/zwpagelayout/README
@@ -1,5 +1,5 @@
=============================================================================
-Package: zwpagelayout Version 1.4d 28 February 2020
+Package: zwpagelayout Version 1.4e 18 April 2022
=============================================================================
This package was developed as a typographers toolbox offering the most
@@ -10,10 +10,8 @@ Finally it is possible to reflect pages both horizontally and vertically.
Partial PDF/X conformance is implemented and black overprint is enabled
in pdfTeX, dvips, as well as (x)dvipdfm(x) drivers, i.e in XeLaTeX.
-Version 1.4d is a bug fix:
-* PDF/X-1a identification corrected.
-* Package iftex loaded instead of ifpdf and ifxetex.
-* Lualatex compatibility supported
+Version 1.4e is a bug fix:
+A typo in a macro name corrected.
Version 1.4 implements black overprint for (x)dvipdfm(x) family of drivers,
i.e. it now works also with XeLaTeX.
diff --git a/macros/latex/contrib/zwpagelayout/adjustfoot.pdf b/macros/latex/contrib/zwpagelayout/adjustfoot.pdf
index d2384367b3..d5722bb0fc 100644
--- a/macros/latex/contrib/zwpagelayout/adjustfoot.pdf
+++ b/macros/latex/contrib/zwpagelayout/adjustfoot.pdf
Binary files differ
diff --git a/macros/latex/contrib/zwpagelayout/adjusthead.pdf b/macros/latex/contrib/zwpagelayout/adjusthead.pdf
index 9598698e97..12b9ab9698 100644
--- a/macros/latex/contrib/zwpagelayout/adjusthead.pdf
+++ b/macros/latex/contrib/zwpagelayout/adjusthead.pdf
Binary files differ
diff --git a/macros/latex/contrib/zwpagelayout/coversample.pdf b/macros/latex/contrib/zwpagelayout/coversample.pdf
index 334662fd3d..8427857093 100644
--- a/macros/latex/contrib/zwpagelayout/coversample.pdf
+++ b/macros/latex/contrib/zwpagelayout/coversample.pdf
Binary files differ
diff --git a/macros/latex/contrib/zwpagelayout/zwpagelayout.pdf b/macros/latex/contrib/zwpagelayout/zwpagelayout.pdf
index aedc8a60dd..13c14b79e7 100644
--- a/macros/latex/contrib/zwpagelayout/zwpagelayout.pdf
+++ b/macros/latex/contrib/zwpagelayout/zwpagelayout.pdf
Binary files differ
diff --git a/macros/latex/contrib/zwpagelayout/zwpagelayout.sty b/macros/latex/contrib/zwpagelayout/zwpagelayout.sty
index 35e7416976..7454bf9fff 100644
--- a/macros/latex/contrib/zwpagelayout/zwpagelayout.sty
+++ b/macros/latex/contrib/zwpagelayout/zwpagelayout.sty
@@ -1,7 +1,7 @@
-\ProvidesPackage{zwpagelayout}[2020/02/28 ZW Page Layout]
-\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 547 2020-02-28 13:17:43Z zw $\@gobble}
+\ProvidesPackage{zwpagelayout}[2022/04/18 ZW Page Layout]
+\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 552 2022-04-18 09:39:07Z zw $\@gobble}
-%% Copyright 2008--2020 Z. Wagner, http://icebearsoft.euweb.cz
+%% Copyright 2008--2022 Z. Wagner, http://icebearsoft.euweb.cz
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -758,7 +758,7 @@
\def\zwpl@patchfoot{\let\zwpl@oddfoot\@oddfoot \let\zwpl@evenfoot\@evenfoot
\ifzwpl@overprint
\expandafter\ifx\csname OverprintXeTeXExtGState\endcsname\relax \else
- \let\zwpl@oddhead\@oddhead \let\zwpl@evenhead\evenhead
+ \let\zwpl@oddhead\@oddhead \let\zwpl@evenhead\@evenhead
\def\@oddhead{\OverprintXeTeXExtGState \zwpl@oddhead}%
\def\@evenhead{\OverprintXeTeXExtGState \zwpl@evenhead}%
\fi
diff --git a/macros/latex/contrib/zwpagelayout/zwpagelayout.tex b/macros/latex/contrib/zwpagelayout/zwpagelayout.tex
index fe99d96270..a6e5a6f7b7 100644
--- a/macros/latex/contrib/zwpagelayout/zwpagelayout.tex
+++ b/macros/latex/contrib/zwpagelayout/zwpagelayout.tex
@@ -1,4 +1,4 @@
-%% $Id: zwpagelayout.tex 548 2020-02-28 13:27:51Z zw $
+%% $Id: zwpagelayout.tex 552 2022-04-18 09:39:07Z zw $
\input utf8-t1 % encTeX required
\documentclass[11pt]{article}
\usepackage{zwgetfdate}
@@ -1271,6 +1271,9 @@ This section summarizes the changes. The version and the package date is given.
specify the date in the \cmd{usepackage} or \cmd{RequirePackage} command if you rely on a specific
feature not available in the old version of the package.
+\subsection{Version 1.4e, 2022/04/18}
+Bug fix, a typo in a macro name.
+
\subsection{Version 1.4d, 2020/02/07}
\begin{itemize}
\item Bug fix, packages \pkg{ifpdf} and \pkg{ifxetex} replaced with \pkg{iftex}.