xwatermark (26oct12)

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

10 files changed, 347 insertions, 431 deletions

diff --git a/Master/texmf-dist/doc/latex/xwatermark/README b/Master/texmf-dist/doc/latex/xwatermark/README
index 28420e50d05..f1361cf49ef 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.2c, 10 October 2012
+Version 1.5.2d, 23 October 2012
 
 LOCATION ON CTAN
 
diff --git a/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex b/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
deleted file mode 100644
index 775e2b31323..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/tab-globaloptions.tex
+++ /dev/null
@@ -1,60 +0,0 @@
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide (global options), version 1.5.2c             %
-%                                                                            %
-% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-
-\documentclass[
-  a4paper,10pt,final,UK-English,subsidfile
-]{amltxdoc}
-
-\makeatletter
-\InputIfFileExists{xwatermark-guide.cfg}{}{%
-  \@latex@error{No file 'xwatermark-guide.cfg' or wrong path}\@ehc
-}
-\WrapQuotes
-\usecsifdef\NoPrintNotes
-\makeindex
-
-\begin{document}
-
-\colone4cm\coltwo2.5cm
-\colthree=\dimexpr\textwidth-(\colone+\coltwo+1.5cm)\relax
-\coltotal=\dimexpr\colone+\coltwo+\colthree\relax
-\extrarowheight=2pt
-\arrayrulecolor{orange}
-\noindent
-\begin{longtable}[c]{>{\hspace{0pt}\raggedright}m{\colone}m{\coltwo}W}
-\caption{Global options of the package\label{tab:globaloptions}}\\\whline
-
-\multicolumn{3}{M}{All the keys in this table are \quoted{option keys}, \ie, they can appear only in \hx{\documentclass} or \hx{\usepackage}. If a key is an option key and it is issued in functions other than \hx{\documentclass} or \hx{\usepackage}, the package will alert the user to that effect.}\\\hline
-
-\bfblue Option & \bfblue Default & \bfblue Meaning\\\hline
-\endfirsthead
-\hline
-\multicolumn{3}{l}{\emph{Continued from last page}}\\\hline
-\bfblue Option & \bfblue Default & \bfblue Meaning %\\\hline
-\endhead
-\multicolumn{3}{r}{\emph{Continued on next page}}\\\hline
-\endfoot
-\hline
-\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.\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}.\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.\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).\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.\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
deleted file mode 100644
index 55ae1da30e9..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/tab-localoptions.tex
+++ /dev/null
@@ -1,173 +0,0 @@
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file xwatermark-guide (local options), version 1.5.2c.             %
-%                                                                            %
-% Copyright (c) 2009-2012 Ahmed Musa (amusa22@gmail.com).                    %
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-
-\documentclass[
-  use-a4-paper,use-10pt-font,final-version,UK-English,
-  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
-\arrayrulecolor{orange}
-
-\begin{longtable}[c]{>{\hspace{0pt}\raggedright}m{\colone}m{\coltwo}W}
-\caption{Local (function-dependent) options of the package
-  \label{tab:localoptions}}\\\whline
-
-\multicolumn{3}{M}{Most of the keys in this table are \quoted{non-option keys}, \ie, they can't appear in \hx{\documentclass} or \hx{\usepackage} but in the arguments of the given functions. If a key is a non-option key and the user submits it to \hx{\documentclass} or \hx{\usepackage}, the package will alert the user.}\\\hline
-
-\bfblue Option & \bfblue Default & \bfblue Meaning\\\hline
-\endfirsthead
-\hline
-\multicolumn{3}{l}{\emph{Continued from last page}}\\\hline
-\bfblue Option & \bfblue Default & \bfblue Meaning %\\\hline
-\endhead
-\multicolumn{3}{r}{\emph{Continued on next page}}\\\hline
-\endfoot
-\hline
-\endlastfoot
-\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.\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.\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} & \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} & \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}.\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.\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
-\ffx{picontoptext,picture-on-top-text} & true & Pictures should be placed on top of text watermarks if the two types of watermark occur on the same spot on a page. \\\hline
-\ffx{picxpos,picture-xpos,picture-x-position} & 0 & The horizontal coordinate of the picture watermarks.\\\hline
-\ffx{picypos,picture-ypos,picture-y-position} & 0 & The horizontal coordinate of the picture watermarks. \\\hline
-\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.\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}\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.\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
-\ffx{tileysize,tile-ysize} & .25\hx{\paperheight} & The height of each cell of tiled wallpaper.\\\hline
-\ffx{textheight,text-height} & .25\hx{\paperheight} & The height of each cell of text wallpaper. \\\hline
-\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.\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}\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
-\ffx{framebox,insertframe,insert-frame} & true & The boolean that determines whether the box is
-  framed or not.\\\hline
-\fx{framesep} & 3pt & \hx{\fboxsep} of the boxed minipage.\\\hline
-\fx{framerule} & 0.4pt & \hx{\fboxrule} of the boxed minipage.\\\hline
-\fx{textwidth} & \hx{\paperwidth} & Width of the boxed minipage.\\\hline
-\fx{textcolor} & black & Color of text inside boxed minipage.\\\hline
-\fx{framecolor} & white & Color of frame of boxed minipage.\\\hline
-\ffx{textalign, text-align} & center & Alignment of the text inside the boxed minipage of the command \fx{\xwmminipage} (expected values are \fx{center}, \fx{left}, \fx{right} and \fx{justified}).\\\hline
-
-\multicolumn{3}{c}{\bffunc{\xwmcolorbox} \textbf{macro}}\\\hline
-
-\fx{depth} & 0ex & Additional depth of the colorbox.\\\hline
-\ffx{framebox,insertframe,insert-frame} & true & The boolean that determines whether the box is framed
-  or not.\\\hline
-\fx{framesep} & 3pt & \hx{\fboxsep} of the colorbox.\\\hline
-\fx{framerule} & 0.4pt & \hx{\fboxrule} of the colorbox.\\\hline
-\fx{height} & 0ex & Additional height of the colorbox.\\\hline
-\ffx{innerframecolor,inner-frame-color} & white & Color of the inner frame of colorbox.\\\hline
-\ffx{outerframecolor,outer-frame-color} & white & Color of the outer frame of colorbox.\\\hline
-\fx{textcolor} & black & Color of text inside colorbox.\\\hline
-\ffx{textalign,text-align} & center & Alignment of the text inside the colorbox of
-  \fx{\xwmcolorbox} (expected values are \fx{center}, \fx{left}, \fx{right} and \fx{justified}).\\\hline
-\fx{width} & \hx{\paperwidth} & Width of the colorbox.\\\hline
-
-\multicolumn{3}{c}{\bffunc{\makecolorbox} \textbf{macro}}\\\hline
-\multicolumn{3}{M}{The options of the macro \fx{\makecolorbox} are the same as those of the related macro \fx{\xwmcolorbox}. Please refer to \autoref{sec:makecolorbox} for the syntaxes of these macros.}\\\hline
-
-\multicolumn{3}{c}{\bffunc{\fancypagenos} \textbf{macro}}\\\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} & 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
-\ffx{footrule-sep,footrule-separation} & 2pt & Foot rule vertical separation (\ie, the vertical separation between the two lines. \\\hline
-\fx{footrule-color} & cyan & Foot rule color.\\\hline
-\fx{hfoffset-left} & .5 & Left \hx{\hfoffset} (see \pkgg{fancyhdr} for the meaning of \hx{\hfoffset}). \\\hline
-\fx{hfoffset-right} & .5 & Right \hx{\hfoffset} (see \pkgg{fancyhdr}). \\\hline
-\fx{headrule-height} & .4pt & Head rule height.\\\hline
-\fx{headrule-depth} & .4pt & Head rule depth.\\\hline
-\fx{headrule-width} & \hx{\headwidth} & Head rule width.\\\hline
-\ffx{headrule-sep, headrule-separation} & 2pt & Head rule separation (\ie, the vertical separation between the two lines.\\\hline
-\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} & \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} & 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
-\ffx{scale,textscale,text-scale} & 2.5 & The scale of the fancy-page numbers.\\\hline
-\ffx{angle,textangle,text-angle} & 0 & The orientation of the fancy-page numbers.\\\hline
-\ffx{width,textwidth,text-width} & 0ex & Width of the fancy-page numbers.\\\hline
-\ffx{height,textheight,text-height} & 0ex & Height of the fancy-page numbers.\\\hline
-\ffx{xpos,textxpos,x-position} & 0 & The horizontal coordinates of the fancy-page numbers
-  (from page center).\\\hline
-\ffx{ypos,textypos,y-position} & 0 & The vertical coordinates of the fancy-page numbers (from page center).\\\whline
-\end{longtable}
-
-\normalfont\normalsize
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex
new file mode 100644
index 00000000000..206b5bfdbc0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples1.tex
@@ -0,0 +1,75 @@
+%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
+% This is file 'xwatermark-examples1.tex', version 1.5.2d.                   %
+%                                                                            %                                                              % 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.2d\\[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
new file mode 100644
index 00000000000..c90e563f25e
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..169904b7991
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples2.tex
@@ -0,0 +1,201 @@
+%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
+% This is file 'xwatermark-examples2.tex', version 1.5.2d.                   %
+%                                                                            %
+% 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}
+\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.2d\\[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
deleted file mode 100644
index 8fc850de85e..00000000000
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
+++ /dev/null
@@ -1,164 +0,0 @@
-%++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% 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/10/14 v1.5.2c Configuration file for xwatermark-guide.tex (AM)]
-\NeedsTeXFormat{LaTeX2e}
-\makeatletter
-\ltsloadpackages{%
-  % change file name ++++++++++++++++++++++++
-  n-xwatermark|printwatermark;
-  array;
-  colortbl;
-%  ltablex;
-  multido;
-}
-%\keepXColumns
-\providerobust@def*\colorbullet#1{\textcolor{#1}{\textbullet}\sspace}
-\new@def*\whline{%
-  \noalign{\global\let\savedarw\arrayrulewidth
-    \gdef\arrayrulewidth{1pt}}%
-  \hline
-  \noalign{\global\let\arrayrulewidth\savedarw}%
-}
-\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}}
-
-\amltxdocoptions{%
-  geometryoptions      = {left=3cm,right=3cm,top=2.5cm,%
-                          bottom=2.5cm,includeheadfoot},
-  reviewdocument        = false,
-  parindent             = false,
-  tableofcontents       = false,
-  frontpagestyle        = empty,
-  pretitleskip          = 0ex,
-  posttitleskip         = 1ex,
-  presuptitleskip       = .15\paperheight,
-  postsuptitleskip      = 0ex,
-  presubtitleskip       = 0ex,
-  postsubtitleskip      = 0ex,
-  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
-}
-\robust@def*\otherchars{\quoted{other} characters\sspace}
-\newdef*\impnote{\emph{Important note}:\space}
-\let\sectionbreak\medbreak
-\newletcs\mccolor\makemaccolor
-\newletcs\pucolor\makepurple
-
-\ifamd@subsidfile\else\ltsafterfi
-
-% Change package name: +++++++++++++++
-\usepackage[persistent,useincluput]{n-ltxtools-incluput}
-
-\fancypagenos[%
-  showonpageone     = false,
-  showpagenumbers   = true,
-  showheadrule      = true,
-  showfootrule      = false,
-  yposition         = -.44\paperheight,
-  xposition         = 0,
-  scale             = 1,
-  angle             = 0,
-  left-header       = {The \textcolor{macrocolor}{xwatermark} package},
-  style             = {\textsc{Page~\thepage~of~\pageref{xwmlastpage}}},
-  right-header      = \ttcl{black}{\today}
-]
-
-\newwatermark'
-[page=1,fontfamily=phv,fontsize=11pt,fontseries=m,align=center,
-  coordunit=pc,width=.975\paperwidth,angle=0,scale=1,xpos=-.62,ypos=31.65]{%
-  \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=white,
-    outerframecolor=purple,innerframecolor=brown,textalign=justified,
-    width=.975\paperwidth]{%
-    \normalfont\small\color{black}\vspace*{-1ex}%
-    \parbox{.95\paperwidth}{%
-      \begin{center}\colorbullet{red}\hspace{1cm}\licensename\hspace{1cm}%
-      \colorbullet{red}\end{center}\vspace*{1ex}%
-      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. \CopyrightYear\vspace*{1ex}%
-    }%
-  }%
-}
-
-\def\colorseriescycle{20}
-%\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}
-\definecolorseries{Y}{cmyk}{last}{white}[cmyk]{0,0,1,0}
-\resetcolorseries[10]{Y}
-\definecolorseries{K}{cmyk}{last}{white}[cmyk]{0,0,0,1}
-\resetcolorseries[10]{K}
-\definecolorseries{L}{rgb}{step}{yellow!50}[cmyk]{0.1,0.1,0.3}
-\resetcolorseries[10]{L}
-
-\newwatermark'[page=1,coordunit=pc,ypos=25,scale=.5]{%
-  \begingroup
-  \fboxsep=2mm\relax
-  \def\elt#1{%
-    \vbox{%
-      \hbox{%
-        \normalfont
-        \fboxsep=2mm\relax
-        \hfil
-        \detokenize\expandafter
-          {\expandafter0\expandafter.\number#1}%
-        \hfil\vrule height1ex depth.25ex width0pt
-      }%
-    }%
-  }%
-  \multido{\ncolr=0+1}{10}{\colorbox{C!![\ncolr]}{\elt{\ncolr}}}\\
-  \multido{\ncolr=0+1}{10}{\colorbox{M!![\ncolr]}{\elt{\ncolr}}}\\
-  \multido{\ncolr=0+1}{10}{\colorbox{Y!![\ncolr]}{\elt{\ncolr}}}\\
-  \multido{\ncolr=0+1}{10}{\colorbox{K!![\ncolr]}{\elt{\ncolr}}}\\
-  \multido{\ncolr=0+1}{10}{\colorbox{L!![\ncolr]}{\elt{\ncolr}}}%
-  \endgroup
-}
-\newwatermark[page=1,coordunit=pc,ypos=25]{%
-  \begingroup
-  \fboxsep=2mm\relax
-  \@tempcnta\z@pt
-  \ltstfor xwatermark\dofor{%
-    \csn@def{xwmd@\number\@tempcnta}{%
-      \vbox{\hbox to\dimexpr\paperwidth/13\relax
-        {\hfil\detokenize{#1}\hfil
-        \vrule height1.8ex depth.6ex width0pt}%
-      }%
-    }%
-    \advance\@tempcnta\@ne
-  }%
-  \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}}\\
-  \multido{\ncolr=0+1}{10}{\colorbox{K!![\ncolr]}{\elt}}\\
-  \multido{\ncolr=0+1}{10}{\colorbox{L!![\ncolr]}{\elt}}%
-  \endgroup
-}
-\ltsfi
-
-\endinput
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
index 39cc4bc8b2a..8c4ad0556e1 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
@@ -19,13 +19,14 @@
   \let\restoregeometry\relax
 }
 
+
 \begin{document}
 
 \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.2c}
+\version{1.5.2d}
 \titleurl{http://mirror.ctan.org/macros/latex/contrib/xwatermark/}
 \author{Ahmed Musa\Email{amusa22@gmail.com}\\
   {\small The University of Central Lancashire, Preston, UK}}
@@ -41,9 +42,6 @@
 \end{abstract}
 \end{frontmatter}
 
-%\fcolorbox{gray}{blue}{\box\boxa}
-
-%\newpage
 \noindent
 
 \xwmcolorbox[framesep=5pt,framerule=2pt,fillcolor=white,
@@ -663,7 +661,10 @@ 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}
+  \begin{version}{1.5.2d}{2012/10/23}
+  \item Bug fix in writing section numbers and pages to the auxiliary file \vsecref*
+  \end{version}
+  \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}
diff --git a/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty b/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
index 51b61741c18..9ead5f270e9 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.2c, October 2012.               %
+% This is file 'xwatermark.sty', version 1.5.2d, October 23, 2012.           %
 %                                                                            %
 % This package puts user-specified watermarks (graphics and arbitrary        %
 % texts) on select pages of documents. See package documentation             %
@@ -33,7 +33,7 @@
 \UseNormalCatcodes
 \StyleFilePurpose{A dynamic watermarking scheme}
 \StyleFileRCSInfo
-$Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
+$Id: xwatermark.sty,v 1.5.2d 2012/10/23 09:00:00 Ahmed Musa Exp $
 \ProvidesPackage{xwatermark}[\StyleFileInfo]
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
 \SetStyleFileMessages[xwm@]{info}{warn}{err}
@@ -58,26 +58,41 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
 \cptnewvariables{box}[xwm@box]{a,b}\relax
 \cptnewvariables{count}[xwm@]{cnta}[\z@pt]
 \cptnewvariables{if}[xwm@]{pdf,swa,swb,foregrd,wall,putmark}[false]
+\newletcs\xwm@catch@nil\relax
+\new@def*\xwm@catchtonil#1\xwm@catch@nil{\def\stuff{#1}}
 \xwm@putmarktrue
 \cptnewvariables{write}[xwm@]{wrt}\relax
 \robust@def*\AtShipoutAlwaysUpperLeft#1{%
   \AtBeginShipout{\AtBeginShipoutUpperLeft{#1}}%
 }
-\robust@def*\xwm@secstartpage#1{%
+\robust@def*\xwm@secstopagerange#1{%
+  % To do: what of if a chapter, instead of another section,
+  % comes after section.
   \begingroup
-  \def\do##1##2,{%
-    \ifx\do##1\else
-      \csn@gdef{xwm@secstartpage@@\romannumeral##1}{##2}%
-      \expandafter\do
-    \fi
+  \ifblankTF{#1}{}{%
+    \def\@do##1##2,##3\@nil##4{%
+      \ifstrcmpTF\do{##1}{}{%
+        \csn@xdef{xwm@sec@page@end@\detokenize{##4}}{##2}%
+        \do{##1}{##2},##3\@nil
+      }%
+    }%
+    \def\do##1##2,##3\@nil{%
+      \ifstrcmpTF\do{##1}{}{%
+        \csn@xdef{xwm@sec@page@start@\detokenize{##1}}{##2}%
+        \@do##3\@nil{##1}%
+      }%
+    }%
+    \do#1,\do\do,\@nil
   }%
-  \do#1,\do\do,%
   \endgroup
 }
 \new@def*\xwm@seclist{}
 \AtEndDocument{%
   \immediate\write\@auxout{%
-    \string\xwm@secstartpage{\xwm@seclist}%
+    \string\xwm@secstopagerange{%
+      \xwm@seclist\ifx\xwm@seclist\@empty\else,\fi
+      {10000}{\lastdocpage}%
+    }%
   }%
 }
 \robust@def*\xwm@recordsecno{%
@@ -87,6 +102,7 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
   }%
 }
 \edef\reserved@a{%
+  % To do: do the same for chapter.
   \def\noexpand\@seccntformat##1{%
     \unexpanded\expandafter{\@seccntformat{#1}}%
     \unexpanded{\protect\xwm@recordsecno}%
@@ -210,28 +226,35 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
 }
 \DefSuffixChecker\xwm@suffixcheck{*}{+}{'}
 \robust@def*\xwmifitemsinTF{%
-  \xwm@swatrue\cpt@testopt\xwm@itemsin\@ne
-}
-\robust@def*\xwmifitemsinFT{%
-  \xwm@swafalse\cpt@testopt\xwm@itemsin\@ne
+  \begingroup\xwm@swatrue\cpt@testopt\xwm@itemsin\@ne
 }
 \robust@def*\xxwmifitemsinTF{%
-  \xwm@swatrue\cpt@testopt\xwm@xitemsin{1}%
+  \begingroup\xwm@swatrue\cpt@testopt\xwm@xitemsin\@ne
+}
+\robust@def*\xwmifitemsinFT{%
+  \begingroup\xwm@swafalse\cpt@testopt\xwm@itemsin\@ne
 }
 \robust@def\xwm@xitemsin[#1]#2#3{%
   \cptexpandtwoargs{\xwm@itemsin[#1]}{#2}{#3}%
 }
 \robust@def\xwm@itemsin[#1]#2#3{%
-  \ifnum\numexpr#1<\@ne
-    \xwm@err{Invalid number '\the#1'\relax\MsgBrk
-      for command \string\xwmifitemsinTF}\@ehd
+  \begingroup
+  \afterassignment\xwm@catchtonil\@tempcnta=#1\xwm@catch@nil
+  \if\relax\cptoxdetok\stuff\relax
+    \ifnum\numexpr#1<\@ne
+      \xwm@err{Invalid number '\the#1'\relax
+        \MsgBrk for command \string\xwmifitemsinTF}\@ehd
+    \fi
+  \else
+    \xwm@err{Token '\detokenize{#1}' not an integer}\@ehd
   \fi
+  \endgroup
   \lowercase{%
     \edef\xwm@tempa{\unexpanded{#2}}%
     \edef\xwm@tempb{\unexpanded{#3}}%
   }%
   \cpt@sttrue\cpt@csvnormalize[,]\xwm@tempb
-  \chardef\xwm@nritems\z@pt
+  \def\xwm@nritems{0}%
   \def\xwm@items{}%
   \def\csv@do##1{%
     \xifinsetFT{,\detokenize{##1}}{,\cptoxdetok\xwm@tempb}{}{%
@@ -244,6 +267,7 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
     }%
   }%
   \csv@@parse*[,]\xwm@tempa
+  \expandafter\endgroup
   \csname
     @\ifnum\xwm@nritems>\numexpr#1-1\relax
       \ifxwm@swa first\else second\fi
@@ -1346,16 +1370,20 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
       \ifnum\xwm@cnta<\numexpr\xwm@lastpage+1\relax
     \cptrepeat
   }%
+  % Incomplete concept. To be refined later. Basically, I want to get page
+  % range from section numbers. The work to be done next is actually in
+  % formatting \xwm@seclist and completing \xwm@convertsecstopagerange and
+  % \xwm@convertsecstopagerange@hyphen.
   \xwm@ifpagespec{section=}{%
     \xwm@avoidtwopagespecs
     \xwm@getpagespec{section}%
-    \xwm@convertsectopage\xwm@currpages
+    \xwm@convertsecstopagerange\xwm@currpages
     \xwm@addcurrmark\xwm@currpages
   }%
   \xwm@ifpagespec{sections=}{%
     \xwm@avoidtwopagespecs
     \xwm@getpagespec{sections}%
-    \xwm@convertsectopage@hyphen\xwm@currpages
+    \xwm@convertsecstopagerange@hyphen\xwm@currpages
     \xwm@hyphenpagerange\xwm@currpages\xwm@pagestart\xwm@pageend
     \xwm@cnta\numexpr\xwm@pagestart\relax
     \cptloop
@@ -1367,7 +1395,7 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
   \xwm@ifpagespec{sectionx=}{%
     \xwm@avoidtwopagespecs
     \xwm@getpagespec{sectionx}%
-    \xwm@convertsectopage\xwm@currpages
+    \xwm@convertsecstopagerange\xwm@currpages
     \expandafter\cptfor\xwm@currpages\dofor{%
       \xwm@addcurrmark{##1}%
     }%
@@ -1378,15 +1406,22 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
   \fi
   \postgroupdef\xwm@currwatermark\endgroup
 }
-% \xwm@convertsectopage{<current.pages>}
-\robust@def*\xwm@convertsectopage#1{%
+% \xwm@convertsecstopagerange{<section.range>}
+\robust@def*\xwm@convertsecstopagerange#1{%
   \begingroup
   \def\xwm@tempa{}%
   \expandafter\cptfor#1\dofor{%
-    \letcstocsn\reserved@a{xwm@secstartpage@@\romannumeral##1}%
+    \letcstocsn\reserved@a{xwm@sec@page@start@\detokenize{##1}}%
+    \letcstocsn\reserved@b{xwm@sec@page@end@\detokenize{##1}}%
     \ifx\reserved@a\undefined
       \def\reserved@a{1}%
     \fi
+    \ifx\reserved@b\undefined
+      \def\reserved@b{1}%
+    \fi
+    % To do:
+    % To build the page range for each section, loop from section start
+    % (page start) to section end (page end).
     \xifinsetTF{,\reserved@a,}{,\xwm@tempa,}{}{%
       \edef\xwm@tempa{%
         \xwm@tempa\ifx\xwm@tempa\@empty\else,\fi\reserved@a
@@ -1396,12 +1431,12 @@ $Id: xwatermark.sty,v 1.5.2c 2012/10/14 09:00:00 Ahmed Musa Exp $
   \let#1\xwm@tempa
   \postgroupdef#1\endgroup
 }
-% \xwm@convertsectopage@hyphen{<current.pages>}
-\robust@def*\xwm@convertsectopage@hyphen#1{%
+% \xwm@convertsecstopagerange@hyphen{<section.range>}
+\robust@def*\xwm@convertsecstopagerange@hyphen#1{%
   \begingroup
   \def\xwm@tempa{}%
   \def\csv@do##1{%
-    \letcstocsn\reserved@a{xwm@secstartpage@@\romannumeral##1}%
+    \letcstocsn\reserved@a{xwm@sec@page@start@\detokenize{##1}}%
     \ifx\reserved@a\undefined
       \def\reserved@a{1}%
     \fi
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ccce9b86dea..fca1b17f84b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1031,6 +1031,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'xparse',      "die 'skipping, use xpackages'",
  'xtcapts',     "die 'skipping, noinfo license'",
  'xtheorem',    "die 'skipping, will be in xpackages when ready (Morten says)'",
+ 'xwatermark',	"&MAKEflatten",
  'xymtex',	"&MAKExymtex",
  'xypic',	"&MAKExypic",
  'yi4latex',	"die 'skipping, nosell license'",