diff options
author | Karl Berry <karl@freefriends.org> | 2014-08-23 22:45:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-08-23 22:45:58 +0000 |
commit | 5caddc787b889e7f0a38ec359b4d9fc9ba22488d (patch) | |
tree | 4a199a6389c59ce33bd1790fe50d30e2232c40f1 /Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | |
parent | ae5ff6bcb4200bf952fc9c37ab73d4cae9e49853 (diff) |
pst-plot (23aug14)
git-svn-id: svn://tug.org/texlive/trunk@35025 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-plot/pst-plot.tex | 50 |
1 files changed, 27 insertions, 23 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 ce0d589e60b..d248c402a95 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 69 2014-08-17 20:35:59Z herbert $ +% $Id: pst-plot.tex 83 2014-08-23 15:04:57Z herbert $ %% %% BEGIN pst-plot.tex %% @@ -22,8 +22,8 @@ \ifx\PSTFPloaded\endinput\else \input pst-fp.tex \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % -\def\fileversion{1.69} -\def\filedate{2014/08/17} +\def\fileversion{1.70} +\def\filedate{2014/08/23} \message{ v\fileversion, \filedate\space (tvz,hv)} % \edef\TheAtCode{\the\catcode`\@} @@ -1257,21 +1257,25 @@ D\space##1% \define@key[psset]{pst-plot}{xylogBase}[{}]{\def\psk@xlogBase{#1}\def\psk@ylogBase{#1}}% \psset[pst-plot]{xylogBase={}}% % -\define@key[psset]{pst-plot}{trigLabelBase}[0]{\pst@getint{#1}{\psk@trigLabelBase}} +\define@key[psset]{pst-plot}{trigLabelBase}[0]{\pst@getint{#1}{\psk@xtrigLabelBase}\let\psk@ytrigLabelBase\psk@xtrigLabelBase} +\define@key[psset]{pst-plot}{xtrigLabelBase}[0]{% + \pst@getint{#1}{\psk@xtrigLabelBase}\psset{xtrigLabels}} +\define@key[psset]{pst-plot}{ytrigLabelBase}[0]{% + \pst@getint{#1}{\psk@ytrigLabelBase}\psset{ytrigLabels}} \psset[pst-plot]{trigLabelBase=0} % \define@boolkey[psset]{pst-plot}[Pst@]{xtrigLabels}[true]{% \ifPst@xtrigLabels \def\pst@@@hlabel##1{\pshlabel{##1}} \def\pshlabel##1{% - \ifnum\psk@trigLabelBase<2 - \def\de@nominator{\@ne}\else\def\de@nominator{\psk@trigLabelBase}\fi - \def\pst@tempA{##1} + \ifnum\psk@xtrigLabelBase<2 + \def\de@nominator{\@ne}\else\def\de@nominator{\psk@xtrigLabelBase}\fi + \def\pst@tempA{##1}% \pst@abs{\pst@tempA}\pst@cntm \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@xmathLabel% + \ifPst@xmathLabel $\psk@xlabelFontSize \ifnum\pst@tempA<0 -\fi \ifnum\pst@cnto=\@ne % #1 = trigLabelBase @@ -1280,8 +1284,8 @@ D\space##1% \the\pst@cnto\pi % print \pst@cnto/\de@nominator pi \fi$% \else% - \psk@xlabelFontSize% - \ifnum\pst@tempA<0 -\fi% + \psk@xlabelFontSize + \ifnum\pst@tempA<0 -\fi \ifnum\pst@cnto=\@ne% % #1 = trigLabelBase $\pi$% % print pi \else% @@ -1345,8 +1349,8 @@ D\space##1% \ifPst@ytrigLabels \def\pst@@@vlabel##1{\psvlabel{##1}} \def\psvlabel##1{% - \ifnum\psk@trigLabelBase<2 - \def\de@nominator{\@ne}\else\def\de@nominator{\psk@trigLabelBase}\fi + \ifnum\psk@ytrigLabelBase<2 + \def\de@nominator{\@ne}\else\def\de@nominator{\psk@ytrigLabelBase}\fi \def\pst@tempA{##1} \pst@abs{\pst@tempA}\pst@cntm \pst@mod{\pst@cntm}{\de@nominator}\pst@cntp % cntb=##1 modulo trigLabelBase @@ -1795,13 +1799,13 @@ D\space##1% \pst@vlabels{\pst@dimd}{\psk@arrowB}{#3}{#5}% \ifPst@xAxis\ifdim\pst@dima<\z@\showoriginfalse\fi\fi% no 0 when x- axis is crossing \pst@vlabels{\pst@dimb}{\psk@arrowA}{#3}{#5}% - \endgroup% - \fi% - \ifPst@xAxis% - \begingroup% - \ifdim\pst@dimb=\z@\else\showoriginfalse\fi% - \ifnum\psk@dx=\z@% - \pst@dimg=\psk@Dx\psxunit% + \endgroup + \fi + \ifPst@xAxis + \begingroup + \ifdim\pst@dimb=\z@\else\showoriginfalse\fi + \ifnum\psk@dx=\z@ + \pst@dimg=\psk@Dx\psxunit \ifdim\pst@dimg<\p@\pst@cnta=\psk@Dx\edef\psk@Dx{-\the\pst@cnta}% v.1.21 \fi% v.1.21 \edef\psk@dx{\number\pst@dimg}% @@ -2174,11 +2178,11 @@ D\space##1% \fi% \else \pst@cnta=#1\relax% % Distance (in sp) to end. - \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dx} - \pstFPadd\pst@tempA{1.55}{\pst@tempA} % to prevent rounding errors - \edef\pst@tempB{\pst@int{\pst@tempA}} + \pstFPdiv\pst@tempA{\the\pst@cnta}{\psk@dx}% + \pstFPadd\pst@tempA{1.55}{\pst@tempA}% % to prevent rounding errors + \edef\pst@tempB{\pst@int{\pst@tempA}}% % \divide\pst@cnta\psk@dx\relax% % Number of ticks/labels - \edef\pst@tempA{\psk@Dx} + \edef\pst@tempA{\psk@Dx}% \multido{\iB=#3+1,\rB=#3+\pst@tempA}{\pst@tempB}% {\uput{\psxlabelsep}[-90]{\pst@xLabelsRot}(\rB,0)%\psxlabelsep) {\strut\pshlabel{\psPutXLabel{\iB}}}}% |