summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-16 00:25:05 +0000
committerKarl Berry <karl@freefriends.org>2010-01-16 00:25:05 +0000
commit2cdccebac3ad373f3ae1657916375f7c2bc964db (patch)
tree87b99d5ed7a520f2e1005963dd026b27bfea7ce9
parent7dfb5fe2031be6fd3d904936cda1e43b9670731a (diff)
xwatermark update (15jan10)
git-svn-id: svn://tug.org/texlive/trunk@16734 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/xwatermark/xwatermark-bugreport.tex (renamed from Master/texmf-dist/doc/latex/xwatermark/xwatermark-bugreport-1dot4.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.pdf (renamed from Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples-1dot4.pdf)bin182125 -> 182297 bytes
-rw-r--r--Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.tex (renamed from Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples-1dot4.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg (renamed from Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.cfg)0
-rw-r--r--Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.pdf (renamed from Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.pdf)bin255156 -> 255394 bytes
-rw-r--r--Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex (renamed from Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.tex)4
-rw-r--r--Master/texmf-dist/doc/latex/xwatermark/xwatermark-manifest.tex (renamed from Master/texmf-dist/doc/latex/xwatermark/xwatermark-manifest-1dot4.tex)8
-rw-r--r--Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty10
8 files changed, 9 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-bugreport-1dot4.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-bugreport.tex
index 1689ccb25ef..1689ccb25ef 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-bugreport-1dot4.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-bugreport.tex
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples-1dot4.pdf b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.pdf
index 92033fb5808..5a5ade841fe 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples-1dot4.pdf
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples-1dot4.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.tex
index 669457b6437..669457b6437 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples-1dot4.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-examples.tex
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.cfg b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
index c1bab2cf13f..c1bab2cf13f 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.cfg
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.cfg
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.pdf b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.pdf
index 38a07294461..8732326df72 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.pdf
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
index e665403dd1c..45298543936 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide-1dot4.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-guide.tex
@@ -5,7 +5,7 @@
% (c) Ahmed Musa 2010 (a.musa@rocketmail.com) %
%+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
\documentclass[a4paper,11pt,final]{article}
-\InputIfFileExists{xwatermark-guide-1dot4.cfg}{}{%
+\InputIfFileExists{xwatermark-guide.cfg}{}{%
\errmessage{No file xwatermark-guide.cfg or wrong path}}
\begin{document}
\MakeShortVerb{\+}
@@ -103,7 +103,7 @@ When setting package options either in \cmdb{usepackage} or \dclass (or indeed i
\begin{itemize}
\item Multiple lines are permitted but not blank lines.
\item Extra paces between options and words are ignored.
-\item No active characters (those of catcode 13) are allowed (see section~\ref{sec:Active-charact}).
+\item No active characters (those of catcode 13) are allowed (but see section~ \ref{sec:Active-charact}).
\item Options are basically order-agnostic.
\end{itemize}
Thus, \eg, the following statement
diff --git a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-manifest-1dot4.tex b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-manifest.tex
index 65e1fe1f161..514d40e1d97 100644
--- a/Master/texmf-dist/doc/latex/xwatermark/xwatermark-manifest-1dot4.tex
+++ b/Master/texmf-dist/doc/latex/xwatermark/xwatermark-manifest.tex
@@ -4,11 +4,11 @@
The xwatermark bundle (version 1.4) consists of the following files:
xwatermark.sty - The style file
-xwatermark-guide-1dot4.tex - The user manual
-xwatermark-examples-1dot4.tex - The examples file
-xwatermark-guide-1dot4.cfg - The configuration file for the user
+xwatermark-guide.tex - The user manual
+xwatermark-examples.tex - The examples file
+xwatermark-guide.cfg - The configuration file for the user
manual and example files
-xwatermark-bugreport-1dot4.tex - The bug report file
+xwatermark-bugreport.tex - The bug report file
Readme - The README file
xwatermarkpic.tex - Sample .tex graphics file
diff --git a/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty b/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
index b7973759d62..61b875faeb7 100644
--- a/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
+++ b/Master/texmf-dist/tex/latex/xwatermark/xwatermark.sty
@@ -366,15 +366,11 @@ $Id: xwatermark.sty,v 1.4 2010/01/10 09:00:00 Ahmed Musa Exp $
\endgroup
}%
\krsetup{keyfamily=colorbox,macroprefix=cb@}
+\CKVS{align}{center,right,left,justified}
\define@keylist{2,width,\textwidth,;2,textcolor,black,;
2,fillcolor,yellow!55,;2,framecolor,white,;
- 2,text,No text passed.,;2,framesep,3\p@,;2,framerule,0.4\p@,}
-\define@choicekey*+[XWM]{colorbox}{align}[\val\nr]%
-{center,right,left,justified}[center]{%
- \protected@edef\cb@align{\val}%
-}{%
- \xwm@err{Inadmissible value '\string#1' for colorbox's align}%
-}%
+ 2,text,No text passed.,;2,framesep,3\p@,;2,framerule,0.4\p@,;
+ 4,align,center,\protected@edef\cb@align{\val}}
\presetkeys[XWM]{colorbox}{align=center,width,fillcolor,textcolor,text,
framesep,framerule,framecolor}{}
\newcommand\xwcolorbox[1]{%