xwatermark (19aug12)

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

1 files changed, 21 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty b/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
index 9c07a23545a..c9b5394e3b8 100644
--- a/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
+++ b/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
@@ -1,5 +1,5 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file 'xwatermark.sty', version 1.5.2a, February 2012.              %
+% This is file 'xwatermark.sty', version 1.5.2b, August 2012.                %
 %                                                                            %
 % This package puts user-specified watermarks (graphics and arbitrary        %
 % texts) on select pages of documents. See package documentation             %
@@ -23,17 +23,17 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
 \@ifpackageloaded{catoptions}{%
-  \@ifpackagelater{catoptions}{2011/10/22}{}{%
-    \@latex@error{Loaded version of catoptions package is
+  \@ifpackagelater{catoptions}{2012/08/01}{}{%
+    \@latex@error{Loaded version of 'catoptions' package is
       not current}\@ehc
   }%
 }{%
-  \RequirePackage{catoptions}[2011/10/22]%
+  \RequirePackage{catoptions}[2012/08/01]%
 }
 \UseNormalCatcodes
 \StyleFilePurpose{A dynamic watermarking scheme}
 \StyleFileRCSInfo
-$Id: xwatermark.sty,v 1.5.2a 2012/02/01 09:00:00 Ahmed Musa Exp $
+$Id: xwatermark.sty,v 1.5.2b 2012/08/10 09:00:00 Ahmed Musa Exp $
 \ProvidesPackage{xwatermark}[\StyleFileInfo]
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \SetStyleFileMessages[xwm@]{info}{warn}{err}
@@ -45,7 +45,7 @@ $Id: xwatermark.sty,v 1.5.2a 2012/02/01 09:00:00 Ahmed Musa Exp $
   atbegshi||2008/07/31;
   fancyhdr;
   atveryend||2010/03/24;
-  ltxkeys||2011/01/01;
+  ltxkeys;
   framed||2007/10/04
 }
 \AtEndOfPackage{\BeforeStartOfDocument{%
@@ -458,7 +458,6 @@ $Id: xwatermark.sty,v 1.5.2a 2012/02/01 09:00:00 Ahmed Musa Exp $
     \undefcs\xwm@afterlastpage
     \undefcs\xwm@afterl@stpage
   }%
-  \let\xwm@newlabel\xwm@testdef
 }
 \robust@def*\xwmnewlabel{\xwm@newlabel{xwmr}}
 \robust@def*\xwm@newlabel#1#2#3{%
@@ -469,23 +468,24 @@ $Id: xwatermark.sty,v 1.5.2a 2012/02/01 09:00:00 Ahmed Musa Exp $
     }%
     \ltxmsg@warn{Label '#2' multiply defined}%
   }%
-  \csngdef*{#1@#2}{#3}%
+  \csn@gdef{#1@#2}{#3}%
   \endgroup
 }
 \let\xwm@multiplelabels\relax
 \BeforeStartOfDocument{%
   \global\let\xwm@multiplelabels\relax
 }
-\robust@def*\xwm@testdef#1#2#3{%
+\robust@def*\xwm@lbtestdef#1#2#3{%
   \begingroup
   \def\xwm@tempa{#3}%
-  \aftercsname\ifxTF{#1@#2}\xwm@tempa
-    {\global\xwm@swafalse}{\global\xwm@swatrue}%
+  \expandafter\ifx\csname#1@#2\endcsname\xwm@tempa\else
+    \gdef\xwm@lbtestsw{00}\fi
   \endgroup
 }
-% No need for \makeatletter in .xwm file since the file is read
-% by this package only:
+\begingroup
+\makeatletter
 \InputIfFileExists{\jobname.xwm}{}{}
+\endgroup
 \if@filesw
   \immediate\openout\xwm@wrt=\jobname.xwm
   \immediate\write\xwm@wrt{\relax}
@@ -498,9 +498,15 @@ $Id: xwatermark.sty,v 1.5.2a 2012/02/01 09:00:00 Ahmed Musa Exp $
     \endgroup
   \fi
   \immediate\closeout\xwm@wrt
+  \let\xwm@newlabel\xwm@lbtestdef
+  \gdef\xwm@lbtestsw{01}%
+  \begingroup
+  \makeatletter
+  \InputIfFileExists{\jobname.xwm}{}{}%
+  \endgroup
   \if@filesw
     \ifx\xwm@multiplelabels\relax
-      \ifxwm@swa
+      \if\xwm@lbtestsw
         \ltxmsg@warn{Label(s) may have changed.
           Rerun to get cross-references right}%
       \fi
@@ -1658,7 +1664,7 @@ $Id: xwatermark.sty,v 1.5.2a 2012/02/01 09:00:00 Ahmed Musa Exp $
     }%
   }%
   \tsv@@loop*\xwm@inputpath
-  \ifboolTF{cpt@choicefd}\@firstoftwo\@secondoftwo
+  \ifboolTF{cpt@choicefd}%
 }
 \robust@def*\xwm@nofileerr#1#2{%
   \message{%