xwatermark (17oct12)

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

11 files changed, 35 insertions, 598 deletions

diff --git a/Master/texmf-dist/doc/latex/xwatermark/README b/Master/texmf-dist/doc/latex/xwatermark/README
index 0322e818dc3..28420e50d05 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/README
+++ b/Master/texmf-dist/doc/latex/xwatermark/README
@@ -2,7 +2,11 @@ This is the README file for the 'xwatermark' package.
 
 VERSION
 
-Version 1.5.2b, 10 August 2012
+Version 1.5.2c, 10 October 2012
+
+LOCATION ON CTAN
+
+macros/latex/contrib/xwatermark
 
 SUMMARY
 
diff --git a/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex b/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
index 954064c41c7..775e2b31323 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
@@ -1,5 +1,5 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide (global options), version 1.5.2a             %
+% This is file xwatermark-guide (global options), version 1.5.2c             %
 %                                                                            %
 % Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
diff --git a/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex b/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex
index 85bc44d146a..55ae1da30e9 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex
@@ -1,5 +1,5 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide (local options), version 1.5.2a              %
+% This is file xwatermark-guide (local options), version 1.5.2c.             %
 %                                                                            %
 % Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
@@ -170,5 +170,4 @@
 
 \normalfont\normalsize
 
-
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.cfg b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.cfg
deleted file mode 100644
index 7644422fc9b..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.cfg
+++ /dev/null
@@ -1,248 +0,0 @@
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-examples.cfg, version 1.5.2a                       %
-%                                                                            %
-% Copyright (c) 2009-2012 Ahmed2Musa (a.musa@rocketmail.com).                %
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-
-\ProvidesFile{xwatermark-examples.cfg}
-  [2012/02/01 v1.5.2a Configuration file for xwatermark-examples.tex (AM)]
-\NeedsTeXFormat{LaTeX2e}
-\makeatletter
-
-\@ifundefined{ver@ltxtools-base1.sty}{%
-  \csname @\ifx\documentclass\@twoclasseserror
-    first\else second\fi oftwo\endcsname
-  \usepackage\RequirePackage{ltxtools-base1}%
-}{}
-\AtBeginDocument{\hypersetup{pdfstartview=Fit,colorlinks}}
-
-\ltsloadpackages{%
-  xcolor|dvipsnames,table,hyperref;
-  geometry|left=3cm,right=3cm,top=2.5cm,bottom=2.5cm,includeheadfoot;
-  lipsum;
-  amsmath;
-  amssymb;
-  ltxtools-doc;
-  xwatermark|printwatermark;
-  hyperref|verbose=false,pdfpagemode=UseThumbs,
-    pdfview=FitB,pdfstartview=FitB;
-}
-\WrapQuotes
-\new@def\hspce{\hspace{1cm}}
-\nameabbrev\lppl{\LaTeX\ Project Public License}[LPPL]
-\providerobust@def*\eg{%
-  \ifnextcharTF.{e.\,g\sspace}{e.\,g.\@\sspace}%
-}
-\providerobust@def*\ie{%
-  \ifnextcharTF.{i.\,e\sspace}{i.\,e.\@\sspace}%
-}
-\shelllet\ttcl=\textcolor
-\providerobust@def*\xcopyright#1{%
-  \unskip\ttcl{#1}{\textsuperscript{\copyright}}%
-}
-\robust@def*\xxcopyright{%
-  \mbox{\textcopyright~\lower.7\p@\hbox{\uppercase
-  \expandafter{\romannumeral\year}}}\sspace
-}
-\robust@def*\colorbullet#1{\ttcl{#1}{\textbullet}\sspace}
-\providerobust@def*\pkg{%
-  \ifnextcharTF'%
-    {\@firstoftwo{\def\xwm@pkgsw{00}\xwm@pkg}}
-    {\def\xwm@pkgsw{01}\xwm@pkg}%
-}
-\robust@def*\xwm@pkg#1{%
-  \def\do##1{\ttcl{ForestGreen}{\texttt{##1}}}%
-  \ltsprintcommalist{#1}\do
-  \if\xwm@pkgsw\@space package\ifnum\maxindrisnr>\@ne s\fi\fi
-}
-\providerobust@def*\email{\hyper@normalise\xwm@email}
-\robust@def*\xwm@email#1{\href{mailto:#1}{#1}}
-\AfterStartOfDocument{%
-  \def\thefootnote{\fnsymbol{footnote}}%
-}
-
-\fancypagenos[
-  showonpageone     = false,
-  coordunit         = pc,
-  showheadrule      = false,
-  showfootrule      = false,
-  x-position        = 0,
-  y-position        = -.5\textwidth,
-  scale             = 2.5,
-  angle             = 0,
-  hfoffset-left     = .9,
-  hfoffset-right    = .9,
-  style             = Page \thepage~of~\lastdocpage,
-  header-left       = \ttcl{blue}{\today},
-  header-right      = Ahmed Musa,
-  footer-center     = \pkg'{xwatermark},
-  header-center     = \textsf{\ttcl{purple}{Demonstration document}}
-]
-
-\renewcommand\textfraction{0.05}
-\renewcommand\topfraction{0.95}
-\renewcommand\bottomfraction{0.95}
-\abovedisplayskip=6pt plus3pt minus1pt
-\belowdisplayskip=6pt plus3pt minus1pt
-\abovedisplayshortskip=0pt plus3pt minus0pt
-\belowdisplayshortskip=4pt plus3pt minus0pt
-\belowcaptionskip=6pt plus3pt minus1pt
-\abovecaptionskip=6pt plus3pt minus1pt
-\setcounter{totalnumber}{5}
-
-\csn@def{watermark-2}{%
-  % The macro \aaa below is an unlikely example definition,
-  % but it provides a test of xwatermark schemes:
-  \def\aaa##1{##1}%
-  \xwmcolorbox[fillcolor=gray!55,width=.982\paperheight,
-    textalign=center,framesep=5pt,framerule=2pt,
-    outerframecolor=blue,innerframecolor=white]{%
-    \color{white}\framebox[2cm][c]{\phantom{Hello}}%
-    \hspce\color{black}\ttcl{red}{\textbullet}%
-    \hspce The marks on these pages were
-    placed effortlessly by using the \pkg'{xwatermark}
-    \hspce\ttcl{red}{\textbullet}\hspce\color{white}%
-    \framebox[2cm][c]{\phantom{Hello}}%
-    \rotatebox[origin=c]{90}{\makebox[1.4cm][c]{\phantom{Hello}}}%
-  }\\[0cm]%
-  \rotatebox[origin=c]{-90}{\raisebox{-13.55cm}[0cm][0cm]{%
-  \hspace*{-.1mm}%
-    \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=yellow!75,
-      outerframecolor=ForestGreen,innerframecolor=white,
-      textalign=center,width=.715\paperwidth]{%
-      \color{white}\framebox[2cm][c]{\phantom{Hello}}\hspce
-      \color{black}\ttcl{red}{\textbullet}%
-      \hspce Page~\thepage~of~\pageref*{xwmlastpage}\hspce
-      \ttcl{red}{\textbullet}\hspce
-      \color{white}\framebox[2cm][c]{\phantom{Hello}}%
-      \rotatebox[origin=c]{90}{\makebox[1.4cm][c]{\phantom{Hello}}}%
-  }}}\\[0cm]%
-    \rotatebox[origin=c]{-90}{\raisebox{12.35cm}[0cm][0cm]
-      {\makebox[0cm][r]{%
-      \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=yellow!55,
-        outerframecolor=ForestGreen,innerframecolor=white,
-        textalign=justified,width=.715\paperwidth]{%
-          \normalfont\small\color{blue}\vspace*{-1ex}%
-          \begin{center}\colorbullet{red}\hspace{.25cm}%
-          \ttcl{Purple}{LICENSE}%
-          \hspace{.25cm}\colorbullet{red}\end{center}\relax
-          This work (\ie, all the files in the \pkg'{xwatermark}
-          manifest) may be distributed and/or modified under the
-          conditions of the \lppl, either version~1.3 of this
-          license or any later version. The \lppl maintenance
-          status of this software is \quoted{author-maintained}.
-          This software is provided \quoted{as it is}, without
-          warranty of any kind, either expressed or implied,
-          including, but not limited to, the implied
-          warranties of merchantability and fitness for a
-          particular purpose.
-  }}}}\\[0cm]%
-  \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=gray!55,
-    outerframecolor=blue,innerframecolor=white,
-    textalign=center,width=.982\paperheight]{%
-      \color{white}\framebox[2cm][c]{\phantom{Hello}}%
-      \hspce\color{black}\ttcl{red}{\textbullet}%
-      \hspace{4.3cm}User manual for the \pkg'{xwatermark}
-      \hspace{4.3cm}\ttcl{red}{\textbullet}\hspce
-      \color{white}\framebox[2cm][c]{\phantom{Hello}}%
-      \rotatebox[origin=c]{90}{\makebox[1.4cm][c]
-      {\phantom{Hello}}}%
-  }%
-}
-\newcommand*\scaleb[1]{\scalebox{2.5}{#1}}
-\newcommand*\tmptexbox{%
-  \fboxrule4pt\fbox{\scaleb\TeX}\\[0ex]\fbox{\scaleb\LaTeX}%
-}
-\csn@def{watermark-3}{%
-  \xwmcolorbox[width=.8\paperwidth,framerule=4pt,framebox,
-    framesep=4pt,innerframecolor=Green,outerframecolor=blue]{%
-    \xwmminipage[width=.7\paperwidth,textalign=left,
-      framerule=4pt,framecolor=magenta,textcolor=red,framebox]
-      {\tmptexbox}\\[0ex]%
-    \xwmminipage[width=.7\paperwidth,textalign=center,
-      textcolor=blue,framerule=4pt,framecolor=black,framebox]
-      {\tmptexbox}\\[0ex]%
-    \xwmminipage[width=.7\paperwidth,textalign=right,
-      framecolor=ProcessBlue,textcolor=orange,framerule=4pt,
-      framebox]{\tmptexbox}%
-  }%
-}
-
-\csn@def{watermark-4}{%
-  \xwmcolorbox[fillcolor=teal,width=.983\paperheight,
-    textalign=center,framesep=5pt,framerule=2pt,
-    outerframecolor=purple,innerframecolor=magenta]{%
-    \color{white}\framebox[2cm][t]{\phantom{Hello}}%
-    \hspce\color{orange!85!red!55}%
-    \ttcl{red}{$\blacktriangleright$}\hspce The~
-    \texttt{\ttcl{white}{xwatermark}}~
-    package\hspce\ttcl{red}{$\blacktriangleleft$}%
-    \hspce\color{white}\framebox[2cm][t]{\phantom{Hello}}%
-    \rotatebox[origin=c]{90}{\makebox[1.4cm][c]{\phantom{Hello}}}%
-  }\\[0cm]%
-  \rotatebox[origin=c]{-90}{\raisebox{-13.7cm}[0cm][0cm]{%
-    \hspace*{-.1mm}%
-    \xwmcolorbox[framesep=5pt,framerule=2pt,
-      fillcolor=green!75!blue!50,outerframecolor=brown,
-      innerframecolor=white,textalign=center,width=.713\paperwidth,
-      textcolor=white]{a.musa@rocketmail.com}}%
-  }\\[0cm]%
-    \rotatebox[origin=c]{-90}{\raisebox{13.5cm}[0cm][0cm]{%
-      \makebox[0cm][r]{%
-      \xwmcolorbox[framesep=5pt,framerule=2pt,
-        fillcolor=green!75!blue!50,outerframecolor=brown,
-        innerframecolor=white,textalign=center,width=.713\paperwidth,
-        textcolor=white]{\xxcopyright Ahmed Musa}%
-  }}}\\[0cm]%
-  \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=teal,
-    outerframecolor=purple,innerframecolor=magenta,textalign=center,
-    width=.983\paperheight]{\color{white}\framebox[2cm][t]
-    {\phantom{Hello}}\hspce\color{orange!85!red!55}%
-    \ttcl{red}{$\blacktriangleright$}\hspace{2.1cm}%
-    Page~\thepage~of~\pageref*{xwmlastpage}%
-    \hspace{2cm}\ttcl{red}{$\blacktriangleleft$}\hspce
-    \color{white}\framebox[2.1cm][t]{\phantom{Hello}}%
-    \rotatebox[origin=c]{90}{\makebox[1.4cm][c]{\phantom{Hello}}}%
-  }%
-}
-\csn@def{watermark-5}{%
-  \xwmcolorbox[framesep=5pt,framerule=4pt,innerframecolor=green,
-  outerframecolor=red,textalign=center,width=.7\paperheight,
-  textcolor=blue]{\scalebox{5}{Hello world,}}\\[.25ex]%
-  \xwmcolorbox[framesep=5pt,framerule=4pt,innerframecolor=white,
-  outerframecolor=blue,fillcolor=brown!55,textalign=center,
-  width=.7\paperheight,textcolor=red]{\scalebox{5}{We're here!}}%
-}
-\csn@def{watermark-6}{%
-  \xwmminipage[width=\hsize,framerule=2pt,framebox,framecolor=green,
-    height=2cm,depth=2cm]{%
-    \xwmminipage[width=\hsize,textalign=center,textcolor=magenta,
-    framebox]{\fbox{\TeX}\\[0ex]\fbox{\LaTeX}}%
-  }%
-}
-
-\csn@def{watermark-7}{%
-  \begin{center}%
-  \color{Yellow}%
-  \fboxrule4\p@
-  \centering\fbox{%
-    \begin{minipage}[c]{\textwidth}%
-      \xwmstrut{2cm}\z@
-      \color{ProcessBlue}\centering
-      \fboxrule3\p@\vss
-      \fbox{%
-        \begin{minipage}[c]{.5\hsize}%
-          \xwmstrut{1.3cm}\z@
-          \fboxrule4\p@\vss
-          \centering\color{LimeGreen}%
-          \fbox{\ttcl{red}{\scalebox{2}{xwatermark}}}%
-          \xwmstrut\z@{1cm}%
-        \end{minipage}%
-      }%
-      \xwmstrut\z@{2cm}%
-    \end{minipage}%
-  }
-  \end{center}%
-}
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.pdf b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.pdf
deleted file mode 100644
index db2b512d5a0..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex
deleted file mode 100644
index b52b94bb361..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex
+++ /dev/null
@@ -1,86 +0,0 @@
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file 'xwatermark-examples1.tex', version 1.5.2a.                   %
-%                                                                            %                                                              % This work (ie, all the files in the xwatermark manifest) may be            %
-% distributed and/or modified under the conditions of the LaTeX              %
-% Project Public License, either version 1.3 of this license or any          %
-% later version. The latest version of this license is at                    %
-% http://www.latex-project.org/lppl.txt and version 1.3 or later             %
-% is part of all distributions of LaTeX version 2005/12/01 or later.         %
-%                                                                            %
-% The LPPL maintenance status of this software is 'author-maintained'.       %
-%                                                                            %
-% This software is provided 'as it is', without warranty of any kind,        %
-% either expressed or implied, including, but not limited to, the            %
-% implied warranties of merchantability and fitness for a particular         %
-% purpose.                                                                   %
-%                                                                            %
-% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-
-\documentclass[a4paper,10pt,final,showpagenos]{article}
-\makeatletter
-\InputIfFileExists{xwatermark-examples.cfg}{}{%
-  \errmessage{No file xwatermark-examples.cfg or wrong path}}
-
-\xnewwatermark
-[pages={\lastdocpage-1}-\lastdocpage,fontfamily=phv,fontsize=11pt,
-  fontseries=m,align=center,height=\paperheight,width=\paperheight,
-  angle=90,scale=1,xpos=1.15,ypos=0]{\usecsn{watermark-4}}
-
-\xnewwatermark*
-[pagex={3,5,7},fontfamily=phv,fontsize=11pt,
-  fontseries=m,align=center,height=\paperheight,width=\paperheight,
-  angle=0,scale=1,xpos=0,ypos=40]{\usecsn{watermark-7}}
-
-\xnewwatermark
-[page=1,fontfamily=phv,fontsize=11pt,
-  fontseries=m,align=center,height=\paperwidth,width=\paperheight,
-  angle=90,scale=1,xpos=1.15,ypos=0]{\usecsn{watermark-2}}
-
-\xnewwatermark
-[page=3,fontfamily=phv,fontsize=11pt,fontseries=m,align=center,
-  height=\paperheight,width=.7\paperheight,angle=45,scale=1,xpos=0,
-  ypos=0]{\usecsn{watermark-5}}
-
-\xnewwatermark
-[evenpages,fontfamily=phv,fontsize=11pt,fontseries=m,align=center,
-  height=\paperheight,width=\paperheight,angle=45,scale=1,xpos=1,
-  ypos=0]{\usecsn{watermark-3}}
-
-
-\begin{document}
-
-\title{%
-  {\setbox\z@\vbox to.25\paperheight{}\box0}%
-  \bfseries The \texttt{\ttcl{blue}{xwatermark}} Package
-  \xcopyright{red}\\[1ex]
-  \large Version 1.5.2a\\[2ex]
-  \Large EXAMPLES (File 1)%
-}
-\author{%
-  \textbf{Ahmed Musa}\\Preston, United Kingdom\\
-  \email{amusa22@gmail.com}
-}
-\maketitle
-
-\thispagestyle{empty}
-
-\newpage
-\noindent
-\ltslipsum[1-3]
-
-\newpage
-\ltslipsum[1-4]
-
-\newpage
-\ltslipsum[1-4]
-
-\newpage
-\ltslipsum[1-4]
-
-\newpage
-\ltslipsum[1-4]
-
-\newpage
-\ltslipsum[1-4]
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.pdf b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.pdf
deleted file mode 100644
index 1f96a24e6da..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex
deleted file mode 100644
index 5e8c9e52ee2..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex
+++ /dev/null
@@ -1,199 +0,0 @@
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file 'xwatermark-examples2.tex', version 1.5.2a.                   %
-%                                                                            %
-% This work (ie, all the files in the xwatermark manifest) may be            %
-% distributed and/or modified under the conditions of the LaTeX              %
-% Project Public License, either version 1.3 of this license or any          %
-% later version. The latest version of this license is at                    %
-% http://www.latex-project.org/lppl.txt and version 1.3 or later             %
-% is part of all distributions of LaTeX version 2005/12/01 or later.         %
-%                                                                            %
-% The LPPL maintenance status of this software is 'author-maintained'.       %
-%                                                                            %
-% This software is provided 'as it is', without warranty of any kind,        %
-% either expressed or implied, including, but not limited to, the            %
-% implied warranties of merchantability and fitness for a particular         %
-% purpose.                                                                   %
-%                                                                            %
-% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-
-\documentclass[final,showpagenos]{article}
-\makeatletter
-
-\InputIfFileExists{xwatermark-examples.cfg}{}{%
-  \errmessage{No file xwatermark-examples.cfg or wrong path}}
-
-\thispagestyle{empty}
-\watermarkpaths[.](/){{}{/Graphics}}
-
-\newwatermark*[%
-  page=2,fontfamily=put,textcolor=BurntOrange,fontsize=1cm,
-  textscale=1,textalign=center,textangle=45,picangle=90,
-  picontoptext=false,boxalign=center,picxpos=50,
-  picypos=.25\paperheight,textxpos=-70,textypos=-50,
-  picbb=116 428 477 718,picscale=1,picfile=tabu-test1,
-  picfileext=eps
-]{\ttcl{Green}{\texttt{xwatermark\\package}}}
-
-\newwallpaper[%
-  page=2,fontfamily=put,textcolor=BurntOrange,fontsize=1cm,
-  textscale=2,textalign=center,textangle=45,picangle=45,
-  tilexoffset=0pt,squaretiles,tileyoffset=0pt,picontoptext=true,
-  boxalign=center,picbb=54 54 483 242,picscale=2,picfile=fant,
-  tileno=4,picfileext=epsx,graphicsoptions={keepaspectratio,hiresbb}
-]{\texttt{fant}}
-
-
-% * (star) means 'put on foreground';
-% ' (prime) means 'ignore this mark':
-\newwallpaper*[%
-  page=3,fontfamily=put,textcolor=BurntOrange,fontsize=1cm,textscale=2,
-  textalign=center,textangle=45,picangle=45,tilexoffset=0pt,%squaretiles,
-  tileyoffset=0pt,picontoptext=false,boxalign=center,
-  picbb=116 428 477 718,picscale=2,picfile=tabu-test1,tileno=4,
-  % The package will look for the right file extension in each mode,
-  % ignoring the following 'epsx':
-  picfileext=epsx
-]{\texttt{test}}
-
-\newwallpaper[%
-  page=5,fontfamily=put,textcolor=BurntOrange,fontsize=1cm,textscale=2,
-  textalign=center,textangle=0,picangle=0,tilexoffset=0pt,squaretiles,
-  tileyoffset=0pt,picontoptext=false,boxalign=center,showpagecenter,
-  picbb=116 428 477 718,picscale=2,picfile=tabu-test1,tileno=4,
-  picfileext=eps
-]{\texttt{test}}
-
-\newwallpaper*[%
-  page=4,fontfamily=put,textcolor=violet!70,fontsize=1cm,textscale=1,
-  textalign=center,textangle=45,picangle=0,tilexoffset=0pt,squaretiles,
-  tileyoffset=0pt,picontoptext=false,boxalign=center,%top-left,
-  picbb=20 21 590 400,picscale=1,picfile=comet1,%tileno=8,
-  picfileext=epsx
-]{Comet}
-
-\dummywallpaper[%
-  page=5,fontfamily=put,textcolor=BurntOrange,fontsize=1cm,textscale=2,
-  textalign=center,textangle=45,picangle=45,squaretiles,tilexoffset=0pt,
-  tileyoffset=0pt,picontoptext=false,%boxalign=l-t,
-  picbb=115 623 238 747,picscale=2,picfile=xwatermarkpic1,
-  picfileext=eps
-]{YES}
-
-\newwatermark[%
-  pages=4,fontfamily=put,textcolor=blue,fontsize=1.2cm,textscale=1,
-  width=.8\paperheight,textalign=center,textangle=90,textxpos=0,textypos=0
-]{%
-  \xwmcolorbox[framesep=4pt,framerule=4pt,fillcolor=brown!70!yellow!55,
-    innerframecolor=white,outerframecolor=blue,height=1.5cm,
-    depth=1cm,textalign=center,width=.8\paperheight]%
-  {\tt\string\advance\ttcl{red}{\string\knowledge}%
-  \string\by\ttcl{red}{\string\inquiry}}%
-}
-
-\newwatermark[%
-  page=6,fontfamily=put,textcolor=BurntOrange!70,fontsize=1cm,textscale=2,
-  picbb=78 563 304 788,picscale=2,picfile=xwatermarkpic3,
-  picfileext=epsx,width=\paperwidth,textalign=center,textangle=0,
-  textxpos=0,textypos=0,picontoptext=false
-]{\ttcl{black}{Yes}}
-
-\newwatermark*[%
-  page=6,fontfamily=put,textcolor=violet!70,fontsize=2cm,textscale=1,
-  width=\paperwidth,textalign=center,textangle=0,textxpos=0,textypos=0
-]{\fbox{Brought to front}}
-
-\newwatermark[%
-  page=7,fontfamily=put,textcolor=MidnightBlue!80,fontsize=2cm,textscale=1,
-  width=\paperwidth,textalign=center,textangle=-50,textxpos=-30,textypos=80
-]{\fbox{Taken to back}}
-
-\csndef*{watermark-2a}#1#2{%
-  \newwatermark[%
-    pages=6-7,fontfamily=pbk,textcolor=gray!35,fontsize=12pt,fontseries=n,
-    textalign=center,textangle=#2,textscale=1,textxpos=#1,textypos=0,
-    width=\paperheight
-  ]{%
-    \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=teal,
-      innerframecolor=magenta,outerframecolor=green,
-      textalign=center,width=.98\paperheight]%
-      {%
-        \color{white}\framebox[2cm][t]{\phantom{Hello}}\hspace{1cm}%
-        \color{orange!85!red!55}\ttcl{red}{$\blacktriangleright$}%
-        \hspace{2.1cm}Page \thepage~of~\pageref{xwmlastpage}%
-        \hspace{2.1cm}\ttcl{red}{$\blacktriangleleft$}\hspace{1cm}%
-        \color{white}\framebox[2cm][t]{\phantom{Hello}}%
-        \xwmstrut{9mm}{6mm}%
-    }%
-  }%
-}
-
-\begin{ltscomment}
-The same watermark is placed twice on the same page.
-Compare this with one of the examples in  xwatermark-examples1.tex:
-\end{ltscomment}
-
-\usecsn{watermark-2a}{-.428\paperwidth}{90}
-\usecsn{watermark-2a}{.428\paperwidth}{-90}
-
-\begin{ltscomment}
-Here is an inefficient example. \scalebox and \rotatebox
-could have been more efficiently achieved in the following
-example:
-\end{ltscomment}
-\newwatermark[page=\lastdocpage,width=\paperheight]{%
-  \setbox\xwm@boxb=\hb@xt@.9\paperheight{%
-  \hfuzz\maxdimen\hss
-  \xwmcolorbox[framesep=4pt,framerule=4pt,fillcolor=brown!70,
-    innerframecolor=white,outerframecolor=MidnightBlue,height=1cm,
-    depth=.8cm,textalign=center,width=.8\paperheight]%
-    {\scalebox{1.2}{\bf\tt\ttcl{white}{\char`\\advance}%
-      \ttcl{red}{\string\knowledge}%
-      \string\by\ttcl{blue}{\char`\\inquiry}}}\hss}%
-  \begin{center}\rotatebox{45}{\box\xwm@boxb}\end{center}%
-}
-
-\begin{document}
-
-\title{%
-  {\setbox\z@\vbox to.25\paperheight{}\box0}%
-  \bfseries The \texttt{\ttcl{blue}{xwatermark}} Package
-  \xcopyright{red}\\[1ex]
-  \large Version 1.5.2a\\[2ex]
-  \Large EXAMPLES (File 2)%
-}
-\author{%
-  \textbf{Ahmed Musa}\\Preston, United Kingdom\\
-  \email{amusa22@gmail.com}
-}
-\maketitle
-\thispagestyle{empty}
-
-\newpage
-
-\ltslipsum[1-4]
-
-\ltslipsum
-
-\newpage
-
-\ltslipsum[1-4]
-
-\newpage
-
-\ltslipsum[1-4]
-
-\newpage
-
-\ltslipsum[1-4]
-
-\newpage
-
-\ltslipsum[1-4]
-
-\newpage
-
-\ltslipsum[1-4]
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
index 30840505db3..8fc850de85e 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
@@ -1,15 +1,18 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide.cfg, version 1.5.2a                          %
+% This is file xwatermark-guide.cfg, version 1.5.2c                          %
 %                                                                            %
 % Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
+% \usepackage[logonly]{trace}
+
 \ProvidesFile{xwatermark-guide.cfg}
-  [2012/02/01 v1.5.2a Configuration file for xwatermark-guide.tex (AM)]
+  [2012/10/14 v1.5.2c Configuration file for xwatermark-guide.tex (AM)]
 \NeedsTeXFormat{LaTeX2e}
 \makeatletter
 \ltsloadpackages{%
-  xwatermark|printwatermark;
+  % change file name ++++++++++++++++++++++++
+  n-xwatermark|printwatermark;
   array;
   colortbl;
 %  ltablex;
@@ -25,9 +28,11 @@
 }
 \newcolumntype{I}{!{\color{red}\vrule width 1pt}}
 \newcolumntype{W}{>{\hspace{0pt}\arraybackslash}m{\colthree}}
+% Adjust this if you change table width:
 \newcolumntype{M}{>{\rightskip-.4cm}m{\dimexpr\coltotal+.5cm}}
+%\newcolumntype{L}{m{\coltotal}}
 
-\amltxoptions{%
+\amltxdocoptions{%
   geometryoptions      = {left=3cm,right=3cm,top=2.5cm,%
                           bottom=2.5cm,includeheadfoot},
   reviewdocument        = false,
@@ -61,7 +66,8 @@
 
 \ifamd@subsidfile\else\ltsafterfi
 
-\usepackage[persistent,useincluput]{ltxtools-incluput}
+% Change package name: +++++++++++++++
+\usepackage[persistent,useincluput]{n-ltxtools-incluput}
 
 \fancypagenos[%
   showonpageone     = false,
@@ -98,7 +104,8 @@
 }
 
 \def\colorseriescycle{20}
-\definecolorseries{C}{cmyk}{last}{white}[cmyk]{1,0,0,0}
+%\definecolorseries{C}{cmyk}{last}{white}[cmyk]{1,0,0,0}
+\definecolorseries{C}{rgb}{step}{cyan!50}[cmyk]{1,0,0,0}
 \resetcolorseries[10]{C}
 \definecolorseries{M}{cmyk}{last}{white}[cmyk]{0,1,0,0}
 \resetcolorseries[10]{M}
@@ -136,7 +143,7 @@
   \fboxsep=2mm\relax
   \@tempcnta\z@pt
   \ltstfor xwatermark\dofor{%
-    \csn@def{d@\number\@tempcnta}{%
+    \csn@def{xwmd@\number\@tempcnta}{%
       \vbox{\hbox to\dimexpr\paperwidth/13\relax
         {\hfil\detokenize{#1}\hfil
         \vrule height1.8ex depth.6ex width0pt}%
@@ -144,7 +151,7 @@
     }%
     \advance\@tempcnta\@ne
   }%
-  \def\elt{\usename{d@\ncolr}}%
+  \def\elt{\usename{xwmd@\ncolr}}%
   \multido{\ncolr=0+1}{10}{\colorbox{C!![\ncolr]}{\elt}}\\
   \multido{\ncolr=0+1}{10}{\colorbox{M!![\ncolr]}{\elt}}\\
   \multido{\ncolr=0+1}{10}{\colorbox{Y!![\ncolr]}{\elt}}\\
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
index 91dd18cf13b..39cc4bc8b2a 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
@@ -25,7 +25,7 @@
 \title{The \texttt{\color{blue}xwatermark} Package\titleref{t1}}
 \subtitle{\textsf{A dynamic watermarking scheme for \latex}}
 \titlenote[t1]{The package is available at \url{\titleurltext}.}
-\version{1.5.2a}
+\version{1.5.2c}
 \titleurl{http://mirror.ctan.org/macros/latex/contrib/xwatermark/}
 \author{Ahmed Musa\Email{amusa22@gmail.com}\\
   {\small The University of Central Lancashire, Preston, UK}}
@@ -69,6 +69,12 @@
 }
 
 
+\docsection(sec:newfeatures){New features}
+
+Enter \ffx'{\xwmwatermarkon,\xwmwatermarkoff} for suspending and resuming watermark placement on pages.
+
+
+
 \docsection(sec:intro){Introduction}
 
 \lletter{T}{he \pkg'{xwatermark}} puts user-specified watermarks (graphics and/or arbitrary texts) on select pages of documents. It has more functionality and dynamism than, for example, the packages \pkg'{draftcopy, draftwatermark, watermark, draftmark,wallpaper}. The advantages of \pkg'{xwatermark} over these earlier packages include:
@@ -657,6 +663,12 @@ Local package options are those associated with the commands \ffx'{\newwatermark
 The following change history highlights significant changes that affect user utilities and interfaces; changes of technical nature are not documented in this section. The \stsign on the right-hand side of the following lists means the subject features in the package but is not reflected anywhere in this user guide.
 
 \begin{versionhist}
+   \begin{version}{1.5.2c}{2012/10/14}
+  \item The commands \ffx'{\xwmwatermarkon,\xwmwatermarkoff} introduced \vsecref*
+  \end{version}
+  \begin{version}{1.5.2b}{2012/08/01}
+  \item Persistent interaction mode inherited from \pkg'{catoptions} removed \vsecref*
+  \end{version}
   \begin{version}{1.5.2a}{2012/02/01}
   \item New command \fx{\xwm@stripallouterbraces} introduced \vsecref*
   \end{version}
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-test-20120201.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-test-20120201.tex
deleted file mode 100644
index 8a41dab0679..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-test-20120201.tex
+++ /dev/null
@@ -1,52 +0,0 @@
-\documentclass[showpagenos]{article}
-\makeatletter
-\usepackage[dvipsnames]{xcolor}
-\usepackage{amsmath,amssymb}
-\usepackage[printwatermark]{xwatermark}
-
-\thispagestyle{empty}
-\watermarkpaths*[.](/){{,/Graphics}}
-% The user should replace 'comet1' and 'fant' with his/her image filenames.
-\newwallpaper[
-  page=1,fontfamily=put,textcolor=BurntOrange,fontsize=1cm,textscale=2,
-  textalign=center,textangle=45,picangle=0,tilexoffset=0pt,%squaretiles
-  tileyoffset=0pt,picontoptext=false,boxalign=top-left,
-  picbb=20 21 590 400,picscale=2,picfile=comet1,tileno=8,
-  picfileext=eps
-]{YES}
-
-\newwallpaper[
-  page=2,fontfamily=put,textcolor=BurntOrange,fontsize=1cm,textscale=2,
-  textalign=center,textangle=45,picangle=45,tilexoffset=0pt,%squaretiles
-  tileyoffset=0pt,picontoptext=true,boxalign=top-left,
-  picbb=54 54 483 242,picscale=2,picfile=fant,tileno=4,
-  picfileext=eps, graphicsoptions={keepaspectratio,hiresbb}
-]{\texttt{fant}}
-
-\newwatermark[
-  pages=3-4,fontfamily=pbk,textcolor=gray!35,fontsize=12pt,fontseries=n,
-  textalign=center,textangle=90,textscale=1,textxpos=-.44\paperwidth,textypos=0,
-  width=\paperheight
-]{%
-  \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=teal,
-    innerframecolor=magenta,outerframecolor=green,
-    textalign=center,width=.995\paperheight]%
-    {%
-      \color{white}\framebox[2cm][t]{\phantom{Hello}}\hspace{1cm}%
-      \color{orange!85!red!55}\textcolor{red}{$\blacktriangleright$}%
-      \hspace{2.1cm}Page \thepage~of~\pageref{xwmlastpage}%
-      \hspace{2.1cm}\textcolor{red}{$\blacktriangleleft$}\hspace{1cm}%
-      \color{white}\framebox[2cm][t]{\phantom{Hello}}%
-      \xwmstrut{9mm}{6mm}%
-  }%
-}
-
-\begin{document}
-xx
-\newpage
-yy
-\newpage
-zz
-\newpage
-ww
-\end{document}