zwpagelayout (15jan13)

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

7 files changed, 71 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/README b/Master/texmf-dist/doc/latex/zwpagelayout/README
index c5b5381fc58..accc23f8a1b 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.4a                              20 May 2012
+Package: zwpagelayout   Version 1.4c                          13 Janyary 2013
 =============================================================================
 
 This package was developed as a typographers toolbox offering the most 
@@ -10,8 +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.4a is a bug fix, an infinite loop occured if a user requested
-nonexistent page style (e.g. as a result of a misprint).
+Version 1.4c is a bug fix, the PDF boxes now properly work in the
+(x)dvipdfm(x) family of drivers.
 
 Version 1.4 implements black overprint for (x)dvipdfm(x) family of drivers,
 i.e. it now works also with XeLaTeX.
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf
index 41a9013e911..ef284c605d4 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf
index fef15d96a82..98727f1f81b 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/adjusthead.pdf
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf
index 7891c285ee5..614b3124d1f 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/coversample.pdf
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf
index 541692c9972..73f1b92a919 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.pdf
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.tex b/Master/texmf-dist/doc/latex/zwpagelayout/zwpagelayout.tex
index 1e7c04bffc6..460e3805bc2 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 435 2012-05-20 18:02:14Z zw $
+%% $Id: zwpagelayout.tex 454 2013-01-13 18:30:27Z zw $
 \input utf8-t1 % encTeX required
 \documentclass[11pt]{article}
 \usepackage{zwgetfdate}
@@ -77,7 +77,8 @@
 This package was developed as a typographers toolbox offering the most important features for
 everyday work. First it allows setting the paper size as well as the page layout. The next
 important feature is the ability of printing crop marks both with \TeX~+~dvips or (x)dvipdfm(x) and with pdf\TeX.
-Finally it is possible to reflect pages both horizontally and vertically.
+Finally it is possible to reflect pages both horizontally and vertically, select black overprint
+and set various PDF/X features.
 \end{abstract}
 
 \tableofcontents
@@ -260,7 +261,8 @@ switched by option \opt{Landscape} (see section~\ref{orientation}).
 
 \subsection{Page bounding boxes}\label{Bboxes}
 The drivers usually set MediaBox to the physical size of the page. If cropmarks are requested (see
-section~\ref{cropmarks}), the package sets also BleedBox, TrimBox and ArtBox. CropBox is
+section~\ref{cropmarks}), the package sets also BleedBox and TrimBox, ArtBox is explicitely
+forbidden by PDF/X. CropBox is
 intentionally unset since it causes cropped display in Adobe Reader. Since page size setting is
 delayed, MediaBox contains the whole page including the area for the cropmarks. MediaBox is
 calculated by the driver, the other boxes are calculated by \TeX. Their dimensions are therefore
@@ -514,7 +516,7 @@ Remember that these options are intended for printing only.
 The hypertext links made by the \pkg{hyperref} package will be wrong. If you wish to rotate parts
 of texts and preserve hyperlinks, use \pkg{rotating} instead.
 
-A word of warning has to be said. In \texttt{pdftext} reflection is implemented by redefininng
+A word of warning has to be said. In \texttt{pdftex} reflection is implemented by redefininng
 \cmd{shipout}. We add PDF literal code to the beginning of each page. For \texttt{dvips} we add
 code to the \texttt{bop-hook}. If you need your own code in the \texttt{bop-hook}, you have to
 store the old definition and execute it. For \texttt{xetex} we add code to \texttt{bop} and
@@ -557,7 +559,8 @@ This option specifies the length of the crop mark.
 
 \subsubsection{Option \opt{cropgap}, default 5\,mm}
 \omg{cropgap}
-This is the space that must be left blank between the crop marks and the trimmed page.
+This is the space that must be left blank between the crop marks and the trimmed page. This area is
+also known as bleed.
 
 \subsubsection{Option \opt{cropframe}, default \false, standard \true}\label{cropframe}
 \omg{cropframe}
@@ -578,7 +581,7 @@ This option selects the style of the crop marks. Two styles are defined, \textit
 \omg{croptitle}
 This option defines the text that should be printed on each page. It may \eg. be the title of the
 document. Remember that all spaces are gobbled when parsing the options. The spaces must therefore
-be specified as \verb*;\ ;.
+be specified as \verb*;\ ; or the text must be enclosed in curly braces.
 
 \subsubsection{Option \opt{cropseparator}}
 \omg{cropseparator}
@@ -680,7 +683,7 @@ frames.
 The width of the leaves is equal because it is achieved by \cmd{hfil}. If you specify
 \verb.foldcorr=-2mm., the corrected leaf will be 2\,mm narower that the others. Since there is
 \textit{1fil} in the width specification of the leaves, you can achieve nice tricks be specifying
-\verb.foldcorr=5cm plus -1fil.. In such a cas the \textit{1fil} in the corrected leaf will vanish
+\verb.foldcorr=5cm plus -1fil.. In such a case the \textit{1fil} in the corrected leaf will vanish
 and its width will be 5\,cm.
 
 Width corrections are not allowed in the \textit{Z} and \textit{4} types and the option value is
@@ -712,7 +715,7 @@ on the odd pages. The correction of the same size is applied to the opposite sid
 even pages.
 
 \section{Color support}\label{color}
-The package is able to produce basic color support, namely it prints the names of separations. The
+The package offers basic color support, namely it prints the names of separations. The
 color support is implemented via a few options. Color printing is performed using the \pkg{color}
 package that is loaded automatically. The package does not use predefined color names.
 
@@ -728,7 +731,7 @@ macro is not defined, the \pkg{color} package will be added if:
 If none of the above applies, the color support is not needed and the package will not be loaded.
 
 If the \pkg{color} package is being loaded, no options are given to it. Especially the driver
-selected by the \opt{driver} option (see section~\ref{driver.selection}) is not sent. If you must
+selected by the \opt{driver} option (see section~\ref{driver.selection}) is not set. If you must
 specify any option for the \pkg{color} package, you have to load it yourself before loading
 \pkg{zwpagelayout}.
 
@@ -748,7 +751,7 @@ As default their color is mixed of 100\,\% of all components of the current colo
 default model is \texttt{cmyk}, the default value of this option is \verb;{1,1,1,1};. Notice that the
 syntax conforms to the requirements of the \pkg{color} package.
 
-\omg{colors}
+\omg{colors}\label{colors}
 Option \opt{colors} assigns names to the color components of the current model. Specification of
 each color must be enclosed in curly brackets. The color name is followed by a colon and comma
 separated values conforming to the syntax of the \pkg{color} package. It will be clear from the
@@ -788,6 +791,17 @@ specification will therefore look as:
 Notice that the \opt{colormodel} option was not specified. Its default value was used. The
 \opt{cropcolor} option left zero for the yellow separation.
 
+If a color is light as e.\,g. the process yellow, it may be better to display its name in white on
+a colored background. This is achieved by preceding the color name with an asterisk. This is now
+the default behaviour for the yellow color. The default definition is:
+
+\vb
+\begin{verbatim}
+colors={{CYAN:1,0,0,0},{MAGENTA:0,1,0,0},{*YELLOW:0,0,1,0},{BLACK:0,0,0,1}}
+\end{verbatim}
+
+\vb
+
 \subsection{CMYK colors}\label{cmykcolors}
 \mg{cmykblack}\mg{cmykread}\mg{cmykgreen}\mg{cmykblue}
 The \pkg{color} package defines \textit{black} using the GRAY model and colors \textit{red},
@@ -899,6 +913,10 @@ you specify \opt{nopdfinfo} in the list of options, setting all above mentined i
 they are declared in the package, \opt{nopdfinfo} will always erase the PDF title even if it is
 specified before \opt{title}.
 
+It has recently been found that these packages do not conflict, it is safe to specify some
+pieces of information by \pkg{zwpagelayout} and other pieces of information via \pkg{hyperref}.
+Anyway, this option will be preserved for the case that it might be needed in the future.
+
 \section{PDF/X-1a compliance}\label{pdfx1a}
 The package partially implements the PDF/X-1a standard. Remember that implementation is driver
 dependent and not everything can be achieved with all drivers. The following sections will give you
@@ -946,8 +964,9 @@ PDF/X requires all fonts to be embedded. The \pkg{zwpagelayout} package cannot e
 to verify your configuration files and make sure that fonts are embedded.
 
 \subsection{Page bounding boxes}
-It is mandatory to set BleedBox, TrimBox, and ArtBox in addittion to MediaBox. Setting these boxes
-is explained in section~\ref{Bboxes}.
+It is mandatory to set BleedBox and TrimBox in addittion to MediaBox. Setting these boxes
+is explained in section~\ref{Bboxes}. ArtBox is explicitely forbidden by PDF/x, therefore it is not
+set.
 
 \subsection{PDF information}
 Mandatory fields are title, CreationDate and ModDate. All these fields are set automatically unless
@@ -1022,7 +1041,7 @@ Generally speaking, you should not start a chapter on an even page but there are
 desirable. Imagine the situation when each chapter starts with a full page illustration on the left
 and with its title page on the right. In such cases you need to start at the even page but \LaTeX\
 does not contain any direct tool for doing it. This package provides the \cmd{NewEvenPage} with the
-same syntaxe as \cmd{NewOddPage}.
+same syntax as \cmd{NewOddPage}.
 
 \cmg{SetEvenPageMessage}
 Similarly this macro serves for setting the message text that appears if an empty page was inserted
@@ -1243,9 +1262,17 @@ 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.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.
+
+\subsection{Version 1.4b, 2012/10/04}
+New feature, the color name in the cropmarks can be displayed in white on a colored background, see
+page~\pageref{color}.
+
 \subsection{Version 1.4a, 2012/05/20}
 Bug fix, if a user requested unexistent page style, the cropmark mechanism looped forever until all
-main memory was exhausted. Now the package issues an error messages and uses the ``empty'' page
+main memory was exhausted. Now the package issues an error message and uses the ``empty'' page
 style.
 
 \subsection{Version 1.4, 2012/05/13}
diff --git a/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty b/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
index 67a9f34d11f..6dc256aa633 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}[2012/05/20 ZW Page Layout]
-\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 435 2012-05-20 18:02:14Z zw $\@gobble}
+\ProvidesPackage{zwpagelayout}[2013/01/13 ZW Page Layout]
+\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 453 2013-01-13 17:12:17Z zw $\@gobble}
 
-%% Copyright 2008--2012 Z. Wagner, http://icebearsoft.euweb.cz
+%% Copyright 2008--2013 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
@@ -158,7 +158,7 @@
 \DeclareBoolOption{color}
 \DeclareStringOption[cmyk]{colormodel}
 \DeclareStringOption[1,1,1,1]{cropcolor}
-\DeclareStringOption[{CYAN:1,0,0,0},{MAGENTA:0,1,0,0},{YELLOW:0,0,1,0},{BLACK:0,0,0,1}]{colors}
+\DeclareStringOption[{CYAN:1,0,0,0},{MAGENTA:0,1,0,0},{*YELLOW:0,0,1,0},{BLACK:0,0,0,1}]{colors}
 \DeclareBoolOption{redefineblack}
 \DeclareBoolOption{redefinetocmyk}
 
@@ -259,6 +259,7 @@
 
 % This part used always
 
+\let\ZWPL@XeTeXboxes\relax
 \AtBeginDocument{\ifcaseZWdriver \or
    \pdfpagewidth\paperwidth \pdfpageheight\paperheight
 \else
@@ -282,14 +283,14 @@
                             \zwpl@bleedwidth\space \zwpl@bleedheight]
                  /TrimBox [\zwpl@trimorig\space \zwpl@trimorig\space
                            \zwpl@trimwidth\space \zwpl@trimheight]
-                 /ArtBox [\zwpl@trimorig\space \zwpl@trimorig\space
-                          \zwpl@trimwidth\space \zwpl@trimheight]}
+                 %/ArtBox [\zwpl@trimorig\space \zwpl@trimorig\space
+                          %\zwpl@trimwidth\space \zwpl@trimheight]
+    }
     \ifcaseZWdriver
     \or
       \expandafter\pdfpageattr\expandafter{\zw@tmp}
     \or
-      \edef\zw@tmpx{pdf:put @pages <<\zw@tmp>>}
-      \expandafter\special\expandafter{\zw@tmpx}
+      \edef\ZWPL@XeTeXboxes{\noexpand\special{pdf:put @thispage <<\zw@tmp>>}}
     \else
       \special{! userdict begin
                  userdict /bop-hook known {/bop-hook load cvx /ZWBox-hook exch def} if
@@ -298,8 +299,8 @@
                                \zwpl@bleedwidth\space \zwpl@bleedheight] /PAGE pdfmark
                    [/TrimBox [\zwpl@trimorig\space \zwpl@trimorig\space
                               \zwpl@trimwidth\space \zwpl@trimheight] /PAGE pdfmark
-                   [/ArtBox [\zwpl@trimorig\space \zwpl@trimorig\space
-                             \zwpl@trimwidth\space \zwpl@trimheight] /PAGE pdfmark
+                   %[/ArtBox [\zwpl@trimorig\space \zwpl@trimorig\space
+                             %\zwpl@trimwidth\space \zwpl@trimheight] /PAGE pdfmark
                    userdict /ZWBox-hook known {ZWBox-hook} if
                  } def
       end}
@@ -762,13 +763,14 @@
       \def\@evenhead{\OverprintXeTeXExtGState \zwpl@evenhead}%
     \fi
   \fi
-  \def\@oddfoot{\zwpl@cropbox\zwpl@oddfoot}%
-  \def\@evenfoot{\zwpl@cropbox\zwpl@evenfoot}}
+  \def\@oddfoot{\zwpl@cropbox\zwpl@oddfoot\zw@tinyfil}%
+  \def\@evenfoot{\zwpl@cropbox\zwpl@evenfoot\zw@tinyfil}}
 
-\def\zw@tinyfil{\tolerance\@M \hskip \z@ plus .000001fil \relax}
+\def\zw@tinyfil{\tolerance\@M \hskip \z@ plus .00001fil \relax}
 
 % We must use the knockout mode in the cropmarks (added 2010-12-21)
 \def\zwpl@cropbox{{\globaldefs=0\relax \ifzwpl@overprint\SetKnockout\fi
+  \csname ZWPL@XeTeXboxes\endcsname
   \rlap{% Some parameters may be changed within the document
   \raisebox{\zwpl@low}[\z@][\z@]{\everyvbox{}\offinterlineskip\boxmaxdepth\z@
     \hskip -\hoffset \hskip -1in \hskip -
@@ -1005,13 +1007,23 @@
 
 \def\thePageNumber{\#\,\arabic{page}}
 
+\def\zwpl@xprintcolor{\@ifstar\zwpl@s@printcolor\zwpl@printcolor}
+
 \def\zwpl@printcolor#1:#2:{\edef\zwpl@temp{\noexpand\textcolor[\zwpl@colormodel]{#2}{#1}}\zwpl@temp\space}
 
-\def\zwpl@showcolors#1,#2*{\zwpl@printcolor#1:%
+\def\zwpl@s@printcolor#1:#2:{\bgroup
+    \setbox\@tempboxa=\hbox{\space \ignorespaces #1 \unskip \space}\@tempdima=\wd\@tempboxa
+    \@tempdimb=\ht\@tempboxa  \advance\@tempdimb .5pt
+    \@tempdimc=\dp\@tempboxa  \advance\@tempdimc .5pt
+    \edef\zwpl@temp{\noexpand\textcolor[\zwpl@colormodel]{#2}{\rlap{\vrule
+          width \@tempdima height \@tempdimb depth \@tempdimc}}}\zwpl@temp
+    \color{white}\box\@tempboxa \egroup \space}
+
+\def\zwpl@showcolors#1,#2*{\zwpl@xprintcolor#1:%
     \ifcat$#2$\let\zwpl@next\relax
     \else\def\zwpl@next{\zwpl@showcolors#2*}\fi \zwpl@next}
 
-\def\zwpl@showallcolors{\raisebox{.2ex}[\z@][\z@]{\expandafter\zwpl@showcolors\zwpl@colors,*}}
+\def\zwpl@showallcolors{\raisebox{.25ex}[\z@][\z@]{\expandafter\zwpl@showcolors\zwpl@colors,*}}
 
 % Reflect (should be at the end of the package)