8 files changed, 12 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/License.txt b/Master/texmf-dist/doc/latex/zwpagelayout/License
index 90e5e3ab797..90e5e3ab797 100644
--- a/Master/texmf-dist/doc/latex/zwpagelayout/License.txt
+++ b/Master/texmf-dist/doc/latex/zwpagelayout/License
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/README b/Master/texmf-dist/doc/latex/zwpagelayout/README
index b8529959e8c..b7f64b65b10 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.1                          21 December 2010
+Package: zwpagelayout   Version 1.2                          4 September 2011
 =============================================================================
 
 This package was developed as a typographers toolbox offering the most 
@@ -8,6 +8,8 @@ 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.
 
+Version 1.2 is a bug fix release, there was a bug in \ZWifdriver.
+
 Version 1.1 adds a few features: support of black overprint, possibility
 of setting PDF information without the need of loading the hyperref package,
 automatic setting of ArtBox, TrimBox and BleedBox (can be disabled) and
diff --git a/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf b/Master/texmf-dist/doc/latex/zwpagelayout/adjustfoot.pdf
index 759d9676bd5..9b8be271b7e 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 5eb0bcd0d44..3d18a8fdcad 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 99addcdb5f2..6451360e09c 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 b54c2f988ae..4c1cf60b38d 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 42860154c76..93247bc2ce5 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 375 2010-12-21 11:27:31Z zw $
+%% $Id: zwpagelayout.tex 382 2011-09-04 11:06:05Z zw $
 \input utf8-t1 % encTeX required
 \documentclass[11pt]{article}
 \usepackage{zwgetfdate}
@@ -530,7 +530,7 @@ will be shifted by setting \cmd{hoffset} and \cmd{voffset}. If you wish to print
 The values of \cmd{hoffset} and \cmd{voffset} will be set to the sum of \opt{croplength} and \opt{cropgap}, see the following
 text.
 
-\subsection{Basic crop marks options}\label{cropmarks}
+\subsection{Basic crop marks options}
 Options described in this section define basic behaviour of the crop marks.
 
 \subsubsection{Option \opt{onlycropmarks}, default \false, standard \true}
@@ -1039,7 +1039,7 @@ for \texttt{xetex}, 3 for \texttt{dvips}. The branching may look as follows:
 \end{verbatim}
 
 \vb
-Since \cmd{ifcaseZWdriver} is a macro, it cannot by used inside another conditional statement. If
+Since \cmd{ifcaseZWdriver} is a macro, it cannot be used inside another conditional statement. If
 it falls to the \false\ branch, it will not be expanded and \TeX\ will complain that it sees
 misplaced \cmd{else} etc. You would have to enter all corresponding contidional as \cmd{csname}
 constructions or define the condition in a separate macro that will be invoked from the condition.
diff --git a/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty b/Master/texmf-dist/tex/latex/zwpagelayout/zwpagelayout.sty
index fe33debd52e..9829e307e84 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}[2010/12/21 ZW Page Layout]
-\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 377 2010-12-21 14:29:56Z zw $\@gobble}
+\ProvidesPackage{zwpagelayout}[2011/09/04 ZW Page Layout]
+\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 382 2011-09-04 11:06:05Z zw $\@gobble}
 
 %% Copyright 2008--2010 Z. Wagner, http://icebearsoft.euweb.cz
 %
@@ -55,7 +55,6 @@
 \DeclareStringOption[210mm,297mm]{papersize}[] % empty means to calculate
 
 % Normalized paper sizes
-\errorcontextlines 999
 
 \DeclareVoidOption{a0}{\setkeys{zwpl}{AllowWidthHeightSwitching,papersize={841mm,1189mm}}}
 \DeclareVoidOption{a1}{\setkeys{zwpl}{AllowWidthHeightSwitching,papersize={594mm,841mm}}}
@@ -201,7 +200,7 @@
 \DeclareRobustCommand\ZWifdriver[2]{\expandafter\ifx\csname zwpl@use#1\endcsname\relax
     \PackageWarningNoLine{zwpagelayout}{Driver #1 not recognized, code ignored}%
   \else
-  \ifnum\csname zwpl@use#1\endcsname=\zwpl@Driver\relax #2\fi}
+  \ifnum\csname zwpl@use#1\endcsname=\zwpl@Driver\relax #2\fi\fi}
 
 \PackageInfo{zwpagelayout}{Driver mode used:
             \ifcaseZWdriver unknown\or pdftex\or xetex\else dvips\fi.\MessageBreak}
@@ -671,9 +670,9 @@
   }
 \or % xetex
   \iffalse % disabled because it does not work
-  \special{pdf: object @opoff << /Type /ExtGState /op false /OP false /OPM 0 >>}
-  \special{pdf: object @opon << /Type /ExtGState /op true /OP true /OPM 1 >>}
-  \special{pdf: object @extgs << /GSko @opoff 0 R /GSop @opon 0 R >>}
+  \special{pdf: obj @opoff << /Type /ExtGState /op false /OP false /OPM 0 >>}
+  \special{pdf: obj @opon << /Type /ExtGState /op true /OP true /OPM 1 >>}
+  \special{pdf: obj @extgs << /GSko @opoff 0 R /GSop @opon 0 R >>}
   \special{pdf: put @resources << /ExtGState @extgs 0 R >>}
   % macros for setting and resetting the overprint state
   \def\zwpl@setop{\zwpl@resetop