diff options
author | Karl Berry <karl@freefriends.org> | 2014-06-24 17:41:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-06-24 17:41:52 +0000 |
commit | e1a3b7c2ba086fd66714cde211d6b996d926d4f7 (patch) | |
tree | a1424efb67801d76323cf012d636a86d9a2821b9 /Master/texmf-dist/tex/generic/pst-plot | |
parent | ba7deafdb1a14a257559cdbc264d6e2fe2a34db1 (diff) |
pst-plot (24jun14)
git-svn-id: svn://tug.org/texlive/trunk@34378 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-plot')
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | 62 |
1 files changed, 36 insertions, 26 deletions
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 }}% |