summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-24 17:41:52 +0000
committerKarl Berry <karl@freefriends.org>2014-06-24 17:41:52 +0000
commite1a3b7c2ba086fd66714cde211d6b996d926d4f7 (patch)
treea1424efb67801d76323cf012d636a86d9a2821b9
parentba7deafdb1a14a257559cdbc264d6e2fe2a34db1 (diff)
pst-plot (24jun14)
git-svn-id: svn://tug.org/texlive/trunk@34378 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/README18
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/README-doc3
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.pdfbin1249898 -> 1255335 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-plot/pst-plot-doc.tex25
-rw-r--r--Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex62
6 files changed, 55 insertions, 54 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
Binary files differ
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}
diff --git a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
index bccb3a48446..1a9e012a327 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -20,8 +20,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.62}
-\def\filedate{2014/05/12}
+\def\fileversion{1.63}
+\def\filedate{2014/06/24}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -1190,15 +1190,25 @@ D\space##1%
\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{}
\psset[pst-plot]{showorigin}
%
-\define@key[psset]{pst-plot}{labelFontSize}[{}]{\def\psk@labelFontSize{#1}}%
+\define@key[psset]{pst-plot}{labelFontSize}[{}]{\def\psk@xlabelFontSize{#1}\def\psk@ylabelFontSize{#1}}%
+\define@key[psset]{pst-plot}{xlabelFontSize}[{}]{\def\psk@xlabelFontSize{#1}}%
+\define@key[psset]{pst-plot}{ylabelFontSize}[{}]{\def\psk@ylabelFontSize{#1}}%
\define@boolkey[psset]{pst-plot}[Pst@]{mathLabel}[true]{%
\ifPst@mathLabel%
- \def\pshlabel##1{$\psk@labelFontSize##1$}%
- \def\psvlabel##1{$\psk@labelFontSize##1$}%
+ \Pst@xmathLabeltrue \Pst@ymathLabeltrue
+ \def\pshlabel##1{$\psk@xlabelFontSize##1$}%
+ \def\psvlabel##1{$\psk@ylabelFontSize##1$}%
\else%
- \def\pshlabel##1{\psk@labelFontSize##1}%
- \def\psvlabel##1{\psk@labelFontSize##1}%
+ \Pst@xmathLabelfalse \Pst@ymathLabelfalse
+ \def\pshlabel##1{\psk@xlabelFontSize##1}%
+ \def\psvlabel##1{\psk@ylabelFontSize##1}%
\fi}
+\define@boolkey[psset]{pst-plot}[Pst@]{xmathLabel}[true]{%
+ \ifPst@xmathLabel%
+ \def\pshlabel##1{$\psk@xlabelFontSize##1$}\else\def\pshlabel##1{\psk@xlabelFontSize##1}\fi}
+\define@boolkey[psset]{pst-plot}[Pst@]{ymathLabel}[true]{%
+ \ifPst@ymathLabel%
+ \def\psvlabel##1{$\psk@ylabelFontSize##1$}\else\def\psvlabel##1{\psk@ylabelFontSize##1}\fi}
\psset[pst-plot]{labelFontSize={},mathLabel}
%
\define@boolkey[psset]{pst-plot}[Pst@]{xAxis}[true]{}
@@ -1259,8 +1269,8 @@ D\space##1%
\pst@mod{\pst@cntm}{\de@nominator}\pst@cntp % cntb=##1 modulo trigLabelBase
\ifnum\@ne>\pst@cntp % 1 > modulo -> then we have pi/x
\pst@cnto=\pst@cntm \divide\pst@cnto by \de@nominator
- \ifPst@mathLabel%
- $\psk@labelFontSize
+ \ifPst@xmathLabel%
+ $\psk@xlabelFontSize
\ifnum\pst@tempA<0 -\fi
\ifnum\pst@cnto=\@ne % #1 = trigLabelBase
\pi % print pi
@@ -1268,7 +1278,7 @@ D\space##1%
\the\pst@cnto\pi % print \pst@cnto/\de@nominator pi
\fi$%
\else%
- \psk@labelFontSize%
+ \psk@xlabelFontSize%
\ifnum\pst@tempA<0 -\fi%
\ifnum\pst@cnto=\@ne% % #1 = trigLabelBase
$\pi$% % print pi
@@ -1277,8 +1287,8 @@ D\space##1%
\fi%
\fi%
\else%
- \ifPst@mathLabel%
- $\psk@labelFontSize%
+ \ifPst@xmathLabel%
+ $\psk@xlabelFontSize%
\ifnum\pst@cntp=\@ne% % < 1 pi?
\if\pst@cntm=\@ne%
\frac{\pi}{\de@nominator}% % pi/x
@@ -1292,7 +1302,7 @@ D\space##1%
\else\frac{\pst@tempA\pi}{\de@nominator}%
\fi\fi\fi$%
\else%
- \psk@labelFontSize%
+ \psk@xlabelFontSize%
\ifnum\pst@cntp=\@ne% % < 1 pi?
\if\pst@cntm=\@ne%
$\frac{\pi}{\de@nominator}$% % pi/x
@@ -1314,18 +1324,18 @@ D\space##1%
% \ifnum\psk@ticks<\tw@ % ticks=all|x
\ifnum\psk@labels<\tw@ % labels=all|x
\ifx\psk@xlogBase\@empty%
- \pshlabel{\psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
+ \pshlabel{\psk@xlabelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
\else%
- \ifPst@mathLabel%
- \pshlabel{\psk@labelFontSize\psk@xlogBase^{\expandafter\@stripDecimals##1..\@nil}}%
+ \ifPst@xmathLabel%
+ \pshlabel{\psk@xlabelFontSize\psk@xlogBase^{\expandafter\@stripDecimals##1..\@nil}}%
\else%
- \pshlabel{\psk@labelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
+ \pshlabel{\psk@xlabelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
\fi
\fi%
\fi%
}%
- \ifPst@mathLabel%
- \def\pshlabel##1{$\psk@labelFontSize##1$}\else\def\pshlabel##1{\psk@labelFontSize##1}\fi%
+ \ifPst@xmathLabel%
+ \def\pshlabel##1{$\psk@xlabelFontSize##1$}\else\def\pshlabel##1{\psk@xlabelFontSize##1}\fi%
\fi%
}%
%
@@ -1340,8 +1350,8 @@ D\space##1%
\pst@mod{\pst@cntm}{\de@nominator}\pst@cntp % cntb=##1 modulo trigLabelBase
\ifnum\@ne>\pst@cntp % 1 > modulo -> then we have pi/x
\pst@cnto=\pst@cntm \divide\pst@cnto by \de@nominator
- \ifPst@mathLabel%
- $\psk@labelFontSize
+ \ifPst@ymathLabel%
+ $\psk@ylabelFontSize
\ifnum\pst@tempA<0 -\fi
\ifnum\pst@cnto=\@ne % #1 = trigLabelBase
\pi % print pi
@@ -1349,7 +1359,7 @@ D\space##1%
\the\pst@cnto\pi % print \pst@cnto/\de@nominator pi
\fi$%
\else%
- \psk@labelFontSize%
+ \psk@ylabelFontSize%
\ifnum\pst@tempA<0 -\fi%
\ifnum\pst@cnto=\@ne% % #1 = trigLabelBase
$\pi$% % print pi
@@ -1358,8 +1368,8 @@ D\space##1%
\fi%
\fi%
\else%
- \ifPst@mathLabel%
- $\psk@labelFontSize%
+ \ifPst@ymathLabel%
+ $\psk@ylabelFontSize%
\ifnum\pst@cntp=\@ne% % < 1 pi?
\if\pst@cntm=\@ne%
\frac{\pi}{\de@nominator}% % pi/x
@@ -1373,7 +1383,7 @@ D\space##1%
\else\frac{\pst@tempA\pi}{\de@nominator}%
\fi\fi\fi$%
\else%
- \psk@labelFontSize%
+ \psk@ylabelFontSize%
\ifnum\pst@cntp=\@ne% % < 1 pi?
\if\pst@cntm=\@ne%
$\frac{\pi}{\de@nominator}$% % pi/x
@@ -1398,7 +1408,7 @@ D\space##1%
\ifx\psk@ylogBase\@empty%
\psvlabel{\expandafter\@LabelComma##1..\@nil\psk@ylabelFactor}%
\else%
- \ifPst@mathLabel%
+ \ifPst@ymathLabel%
\psvlabel{\psk@ylogBase^{\expandafter\@stripDecimals##1..\@nil }}%
\else
\psvlabel{\psk@ylogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil }}%