summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-28 22:32:29 +0000
committerKarl Berry <karl@freefriends.org>2020-02-28 22:32:29 +0000
commit42b1e02e459df53a7a73ab4267cd31b4c9641753 (patch)
tree135ead87726746dc3da82c194da54d8b2534564c
parent8ad34d0fee4b46df8675ac6d1d711626f64aaf9b (diff)
zwpagelayout (28feb20)
git-svn-id: svn://tug.org/texlive/trunk@53965 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/zwpagelayout/README18
-rw-r--r--Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdfbin88990 -> 88982 bytes
-rw-r--r--Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdfbin88751 -> 88745 bytes
-rw-r--r--Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdfbin65922 -> 65924 bytes
-rw-r--r--Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdfbin471045 -> 475910 bytes
-rw-r--r--Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.tex26
-rw-r--r--Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty14
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
8 files changed, 44 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/README b/Master/texmf-dist/doc/latex/zwpagelayout/README
index accc23f8a1b..1a7f466f62e 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/README
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/README
@@ -1,5 +1,5 @@
=============================================================================
-Package: zwpagelayout Version 1.4c 13 Janyary 2013
+Package: zwpagelayout Version 1.4d 28 February 2020
=============================================================================
This package was developed as a typographers toolbox offering the most
@@ -10,12 +10,24 @@ 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.4c is a bug fix, the PDF boxes now properly work in the
-(x)dvipdfm(x) family of drivers.
+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.4 implements black overprint for (x)dvipdfm(x) family of drivers,
i.e. it now works also with XeLaTeX.
+
+Installation:
+
+1. put zwpagelayout.sty to the directory where latex expects packages,
+ preferably texmf-dist/tex/latex/zwpagelayout
+
+2. put all remaining files to a directory where texdoc looks for
+ documentation, preferably texmf-dist/doc/zwpagelayout
+
+
The license of the package is LPPL.
Author: Z. Wagner, http://icebearsoft.euweb.cz
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf
index ef284c605d4..d2384367b3e 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf
index 98727f1f81b..9598698e970 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf
index 614b3124d1f..334662fd3de 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf
index 73f1b92a919..aedc8a60ddc 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.tex b/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.tex
index 460e3805bc2..fe99d96270e 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.tex
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.tex
@@ -1,4 +1,4 @@
-%% $Id: zwpagelayout.tex 454 2013-01-13 18:30:27Z zw $
+%% $Id: zwpagelayout.tex 548 2020-02-28 13:27:51Z zw $
\input utf8-t1 % encTeX required
\documentclass[11pt]{article}
\usepackage{zwgetfdate}
@@ -118,11 +118,20 @@ proof-reading is time consuming and expensive. This package therefore allows the
to be switched off and just add the crop marks provided the paper dimensions are correctly
supplied. The details will be explained later when describing the package options.
+\section{Installation}\label{installation}
+The package consists of a single file, \texttt{zwpagelayout.sty}. Put it to a directory where
+\LaTeX\ expects packages, preferably \texttt{texmf-dist/tex/latex/zwpagelayout}. All remaining
+files belong to the documentation, put them to a directory where documentation (including
+documentation sources) is expected by \pkg{texdoc} or a similar program, preferably
+\texttt{texmf-dist/doc/zwpagelayout}.
+
\section{Package dependence}
As written in the introduction, the goal was to implement as much within this single package in
order to reduce the risk of clashes. Yet a few packages may be loaded. The package needs to know
-what engine is being used. For this purpose the \pkg{ifxetex} and \pkg{ifpdf} packages are used. If
-any of these packages is not found, it is assumed that the corresponding engine is not available.
+what engine is being used. For this purpose the \pkg{iftex} package\footnote{Up to version 1.4c
+both \pkg{ifxetex} and \pkg{ifpdf} were used. Nowadays both these packages are deprecated and load
+\pkg{iftex}. The package would fail with a critical error if they were used.} is used. If
+the package is not found, it is assumed that the engines are not available.
No error is reported. The color support requires the \pkg{color} package. It is loaded only if the
color support is requested. The algorithm for deciding when the package is needed will be described
in detail in section~\ref{color}.
@@ -1262,6 +1271,15 @@ 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.4d, 2020/02/07}
+\begin{itemize}
+\item Bug fix, packages \pkg{ifpdf} and \pkg{ifxetex} replaced with \pkg{iftex}.
+\item Bug fix, identification of PDF/X-1a corrected.
+\item Feature request, luatex85 loaded in order to support Lua\LaTeX\ compatibility.
+\item Modification, distribution file flattened as required by CTAN, see
+section~\ref{installation}.
+\end{itemize}
+
\subsection{Version 1.4c, 2013/01/13}
Bug fix, the PDF boxes are properly set even in the (x)dvipdfm(x) family of drivers, i.\,e.\@ in
\XeLaTeX.
@@ -1346,7 +1364,7 @@ packages.
\section{License}
The package can be used and distributed according to the \LaTeX\ Project Public License version~1.3 or later the
-text of which can be found at the \texttt{License.txt} file in the \texttt{doc} directory or at
+text of which can be found at the \texttt{License.txt} file or at
\url{http://www.latex-project.org/lppl.txt}
\section{Trade marks}
diff --git a/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty b/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
index 6dc256aa633..35e74169765 100644
--- a/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
+++ b/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
@@ -1,7 +1,7 @@
-\ProvidesPackage{zwpagelayout}[2013/01/13 ZW Page Layout]
-\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 453 2013-01-13 17:12:17Z zw $\@gobble}
+\ProvidesPackage{zwpagelayout}[2020/02/28 ZW Page Layout]
+\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 547 2020-02-28 13:17:43Z zw $\@gobble}
-%% Copyright 2008--2013 Z. Wagner, http://icebearsoft.euweb.cz
+%% Copyright 2008--2020 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
@@ -20,8 +20,8 @@
% adjustfoot.tex, adjustfoot.pdf, adjusthead.tex, adjusthead.pdf,
% coversample.tex, coversample.pdf, LoremIpsumDolor.tex.
-\@ifpackageloaded{ifpdf}{}{\IfFileExists{ifpdf.sty}{\RequirePackage{ifpdf}}{\newif\ifpdf}}
-\@ifpackageloaded{ifxetex}{}{\IfFileExists{ifxetex.sty}{\RequirePackage{ifxetex}}{\newif\ifxetex}}
+\@ifpackageloaded{iftex}{}{\IfFileExists{iftex.sty}{\RequirePackage{iftex}}{\newif\ifpdf\newif\ifxetex\newif\ifluatex}}
+\ifluatex\RequirePackage{luatex85}\fi
\RequirePackage{kvoptions}[2010/02/22]
\SetupKeyvalOptions{family=zwpl,prefix=zwpl@}
@@ -342,7 +342,7 @@
\ifcat$\zwpl@pdfminorversion$ \else \ZWifdriver{pdftex}{\pdfminorversion3 \relax}\fi
\def\zwpl@pdfxinfo{}
\ifzwpl@pdfx
- \def\zwpl@pdfxinfo{ /GTS_PDFXVersion (PDF/X-1:2001) /GTS_PDFXConformance (PDFX-1a:2001)}
+ \def\zwpl@pdfxinfo{ /GTS_PDFXVersion (PDF/X-1a:2001) /GTS_PDFXConformance (PDFX-1a:2001)}
\ifcat$\zwpl@ICCfile$ \else
\ifcase\zwpl@Driver
\or
@@ -401,7 +401,7 @@
/S/GTS_PDFX
/OutputCondition (\zwpl@OutputCondition)
/OutputConditionIdentifier (\zwpl@OutputConditionIdentifier)
- /RegistryName (http://www/color.org)\zwpl@profile
+ /RegistryName (http://www.color.org)\zwpl@profile
>> ]}
\ifcase\zwpl@Driver
\or
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 1d5298404c9..09fffe3c75f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1386,7 +1386,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'zhmetrics', "&MAKEcopy",
'zhmetrics-uptex', "&MAKEflatten",
'zwgetfdate', "&MAKEcopy",
- 'zwpagelayout',"&MAKEcopy",
);