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

3 files changed, 19 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty
index 7f2608fad07..e4d04f2d231 100644
--- a/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty
+++ b/Master/texmf-dist/tex/latex/pgf/basiclayer/pgf.sty
@@ -5,12 +5,12 @@
 
 \RequirePackage{pgfrcs}
 
-\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/basiclayer/pgf.sty,v 1.4 2005/09/05 13:23:04 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/basiclayer/pgf.sty,v 1.5 2005/10/25 08:18:14 tantau Exp $
 
 \def\pgf@draft{}
 \DeclareOption{draft}{\def\pgf@draft{\pgf@draftmodetrue}}
 
-\def\pgf@obsolete{\RequirePackage{pgfcompatibility-version-0-65}}
+\def\pgf@obsolete{\RequirePackage{pgfcomp-version-0-65}}
 \DeclareOption{version=0.65}{}
 \DeclareOption{version=0.96}{\def\pgf@obsolete{}}
 
diff --git a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcompatibility-version-0-65.sty b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty
index f084c7ec3e8..52122b16a8f 100644
--- a/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcompatibility-version-0-65.sty
+++ b/Master/texmf-dist/tex/latex/pgf/compatibility/pgfcomp-version-0-65.sty
@@ -1,6 +1,6 @@
 \RequirePackage{pgfrcs}
 
-\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfcompatibility-version-0-65.sty,v 1.4 2005/07/18 14:37:48 tantau Exp $
+\ProvidesPackageRCS[v\pgfversion] $Header: /cvsroot/pgf/pgf/latex/pgf/compatibility/pgfcomp-version-0-65.sty,v 1.3 2005/11/14 16:43:25 tantau Exp $
 
 % Copyright 2005 by Till Tantau <tantau@cs.tu-berlin.de>.
 %
@@ -375,8 +375,8 @@
   \addtolength\pgf@y{#6}%
   \addtolength\pgf@y{#6}%
   \edef\pgf@boxsize{\noexpand\pgf@x=\the\pgf@x\noexpand\pgf@y=\the\pgf@y}%
-  \csname pgf@haligncenter\endcsname%
-  \csname pgf@valigncenter\endcsname%
+  \csname pgf@haligncompcenter\endcsname%
+  \csname pgf@valigncompcenter\endcsname%
   \wd\pgf@hbox=0pt%
   \pgfputat{#3}{%
   \pgfsys@hbox\pgf@hbox}%
@@ -688,13 +688,22 @@
 
 \long\def\pgfbox[#1,#2]#3{%
   \pgf@makehbox{#3}%
-  \csname pgf@halign#1\endcsname%
-  \csname pgf@valign#2\endcsname%
+  \csname pgf@haligncomp#1\endcsname%
+  \csname pgf@valigncomp#2\endcsname%
   \wd\pgf@hbox=0pt%
   \ht\pgf@hbox=0pt%
   \dp\pgf@hbox=0pt%
   \pgfqbox{\pgf@hbox}%
   \ignorespaces}
 
+\def\pgf@haligncompleft{}% do nothing
+\def\pgf@haligncompcenter{\setbox\pgf@hbox=\hbox{\hskip-.5\wd\pgf@hbox\box\pgf@hbox}}
+\def\pgf@haligncompright{\setbox\pgf@hbox=\hbox{\hskip-\wd\pgf@hbox\box\pgf@hbox}}
+\def\pgf@valigncompbase{}% do nothing
+\def\pgf@valigncompbottom{\setbox\pgf@hbox=\hbox{\raise\dp\pgf@hbox\box\pgf@hbox}}
+\def\pgf@valigncompcenter{%
+  \setbox\pgf@hbox=\hbox{\raise.5\dp\pgf@hbox\hbox{\lower.5\ht\pgf@hbox\box\pgf@hbox}}}%
+\def\pgf@valigncomptop{\setbox\pgf@hbox=\hbox{\lower\ht\pgf@hbox\box\pgf@hbox}}
+
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty
index 19023c2efd0..36784a3c968 100644
--- a/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty
+++ b/Master/texmf-dist/tex/latex/pgf/utilities/pgfpages.sty
@@ -796,7 +796,7 @@
         \pgflowlevel{\pgftransformshift{\pgfpoint{-.5\@tempdima}{-.5\@tempdimb}}}%
         \expandafter\ifx\csname pgfpages@p@\the\pgf@cpn @bordercode\endcsname\relax%
         \else%
-          \pgfpathmoveto{\pgfpathorigin}%
+          \pgfpathmoveto{\pgfpointorigin}%
           \pgfpathlineto{\pgfpoint{\wd0}{0pt}}%
           \pgfpathlineto{\pgfpoint{\wd0}{\ht0}}%
           \pgfpathlineto{\pgfpoint{0pt}{\ht0}}%
@@ -808,7 +808,7 @@
           {
             \expandafter\@tempdima\csname pgfpages@p@\the\pgf@cpn @cornerwidth\endcsname\relax%
             \color{black}
-            \pgfpathrectangle{\pgfpathorigin}{\pgfpoint{\@tempdima}{\@tempdima}}%
+            \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\@tempdima}{\@tempdima}}%
             \pgfpathrectangle{\pgfpoint{0pt}{\ht0-\@tempdima}}{\pgfpoint{\@tempdima}{\@tempdima}}%
             \pgfpathrectangle{\pgfpoint{\wd0-\@tempdima}{0pt}}{\pgfpoint{\@tempdima}{\@tempdima}}%
             \pgfpathrectangle{\pgfpoint{\wd0-\@tempdima}{\ht0-\@tempdima}}{\pgfpoint{\@tempdima}{\@tempdima}}%
@@ -824,7 +824,7 @@
             \pgfpathclose
             \pgfusepath{clip}
             \color{white}
-            \pgfpathrectangle{\pgfpathorigin}{\pgfpoint{\wd0}{\ht0}}
+            \pgfpathrectangle{\pgfpointorigin}{\pgfpoint{\wd0}{\ht0}}
             \pgfusepath{fill}
           }
         \fi%