From 4540b32a0ff09390a1a72db85682bcfc6baccd25 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 17 Apr 2017 22:25:13 +0000 Subject: pst-plot (17apr17) git-svn-id: svn://tug.org/texlive/trunk@43898 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pst-plot/pst-plot.tex | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex') 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 4c527a0f4a0..da341ea0519 100644 --- a/Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex +++ b/Master/texmf-dist/tex/generic/pst-plot/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.77} -\def\filedate{2017/03/20} +\def\fileversion{1.78} +\def\filedate{2017/04/16} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -1200,7 +1200,7 @@ D\space##1% \psset[pst-plot]{dy=0} % \define@boolkey[psset]{pst-plot}[]{showorigin}[true]{} -\psset[pst-plot]{showorigin} +\psset[pst-plot]{showorigin=true} % \long\def\psrotatebox#1#2{% \leavevmode @@ -1351,9 +1351,9 @@ D\space##1% \edef\@xyDecimals{\psk@xDecimals}% % \ifnum\psk@ticks<\tw@ % ticks=all|x \ifnum\psk@labels<\tw@ % labels=all|x - \ifx\psk@xlogBase\@empty% - \pshlabel{\psk@xlabelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}% - \else% + \ifx\psk@xlogBase\@empty + \pshlabel{\psk@xlabelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor} + \else \ifPst@xmathLabel% \pshlabel{\psk@xlabelFontSize\psk@xlogBase^{\expandafter\@stripDecimals##1..\@nil}}% \else% @@ -2369,12 +2369,12 @@ D\space##1% \pst@cnta=#1\relax% % Distance (in sp) to end. \divide\pst@cnta\psk@dx\relax% % Number of ticks/labels \ifnum\pst@cnta=\z@\else% - \pst@dimb=\psk@dx sp% % Space between ticks. - \ifPst@yAxis\else\showorigintrue\fi% - \ifnum\psk@labels<\tw@\ifPst@xAxis\pst@@hlabels\fi\fi% - \showoriginfalse% - \fi% - \fi% + \pst@dimb=\psk@dx sp % Space between ticks. +% \ifPst@yAxis\else\showorigintrue\fi %%%% 20170417 + \ifnum\psk@labels<\tw@ \ifPst@xAxis\pst@@hlabels\fi\fi + \showoriginfalse + \fi + \fi \else % \pst@cnta=#1\relax% % Distance (in sp) to end. % \edef\pst@tempA{\strip@pt#1}% @@ -2408,7 +2408,7 @@ D\space##1% \ifshoworigin\hbox to \z@{\hss\pst@@@hlabel{\psk@Ox}\hss}\fi% \mmultido{\nA=\psk@Ox+\psk@Dx}{\pst@cnta}{% \hskip\pst@dimb\hbox to \z@{\hss% - \ifdim\nA pt=\z@ \pst@@@hlabel{0}% + \ifdim\nA pt=\z@ \ifshoworigin\pst@@@hlabel{0}\fi \else\expandafter\pst@@@hlabel{\nA}% \fi% prevent -0, doesn't work with \ifnum \hss}% @@ -2462,12 +2462,12 @@ D\space##1% \vbox to \z@{% \vss\hbox to\z@{% \ifcase\psk@ylabelPos % and also check for -0 - \hss\ifdim\nA pt=\z@ \pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% + \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi% \hskip\psylabelsep\hskip-\pst@yticksizeA\or% top = 1 - \hss\ifdim\nA pt=\z@\pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% + \hss\ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi% \ifdim\psylabelsep=\z@\hss\else\kern-\psylabelsep\fi\or% right=2 \hskip\pst@yticksizeB\hskip\psylabelsep - \ifdim\nA pt=\z@ \pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% bottom + \ifdim\nA pt=\z@ \ifshoworigin\pst@@@vlabel{0}\fi\else\pst@@@vlabel{\nA}\fi% bottom \fi}\vss}% }\vss}% } -- cgit v1.2.3