xwatermark 1.5.2a (1feb12)

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

13 files changed, 198 insertions, 129 deletions

diff --git a/Master/texmf-dist/doc/latex/xwatermark/README b/Master/texmf-dist/doc/latex/xwatermark/README
index e4e2fa5227a..afa8d0ee89b 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/README
+++ b/Master/texmf-dist/doc/latex/xwatermark/README
@@ -2,7 +2,7 @@ This is the README file for the 'xwatermark' package.
 
 VERSION
 
-Version 1.5.2, November 2011
+Version 1.5.2a, 01 February 2012
 
 SUMMARY
 
@@ -27,7 +27,7 @@ those defined within the user document can be passed to this package.
 
 LICENSE
 
-Copyright (c) 2009-2011 Ahmed Musa (amusa22@gmail.com)
+Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com)
 
 This work (ie, all the files in the xwatermark manifest) may be
 distributed and/or modified under the conditions of the LaTeX
diff --git a/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex b/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
index 2994761758b..954064c41c7 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
@@ -1,17 +1,19 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide (global options), version 1.5.1              %
+% This is file xwatermark-guide (global options), version 1.5.2a             %
 %                                                                            %
-% Copyright (c) 2009-2011 Ahmed Musa (amusa22@gmail.com).                    %
+% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
-\documentclass[a4paper,10pt,final,UK-English,table-file]{amltxdoc}
+\documentclass[
+  a4paper,10pt,final,UK-English,subsidfile
+]{amltxdoc}
+
 \makeatletter
 \InputIfFileExists{xwatermark-guide.cfg}{}{%
   \@latex@error{No file 'xwatermark-guide.cfg' or wrong path}\@ehc
 }
-\usepackage{reviewtools}
 \WrapQuotes
-\NoPrintNotes
+\usecsifdef\NoPrintNotes
 \makeindex
 
 \begin{document}
@@ -39,19 +41,20 @@
 \endlastfoot
 \ffx{defaultfirstpage, default-first-page} & 1 & The default first page of document, when the first page hasn't been known yet. \\\hline
 \ffx{defaultlastpage, default-last-page} & 1 & The default last page of document, when the last page has't been shipped out yet. \\\hline
-\fx{draft} & \hx{false} & The document is in draft mode.\ltnote{\ffx'{draft,final} are complementary (biboolean) options, \ie, when one is true, the other is automatically set to false.}\\\hline
+\fx{draft} & \hx{false} & The document is in draft mode.\ltablenote{\ffx'{draft,final} are complementary (biboolean) options, \ie, when one is true, the other is automatically set to false.}\\\hline
 \fx{final} & \hx{true} & The document is in final mode.\\\hline
-\ffx{disablegeometry, disable-geometry} & \hx{false} & This option determines whether the page layout settings by the \pkg'{geometry} should be disabled so that the watermarks can be set more readily by \pkg{xwatermark}.\ltnote{Version~5.6 and higher of the \pkg'{geometry} make this option less likely to be needed, unlike the earlier versions of \pkg{geometry}.}\\\hline
+\ffx{disablegeometry, disable-geometry} & \hx{false} & This option determines whether the page layout settings by the \pkg'{geometry} should be disabled so that the watermarks can be set more readily by \pkg{xwatermark}.\ltablenote{Version~5.6 and higher of the \pkg'{geometry} make this option less likely to be needed, unlike the earlier versions of \pkg{geometry}.}\\\hline
 \ffx{frontpagestyle, front-page-style} & empty & The style of the front page, in the sense of the \pkg'{fancyhdr}. \\\hline
 \ffx{picontoptext,pic-on-top-text, picture-on-top-text} & \hx{true} & The boolean that determines if picture watermark is placed on top of text watermark or otherwise, when they occur at the same location on a page.\\\hline
-\ffx{printwatermark, print-watermark} & \hx{true} & The global boolean switch that determines whether watermarks should be printed or not.\ltnote{This option can be passed to package as either \fx{true} or \fx{false} and can appear in the \hx{\documentclass} options list or \hx{\usepackage}. If for any reason you don't want the watermark printed in any run, you can enter \fx{printwatermark}=\hx{false}. If the option \fx{draft} or \fx{final} appears in the \hx{\documentclass} or \hx{\usepackage}, it won't affect the printing or otherwise of the watermark, apart from determining if graphics watermarks are actually inserted instead of framed empty boxes. The printing of the watermark is determined by the option \fx{printwatermark}.}\\\hline
+\ffx{printwatermark, print-watermark} & \hx{true} & The global boolean switch that determines whether watermarks should be printed or not.\ltablenote{This option can be passed to package as either \fx{true} or \fx{false} and can appear in the \hx{\documentclass} options list or \hx{\usepackage}. If for any reason you don't want the watermark printed in any run, you can enter \fx{printwatermark}=\hx{false}. If the option \fx{draft} or \fx{final} appears in the \hx{\documentclass} or \hx{\usepackage}, it won't affect the printing or otherwise of the watermark, apart from determining if graphics watermarks are actually inserted instead of framed empty boxes. The printing of the watermark is determined by the option \fx{printwatermark}.}\\\hline
 \ffx{resetpaperorigin,reset-paper-origin} & \hx{false} & The boolean to call to reset the paper origin (\hhx'{\pdfhorigin, \pdfvorigin, \hoffset, \voffset}) to zero unit. \\\hline
-\ffx{showpagecenter, show-page-center} & \hx{false} & Boolean that indicates if the center of the paper should be shown with a cross (and circle).\ltnote{The \pkg'{xwmgrid}, which provides a full gridding functionality consistent with the \pkg'{xwatermark}, will be released shortly.}\\\hline
+\ffx{showpagecenter, show-page-center} & \hx{false} & Boolean that indicates if the center of the paper should be shown with a cross (and circle).\ltablenote{The \pkg'{xwmgrid}, which provides a full gridding functionality consistent with the \pkg'{xwatermark}, will be released shortly.}\\\hline
 \ffx{textontoppic,text-on-top-pic,text-on-top-picture} & \hx{false} & The reverse of  \fx{picontoptext}.\\\hline
 \ffx{usedummymarks, use-dummy-marks} & \hx{true} & The boolean that instructs \pkg{xwatermark} to print watermarks that have been defined by the \fx{\dummywatermark} or \fx{\dummywallpaper} in addition to those defined by \fx{\newwatermark} and/or \fx{\newwallpaper}.\\\hline
-\ffx{watermarkparser, watermark-parser} & \fx{;}~(semicolon) & The option determines the watermark parser, a quantity that is used internally to build watermarks into lists.\ltnote{If you do have the \fx{watermarkparser} in your watermark, it must be enclosed in curly braces, otherwise the package will flag a fatal error. You can change the \fx{watermarkparser} to say \quoted{\fx{|}} (vertical bar), in case you have too many \quoted{\fx{;}} (semicolons) in your watermarks and you are fed up with enclosing them in braces.}\\\hline
+\ffx{watermarkparser, watermark-parser} & \fx{;}~(semicolon) & The option determines the watermark parser, a quantity that is used internally to build watermarks into lists.\ltablenote{If you do have the \fx{watermarkparser} in your watermark, it must be enclosed in curly braces, otherwise the package will flag a fatal error. You can change the \fx{watermarkparser} to say \quoted{\fx{|}} (vertical bar), in case you have too many \quoted{\fx{;}} (semicolons) in your watermarks and you are fed up with enclosing them in braces.}\\\hline
 \end{longtable}
 
 \normalfont\normalsize
 
+
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex b/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex
index f0ca5dd4992..85bc44d146a 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex
@@ -1,21 +1,24 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide (local options), version 1.5.1               %
+% This is file xwatermark-guide (local options), version 1.5.2a              %
 %                                                                            %
-% Copyright (c) 2009-2011 Ahmed Musa (amusa22@gmail.com).                    %
+% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
 \documentclass[
   use-a4-paper,use-10pt-font,final-version,UK-English,
-  no-hyperref-msg,wrapquote,tablefile,verbose=false
+  no-hyperref-msg,wrapquote,subsidfile,verbose=false
 ]{amltxdoc}
+
 \makeatletter
 \InputIfFileExists{xwatermark-guide.cfg}{}{%
   \@latex@error{No file 'xwatermark-guide.cfg' or wrong path}\@ehc
 }
+\hoffset\z@pt
 
 \begin{document}
 
 \extrarowheight=2pt
+
 \colone4cm\coltwo2.8cm
 \colthree=\dimexpr\textwidth-(\colone+\coltwo+1.5cm)\relax
 \coltotal=\dimexpr\colone+\coltwo+\colthree\relax
@@ -40,27 +43,27 @@
 \multicolumn{3}{c}{\bf\bffunc{\newwatermark} macro}\\\hline
 
 \ffx{angle,textangle,text-angle} & $0^\circ$ & The orientation of text watermark. \\\hline
-\ffx{align,textalign,text-align} & \texttt{center} & The internal horizontal alignment of the watermark within a watermark box.\ltnote{The key can assume only one of the values \ffx'{center, left, right, justified}. Any other text alignment value is inadmissible and thus rejected by the package with a fatal error.}\\\hline
-\ffx{page,pages,pagex,firstpage,lastpage,allpages,evenpages,oddpages} & & These determine the pages on which the watermarks are to be printed.\ltnote{The options \fx{allpages}, \fx{evenpages}, \fx{oddpages} are boolean keys, while \ffx'{page,pages,pagex} require values, \eg, \ffx'{page=x,pages=x-y,pagex={x,y,z}}. If the package is loaded and none of these options is passed to it, but the option \fx{printwatermark} is true, the default watermark (DRAFT) will be printed on the first page of the document (but only in draft mode) and a warning message logged in the transcript file. The key \fx{pages} expects a page range with the pages separated by a hyphen, while \fx{pagex} expects a list of pages that will receive the watermarks.}\\\hline
+\ffx{align,textalign,text-align} & \texttt{center} & The internal horizontal alignment of the watermark within a watermark box.\ltablenote{The key can assume only one of the values \ffx'{center, left, right, justified}. Any other text alignment value is inadmissible and thus rejected by the package with a fatal error.}\\\hline
+\ffx{page,pages,pagex,firstpage,lastpage,allpages,evenpages,oddpages} & & These determine the pages on which the watermarks are to be printed.\ltablenote{The options \fx{allpages}, \fx{evenpages}, \fx{oddpages} are boolean keys, while \ffx'{page,pages,pagex} require values, \eg, \ffx'{page=x,pages=x-y,pagex={x,y,z}}. If the package is loaded and none of these options is passed to it, but the option \fx{printwatermark} is true, the default watermark (DRAFT) will be printed on the first page of the document (but only in draft mode) and a warning message logged in the transcript file. The key \fx{pages} expects a page range with the pages separated by a hyphen, while \fx{pagex} expects a list of pages that will receive the watermarks.}\\\hline
 
-\ffx{boxalign,box-align} & \texttt{center/s} & The alignment of the watermark box.\ltnote{Both text and picture watermarks are normally put in boxes for manipulation before being typeset. This key refers to the horizontal and vertical alignments of the box. The key can assume one of the values \ffx{t-l,t-r,b-l,b-r,s}, or \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}. Elements of these two sets can't be combined. When submitted as key values, the elements of both sets are not to be separated by commas or spaces but by hyphens (\eg, one of \ffx{t-l,t-r,b-l,b-r,s}, or one of \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}).}\\\hline
+\ffx{boxalign,box-align} & \texttt{center/s} & The alignment of the watermark box.\ltablenote{Both text and picture watermarks are normally put in boxes for manipulation before being typeset. This key refers to the horizontal and vertical alignments of the box. The key can assume one of the values \ffx{t-l,t-r,b-l,b-r,s}, or \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}. Elements of these two sets can't be combined. When submitted as key values, the elements of both sets are not to be separated by commas or spaces but by hyphens (\eg, one of \ffx{t-l,t-r,b-l,b-r,s}, or one of \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}).}\\\hline
 \ffx{coordunit,coord-unit,position-unit} & \hx{mm} & The unit for x- and y-coordinates of watermark. \\\hline
 \ffx{color,textcolor,text-color} & \hx{gray!25} & The color of the text watermark.\\\hline
 \fx{draft} & \texttt{false} & This option will insert framed empty boxes in place of graphics watermarks.\\\hline
 \ffx{draftboxcolor,draft-box-color} & \texttt{blue} & The color of the box that is printed in place of graphics watermarks in \fx{draft} document mode. \\\hline
 \fx{final} & \texttt{false} & This option actually does nothing for now. It is included for possible future application.\\\hline
-\ffx{fontfamily,font-family} & \hx{bch} & The \hx{fontfamily} of the text watermark.\\\hline
-\ffx{fontsize,font-size} & 1cm & The \hx{fontsize} of the text watermark.\ltnote{If for some reason you need other fontsizes (\eg, 10pt, 11pt or 12pt for printing text watermarks in \hx{\normalfont}), you will need to submit them as values of \hx{fontsize}.}\\\hline
+\ffx{fontfamily} & \hx{bch} & The \hx{fontfamily} of the text watermark.\\\hline
+\ffx{fontsize} & 1cm & The \hx{fontsize} of the text watermark.\ltablenote{If for some reason you need other fontsizes (\eg, 10pt, 11pt or 12pt for printing text watermarks in \hx{\normalfont}), you will need to submit them as values of \hx{fontsize}.}\\\hline
 
-\ffx{fontseries,font-series} & \hx{b} & The font series of the text watermark.\ltnote{If you need normal document text, put \fx{fontseries=m}, which implies medium weight and width.}\\\hline
+\ffx{fontseries} & \hx{b} & The font series of the text watermark.\ltablenote{If you need normal document text, put \fx{fontseries=m}, which implies medium weight and width.}\\\hline
 
-\fx{graphicsoptions} & & Additional user-supplied key-value options for the command \hx{\includegraphics}.\ltnote{The command \hx{\includegraphics} is used for all graphics inclusion tasks. Users can directly pass values to admissible options of the command \hx{\includegraphics}. See \autoref{sec:graphicsoptions}.} \\\hline
+\fx{graphicsoptions} & & Additional user-supplied key-value options for the command \hx{\includegraphics}.\ltablenote{The command \hx{\includegraphics} is used for all graphics inclusion tasks. Users can directly pass values to admissible options of the command \hx{\includegraphics}. See \autoref{sec:graphicsoptions}.} \\\hline
 \ffx{height,textheight,text-height} & \hx{\paperwidth} & The height of text watermarks.\\\hline
 \ffx{mark,textmark,text-mark} & DRAFT & The default text watermark.\\\hline
 \ffx{picscale,picture-scale} & 1 & Scale of picture watermark.\\\hline
 \ffx{picbb,picture-bb,pic-bounding-box} & 0 0 100 100& The bounding box (dvi mode) or viewport (pdf mode) of the picture watermark.\\\hline
-\ffx{picfile,picture-file} & & The filename of picture watermark.\ltnote{This, with its full path, must be submitted when including picture watermark.}\\\hline
-\ffx{picfileext,pic-file-ext} & eps/pdf & The filename extension of the picture watermark.\ltnote{Valid extensions are \fx{eps}, \fx{pdf}, \fx{png}, \fx{jpeg}, \fx{mps}; the latter four may be used in the case of \pdftex. The file extension should be passed without the dot. If the option is not passed to package, \pkg{xwatermark} selects \fx{eps} (in dvi mode) or \fx{pdf} (in \pdftex mode).}  \\\hline
+\ffx{picfile,picture-file} & & The filename of picture watermark.\ltablenote{This, with its full path, must be submitted when including picture watermark.}\\\hline
+\ffx{picfileext,pic-file-ext} & eps/pdf & The filename extension of the picture watermark.\ltablenote{Valid extensions are \fx{eps}, \fx{pdf}, \fx{png}, \fx{jpeg}, \fx{mps}; the latter four may be used in the case of \pdftex. The file extension should be passed without the dot. If the option is not passed to package, \pkg{xwatermark} selects \fx{eps} (in dvi mode) or \fx{pdf} (in \pdftex mode).}  \\\hline
 \ffx{picheight,pic-height,picture-height} & & The height of picture watermarks.\\\hline
 \ffx{picangle,picture-angle} & $0^\circ$ & The orientation of picture watermarks. \\\hline
 \ffx{picwidth,picture-width} & & The width of picture watermarks. \\\hline
@@ -70,14 +73,14 @@
 \ffx{scale,textscale,text-scale} & 1 & The scale of the text watermark.\\\hline
 \ffx{showpagecenter,show-page-center,showpapercenter} & false & Boolean for requesting the indication of the center of the paper. See \pkgg'{xwmgrids} for additional information. \\\hline
 \ffx{textontoppic,text-on-top-pic,text-on-top-picture} & false & Text watermarks should be placed on top of graphics watermarks if the two types of watermark occur on the same spot on a page. This reverses the boolean \fx{picontoptext}.\\\hline
-\ffx{width,textwidth,text-width} & \hx{\paperheight} & The width of text watermarks; doesn't apply to graphics watermarks.\ltnote{For some design reasons we set \hx{\paperheight} as the default value of mark's width instead of mark's height.}\\\hline
-\ffx{xpos,textxpos,text-xpos,text-x-position} & 0 & These specify the horizontal coordinate of watermark (with reference to the center of paper, and not the text center).\ltnote{There is no need to attach a unit to \fx{xpos} or \fx{ypos}; if the user does, the unit will be used in place of \fx{coordunit}.}\\\hline
+\ffx{width,textwidth,text-width} & \hx{\paperheight} & The width of text watermarks; doesn't apply to graphics watermarks.\ltablenote{For some design reasons we set \hx{\paperheight} as the default value of mark's width instead of mark's height.}\\\hline
+\ffx{xpos,textxpos,text-xpos,text-x-position} & 0 & These specify the horizontal coordinate of watermark (with reference to the center of paper, and not the text center).\ltablenote{There is no need to attach a unit to \fx{xpos} or \fx{ypos}; if the user does, the unit will be used in place of \fx{coordunit}.}\\\hline
 \ffx{ypos,textypos,text-ypos,text-y-position} & 0 & The vertical coordinate of the watermark.\\\hline
 
-\multicolumn{3}{c}{\bffunc{\newwallpaper} \textbf{macro}\ltnote{Some of the \fx{\newwatermark} keys can also be called when inserting wallpapers. If you aren't sure if a key is applicable, don't worry: just try it. The package collects all inadmissible keys together and prints them in the transcript file on each run. Normally, the user is alerted by an error message. Indeed if you receive any failed compilation, you should first suspect that the failure is due to the use of an invalid key. The next keys apply specifically to wallpaper watermarks.}}\\\hline
+\multicolumn{3}{c}{\bffunc{\newwallpaper} \textbf{macro}\ltablenote{Some of the \fx{\newwatermark} keys can also be called when inserting wallpapers. If you aren't sure if a key is applicable, don't worry: just try it. The package collects all inadmissible keys together and prints them in the transcript file on each run. Normally, the user is alerted by an error message. Indeed if you receive any failed compilation, you should first suspect that the failure is due to the use of an invalid key. The next keys apply specifically to wallpaper watermarks.}}\\\hline
 
-\ffx{align,textalign,text-align} & \texttt{center} & The internal horizontal alignment of the watermark within a watermark box.\ltnote{The key can assume only one of the values \ffx'{center, left, right, justified}.}\\\hline
-\ffx{boxalign,box-align} & center (s) & The horizontal and vertical alignments of the watermark box.\ltnote{The key can assume one of the values \ffx{t-l,t-r,b-l,b-r,s}, or \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}. When submitted as key values, the elements are not to be separated by commas or spaces but by hyphens (\eg, one of \ffx{t-l,t-r,b-l,b-r,s}, or one of \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}).} \\\hline
+\ffx{align,textalign,text-align} & \texttt{center} & The internal horizontal alignment of the watermark within a watermark box.\ltablenote{The key can assume only one of the values \ffx'{center, left, right, justified}.}\\\hline
+\ffx{boxalign,box-align} & center (s) & The horizontal and vertical alignments of the watermark box.\ltablenote{The key can assume one of the values \ffx{t-l,t-r,b-l,b-r,s}, or \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}. When submitted as key values, the elements are not to be separated by commas or spaces but by hyphens (\eg, one of \ffx{t-l,t-r,b-l,b-r,s}, or one of \ffx{top-left, top-right, bottom-left, bottom-right, center, justified}).} \\\hline
 \ffx{picheight,picture-height} & .25\hx{\paperheight} & The height of each cell of picture wallpaper. \\\hline
 \ffx{picwidth,picture-width}  & .25\hx{\paperwidth} & The width of each cell of picture wallpaper.\\\hline
 \ffx{tilexsize,tile-xsize} & .25\hx{\paperwidth} & The width of each cell of tiled wallpaper.\\\hline
@@ -86,12 +89,12 @@
 \ffx{textwidth,text-width} & .25\hx{\paperwidth} & The width of each cell of text wallpaper.\\\hline
 \ffx{tilexoffset,tile-xoffset} & 0pt & The horizontal shift between the tiles of wallpaper.\\\hline
 \ffx{tileyoffset,tile-yoffset} & 0pt & The vertical shift between the tiles of wallpaper.\\\hline
-\ffx{tileno,tilenumber,tile-number,number-of-tiles} & 4 & The maximum number of cells for tiled wallpapers if the parameters \fx{tilexsize} and \fx{tileysize} aren't specified or if the boolean \fx{squaretiles} is true.\ltnote{If \fx{tilexsize} and \fx{tileysize} are given and \fx{squaretiles} is false, \fx{tileno} is ignored.}\\\hline
-\ffx{squaretiles,square-tiles} & true & The boolean that determines if the tiles should be rectangular or square.\ltnote{Sometimes choosing \fx{squaretiles} (\ie, setting it true) can yield an undesired outcome if \ffx'{textalign,boxalign} haven't been properly selected. In such a situation, the user is advised to first experiment with setting \fx{squaretiles} to false and/or \ffx'{textalign,boxalign} to \fx{center}.}\\\hline
+\ffx{tileno,tilenumber,tile-number,number-of-tiles} & 4 & The maximum number of cells for tiled wallpapers if the parameters \fx{tilexsize} and \fx{tileysize} aren't specified or if the boolean \fx{squaretiles} is true.\ltablenote{If \fx{tilexsize} and \fx{tileysize} are given and \fx{squaretiles} is false, \fx{tileno} is ignored.}\\\hline
+\ffx{squaretiles,square-tiles} & true & The boolean that determines if the tiles should be rectangular or square.\ltablenote{Sometimes choosing \fx{squaretiles} (\ie, setting it true) can yield an undesired outcome if \ffx'{textalign,boxalign} haven't been properly selected. In such a situation, the user is advised to first experiment with setting \fx{squaretiles} to false and/or \ffx'{textalign,boxalign} to \fx{center}.}\\\hline
 \ffx{wpxoffset,wallpaper-xoffset} & 0pt & The horizontal offset of wallpaper from the margin or edge of paper.\\\hline
 \ffx{wpyoffset,wallpaper-yoffset} & 0pt & The vertical offset of wallpaper from the margin or edge of paper.\\\hline
 
-\multicolumn{3}{c}{\bffunc{\xwmminipage} \textbf{macro}\ltnote{The \fx{\xwmminipage} command can take verbatim material and provides a \keyval alternative to the \hx{\boxedminipage} command of the \pkg'{boxedminipage}.}}\\\hline
+\multicolumn{3}{c}{\bffunc{\xwmminipage} \textbf{macro}\ltablenote{The \fx{\xwmminipage} command can take verbatim material and provides a \keyval alternative to the \hx{\boxedminipage} command of the \pkg'{boxedminipage}.}}\\\hline
 
 \fx{depth} & 0ex & Additional depth of the boxed minipage.\\\hline
 \fx{height} & \hx{.5\textheight} & Additional height of the boxed minipage.\\\hline
@@ -124,13 +127,13 @@
 
 \multicolumn{3}{c}{\bffunc{\fancypagenos} \textbf{macro}}\\\hline
 
-\ffx{cfoot,center-footer,footer-center} &  & Center footer.\ltnote{All headers and footers are as in \pkgg'{fancyhdr}.} \\\hline
+\ffx{cfoot,center-footer,footer-center} &  & Center footer.\ltablenote{All headers and footers are as in \pkgg'{fancyhdr}.} \\\hline
 \ffx{chead,center-header,header-center} &  & Center header.\\\hline
 \fx{format} & \hx{\fbox} & The desired format of the fancy-page numbers.\\\hline
 \ffx{coordunit,coord-unit,position-unit} & mm & The units of the position/coordinates \fx{x} and \fx{y}.\\\hline
-\ffx{fontfamily,font-family} & cmss & The \hx{fontfamily} of the fancy-page numbers.\\\hline
-\ffx{fontsize,font-size} & 5cm & The \hx{fontsize} of the fancy-page numbers.\\\hline
-\ffx{fontseries,font-series} & \hx{b} & The font series of the fancy-page numbers.\\\hline
+\ffx{fontfamily} & cmss & The \hx{fontfamily} of the fancy-page numbers.\\\hline
+\ffx{fontsize} & 5cm & The \hx{fontsize} of the fancy-page numbers.\\\hline
+\ffx{fontseries} & \hx{b} & The font series of the fancy-page numbers.\\\hline
 \fx{footrule-height} & .4pt & Foot rule height.\\\hline
 \fx{footrule-depth} & .4pt & Foot rule depth.\\\hline
 \fx{footrule-width} & \hx{\headwidth} & Foot rule width.\\\hline
@@ -145,14 +148,14 @@
 \fx{headrule-color} & blue & Head rule color. \\\hline
 \ffx{lfoot,left-footer,footer-left} & & Left footer. \\\hline
 \ffx{lhead,left-header,header-left} &  & Left header.\\\hline
-\ffx{style,printstyle,print-style} & \hx{\thepage} & The presentation style of the fancy-page numbers.\\\hline
+\ffx{style,printstyle} & \hx{\thepage} & The presentation style of the fancy-page numbers.\\\hline
 \ffx{rfoot,right-footer,footer-right} & & Right footer. \\\hline
 \ffx{rhead,right-header,header-right} &  & Right header.\\\hline
 \ffx{showpagenos,show-pageno,show-pagenos,show-page-numbers} & true & Boolean that determines if fancy-page numbers should be shown.\\\hline
-\ffx{showonpageone,show-on-page-one,show-on-page-1} & false & Boolean that determines if fancy-page numbers should be shown on the first page of the document.\\\hline
-\ffx{showheadrule,show-headrule} & true & Boolean that determines if the head-rule should be shown.\\\hline
-\ffx{showfootrule,show-footrule} & true & Boolean that determines if the foot-rule should be shown. \\\hline
-\ffx{sendtoback, send-to-back} & true & Boolean that determines if the fancy-page numbers should be placed in the background or foreground.\\\hline
+\ffx{showonpageone,show-on-page-one} & false & Boolean that determines if fancy-page numbers should be shown on the first page of the document.\\\hline
+\ffx{showheadrule,show-headrule} & true & Boolean that determines if the headrule should be shown.\\\hline
+\ffx{showfootrule,show-footrule} & true & Boolean that determines if the footrule should be shown. \\\hline
+\ffx{sendtoback} & true & Boolean that determines if the fancy-page numbers should be placed in the background or foreground.\\\hline
 \ffx{align,textalign,text-align} & center & The alignment of the text in the fancy-page number box (if it is boxed).\\\hline
 \ffx{boxalign,box-align} & center & The alignment of the fancy-page number box (if it is boxed).\\\hline
 \ffx{color,textcolor,text-color} & blue & The color of the fancy-page numbers.\\\hline
@@ -167,4 +170,5 @@
 
 \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
index db2f8904199..7644422fc9b 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.cfg
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.cfg
@@ -1,24 +1,24 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-examples.cfg, version 1.5.2                        %
+% This is file xwatermark-examples.cfg, version 1.5.2a                       %
 %                                                                            %
-% Copyright (c) 2009-2011 Ahmed Musa (a.musa@rocketmail.com).                %
+% Copyright (c) 2009-2012 Ahmed2Musa (a.musa@rocketmail.com).                %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
 \ProvidesFile{xwatermark-examples.cfg}
-  [2011/10/20 v1.5.2 Configuration file for xwatermark-examples.tex (AM)]
+  [2012/02/01 v1.5.2a Configuration file for xwatermark-examples.tex (AM)]
 \NeedsTeXFormat{LaTeX2e}
 \makeatletter
-\@ifundefined{ver@catoptions.sty}{%
+
+\@ifundefined{ver@ltxtools-base1.sty}{%
   \csname @\ifx\documentclass\@twoclasseserror
     first\else second\fi oftwo\endcsname
-  \usepackage\RequirePackage{catoptions}%
+  \usepackage\RequirePackage{ltxtools-base1}%
 }{}
 \AtBeginDocument{\hypersetup{pdfstartview=Fit,colorlinks}}
 
-\cptloadpackages{%
+\ltsloadpackages{%
   xcolor|dvipsnames,table,hyperref;
-  geometry|left=3cm,right=3cm,top=2.5cm,bottom=2.5cm,
-    includeheadfoot;
+  geometry|left=3cm,right=3cm,top=2.5cm,bottom=2.5cm,includeheadfoot;
   lipsum;
   amsmath;
   amssymb;
@@ -28,39 +28,35 @@
     pdfview=FitB,pdfstartview=FitB;
 }
 \WrapQuotes
-\newprovidedcommands{%
-  \newdef\new@def,\renewdef\renew@def,\robustdef\robust@def,
-  \robustredef\robust@redef,\providedef\LTS@providedef,
-  \providerobustdef\LTS@providerobustdef
-}
-\newdef\hspce{\hspace{1cm}}
+\new@def\hspce{\hspace{1cm}}
 \nameabbrev\lppl{\LaTeX\ Project Public License}[LPPL]
-\providerobustdef*\eg{%
+\providerobust@def*\eg{%
   \ifnextcharTF.{e.\,g\sspace}{e.\,g.\@\sspace}%
 }
-\providerobustdef*\ie{%
+\providerobust@def*\ie{%
   \ifnextcharTF.{i.\,e\sspace}{i.\,e.\@\sspace}%
 }
 \shelllet\ttcl=\textcolor
-\providerobustdef*\xcopyright#1{%
+\providerobust@def*\xcopyright#1{%
   \unskip\ttcl{#1}{\textsuperscript{\copyright}}%
 }
-\robustdef*\xxcopyright{%
+\robust@def*\xxcopyright{%
   \mbox{\textcopyright~\lower.7\p@\hbox{\uppercase
   \expandafter{\romannumeral\year}}}\sspace
 }
-\robustdef*\colorbullet#1{\ttcl{#1}{\textbullet}\sspace}
-\providerobustdef*\pkg{%
+\robust@def*\colorbullet#1{\ttcl{#1}{\textbullet}\sspace}
+\providerobust@def*\pkg{%
   \ifnextcharTF'%
-    {\@firstoftwo{\@tempswatrue\xwm@pkg}}
-    {\@tempswafalse\xwm@pkg}%
+    {\@firstoftwo{\def\xwm@pkgsw{00}\xwm@pkg}}
+    {\def\xwm@pkgsw{01}\xwm@pkg}%
 }
-\robustdef*\xwm@pkg#1{%
-  \ttcl{ForestGreen}{\texttt{#1}}\if@tempswa\@space package\fi
+\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
 }
-\providerobustdef*\email{\hyper@normalise\xwm@email}
-\robustdef*\xwm@email#1{\href{mailto:#1}{#1}}
-\providedef*\impnote{\emph{Important note}:\space}
+\providerobust@def*\email{\hyper@normalise\xwm@email}
+\robust@def*\xwm@email#1{\href{mailto:#1}{#1}}
 \AfterStartOfDocument{%
   \def\thefootnote{\fnsymbol{footnote}}%
 }
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.pdf b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.pdf
index b78bc757aee..db2b512d5a0 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.pdf
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.pdf
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex
index 06f09896867..b52b94bb361 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex
@@ -1,5 +1,5 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file 'xwatermark-examples1.tex', version 1.5.2.                    %
+% 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          %
@@ -14,7 +14,7 @@
 % implied warranties of merchantability and fitness for a particular         %
 % purpose.                                                                   %
 %                                                                            %
-% Copyright (c) 2009-2011 Ahmed Musa (amusa22@gmail.com).                    %
+% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
 \documentclass[a4paper,10pt,final,showpagenos]{article}
@@ -47,13 +47,14 @@
   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.2\\[2ex]
+  \large Version 1.5.2a\\[2ex]
   \Large EXAMPLES (File 1)%
 }
 \author{%
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.pdf b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.pdf
index 5a90dfaf8e1..1f96a24e6da 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.pdf
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.pdf
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex
index d654ee57eea..5e8c9e52ee2 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex
@@ -1,5 +1,5 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file 'xwatermark-examples2.tex', version 1.5.2.                    %
+% 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              %
@@ -15,17 +15,16 @@
 % implied warranties of merchantability and fitness for a particular         %
 % purpose.                                                                   %
 %                                                                            %
-% Copyright (c) 2009-2011 Ahmed Musa (amusa22@gmail.com).                    %
+% 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}
 \watermarkpaths[.](/){{}{/Graphics}}
 
 \newwatermark*[%
@@ -69,7 +68,7 @@
 \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,
+  tileyoffset=0pt,picontoptext=false,boxalign=center,%top-left,
   picbb=20 21 590 400,picscale=1,picfile=comet1,%tileno=8,
   picfileext=epsx
 ]{Comet}
@@ -77,7 +76,7 @@
 \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=lt,
+  tileyoffset=0pt,picontoptext=false,%boxalign=l-t,
   picbb=115 623 238 747,picscale=2,picfile=xwatermarkpic1,
   picfileext=eps
 ]{YES}
@@ -130,19 +129,19 @@
   }%
 }
 
-\begin{newcomment}
+\begin{ltscomment}
 The same watermark is placed twice on the same page.
 Compare this with one of the examples in  xwatermark-examples1.tex:
-\end{newcomment}
+\end{ltscomment}
 
 \usecsn{watermark-2a}{-.428\paperwidth}{90}
 \usecsn{watermark-2a}{.428\paperwidth}{-90}
 
-\begin{newcomment}
+\begin{ltscomment}
 Here is an inefficient example. \scalebox and \rotatebox
 could have been more efficiently achieved in the following
 example:
-\end{newcomment}
+\end{ltscomment}
 \newwatermark[page=\lastdocpage,width=\paperheight]{%
   \setbox\xwm@boxb=\hb@xt@.9\paperheight{%
   \hfuzz\maxdimen\hss
@@ -161,7 +160,7 @@ example:
   {\setbox\z@\vbox to.25\paperheight{}\box0}%
   \bfseries The \texttt{\ttcl{blue}{xwatermark}} Package
   \xcopyright{red}\\[1ex]
-  \large Version 1.5.2\\[2ex]
+  \large Version 1.5.2a\\[2ex]
   \Large EXAMPLES (File 2)%
 }
 \author{%
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
index 7fa223561c7..30840505db3 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
@@ -1,21 +1,22 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide.cfg, version 1.5.2                           %
+% This is file xwatermark-guide.cfg, version 1.5.2a                          %
 %                                                                            %
-% Copyright (c) 2009-2011 Ahmed Musa (amusa22@gmail.com).                    %
+% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
 \ProvidesFile{xwatermark-guide.cfg}
-  [2011/10/20 v1.5.2 Configuration file for xwatermark-guide.tex (AM)]
+  [2012/02/01 v1.5.2a Configuration file for xwatermark-guide.tex (AM)]
 \NeedsTeXFormat{LaTeX2e}
 \makeatletter
-\cptloadpackages{%
+\ltsloadpackages{%
   xwatermark|printwatermark;
   array;
   colortbl;
+%  ltablex;
   multido;
 }
 %\keepXColumns
-\providerobustdef*\colorbullet#1{\textcolor{#1}{\textbullet}\sspace}
+\providerobust@def*\colorbullet#1{\textcolor{#1}{\textbullet}\sspace}
 \new@def*\whline{%
   \noalign{\global\let\savedarw\arrayrulewidth
     \gdef\arrayrulewidth{1pt}}%
@@ -31,25 +32,28 @@
                           bottom=2.5cm,includeheadfoot},
   reviewdocument        = false,
   parindent             = false,
-  toc                   = false,
+  tableofcontents       = false,
   frontpagestyle        = empty,
   pretitleskip          = 0ex,
   posttitleskip         = 1ex,
-  presuptitleskip       = .17\paperheight,%15ex,
+  presuptitleskip       = .15\paperheight,
   postsuptitleskip      = 0ex,
   presubtitleskip       = 0ex,
   postsubtitleskip      = 0ex,
-  postauthorskip        = 1.5cm,
+  postauthorskip        = 1cm,
   natbiboptions         = {numbers,sort&compress},
   cmdcolor              = xmagenta1,
   stylecolor            = xgreen1,
   specialcolor          = teal,
   sectionheadcolor      = blue
 }
+\AtBeginDocument{%
+  \hypersetup{pdfstartview=Fit,pdfview=FitB,colorlinks}%
+}
 \AfterStartOfDocument{%
   \let\footnote\ltsfootnote
 }
-\robustdef*\otherchars{\quoted{other} characters\sspace}
+\robust@def*\otherchars{\quoted{other} characters\sspace}
 \newdef*\impnote{\emph{Important note}:\space}
 \let\sectionbreak\medbreak
 \newletcs\mccolor\makemaccolor
@@ -131,7 +135,7 @@
   \begingroup
   \fboxsep=2mm\relax
   \@tempcnta\z@pt
-  \cpttfor xwatermark\dofor{%
+  \ltstfor xwatermark\dofor{%
     \csn@def{d@\number\@tempcnta}{%
       \vbox{\hbox to\dimexpr\paperwidth/13\relax
         {\hfil\detokenize{#1}\hfil
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.pdf b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.pdf
index 9c19681cb9f..adc639a2f7e 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.pdf
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.pdf
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
index 29d45d74afa..a178403449a 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
@@ -10,13 +10,9 @@
   input-config-file,
   no-hyperref-messages,
   option-stack-limit=4,
-  inputfile=true
+  inputfile=true,
 ]{amltxdoc}
 
-\useshortdoccmds
-\usepackage{ltxtools-review}
-
-
 \makeindex
 \ifdefTF\newgeometry{}{%
   \let\newgeometry\@gobble
@@ -27,10 +23,12 @@
 
 \begin{frontmatter}
 \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.2}
+\version{1.5.2a}
 \titleurl{http://mirror.ctan.org/macros/latex/contrib/xwatermark/}
-\author{Ahmed Musa\Email{amusa22@gmail.com}\\Preston, Lancashire, UK}
+\author{Ahmed Musa\Email{amusa22@gmail.com}\\
+  {\small The University of Central Lancashire, Preston, UK}}
 
 \let\abstractname\relax
 \begin{abstract}
@@ -43,9 +41,7 @@
 \end{abstract}
 \end{frontmatter}
 
-\newpage
 \noindent
-
 \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=white,
   outerframecolor=purple,innerframecolor=brown,textalign=justified,
   width=.97\textwidth]{%
@@ -202,10 +198,10 @@ In this way, you don't have to bother with locating in the source file the spot
 
 \ltsnote Each call to \fx{\newwatermark} must contain the page(s) that will receive the watermark(s), otherwise the user will be alerted. The page specifiers are:
 
-\start'{example}[page specifiers]
-page=x, pages=x-y, pagex={x,y,z}, firstpage, lastpage, allpages,
-oddpages, evenpages
-\finish{example}
+\start'{syntax}[page specifiers]
+page=x    pages=x-y    pagex={x,y,z}    firstpage
+lastpage  allpages     oddpages         evenpages
+\finish{syntax}
 
 
 \docsubsection{Options without values}
@@ -224,10 +220,10 @@ then there will be no problem but the outcome may be unpredictable, depending on
 
 If you issue any of the statements
 
-\start{example}[page specifiers]
-page=x, pages=x-y, pagex={x,y,z}, firstpage, lastpage, allpages=true,
-evenpages=true, oddpages=true
-\finish{example}
+\start{syntax}[page specifiers]
+page=x      pages=x-y        pagex={x,y,z}    firstpage
+lastpage    allpages=true    evenpages=true   oddpages=true
+\finish{syntax}
 
 together with \fx{printwatermark}=\hx{true} but you don't want the mark on any particular page, we can simply set \fx{\newwatermark[other keys,textmark=]{}} or, to the same effect, we may set \fx{\newwatermark[other keys]{}}, where \quoted{other keys} may include the page specifiers\footnote{In the case of graphics watermarks, setting \ftfx{\newwatermark[other keys,picfile=]{}} will prompt a \quoted{no file} error.}. These both imply that the text watermark for the given page is empty. This can be useful when transiting from one watermark type to another. Moreover, since both picture and text marks can be submitted via one and the same command \fx{\newwatermark} (see \sref{sec:pic-text-mark}), this technique may be used to empty the text watermark for the given page or range of pages. For example,
 
@@ -656,6 +652,9 @@ 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.2a}{2012/02/01}
+  \item New command \fx{\xwm@stripallouterbraces} introduced \vsecref*
+  \end{version}
   \begin{version}{1.5.2}{2011/10/20}
   \item To match changes in \pkg'{ltxkeys} \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
new file mode 100644
index 00000000000..8a41dab0679
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-test-20120201.tex
@@ -0,0 +1,52 @@
+\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}
diff --git a/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty b/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
index f48af204ad6..e32d7e444f3 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.2, November 2011.               %
+% This is file 'xwatermark.sty', version 1.5.2a, February 2012.              %
 %                                                                            %
 % This package puts user-specified watermarks (graphics and arbitrary        %
 % texts) on select pages of documents. See package documentation             %
@@ -19,7 +19,7 @@
 % implied warranties of merchantability and fitness for a particular         %
 % purpose.                                                                   %
 %                                                                            %
-% Copyright (c) 2009-2011 Ahmed Musa (amusa22@gmail.com).                    %
+% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
 \@ifpackageloaded{catoptions}{%
@@ -31,9 +31,9 @@
   \RequirePackage{catoptions}[2011/10/22]%
 }
 \UseNormalCatcodes
-\StyleFilePurpose{Puts select watermarks on select pages}
+\StyleFilePurpose{A dynamic watermarking scheme}
 \StyleFileRCSInfo
-$Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
+$Id: xwatermark.sty,v 1.5.2a 2012/02/01 09:00:00 Ahmed Musa Exp $
 \ProvidesPackage{xwatermark}[\StyleFileInfo]
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \SetStyleFileMessages[xwm@]{info}{warn}{err}
@@ -77,8 +77,19 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
   }%
   \expandafter\reserved@a\xwm@boxframestack
 }
-\newletcs\xwm@stripallbr\stripallouterbraces
-\newletcs\xwm@stripallbrincs\stripallouterbracesincs
+\robust@def\xwm@stripallouterbraces#1#2{%
+  \edef#2{\unexpanded\cptthreexp{\xwm@str@pallouterbraces#1\strip@nil}}%
+}
+\robust@def\xwm@str@pallouterbraces#1\strip@nil{%
+  \romannumeral\ifbracedTF{#1}{%
+    \expandafter\ifnullTF\expandafter{\@gobble#1}{%
+      \expandafter\@gobble\xwm@str@pallouterbraces#1\strip@nil
+    }{0 #1}%
+  }{0 #1}%
+}
+\robust@def\xwm@stripallouterbracesincs#1{%
+  \expandafter\xwm@stripallouterbraces\expandafter{#1}#1%
+}
 \new@def*\xwmremoveleadparsers#1#2{%
   \s@expandarg\ifbracedTF{#2}{%
     \unexpanded\expandafter{#2}%
@@ -316,7 +327,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
   \ifmacroTF{#1}{}{\cpt@notcserr{#1}}%
   \begingroup
   \cptexpandmacro{#1}\xwm@tempa
-  \cptexpandargonce{\endgroup\xwm@stripallbr}\xwm@tempa#1%
+  \cptexpandargonce{\endgroup\xwm@stripallouterbraces}\xwm@tempa#1%
   \ltxkeys@trimspacesincs{#1}%
   \cptexpandsecond{\def\reserved@a##1}{#1}##2##3\xwm@nil{%
     \def\reserved@a{##2}%
@@ -528,7 +539,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
 \fi
 \robust@def*\DeclareWatermarkParser#1{%
   \begingroup
-  \xwm@stripallbr{#1}\xwm@tempa
+  \xwm@stripallouterbraces{#1}\xwm@tempa
   \xdef\xwm@watermarkparser{\cptoxdetok\xwm@tempa}%
   \endgroup
 }
@@ -554,7 +565,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
         \xwm@swbtrue
         \cptgxaddtolist*\xwm@picfilesread{\usename{#2picfile}}%
       }%
-      \aftercsname\xwm@stripallbrincs{#2picfileext}%
+      \aftercsname\xwm@stripallouterbracesincs{#2picfileext}%
       \ifboolTF{xwm@pdf}{%
         \xifinsetTF{,\usename{#2picfileext},}{,pdf,png,jpeg,jpg,mps,}{}{%
           \csn@def{#2picfileext}{pdf}%
@@ -633,7 +644,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
   pmark=true;
   graphicsoptions={}/
     \ifbracedTF{##1}{%
-      \aftercsname{\xwm@stripallbr{##1}}{#1graphicsoptions}
+      \aftercsname{\xwm@stripallouterbraces{##1}}{#1graphicsoptions}
     }{%
       \cpt@err{Values of key 'graphicsoptions' not braced}\@ehc
     };
@@ -670,7 +681,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
   fontsize=1cm/\aftercsname{\xwm@defaultunits{##1}}{#1fontsize};
   fontseries=b;
   fontfamily=bch;
-  \needvalue{picfile}=/\aftercsname\xwm@stripallbrincs{#1picfile}
+  \needvalue{picfile}=/\aftercsname\xwm@stripallouterbracesincs{#1picfile}
     \ifcsnnullTF{#1picfile}{\usename{#1pmarkfalse}}{\usename{#1pmarktrue}
     \usename{#1minmarktrue}};
   \needvalue{picture-file}=/\setaliaskey{picfile};
@@ -691,7 +702,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
   picture-y-position=0/\setaliaskey{picypos};
   mark=DRAFT/\setaliaskey{textmark};
   textmark=DRAFT/
-    \aftercsname\xwm@stripallbrincs{#1textmark}
+    \aftercsname\xwm@stripallouterbracesincs{#1textmark}
     \ifcsnnullTF{#1textmark}{%
       \usename{#1tmarkfalse}
     }{%
@@ -713,7 +724,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
       \usename{#1minmarktrue}\fi
     };
   pages=1-1/
-    \aftercsname\xwm@stripallbrincs{#1pages}
+    \aftercsname\xwm@stripallouterbracesincs{#1pages}
     \aftercsname\xifstrcmpTF{#1pages}{0-0}{}{%
       \usename{#1prangetrue}\usename{#1minmarktrue}
     }
@@ -1579,10 +1590,10 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
   \cpt@useemptytrue
   \def\xwm@tempa{#3}%
   \ifboolTF{cpt@st}{%
-    \ifbracedTF{#3}{\xwm@stripallbr{#3}\xwm@tempa}{}%
+    \ifbracedTF{#3}{\xwm@stripallouterbraces{#3}\xwm@tempa}{}%
     \def\csv@do##1{%
       \ifbracedTF{##1}{%
-        \xwm@stripallbr{##1}\xwm@tempa
+        \xwm@stripallouterbraces{##1}\xwm@tempa
       }{%
         \def\xwm@tempa{##1}%
       }%
@@ -1631,7 +1642,7 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
   \let\xwm@pathfound\@empty
   \cpt@choicefdfalse
   \def\tsv@do##1{%
-    \xwm@stripallbr{##1}\xwm@tempa
+    \xwm@stripallouterbraces{##1}\xwm@tempa
     \openin\@inputcheck\xwm@tempa#1\@space
     \xwmifeofTF\@inputcheck{}{%
       \let\xwm@pathfound\xwm@tempa
@@ -1829,8 +1840,8 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
 \catcode`\|=\catcode`\%
 \robust@gdef*\xwm@boxedminipage[#1]{%
   \ltxkeys@launchkeys[XWM]{boxedminipage}{#1}%
-  \xwm@stripallbrincs\xwmbmp@width
-  \xwm@stripallbrincs\xwmbmp@textcolor
+  \xwm@stripallouterbracesincs\xwmbmp@width
+  \xwm@stripallouterbracesincs\xwmbmp@textcolor
   \leavevmode\@pboxswfalse
   \begingroup
   \color{\xwmbmp@framecolor}%
@@ -1908,8 +1919,8 @@ $Id: xwatermark.sty,v 1.5.2 2011/11/24 09:00:00 Ahmed Musa Exp $
 \robust@def*\xwmminipage{\cpt@testopt\xwm@minipage{}}
 \robust@def\xwm@minipage[#1]#2{%
   \ltxkeys@launchkeys[XWM]{minipage}{#1}%
-  \xwm@stripallbrincs\xwmmp@width
-  \xwm@stripallbrincs\xwmmp@textcolor
+  \xwm@stripallouterbracesincs\xwmmp@width
+  \xwm@stripallouterbracesincs\xwmmp@textcolor
   \xwm@pushboxframe
   \fboxsep\xwmmp@framesep\fboxrule\xwmmp@framerule\relax
   \cptdimdef\xwmmp@boxwidth{\xwmmp@width-2\fboxsep-2\fboxrule}%