Fix ctan2tds for pgf installation

comment powerdot-doc-vn in tpm-ctan-check, it always breaks

Update of the following packages:
labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj
pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref
muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo


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

1 files changed, 25 insertions, 18 deletions

diff --git a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
index 5febf8c8960..2aabc0bc603 100644
--- a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
+++ b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
@@ -172,10 +172,11 @@ documentation and for contributing the |\@selective@sanitize| macro.
 % \changes{v2.5b}{2005/06/20}{Made retrieving document class more robust}
 % \changes{v2.5d}{2005/08/12}{Added missing \cs{filename@area} in
 %   document class retrieval in \texttt{xkeyval.sty}}
+% \changes{v2.5e}{2005/11/25}{Updated docs}
 %
 % \GetFileInfo{xkeyval.sty}
 %
-% \CheckSum{2963}
+% \CheckSum{2964}
 %
 %\DoNotIndex{\:,\@,\@@,\@backslashchar,\@ehc,\@empty,\@expandtwoargs,
 %\@for,\@forloop,\@fornoop,\@fortmp,\@gobble,\@gobbletwo,\@if,\@ifnch,
@@ -1713,11 +1714,8 @@ documentation and for contributing the |\@selective@sanitize| macro.
 %a lot of authors are involved and since it requires a change of
 %policy, the conversion of \pf{PSTricks} packages might take some
 %time. Hence, at the moment of writing, \pf{xkeyval} will conflict
-%with \pf{pst-key} and the \pf{PSTricks} packages using \pf{pst-key},
-%which are \pf{pst-circ}, \pf{pst-eucl}, \pf{pst-fr3d}, \pf{pst-geo},
-%\pf{pst-gr3d}, \pf{pst-labo}, \pf{pst-lens}, \pf{pst-ob3d},
-%\pf{pst-optic}, \pf{pst-osci}, \pf{pst-poly}, \pf{pst-stru},
-%\pf{pst-uml} and \pf{pst-vue3d}.
+%with \pf{pst-key} and the \pf{PSTricks} packages still using
+%\pf{pst-key}, which are \pf{pst-ob3d}, \pf{pst-stru} and \pf{pst-uml}.
 %
 %Have a look at the \pf{PSTricks} website \cite{PSTricksWeb} to find
 %out if the package that you want to use has been converted already.
@@ -2048,10 +2046,10 @@ documentation and for contributing the |\@selective@sanitize| macro.
 % Load \LaTeX\ primitives if necessary and provide information.
 %    \begin{macrocode}
 \ifx\ProvidesFile\@undefined
-  \message{2005/08/12 v2.5d key=value parser (HA)}
+  \message{2005/11/25 v2.5e key=value parser (HA)}
   \input xkvtxhdr
 \else
-  \ProvidesFile{xkeyval.tex}[2005/08/12 v2.5d key=value parser (HA)]
+  \ProvidesFile{xkeyval.tex}[2005/11/25 v2.5e key=value parser (HA)]
   \@addtofilelist{xkeyval.tex}
 \fi
 %    \end{macrocode}
@@ -3996,7 +3994,7 @@ documentation and for contributing the |\@selective@sanitize| macro.
 %<*xkvlatex>
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{xkeyval}
-  [2005/08/12 v2.5d package option processing (HA)]
+  [2005/11/25 v2.5e package option processing (HA)]
 %    \end{macrocode}
 % Initializations. Load |xkeyval.tex|, adjust some catcodes to define
 % internal macros and initialize the |\DeclareOptionX*| working macro.
@@ -4739,11 +4737,11 @@ documentation and for contributing the |\@selective@sanitize| macro.
 % provide information.
 %    \begin{macrocode}
 \ifx\ProvidesFile\@undefined
-  \message{2005/02/22 v1.5 PSTricks specialization of xkeyval (HA)}
+  \message{2005/11/25 v1.6 PSTricks specialization of xkeyval (HA)}
   \ifx\XKeyValLoaded\endinput\else\input xkeyval \fi
 \else
   \ProvidesFile{pst-xkey.tex}
-    [2005/02/22 v1.5 PSTricks specialization of xkeyval (HA)]
+    [2005/11/25 v1.6 PSTricks specialization of xkeyval (HA)]
   \@addtofilelist{pst-xkey.tex}
   \RequirePackage{xkeyval}
 \fi
@@ -4767,13 +4765,14 @@ documentation and for contributing the |\@selective@sanitize| macro.
 % \end{macro}
 % \begin{macro}{\psset}
 % \changes{v1.8b}{2004/12/22}{Properly expand \cs{pst@famlist}}
+% \changes{v2.5e}{2005/11/25}{Added \cs{ignorespaces} as in \texttt{pstricks.tex}}
 % \begin{macro}{\pss@t}
 % Set keys. Uses \pf{xkeyval}'s |\setkeys+|.
 %    \begin{macrocode}
 \def\psset{%
   \expandafter\@testopt\expandafter\pss@t\expandafter{\pst@famlist}%
 }
-\def\pss@t[#1]{\setkeys+[psset]{#1}}
+\def\pss@t[#1]#2{\setkeys+[psset]{#1}{#2}\ignorespaces}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -4798,7 +4797,7 @@ documentation and for contributing the |\@selective@sanitize| macro.
 %<*pxklatex>
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{pst-xkey}
-  [2005/02/22 v1.5 package wrapper for pst-xkey.tex (HA)]
+  [2005/11/25 v1.6 package wrapper for pst-xkey.tex (HA)]
 %    \end{macrocode}
 % Load required package.
 %    \begin{macrocode}
@@ -5572,11 +5571,19 @@ actually used. They are not expanded during option processing.\\
   year         = 2003
 }
 
-@BOOK{companion,
-  author       = {Frank Mittelbach and Michel Goossens and Johannes Braams and David Carlisle and Chris Rowley},
-  title        = {The {\LaTeX} {C}ompanion, {S}econd {E}dition},
-  year         = {2004},
-  publisher    = {{Addison-Wesley}}
+@book{companion,
+  author       = {Frank Mittelbach and Michel Goossens},
+  title        = {The {\LaTeX} Companion},
+  edition      = 2,
+  note         = {With Johannes Braams, David Carlisle, and Chris Rowley},
+  series       = {Tools and Techniques for Computer Typesetting},
+  publisher    = {Addison-Wesley},
+  address      = {Boston, Massachusetts},
+  year         = 2004,
+  pagenums     = {1120},
+  bibliography = {yes},
+  index        = {yes},
+  isbn         = {0-201-36299-6}
 }
 
 @MISC{keyval,