pst-plot (24jun14)

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

5 files changed, 19 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-plot/Changes b/Master/texmf-dist/doc/generic/pst-plot/Changes
index 6830460a1c4..108a050c143 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-plot/Changes
@@ -1,4 +1,5 @@
 ----- pst-plot.tex
+1.63  2014-06-24  - added x|y versions of mathLabel and labelFontSize
 1.62  2014-05-12  - moved comma and decimalSeparator into pst-tools
 1.61  2014-03-12  - allow plotstyle cspline (cubic splines)
                     (Christoph Bersch)
diff --git a/Master/texmf-dist/doc/generic/pst-plot/README b/Master/texmf-dist/doc/generic/pst-plot/README
index 57233cad60e..efdfe42fcfd 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/README
+++ b/Master/texmf-dist/doc/generic/pst-plot/README
@@ -1,15 +1,3 @@
-This version of pst-plot uses the xkeyval package, the extended
-version of keyval.
-
-Save the files pst-plot.sty|.tex| in a directory, which is part of your 
-local TeX node. Then do not forget to run texhash to update this node
-if these packages are new to your TeX distribution.
-For more information  see the documentation of your LaTeX distribution 
-on installing packages into your LaTeX distribution or the 
-TeX Frequently Asked Questions:
-(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
-
-pst-plot needs pstricks, which should be part of your
-local TeX installation, otherwise get it from a CTAN server, f.ex.
-http://mirror.ctan.org/graphics/pstricks/
-
+dtk02-1.pdf     : Die mathematischen Funktionen von PostScript
+dtk02-2.pdf     : Die Plotfunktionen von pst-plot
+tugboat01-4.pdf : The plot functions of pst-plot
diff --git a/Master/texmf-dist/doc/generic/pst-plot/README-doc b/Master/texmf-dist/doc/generic/pst-plot/README-doc
deleted file mode 100644
index efdfe42fcfd..00000000000
--- a/Master/texmf-dist/doc/generic/pst-plot/README-doc
+++ /dev/null
@@ -1,3 +0,0 @@
-dtk02-1.pdf     : Die mathematischen Funktionen von PostScript
-dtk02-2.pdf     : Die Plotfunktionen von pst-plot
-tugboat01-4.pdf : The plot functions of pst-plot
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
index 5351d135d6c..43965293b2d 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
index 770ab4eb295..48af2274cc6 100644
--- a/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex
@@ -34,6 +34,7 @@
 
 \maketitle
 
+
 \begin{abstract}
 This version of \LPack{pst-plot} uses the extended keyval handling
 of \LPack{pst-xkey} and has a lot of the macros which were recently in
@@ -1168,11 +1169,13 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and
 \Lkeyword{xEnd}             & integer or empty & \{\}             & \pageref{nxend}\\
 \Lkeyword{xLabels}          & list         & \{\Lcs{empty}\}      & \pageref{xLabels}\\
 \Lkeyword{xlabelFactor}     & anything     & \{\Lcs{@empty}\}     & \pageref{labelfactor}\\
+\Lkeyword{xlabelFontSize}    & macro        & \{\}           & \pageref{labelfontsize}\\
 \Lkeyword{xlabelOffset}     & length     & 0     & \pageref{labelOffset}\\
 \Lkeyword{xlabelPos}        & \Lkeyval{bottom},\Lkeyval{axis},\Lkeyval{top}
                                            & \Lkeyval{bottom}     & \pageref{labelpos}\\
 \Lkeyword{xLabelsRot}          & angle         & 0      & \pageref{xLabels}\\
 \Lkeyword{xlogBase}         & integer or empty & \{\}             & \pageref{xlogbase}\\
+\Lkeyword{xmathLabel}        & boolean      & \false         & \pageref{labelfontsize}\\
 \Lkeyword{xticklinestyle}   & \Lkeyval{solid}|\Lkeyval{dashed}|\Lkeyval{dotted}|\Lkeyval{none} 
                                            & \Lkeyval{solid}      & \pageref{ticklinestyle}\\
 \Lkeyword{xStart}           & integer or empty & \{\}             & \pageref{nxstart}\\
@@ -1195,11 +1198,13 @@ redefinition, then do it for \Lcs{pst@@@hlabel} and
 \Lkeyword{yEnd}             & integer or empty & \{\}             & \pageref{ystartend}\\
 \Lkeyword{yLabels}          & list         & \{\Lcs{empty}\}      & \pageref{xLabels}\\
 \Lkeyword{ylabelFactor}     & literal      & \{\Lcs{empty}\}      & \pageref{labelfactor}\\
+\Lkeyword{ylabelFontSize}    & macro        & \{\}           & \pageref{labelfontsize}\\
 \Lkeyword{ylabelOffset}     & length     & 0     & \pageref{labelOffset}\\
 \Lkeyword{ylabelPos}        & \Lkeyval{left}|\Lkeyval{axis}|\Lkeyval{right}
                                            & \Lkeyval{left}       & \pageref{labelpos}\\
 \Lkeyword{xLabelsRot}          & angle         & 0      & \pageref{xLabels}\\
 \Lkeyword{ylogBase}         & integer or empty & \{\}             & \pageref{ylogbase}\\
+\Lkeyword{ymathLabel}        & boolean      & \false         & \pageref{labelfontsize}\\
 \Lkeyword{yMaxValue}        & real         & 1.e30                   & \pageref{yMaxValue}\\
 \Lkeyword{yMinValue}        & real         & -1.e30                   & \pageref{yMaxValue}\\
 \Lkeyword{yStart}           & integer or empty & \{\}             & \pageref{ystartend}\\
@@ -1425,7 +1430,7 @@ lines (\Lkeyword{xsubticks}).
 %
 \begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psaxes[axesstyle=polar,subticklinestyle=dashed,subticks=2,
-  labelFontSize=\scriptstyle](3,360)
+  xlabelFontSize=\scriptstyle](3,360)
 \psplot[polarplot,algebraic,linecolor=red,linewidth=2pt,
     plotpoints=2000]{0}{TwoPi}{6*sin(x)*cos(x)}
 \end{pspicture}
@@ -1440,7 +1445,7 @@ lines (\Lkeyword{xsubticks}).
 %
 \begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psaxes[axesstyle=polar,subticklinestyle=dashed,subticks=2,
-  labelFontSize=\scriptstyle](3,360)
+  ylabelFontSize=\scriptstyle](3,360)
 \psplot[polarplot,algebraic,linecolor=red,linewidth=2pt,
     plotpoints=2000]{0}{TwoPi}{6*sin(x)*cos(x)}
 \end{pspicture}
@@ -1576,18 +1581,18 @@ taken into account for \Lkeyval{axis}.
 
 
 %--------------------------------------------------------------------------------------
-\subsection{Options \nxLkeyword{labelFontSize} and \nxLkeyword{mathLabel}}\label{labelfontsize}
+\subsection{Options \nxLkeyword{x|ylabelFontSize} and \nxLkeyword{x|ymathLabel}}\label{labelfontsize}
 %--------------------------------------------------------------------------------------
 
 This option sets the horizontal \textbf{and} vertical font size
-for the labels depending on the option \Lkeyword{mathLabel} for the
+for the labels depending on the option \Lkeyword{mathLabel} (\Lkeyword{xmathLabel}/\Lkeyword{ymathLabel}) for the
 text or the math mode. It will be overwritten when another package
 or a user defines
 \begin{lstlisting}[style=syntax]
-\def\pshlabel#1{\labelFontSize ...}
-\def\psvlabel#1{\labelFontSize ...}
-\def\pshlabel#1{$\labelFontSize ...$}% for mathLabel=true (default)
-\def\psvlabel#1{$\labelFontSize ...$}% for mathLabel=true (default)
+\def\pshlabel#1{\xlabelFontSize ...}
+\def\psvlabel#1{\ylabelFontSize ...}
+\def\pshlabel#1{$\xlabelFontSize ...$}% for mathLabel=true (default)
+\def\psvlabel#1{$\ylabelFontSize ...$}% for mathLabel=true (default)
 \end{lstlisting}
 in another way. Note that for \Lkeyword{mathLabel}=\true the font size
 must be set by one of the mathematical styles \Lcs{textstyle},
@@ -1602,7 +1607,7 @@ must be set by one of the mathematical styles \Lcs{textstyle},
 \psaxes[labelFontSize=\footnotesize]{->}(5,2.25)
 \end{pspicture}\\[20pt]
 \begin{pspicture}(-0.25,-0.25)(5,2.25)
-\psaxes[labelFontSize=\footnotesize]{->}(5,2.25)
+\psaxes[xlabelFontSize=\footnotesize]{->}(5,2.25)
 \end{pspicture}\\[20pt]
 \end{LTXexample}
 
@@ -1612,7 +1617,7 @@ must be set by one of the mathematical styles \Lcs{textstyle},
 \end{pspicture}\\[20pt]
 \psset{mathLabel=true}
 \begin{pspicture}(-0.25,-0.25)(5,2.25)
-\psaxes[labelFontSize=\scriptscriptstyle]{->}(5,2.25)
+\psaxes[ylabelFontSize=\scriptscriptstyle]{->}(5,2.25)
 \end{pspicture}\\[20pt]
 \end{LTXexample}