zwpagelayout 1.4a (21may12)

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

7 files changed, 18 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/README b/Master/texmf-dist/doc/latex/zwpagelayout/README
index 40675167bcc..c5b5381fc58 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.4                               13 May 2012
+Package: zwpagelayout   Version 1.4a                              20 May 2012
 =============================================================================
 
 This package was developed as a typographers toolbox offering the most 
@@ -7,6 +7,11 @@ 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 pdfTeX. 
 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.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 e7ca761b803..41a9013e911 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 ae3bf8a3ff4..fef15d96a82 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 25fc90831cb..7891c285ee5 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 82d5a39e31e..541692c9972 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 35d9a87890c..1e7c04bffc6 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 433 2012-05-13 17:22:20Z zw $
+%% $Id: zwpagelayout.tex 435 2012-05-20 18:02:14Z zw $
 \input utf8-t1 % encTeX required
 \documentclass[11pt]{article}
 \usepackage{zwgetfdate}
@@ -1243,6 +1243,11 @@ 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.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
+style.
+
 \subsection{Version 1.4, 2012/05/13}
 Black overprint is implemented for the (x)dvipdfm(x) family of drivers. It means that it now works
 in \XeLaTeX, see section~\ref{overprinting}.
diff --git a/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty b/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
index 461383265d3..67a9f34d11f 100644
--- a/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
+++ b/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
@@ -1,5 +1,5 @@
-\ProvidesPackage{zwpagelayout}[2012/05/13 ZW Page Layout]
-\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 432 2012-05-13 15:31:25Z zw $\@gobble}
+\ProvidesPackage{zwpagelayout}[2012/05/20 ZW Page Layout]
+\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 435 2012-05-20 18:02:14Z zw $\@gobble}
 
 %% Copyright 2008--2012 Z. Wagner, http://icebearsoft.euweb.cz
 %
@@ -747,7 +747,10 @@
 \fi
 
 \def\zwpl@testps#1{\xdef\zw@pstyle{ZW\ZWpercent#1\ZWpercent}%
-    \@ifundefined{ps@\zw@pstyle}{\zwpl@patchps{#1}{\zw@pstyle}}{}\zwpl@next{\zw@pstyle}}
+    \@ifundefined{ps@#1}{\xdef\zw@reqstyle{empty}%
+      \PackageError{zwpagelayout}{Page style `#1' undefined, `empty' will be used.}}%
+      {\xdef\zw@reqstyle{#1}}%
+    \@ifundefined{ps@\zw@pstyle}{\zwpl@patchps{\zw@reqstyle}{\zw@pstyle}}{}\zwpl@next{\zw@pstyle}}
 
 \def\zwpl@patchps#1#2{\expandafter\gdef\csname ps@#2\endcsname{\csname ps@#1\endcsname \zwpl@patchfoot}}