From 7f9d6c1f454819e93017c0481441540a199e58e7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 14 Jul 2006 22:46:18 +0000 Subject: pstricks-add update git-svn-id: svn://tug.org/texlive/trunk@1843 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pstricks-add/Changes | 7 ++ .../doc/generic/pstricks-add/pstricks-add-doc.pdf | Bin 1489281 -> 1495379 bytes .../doc/generic/pstricks-add/pstricks-add-doc.tex | 120 +++++++++++++-------- .../tex/generic/pstricks-add/pstricks-add.tex | 60 +++++++---- Master/texmf-dist/tpm/pstricks-add.tpm | 8 +- 5 files changed, 126 insertions(+), 69 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index 70efedc3cbf..892738afc96 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/Changes +++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes @@ -12,6 +12,13 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv) pstricks-add ----------- + v 2.77 2006-07-12 - use of abs(dx) to get labels for negative \pst@dx + - fix bug in trigLabels + v 2.76 2006-06-24 - renaming all \Pixxx macros to \psPixx + to prevent mismatches with other packages, + which define also \Pi. + also renamed \RadUnit and \RadUnitInv to \pstRad... + (not valid for pstricks-add.pro) v 2.75 2006-06-17 - plot a derivative of a function by the equation or numerical (\psplot and \paramericplot) - delete macro \psLineIII and the two special options diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf index 9bd2937fb23..f60ac91705e 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf and b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex index e86490290f3..9206c0fb492 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex @@ -3257,14 +3257,14 @@ The option \verb+trigLabelBase+ set the demoninator of fraction. The default val 0 is the same as no fraction. The following constants are are defined in the package: \begin{lstlisting} -\def§\ON§\PiFour§\OFF§{12.566371} -\def§\ON§\PiTwo§\OFF§{6.283185} -\def§\ON§\Pi§\OFF§{3.14159265} -\def§\ON§\PiH§\OFF§{1.570796327} -\newdimen\RadUnit -\newdimen\RadUnitInv -§\ON§\RadUnit§\OFF§=1.047198cm % this is pi/3 -§\ON§\RadUnitInv§\OFF§=0.95493cm % this is 3/pi +\def§\ON§\psPiFour§\OFF§{12.566371} +\def§\ON§\psPiTwo§\OFF§{6.283185} +\def§\ON§\psPi§\OFF§{3.14159265} +\def§\ON§\psPiH§\OFF§{1.570796327} +\newdimen\pstRadUnit +\newdimen\pstRadUnitInv +§\ON§\pstRadUnit§\OFF§=1.047198cm % this is pi/3 +§\ON§\pstRadUnitInv§\OFF§=0.95493cm % this is 3/pi \end{lstlisting} @@ -3283,27 +3283,27 @@ because every 1 xunit (1cm) is a tick and the last one at 6cm. \begin{minipage}{0.4\fullWidth} \begin{pspicture}[trigLabels=true](-0.5,-1.25)(6.5,1.25)% \pnode(5,0){A}% - \psaxes{->}(0,0)(-0.5,-1.25)(\PiTwo,1.25)% + \psaxes{->}(0,0)(-0.5,-1.25)(\psPiTwo,1.25)% \end{pspicture} \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} \begin{pspicture}(-0.5,-1.25)(6.5,1.25)% \pnode(5,0){A}% - \psaxes{->}(0,0)(-.5,-1.25)(\PiTwo,1.25) + \psaxes{->}(0,0)(-.5,-1.25)(\psPiTwo,1.25) \end{pspicture} \end{lstlisting} \end{minipage} \begin{minipage}{0.4\fullWidth} \begin{pspicture}(-0.5,-1.25)(6.5,1.25)% - \psaxes[trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(\PiTwo,1.25) + \psaxes[trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(\psPiTwo,1.25) \end{pspicture} \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} \begin{pspicture}(-0.5,-1.25)(10,1.25)% - \psaxes[§\ON§trigLabelBase=3§\OFF§]{->}(0,0)(-0.5,-1.25)(\PiTwo,1.25) + \psaxes[§\ON§trigLabelBase=3§\OFF§]{->}(0,0)(-0.5,-1.25)(\psPiTwo,1.25) \end{pspicture} \end{lstlisting} \end{minipage} @@ -3315,14 +3315,14 @@ with a different dx value ($\frac{\pi}{3}\approx 1.047$): \begin{minipage}{0.4\fullWidth} -\begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(\PiTwo,0){C}% - \psaxes[dx=\RadUnit]{->}(0,0)(-0.5,-1.25)(\PiTwo,1.25) +\begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(\psPiTwo,0){C}% + \psaxes[dx=\pstRadUnit]{->}(0,0)(-0.5,-1.25)(\psPiTwo,1.25) \end{pspicture}% \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(\PiTwo,0){C}% - \psaxes[§\ON§dx=\RadUnit§\OFF§]{->}(0,0)(-0.5,-1.25)(\PiTwo,1.25) +\begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(\psPiTwo,0){C}% + \psaxes[§\ON§dx=\pstRadUnit§\OFF§]{->}(0,0)(-0.5,-1.25)(\psPiTwo,1.25) \end{pspicture}% \end{lstlisting} \end{minipage} @@ -3330,13 +3330,13 @@ with a different dx value ($\frac{\pi}{3}\approx 1.047$): \begin{minipage}{0.4\fullWidth} \begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(5,0){B}% - \psaxes[dx=\RadUnit,trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(\PiTwo,1.25) + \psaxes[dx=\pstRadUnit,trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(\psPiTwo,1.25) \end{pspicture}% \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} \begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(5,0){B}% - \psaxes[dx=\RadUnit,§\ON§trigLabelBase=3§\OFF§] {->}(0,0)(-0.5,-1.25)(\PiTwo,1.25) + \psaxes[dx=\pstRadUnit,§\ON§trigLabelBase=3§\OFF§] {->}(0,0)(-0.5,-1.25)(\psPiTwo,1.25) \end{pspicture}% \end{lstlisting} \end{minipage} @@ -3348,14 +3348,14 @@ are $6\pi$. Using \verb+trigLabelBase=3+ reduces this value to $2\pi$, a.s.o. \bigskip \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(6,0){D}% \psaxes{->}(0,0)(-0.5,-1.25)(6.5,1.25)% \end{pspicture}% \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{§\ON§xunit=\RadUnit§\OFF§}% +\psset{§\ON§xunit=\pstRadUnit§\OFF§}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25)\pnode(6,0){D}% \psaxes{->}(0,0)(-0.5,-1.25)(6.5,1.25)% \end{pspicture}% @@ -3365,14 +3365,14 @@ are $6\pi$. Using \verb+trigLabelBase=3+ reduces this value to $2\pi$, a.s.o. \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \end{pspicture}% \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{§\ON§xunit=\RadUnit§\OFF§}% +\psset{§\ON§xunit=\pstRadUnit§\OFF§}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[§\ON§trigLabelBase=3§\OFF§]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \end{pspicture}% @@ -3382,14 +3382,14 @@ are $6\pi$. Using \verb+trigLabelBase=3+ reduces this value to $2\pi$, a.s.o. \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[trigLabelBase=4]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \end{pspicture}% \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{§\ON§xunit=\RadUnit§\OFF§}% +\psset{§\ON§xunit=\pstRadUnit§\OFF§}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[§\ON§trigLabelBase=4§\OFF§]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \end{pspicture}% @@ -3397,14 +3397,14 @@ are $6\pi$. Using \verb+trigLabelBase=3+ reduces this value to $2\pi$, a.s.o. \end{minipage} \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[trigLabelBase=6]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \end{pspicture}% \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{§\ON§xunit=\RadUnit§\OFF§}% +\psset{§\ON§xunit=\pstRadUnit§\OFF§}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[§\ON§trigLabelBase=6§\OFF§]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \end{pspicture}% @@ -3413,31 +3413,31 @@ are $6\pi$. Using \verb+trigLabelBase=3+ reduces this value to $2\pi$, a.s.o. -The best way seems to be setting the $x$-unit to \verb+\RadUnit+. Plotting a +The best way seems to be setting the $x$-unit to \verb+\pstRadUnit+. Plotting a function doesn't consider the value for \verb+trigLabelBase+, it has to be done by the user. The first example sets the unit locally for the \verb+\psplot+ back to 1cm, which is needed, because we use this unit on PostScript side. \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(6.5,1.25) - \psplot[xunit=1cm,linecolor=red,linewidth=1.5pt]{0}{\PiTwo}{x RadtoDeg sin} + \psplot[xunit=1cm,linecolor=red,linewidth=1.5pt]{0}{\psPiTwo}{x RadtoDeg sin} \end{pspicture} \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(6.5,1.25) - \psplot[§\ON§xunit=1cm§\OFF§,linecolor=red,linewidth=1.5pt]{0}{§\ON§\PiTwo§\OFF§}{x RadtoDeg sin} + \psplot[§\ON§xunit=1cm§\OFF§,linecolor=red,linewidth=1.5pt]{0}{§\ON§\psPiTwo§\OFF§}{x RadtoDeg sin} \end{pspicture} \end{lstlisting} \end{minipage} \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \psplot[linecolor=red,linewidth=1.5pt]{0}{6}{x Pi 3 div mul RadtoDeg sin} @@ -3445,7 +3445,7 @@ back to 1cm, which is needed, because we use this unit on PostScript side. \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[trigLabelBase=3]{->}(0,0)(-0.5,-1.25)(6.5,1.25) \psplot[linecolor=red,linewidth=1.5pt]{0}{6}{x §\ON§Pi 3 div mul §\OFF§RadtoDeg sin} @@ -3455,36 +3455,36 @@ back to 1cm, which is needed, because we use this unit on PostScript side. \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[dx=1.5]{->}(0,0)(-0.5,-1.25)(6.5,1.25) - \psplot[xunit=.5cm,linecolor=red,linewidth=1.5pt]{0}{\PiFour}{x RadtoDeg sin} + \psplot[xunit=.5cm,linecolor=red,linewidth=1.5pt]{0}{\psPiFour}{x RadtoDeg sin} \end{pspicture} \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[§\ON§dx=1.5§\OFF§]{->}(0,0)(-0.5,-1.25)(6.5,1.25) - \psplot[§\ON§xunit=0.5cm§\OFF§,linecolor=red,linewidth=1.5pt]{0}{§\ON§\PiFour§\OFF§}{x RadtoDeg sin} + \psplot[§\ON§xunit=0.5cm§\OFF§,linecolor=red,linewidth=1.5pt]{0}{§\ON§\psPiFour§\OFF§}{x RadtoDeg sin} \end{pspicture} \end{lstlisting} \end{minipage} \begin{minipage}{0.4\fullWidth} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[dx=0.75,trigLabelBase=2]{->}(0,0)(-0.5,-1.25)(6.5,1.25) - \psplot[xunit=.5cm,linecolor=red,linewidth=1.5pt]{0}{\PiFour}{x RadtoDeg sin} + \psplot[xunit=.5cm,linecolor=red,linewidth=1.5pt]{0}{\psPiFour}{x RadtoDeg sin} \end{pspicture} \end{minipage}% \begin{minipage}{0.6\fullWidth} \begin{lstlisting} -\psset{xunit=\RadUnit}% +\psset{xunit=\pstRadUnit}% \begin{pspicture}(-0.5,-1.25)(6.5,1.25) \psaxes[§\ON§dx=0.75§\OFF§,§\ON§trigLabelBase=2§\OFF§]{->}(0,0)(-0.5,-1.25)(6.5,1.25) - \psplot[§\ON§xunit=0.5cm§\OFF§,linecolor=red,linewidth=1.5pt]{0}{\PiFour}{x RadtoDeg sin} + \psplot[§\ON§xunit=0.5cm§\OFF§,linecolor=red,linewidth=1.5pt]{0}{\psPiFour}{x RadtoDeg sin} \end{pspicture} \end{lstlisting} \end{minipage} @@ -3519,7 +3519,7 @@ The function then is plotted from $0$ to $3\pi=9.424777961$. \begin{center} \psset{unit=1cm} \begin{pspicture}(-0.5,-1.25)(10,1.25) - \psaxes[xunit=\Pi,dx=0.25]{->}(0,0)(-0.25,-1.25)(3.2,1.25) + \psaxes[xunit=\psPi,dx=0.25]{->}(0,0)(-0.25,-1.25)(3.2,1.25) \psplot[xunit=0.25,plotpoints=500,linecolor=red,linewidth=1.5pt]{0}{37.70}{% x RadtoDeg dup sin exch 1.1 mul cos add} \end{pspicture} @@ -3537,7 +3537,7 @@ The function then is plotted from $0$ to $3\pi=9.424777961$. \begin{pspicture}(-0.5,-2)(10,2) \psplot[xunit=0.0625,linecolor=red,linewidth=1.5pt,plotpoints=5000]{0}{150.80}{% x RadtoDeg dup sin exch 1.1 mul cos add} - \psaxes[xunit=\Pi,dx=0.5,Dx=8,subticks=2]{->}(0,0)(-0.1,-2)(3.2,2) + \psaxes[xunit=\psPi,dx=0.5,Dx=8,subticks=2]{->}(0,0)(-0.1,-2)(3.2,2) \end{pspicture} \end{center} \begin{lstlisting} @@ -3546,7 +3546,39 @@ The function then is plotted from $0$ to $3\pi=9.424777961$. \psplot[§\ON§xunit=0.0625§\OFF§,linecolor=red,linewidth=1.5pt,% §\ON§plotpoints=5000§\OFF§]{0}{150.80}% {x RadtoDeg dup sin exch 1.1 mul cos add} - \psaxes[§\ON§xunit=\Pi§\OFF§,§\ON§dx=0.5§\OFF§,§\ON§Dx=8§\OFF§]{->}(0,0)(-0.25,-1.25)(3.2,1.25) + \psaxes[§\ON§xunit=\psPi§\OFF§,§\ON§dx=0.5§\OFF§,§\ON§Dx=8§\OFF§]{->}(0,0)(-0.25,-1.25)(3.2,1.25) +\end{pspicture} +\end{lstlisting} + + +\begin{center} +\psset{unit=1cm} +\begin{pspicture}(-7,-1.5)(7,1.5) + \psaxes[trigLabels=true,xunit=\psPi]{->}(0,0)(-2.2,-1.5)(2.2,1.5) + \psplot[linecolor=red,linewidth=1.5pt]{-7}{7}{x RadtoDeg sin} +\end{pspicture} +\end{center} +\begin{lstlisting} +\begin{pspicture}(-7,-1.5)(7,1.5) + \psaxes[trigLabels=true,§\ON§xunit=\psPi§\OFF§]{->}(0,0)(-2.2,-1.5)(2.2,1.5) + \psplot[linecolor=red,linewidth=1.5pt]{-7}{7}{x RadtoDeg sin} +\end{pspicture} +\end{lstlisting} + + +\begin{center} +\psset{unit=1cm} +\begin{pspicture}(-7,-1.5)(7,1.5) + \psaxes[trigLabels=true, + trigLabelBase=2,dx=\psPiH,xunit=\psPi]{->}(0,0)(-2.2,-1.5)(2.2,1.5) + \psplot[linecolor=red,linewidth=1.5pt]{-7}{7}{x RadtoDeg sin} +\end{pspicture} +\end{center} +\begin{lstlisting} +\begin{pspicture}(-7,-1.5)(7,1.5) + \psaxes[trigLabels=true, + trigLabelBase=2,dx=\psPiH,xunit=\psPi]{->}(0,0)(-2.2,-1.5)(2.2,1.5) + \psplot[linecolor=red,linewidth=1.5pt]{-7}{7}{x RadtoDeg sin} \end{pspicture} \end{lstlisting} diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index d698ac218b2..1d017d90509 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -26,8 +26,8 @@ \ifx\MultidoLoaded\endinput\else\input multido \fi \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi % -\def\fileversion{2.75} -\def\filedate{2006/06/17} +\def\fileversion{2.76b} +\def\filedate{2006/07/07} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -53,14 +53,14 @@ %\psset{dy=0}% \newcount\@zero\@zero=0\relax % -\def\PiFour{12.566371} -\def\PiTwo{6.283185} -\def\Pi{3.14159265} -\def\PiH{1.570796327} -\newdimen\RadUnit -\newdimen\RadUnitInv -\RadUnit=1.047198cm % this is pi/3 -\RadUnitInv=0.95493cm % this is 3/pi +\def\psPiFour{12.566371} +\def\psPiTwo{6.283185} +\def\psPi{3.14159265} +\def\psPiH{1.570796327} +\newdimen\pstRadUnit +\newdimen\pstRadUnitInv +\pstRadUnit=1.047198cm % this is pi/3 +\pstRadUnitInv=0.95493cm % this is 3/pi % \def\pst@getdimdim#1 #2 #3\@nil{% \def\pst@tempA{#2}% @@ -1283,17 +1283,34 @@ \ifPst@trigLabels \def\pst@@@hlabel##1{\pshlabel{##1}} \def\pshlabel##1{% - \ifnum\psk@trigLabelBase<2 + \ifnum\psk@trigLabelBase<2 \def\de@nominator{\@ne}\else\def\de@nominator{\psk@trigLabelBase}\fi - \pst@mod{##1}{\de@nominator}\@tempa - \ifnum\@ne>\@tempa - \count1=##1 \divide\count1 by \de@nominator - \psk@labelFontSize - \ifnum\count1=\@ne - $\pi$\else$\the\count1\pi$\fi - \else\ifnum\@tempa=\@ne - $\frac{\pi}{\de@nominator}$\else$\frac{##1}{\de@nominator}\pi$\fi\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 + \psk@labelFontSize + \ifnum\pst@tempA<0 $-$\fi% + \ifnum\pst@cnto=\@ne % #1 = trigLabelBase + $\pi$ % print pi + \else + $\the\pst@cnto\pi$ % print \pst@cnto/\de@nominator pi + \fi + \else + \ifnum\pst@cntp=\@ne % < 1 pi? + \if\pst@cntm=\@ne + $\frac{\pi}{\de@nominator}$ % pi/x + \else\ifnum\pst@tempA=-1 $\frac{-\pi}{\de@nominator}$ + \else \ifnum\pst@tempA=1 $\frac{\pi}{\de@nominator}$ + \else$\frac{\pst@tempA\pi}{\de@nominator}$ % (x pi)/y + \fi\fi\fi + \else + \ifnum\pst@tempA=1 $\frac{\pi}{\de@nominator}$ + \else\ifnum\pst@tempA=\de@nominator $\pi$ + \else$\frac{\pst@tempA\pi}{\de@nominator}$ + \fi\fi\fi\fi% + }% \else \def\pst@@@hlabel##1{% \edef\@xyDecimals{\psk@xDecimals}% @@ -1641,7 +1658,8 @@ /epsilon 0.01 def % rounding errors /minTickline \ifis@yAxis \pst@number#1 \else \pst@number#2 \fi def /maxTickline \ifis@yAxis \pst@number#3 \else \pst@number#4 \fi def - /dT \ifis@yAxis\psk@dy\else\psk@dx\fi\space 65536 div viceversa {neg} if def + /dT \ifis@yAxis \psk@dy \else \psk@dx \fi\space abs % added abs 2006-07-07 + 65536 div viceversa { neg } if def % div to get pt instead of sp /subTNo \ifis@yAxis\psk@ysubticks\else\psk@xsubticks\fi \space def subTNo 0 gt { /dsubT dT subTNo div def}{ /dsubT 0 def } ifelse % deltaSubTick \ifis@yAxis \psk@yticksize \else \psk@xticksize \fi diff --git a/Master/texmf-dist/tpm/pstricks-add.tpm b/Master/texmf-dist/tpm/pstricks-add.tpm index 4fef559965a..4e8d00fb185 100644 --- a/Master/texmf-dist/tpm/pstricks-add.tpm +++ b/Master/texmf-dist/tpm/pstricks-add.tpm @@ -3,7 +3,7 @@ pstricks-add Package - 2006/06/17 12:21:15 + 2006/07/14 15:23:37 1.0 rahtz @@ -21,15 +21,15 @@ pst-plot, pst-node, pst-tree and pst-grad. [description copied from TeX Catalogue] Herbert Voss - 1906625 + 2007691 - + texmf-dist/dvips/pstricks-add/pstricks-add.pro texmf-dist/tex/generic/pstricks-add/pstricks-add.tex texmf-dist/tex/latex/pstricks-add/pstricks-add.sty texmf-dist/tpm/pstricks-add.tpm - + texmf-dist/doc/generic/pstricks-add/Changes texmf-dist/doc/generic/pstricks-add/README texmf-dist/doc/generic/pstricks-add/examples/12-1.txt -- cgit v1.2.3