2 files changed, 16 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
index ec822fca6f9..9dabc1f9ac3 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,3 +1,5 @@
+%% $Id: pstricks-add.tex 7 2007-12-29 22:21:13Z herbert $
+%%
 %%
 %% This is file `pstricks-add.tex',
 %%
@@ -27,8 +29,8 @@
 \ifx\MultidoLoaded\endinput\else \input multido  \fi
 \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
 %
-\def\fileversion{2.91}
-\def\filedate{2007/10/20}
+\def\fileversion{3.00}
+\def\filedate{2008/01/01}
 \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -37,7 +39,7 @@
 %
 %% prologue for postcript
 \pstheader{pstricks-add.pro}%
-%\pstheader{shfill_emulate.pro}%
+%\pstheader{pst-algparser.pro}%  done by pstricks.tex
 %
 %-------------------------------- pstricks ------------------------------------
 %
@@ -1356,8 +1358,8 @@
 %
 \define@key[psset]{pstricks-add}{labelFontSize}{\def\psk@labelFontSize{#1}}%
 \psset{labelFontSize={}}
-\def\pshlabel#1{\psk@labelFontSize$#1$}%
-\def\psvlabel#1{\psk@labelFontSize$#1$}
+\def\pshlabel#1{\psk@labelFontSize#1}%
+\def\psvlabel#1{\psk@labelFontSize#1}
 %
 \define@boolkey[psset]{pstricks-add}[Pst@]{comma}[true]{}
 \define@boolkey[psset]{pstricks-add}[Pst@]{xAxis}[true]{}
@@ -1423,7 +1425,7 @@
         \fi%
       \fi%
     }
-    \def\pshlabel##1{\psk@labelFontSize$##1$}%
+    \def\pshlabel##1{\psk@labelFontSize##1}%
   \fi
 }
 \psset{trigLabels=false}
@@ -1695,9 +1697,11 @@
 \define@key[psset]{pstricks-add}{xsubtickwidth}{\pst@getlength{#1}\psk@xsubtickwidth}
 \define@key[psset]{pstricks-add}{ysubtickwidth}{\pst@getlength{#1}\psk@ysubtickwidth}
 %
-\define@key[psset]{pstricks-add}{tickcolor}{\def\psk@xtickcolor{#1}\def\psk@ytickcolor{#1}}
-\define@key[psset]{pstricks-add}{xtickcolor}{\def\psk@xtickcolor{#1}}
-\define@key[psset]{pstricks-add}{ytickcolor}{\def\psk@ytickcolor{#1}}
+\define@key[psset]{pstricks-add}{tickcolor}{%
+    \pst@getcolor{#1}\psk@xtickcolor%
+    \pst@getcolor{#1}\psk@ytickcolor}
+\define@key[psset]{pstricks-add}{xtickcolor}{\pst@getcolor{#1}\psk@xtickcolor}
+\define@key[psset]{pstricks-add}{ytickcolor}{\pst@getcolor{#1}\psk@ytickcolor}
 \define@key[psset]{pstricks-add}{subtickcolor}{%
   \pst@getcolor{#1}\psk@xsubtickcolor%
   \pst@getcolor{#1}\psk@ysubtickcolor}
diff --git a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
index f25c298db43..dc7a49dd8c4 100644
--- a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
+++ b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
@@ -1,3 +1,5 @@
+%% $Id: pstricks-add.sty 7 2007-12-29 22:21:13Z herbert $
+%
 \RequirePackage{pstricks}
 \ProvidesPackage{pstricks-add}[2007/09/03 v. 0.11 package wrapper for 
   pstricks-add.tex (hv)]
@@ -6,7 +8,7 @@
   [\filedate\space v\fileversion\space `PSTricks-add' (hv)]
 \IfFileExists{pstricks-add.pro}{%
   \ProvidesFile{pstricks-add.pro}
-    [2007/09/04 v. 0.14,  PostScript prologue file (hv)]
+    [2007/11/18 v. 0.15,  PostScript prologue file (hv)]
     \@addtofilelist{pstricks-add.pro}}{}%
 \InputIfFileExists{pstricks-add.cfg}{%
     \PackageInfo{pstricks-add}{Local config file pstricks-add.cfg used}