summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-08-06 23:36:32 +0000
committerKarl Berry <karl@freefriends.org>2008-08-06 23:36:32 +0000
commitf26efa972afb0a49e7d84d043c942f138122752c (patch)
treed6b24152acfe2a1c86e7ffb85baa26379db7a56d /Master/texmf-dist
parent4d61d8bba8ff6db82cdf511122d94a062916fa5e (diff)
pstricks-add update (6aug08)
git-svn-id: svn://tug.org/texlive/trunk@10122 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin1700802 -> 1700798 bytes
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex157
3 files changed, 60 insertions, 100 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index a0a01b36512..df39b028aab 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 36 2008-07-07 06:58:27Z herbert $
+%% $Id: Changes 38 2008-07-18 16:23:28Z herbert $
%%
pstricks-add.pro ----------- (Dominik Rodriguez/hv)
v 0.20 2008-01-12 - moved the AlgParser into pst-algparser.pro
@@ -33,6 +33,7 @@ pstricks-add.sty ----------- (hv)
pstricks-add.tex ----------- (Dominik Rodriguez/hv)
+ v 3.08 2008-08-06 - fix bug with xyDecimals
v 3.07 2008-07-18 - fix bug with \psdice
- new macro \psChart
- added setlinecap to linestyle dashed
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 6cba02293ea..ef1d7ea6b4a 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
Binary files differ
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 635b5af75d3..430743d66fe 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 37 2008-07-11 13:39:23Z herbert $
+%% $Id: pstricks-add.tex 38 2008-07-18 16:23:28Z herbert $
%%
%%
%% This is file `pstricks-add.tex',
@@ -29,8 +29,8 @@
\ifx\MultidoLoaded\endinput\else \input multido \fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{3.07}
-\def\filedate{2008/06/30}
+\def\fileversion{3.08}
+\def\filedate{2008/08/06}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -1470,124 +1470,81 @@
%
\define@boolkey[psset]{pstricks-add}[Pst@]{trigLabels}[true]{%
\ifPst@trigLabels
- \def\pst@@@hlabel##1{\pshlabel{##1}}%
- \ifPst@trigLabelsSimplify
- \def\pshlabel##1{%
- \ifPst@mathLabel
- $\psk@labelFontSize\psIrFrac{##1.\pi}{\psk@trigLabelBase}$
- \else
- \psk@labelFontSize$\psIrFrac{##1.\pi}{\psk@trigLabelBase}$
- \fi}%
- \else
+ \def\pst@@@hlabel##1{\pshlabel{##1}}
\def\pshlabel##1{%
- \ifnum\psk@trigLabelBase<\tw@
- \def\de@nominator{\@ne}%
- \else
- \def\de@nominator{\psk@trigLabelBase}%
- \fi
- \def\pst@tempA{##1}%
+ \ifnum\psk@trigLabelBase<2
+ \def\de@nominator{\@ne}\else\def\de@nominator{\psk@trigLabelBase}\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\de@nominator
+ \pst@cnto=\pst@cntm \divide\pst@cnto by \de@nominator
\ifPst@mathLabel%
$\psk@labelFontSize
- \ifnum\pst@tempA<\z@ -\fi
+ \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
+ \else%
\psk@labelFontSize%
- \ifnum\pst@tempA<\z@ -\fi
- \ifnum\pst@cnto=\@ne % #1 = trigLabelBase
+ \ifnum\pst@tempA<0 -\fi%
+ \ifnum\pst@cnto=\@ne% % #1 = trigLabelBase
$\pi$% % print pi
- \else
+ \else%
\the\pst@cnto$\pi$% % print \pst@cnto/\de@nominator pi
- \fi
- \fi
- \else
- \ifPst@mathLabel
- $\psk@labelFontSize
- \ifnum\pst@cntp=\@ne % < 1 pi?
- \if\pst@cntm=\@ne
- \frac{\pi}{\de@nominator} % pi/x
- \else
- \ifnum\pst@tempA=\m@ne
- \frac{-\pi}{\de@nominator}
- \else
- \ifnum\pst@tempA=\@ne
- \frac{\pi}{\de@nominator}
- \else
- \frac{\pst@tempA\pi}{\de@nominator} (x pi)/y
- \fi
- \fi
- \fi
- \else
- \ifnum\pst@tempA=\@ne
- \frac{\pi}{\de@nominator}
- \else
- \ifnum\pst@tempA=\de@nominator
- \pi
- \else
- \frac{\pst@tempA\pi}{\de@nominator}
- \fi
- \fi
- \fi$%
- \else
+ \fi%
+ \fi%
+ \else%
+ \ifPst@mathLabel%
+ $\psk@labelFontSize%
+ \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$%
+ \else%
\psk@labelFontSize%
- \ifnum\pst@cntp=\@ne % < 1 pi?
- \ifnum\pst@cntm=\@ne
+ \ifnum\pst@cntp=\@ne% % < 1 pi?
+ \if\pst@cntm=\@ne%
$\frac{\pi}{\de@nominator}$% % pi/x
- \else
- \ifnum\pst@tempA=\m@ne
- $\frac{-\pi}{\de@nominator}$%
- \else
- \ifnum\pst@tempA=\@ne
- $\frac{\pi}{\de@nominator}$%
- \else
- $\frac{\pst@tempA\pi}{\de@nominator}$% (x pi)/y
- \fi
- \fi
- \fi
- \else
- \ifnum\pst@tempA=\@ne
- $\frac{\pi}{\de@nominator}$%
- \else
- \ifnum\pst@tempA=\de@nominator
- $\pi$%
- \else
- $\frac{\pst@tempA\pi}{\de@nominator}$%
- \fi
- \fi
- \fi
- \fi
- \fi
+ \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%
+ \fi%
}%
- \fi
- \else
+ \else%
\def\pst@@@hlabel##1{%
\edef\@xyDecimals{\psk@xDecimals}%
\ifnum\psk@ticks<\tw@% ticks=all|x
- \ifx\psk@xlogBase\@empty
- \pshlabel{%
- \psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
- \else
- \pshlabel{%
- \psk@labelFontSize\psk@xlogBase%
- \textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
- \fi
- \fi
+ \ifx\psk@xlogBase\@empty%
+ \pshlabel{\psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
+ \else%
+ \pshlabel{\psk@labelFontSize\psk@xlogBase\textsuperscript{\expandafter\@stripDecimals##1..\@nil}}%
+ \fi%
+ \fi%
}%
- \ifPst@mathLabel
- \def\pshlabel##1{$\psk@labelFontSize##1$}%
- \else
+ \ifPst@mathLabel%
+ \def\pshlabel##1{$\psk@labelFontSize##1$}\else%
\def\pshlabel##1{\psk@labelFontSize##1}%
\fi%
\fi%
-}
+}%
\psset{trigLabels=false}
%
%logLines=all|x|y|none (0,1,2,3)
@@ -1681,8 +1638,10 @@
% #1 the value, maybe empty
%
\def\@process@digits#1#2;{%
- \ifx *#1\@zeroFill\else#1\@inc@digitcounter\@process@digits#2;\fi%
+ \ifx *#1\@zeroFill\else#1\@inc@digitcounter
+ \ifnum\@xyDecimals>\@get@digitcounter\expandafter\@process@digits#2;\fi\fi%
}
+%
\def\@writeDecimals#1{%
\ifx\@xyDecimals\@empty% take value as is
\def\@tempa{#1}% write only if not empty
@@ -1695,7 +1654,7 @@
\ifnum\@xyDecimals>\@zero
\ifPst@comma{,}\else.\fi
\@Reset@digitcounter
- \@process@digits#1*;
+ \expandafter\@process@digits#1*;
\fi%
\fi%
}