summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-plot
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-16 21:13:16 +0000
committerKarl Berry <karl@freefriends.org>2019-07-16 21:13:16 +0000
commit40ab1ab06c07f247ef9448fab8e9c961a22497b3 (patch)
tree1e820c5e1590c2b3ab5a8fd9e0097a88d46a00ec /Master/texmf-dist/tex/generic/pst-plot
parentfc8b128b3aaf69dfb09def4c721b8e5b911b0f73 (diff)
pst-plot (16jul19)
git-svn-id: svn://tug.org/texlive/trunk@51650 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.tex52
1 files changed, 33 insertions, 19 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 7f6ba8a1922..2436a847390 100644
--- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
+++ b/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex
@@ -1,4 +1,4 @@
-% $Id: pst-plot.tex 798 2018-08-31 14:47:43Z herbert $
+% $Id: pst-plot.tex 1056 2019-05-17 07:39:59Z herbert $
%%
%% BEGIN pst-plot.tex
%%
@@ -23,8 +23,8 @@
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
%
-\def\fileversion{1.91}
-\def\filedate{2018/08/31}
+\def\fileversion{1.92}
+\def\filedate{2019/05/16}
\message{ v\fileversion, \filedate\space (tvz,hv)}
%
\edef\TheAtCode{\the\catcode`\@}
@@ -714,15 +714,15 @@ D\space##1%
\ifPst@valuesStar
Str stringwidth pop /yS \psk@fontscale def /xS ED
gsave newpath
- xO \ifPst@xvalues \pst@number\pslabelsep add \fi
- yO \ifPst@xvalues\else \pst@number\pslabelsep add \fi
+ xO \ifPst@xvalues \pst@number\pslabelsep add \fi
+ yO \ifPst@xvalues \psk@fontscale 4 div sub \else \pst@number\pslabelsep add \fi
moveto \ifx\psk@rot\@empty\else\psk@rot rotate \fi
xS 0 rlineto 0 yS rlineto xS neg 0 rlineto 0 yS neg rlineto
closepath 1 setgray fill stroke
grestore
\fi
xO \ifPst@xvalues \pst@number\pslabelsep add \fi
- yO \ifPst@xvalues\else \pst@number\pslabelsep add \fi
+ yO \ifPst@xvalues \psk@fontscale 4 div sub \else \pst@number\pslabelsep add \fi
moveto \ifx\psk@rot\@empty\else\psk@rot rotate \fi
Str show
grestore } repeat
@@ -934,11 +934,11 @@ D\space##1%
\def\psplot{\def\pst@par{}\pst@object{psplot}}
\def\psplot@i#1#2{\@ifnextchar[{\psplot@x{#1}{#2}}{\psplot@x{#1}{#2}[]}}
\def\psplot@x#1#2[#3]#4{%
- \pst@killglue%
- \begingroup%
- \use@par%
+ \pst@killglue
+ \begingroup
+ \use@par
\@nameuse{beginplot@\psplotstyle}%
- \ifPst@polarplot%
+ \ifPst@polarplot
\addto@pscode{
\psplot@init
#3
@@ -1005,16 +1005,16 @@ D\space##1%
/xy { x \pst@number\psxunit mul F@pstplot \pst@number\psyunit mul
% \ifPst@algebraic F@pstplot \else #4 \fi \pst@number\psyunit mul
} def}%
- \fi%
+ \fi
\gdef\psplot@init{}%
\ifx\pslinestyle\psls@@symbol
\psplot@iii
\else
- \@pstfalse%
+ \@pstfalse
\@nameuse{testqp@\psplotstyle}%
- \if@pst\psplot@ii\else\psplot@iii\fi%
- \fi%
- \endgroup%
+ \if@pst\psplot@ii\else\psplot@iii\fi
+ \fi
+ \endgroup
\ignorespaces}
%
\def\psplot@ii{%
@@ -1228,7 +1228,15 @@ D\space##1%
\edef\psk@dy{\number\pst@dimg}}
\psset[pst-plot]{dy=0}
%
-\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{}
+\define@boolkey[psset]{pst-plot}[]{showXorigin}[true]{}
+\define@boolkey[psset]{pst-plot}[]{showYorigin}[true]{}
+\define@boolkey[psset]{pst-plot}[]{showorigin}[true]{%
+ \ifshoworigin
+ \showXorigintrue\showYorigintrue
+ \else
+ \showXoriginfalse\showYoriginfalse
+ \fi
+}
\psset[pst-plot]{showorigin=true}
%
\long\def\psrotatebox#1#2{%
@@ -2016,7 +2024,7 @@ D\space##1%
\ifPst@xAxis
\SpecialLabelsDonefalse
\begingroup
- \ifdim\pst@dimb=\z@\else\ifPst@xtrigLabels\else\showoriginfalse\fi\fi
+%%% \ifdim\pst@dimb=\z@\else\ifPst@xtrigLabels\else\showoriginfalse\fi\fi
\ifnum\psk@dx=\z@
\pst@dimg=\psk@Dx\psxunit
\ifdim\pst@dimg<\p@
@@ -2481,8 +2489,14 @@ D\space##1%
\ifdim\pst@pmtempb pt < \z@ \def\pst@pmtempe{\pst@int{\pst@pmtempc}}\else\def\pst@pmtempe{\pst@int{\pst@pmtempd}}\fi
\multido{\nA=0+1,\rA=#3+\psk@Dy}{\pst@pmtempe}{%
\ifdim \nA pt < \z@ \def\nB{-\nA}\else \def\nB{\nA}\fi
- \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
- \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}}%
+ \ifnum\psk@ylabelPos=0
+ \uput{\psylabelsep}[180]{\pst@yLabelsRot}(0,\rA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}%
+ \else
+ \uput{\psylabelsep}[0]{\pst@yLabelsRot}(0,\rA){%
+ \strut\expandafter\psvlabel\expandafter{\psPutYLabel{\nB}}}%
+ \fi
+ }%
\SpecialLabelsDonetrue
\fi
\fi