summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-26 23:19:21 +0000
committerKarl Berry <karl@freefriends.org>2006-12-26 23:19:21 +0000
commit5c2f658ac69482a0bac00f4b189ac870a0d621b9 (patch)
tree108610a32f8d5b881772d4bda4da03d4f28cc3ac /Master
parente0a3cd18307ee9a22077133293f921e9b7689316 (diff)
pstricks-add update
git-svn-id: svn://tug.org/texlive/trunk@2954 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/Changes6
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib16
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin1497464 -> 1575338 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex234
-rw-r--r--Master/texmf-dist/source/generic/pstricks-add/Makefile49
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex54
-rw-r--r--Master/texmf-dist/tpm/pstricks-add.tpm9
-rw-r--r--Master/texmf/lists/pstricks-add2
8 files changed, 332 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 4e7eaa99a64..2d3a68cc45c 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -2,6 +2,7 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv)
v 0.10 2006-10-15 - bug correction, x^-1 (dr)
- Constants into tx@Dict to make them global (hv)
- small stuff (hv)
+ - define tan
v 0.09 2006-10-10 cvi for the wavelength to get an integer (hv)
v 0.08 2006-06-17 more improvements to the code (hv)
v 0.07 2006-04-03 remove whitespace (dr)
@@ -16,8 +17,9 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv)
pstricks-add ----------- (Dominik Rodriguez/hv)
- v 2.81 2006-10-10 - fix a trailing space in \pstScalePoints
- - add macro \psforeach
+ v 2.82 2006-11-22 - add boolean key for angleCheck (hv)
+ v 2.81 2006-10-10 - fix a trailing space in \pstScalePoints (hv)
+ - add macro \psforeach (hv)
- fix bug in the line macros \length -> \linelength
v 2.80 2006-09-25 - fix a trailing space for fillstyle transparent
v 2.79 2006-09-21 - make ! not active (for french language and SpecialCoor)
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
index 36183a7a366..96cfd011e51 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
+++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
@@ -119,7 +119,7 @@
}
@Article{girou:02:,
- author = {{Timothy van} Zandt and Denis Girou},
+ author = {{Timothy Van} Zandt and Denis Girou},
title = {Inside {PST}ricks},
journal = TUGboat,
year = 1994,
@@ -139,7 +139,7 @@
@Manual{pstricks,
Title = {PSTricks - {\PS} macros for generic {\TeX}},
- Author = {{Timothy van} Zandt},
+ Author = {{Timothy Van} Zandt},
Organization = {},
Address = {\url{http://www.tug.org/application/PSTricks}},
Note = {},
@@ -148,7 +148,7 @@
@Manual{pst-plot,
Title = {\texttt{pst-plot}: Plotting two dimensional functions and data},
- Author = {{Timothy van} Zandt},
+ Author = {{Timothy Van} Zandt},
Organization = {},
Address = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
Note = {},
@@ -157,7 +157,7 @@
@Manual{multido,
Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
- Author = {{Timothy van} Zandt},
+ Author = {{Timothy Van} Zandt},
Organization = {},
Address = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
Note = {},
@@ -171,3 +171,11 @@
year = 2004
}
+@book{voss06,
+ Title = {\LaTeX{} in {N}aturwissenschaften \&{} {M}athematik},
+ Author = {Herbert Vo\ss},
+ Publisher = {Franzis Verlag},
+ Edition= {first},
+ Address= {München},
+ Year= {2006},
+}
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 6b4259f4820..7b0f1c70f95 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/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
index 7857b51a165..c499d008619 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
@@ -1,3 +1,177 @@
+\documentclass[12pt]{article}
+\listfiles
+\usepackage{filecontents}
+\begin{filecontents*}{demo0.dat}
+ 0.1414 0.0052
+ 0.2828 0.0217
+ 0.4243 0.0480
+ 0.5657 0.0890
+ 0.7071 0.1375
+ 0.8485 0.1906
+ 0.9899 0.2663
+ 1.1314 0.3580
+ 1.2728 0.4644
+ 1.4142 0.5801
+ 1.5556 0.7033
+ 1.6971 0.8899
+ 1.8385 1.1143
+ 1.9799 1.2593
+ 2.1213 1.5692
+ 2.2627 3.2331
+ 2.4042 4.4097
+ 2.5456 5.8186
+ 2.6870 7.4441
+ 2.8284 8.2287
+\end{filecontents*}
+
+\begin{filecontents*}{demo1.dat}
+1 99447169
+2 110351058
+3 123557238
+4 138346129
+5 145050826
+6 160363212
+7 174000394
+8 183856559
+9 189128691
+10 197634845
+11 213257357
+12 216899512
+13 230152738
+14 224144907
+15 247410024
+16 261168438
+17 252920343
+18 326153799
+19 319442110
+20 310351522
+21 381919943
+22 438043888
+23 357527766
+24 603304997
+\end{filecontents*}
+
+\begin{filecontents*}{demo2.dat}
+ 1989 3.08
+ 1990 3.84
+ 1991 4.08
+ 1992 3.21
+ 1993 5.23
+ 1994 2.97
+ 1995 2.53
+ 1996 2.8
+ 1997 2.78
+ 1998 3.15
+ 1999 2.32
+ 2000 2.4
+ 2001 2.46
+\end{filecontents*}
+\begin{filecontents*}{demo3.dat}
+ 1989 3.08
+ 1990 3.1
+ 1991 3.08
+ 1992 3.21
+ 1993 5.0
+ 1994 2.27
+ 1995 3.53
+ 1996 3.8
+ 1997 2.8
+ 1998 4.15
+ 1999 3.32
+ 2000 1.4
+ 2001 2.46
+\end{filecontents*}
+
+
+\usepackage[T1]{fontenc}
+\usepackage[latin1]{inputenc}
+\usepackage{pamathx}
+\usepackage[scaled]{luximono}
+%\usepackage{mathptmx}
+\usepackage[lmargin=2.5cm,bmargin=3cm]{geometry}
+\usepackage{tabularx}
+\usepackage{graphicx}
+\usepackage[svgnames,dvipsnames]{pstricks}
+\usepackage{framed,xspace,multirow,caption}
+\usepackage{pst-eucl}
+\usepackage{pstricks-add}
+\let\pstricksaddFV\fileversion
+\def\PST{\texttt{PSTricks}}
+\newcommand*\PostScript{\textsf{PostScript}\xspace}
+%
+%
+\usepackage{longtable}
+\usepackage{pifont}
+\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
+\makeatletter
+\renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.5em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{3.8em}{3.2em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{7.0em}{4.1em}}
+\renewcommand*\l@paragraph{\@dottedtocline{4}{10em}{5em}}
+\renewcommand*\l@subparagraph{\@dottedtocline{5}{12em}{6em}}
+\makeatother
+\let\psEllipticArc\psellipticarc
+\let\psEllipticArcN\psellipticarcn
+\let\psWedgeEllipse\psellipticwedge
+%\parindent=0pt
+\newcommand\verbI[1]{{\small\texttt{#1}}}
+\newcommand\CMD[1]{{\texttt{\textbackslash#1}}}
+\let\param\texttt
+%
+\newcommand{\pstEllipse}[5][]{%
+ \psset{#1}
+ \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}%
+}
+%
+\newcommand{\pstEllipseWedge}[5][]{%
+ \psset{#1}
+ \pscustom{%
+ \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}%
+ \psline(! #2\space #5\space cos mul #3\space #5\space sin mul)%
+ (0,0)%
+ (! #2\space #4\space cos mul #3\space #4\space sin mul)%
+ }%
+}
+%
+\psset{subgriddiv=0,griddots=5,gridlabels=7pt}
+%
+\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\def\PS{PostScript}
+%
+%\renewcommand{\ttdefault}{ul9}% Luxi Mono
+
+\parindent=0pt
+\parskip=1ex plus 5pt
+
+\usepackage[colorlinks,linktocpage]{hyperref}
+\makeatletter
+\def\verbatim@font{\small\normalfont\ttfamily}
+\makeatother
+\usepackage{showexpl}
+\lstset{preset=\raggedright}
+\usepackage{amsmath}
+
+\newdimen\fullWidth
+\makeatletter
+\renewcommand\ON{%
+ \gdef\lst@alloverstyle##1{%
+ \fboxrule=0pt
+ \fboxsep=0pt
+ \fcolorbox{DarkBlue}{DarkBlue}{\textcolor{white}{\bfseries\strut##1}}%
+}}
+\renewcommand\OFF{%
+ \xdef\lst@alloverstyle##1{##1}%
+}
+
+\makeatother
+\lstset{escapechar=§}
+
+
+\begin{document}
+\fullWidth=\linewidth
+\advance\fullWidth by \marginparsep
+\advance\fullWidth by \marginparwidth
+
\title{\texttt{pstricks-add}\\additionals Macros for \texttt{pstricks}%
%\thanks{%
% This document was written with \texttt{Kile: 1.7 (Qt: 3.1.1; KDE: 3.3;}
@@ -161,6 +335,24 @@ It makes some sense to define a new macroname in the preamble to use it througho
\pst@absdim{4sp}\absDim \the\absDim
\makeatother
\end{LTXexample}
+%
+\subsection{Reading angle values}
+By default \PST\ checks the input value of angles. With the optional argument
+\verb+angleCheck+ this internal check can be disabled. Then \PST\ passes the
+input straight to \PS\ and it is possible to do some calculating by using
+\PS\ code.
+
+\begin{LTXexample}[width=4cm]
+\def\angleA{0 }% space after value
+\def\angleB{45 }
+\begin{pspicture}(4,3)
+\psarc[angleCheck=false,linecolor=red,showpoints=true]%
+ (0,0){3}{ \angleA }{ \angleB 0.5 mul 30 add }
+\end{pspicture}
+\end{LTXexample}
+
+Without disabling the angle check, the above code causes an error because
+of the second argument, which is not a correct angle value.
%--------------------------------------------------------------------------------------
\section{Dashed Lines}
@@ -2385,8 +2577,6 @@ For the \verb+\parametricplot+ the two parts must be divided by the \verb+|+ cha
-\iffalse
-
%--------------------------------------------------------------------------------------
\subsubsection{Using the \texttt{Sum} function}
%--------------------------------------------------------------------------------------
@@ -2405,7 +2595,7 @@ $\displaystyle\sum_{n=0}^{+\infty}\frac{(-1)^nx^{2n}}{n!}$.
\psclip{\psframe(-7,-1.5)(7,1.5)}
\psplot{-7}{7}{cos(x)}
\multido{\n=1+1}{10}{%
- \psplot[linecolor=\getColor{\n}]{-7}{7}{%
+ \psplot[linewidth=1pt,linecolor=\getColor{\n}]{-7}{7}{%
Sum(ijk,0,1,\n,(-1)^ijk*x^(2*ijk)/fact(2*ijk))}}
\endpsclip
\psaxes(0,0)(-7,-1.5)(7,1.5)
@@ -2420,7 +2610,7 @@ $\displaystyle\sum_{n=0}^{+\infty}\frac{(-1)^nx^{2n}}{n!}$.
\psclip{\psframe(-7,-1.5)(7,1.5)}
\psplot{-7}{7}{cos(x)}
\multido{\n=1+1}{10}{%
- \psplot[linecolor=\getColor{\n}]{-7}{7}{%
+ \psplot[linewidth=1pt,linecolor=\getColor{\n}]{-7}{7}{%
Sum(ijk,0,1,\n,(-1)^ijk*x^(2*ijk)/fact(2*ijk))}}
\endpsclip
\psaxes(0,0)(-7,-1.5)(7,1.5)
@@ -2462,7 +2652,38 @@ big number for \verb+plotpoints+.
\clearpage
-\fi
+
+\begin{center}
+\begin{pspicture}[showgrid=true](-8,-8)(8,8)
+ \psset{plotpoints=1000,linewidth=1pt}
+ \psplot[algebraic]{-8}{8}{ceiling(x)}
+ \psplot[algebraic, linecolor=yellow]{-8}{8}{rand/(2^31-1)+x}
+ \psplot[algebraic, linecolor=red]{-8}{8}{floor(x)}
+ \psplot[algebraic, linecolor=blue]{-8}{8}{round(x)}
+ \psplot[algebraic, linecolor=green]{-8}{8}{truncate(x)}
+ \psplot[algebraic, linecolor=cyan]{-8}{8}{div(mul(4,x),7)}
+ \psplot[algebraic, linecolor=gray]{-8}{8}{abs(x)+abs(x-3)-abs(5-5*x/7)}
+ \psplot[algebraic, linecolor=gray]{-8}{8}{abs(3*cos(x)+1)}
+ \psplot[algebraic, linecolor=magenta]{-8}{8}{floor(8*cos(x))}
+\end{pspicture}
+\end{center}
+
+\begin{lstlisting}
+\begin{pspicture}[showgrid=true](-8,-8)(8,8)
+ \psset{plotpoints=1000,linewidth=1pt}
+ \psplot[algebraic, linecolor=yellow]{-8}{8}{rand/(2^31-1)+x}
+ \psplot[algebraic]{-8}{8}{ceiling(x)}
+ \psplot[algebraic, linecolor=red]{-8}{8}{floor(x)}
+ \psplot[algebraic, linecolor=blue]{-8}{8}{round(x)}
+ \psplot[algebraic, linecolor=green]{-8}{8}{truncate(x)}
+ \psplot[algebraic, linecolor=cyan]{-8}{8}{div(mul(4,x),7)}
+ \psplot[algebraic, linecolor=gray]{-8}{8}{abs(x)+abs(x-3)-abs(5-5*x/7)}
+ \psplot[algebraic, linecolor=gray]{-8}{8}{abs(3*cos(x)+1)}
+ \psplot[algebraic, linecolor=magenta]{-8}{8}{floor(8*cos(x))}
+\end{pspicture}
+\end{lstlisting}
+
+
%--------------------------------------------------------------------------------------
@@ -4664,7 +4885,7 @@ and of its 15 first derivatives. It is the sequence definition of the cosine.
\begin{pspicture}[showgrid=true](0,-1.2)(7,1.5)
\psclip{\psframe[linestyle=none](0,-1.1)(7,1.1)}
\multido{\in=0+1}{16}{%
- \psplot[algebraic=true,linecolor=\getColor{\in},linewidth=1pt]{0}{7}
+ \psplot[linewidth=1pt,algebraic=true,linecolor=\getColor{\in},linewidth=1pt]{0}{7}
{Derive(\in,1-x^2/2+x^4/24-x^6/720+x^8/40320-x^10/3628800+x^12/479001600-x^14/87178291200)}}
\endpsclip
\end{pspicture}
@@ -6454,3 +6675,4 @@ See file Changes
%\lstinputlisting{pstricks-add.tex}
+\end{document}
diff --git a/Master/texmf-dist/source/generic/pstricks-add/Makefile b/Master/texmf-dist/source/generic/pstricks-add/Makefile
new file mode 100644
index 00000000000..6c6fa4e95d5
--- /dev/null
+++ b/Master/texmf-dist/source/generic/pstricks-add/Makefile
@@ -0,0 +1,49 @@
+
+# `Makefile' for `pst-tricks-doc.pdf', hv, 2006/11/06
+
+.SUFFIXES : .tex .dvi .ps .pdf .eps
+
+PACKAGE = pstricks-add
+
+MAIN = pstricks-add-doc
+
+LATEX = latex
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+
+all : doc
+# clean
+doc: $(MAIN).pdf
+
+$(MAIN).pdf : $(MAIN).ps
+ GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+
+$(MAIN).ps : $(MAIN).dvi
+ dvips $<
+
+$(MAIN).dvi : $(MAIN).tex
+ $(LATEX) $<
+ $(LATEX) $<
+ if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
+ if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
+ makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
+ $(basename $<).glo
+ makeindex -t $(basename $<).ilg -o $(basename $<).ind \
+ $(basename $<).idx
+ bibtex $(basename $<)
+ $(LATEX) $<
+ $(LATEX) $<
+
+clean :
+ $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
+ $(RM) $(addprefix $(MAIN), .dvi .ps)
+
+veryclean : clean
+ $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+ zip $(ARCHNAME).zip $(ARCHFILES)
+
+# EOF
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 ebb26370977..be90c409c70 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.81}
-\def\filedate{2006/10/03}
+\def\fileversion{2.82}
+\def\filedate{2006/11/22}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -153,6 +153,13 @@
\endgroup%
}
%
+\define@boolkey[psset]{pstricks-add}[Pst@]{angleCheck}[true]{}
+\psset[pstricks-add]{angleCheck=true}
+%
+\def\pst@getangle#1#2{%
+ \ifPst@angleCheck\pst@@getangle{#1}\else\def\pst@angle{#1 }\fi%
+ \let#2\pst@angle}
+%
%--------------------------------------- small stuff -------------------------------
% transalpha needs a run through latex -> dvips -> ps2pdf14(!)
% and view with Acrobat >= 5.0
@@ -548,7 +555,8 @@
\ifx\psk@arrowA\arrowType@H % do we have a Hook arrow at the beginning?
\pst@number\pshooklength % yes
\else
- \psk@arrowsize\space CLW mul add dup \psk@arrowlength\space mul exch \psk@arrowinset mul neg add
+ \psk@arrowsize\space CLW mul add dup \psk@arrowlength\space mul
+ exch \psk@arrowinset mul neg add
\fi
/arrowlength exch def
4 copy % copy all four values for the arrow line
@@ -566,11 +574,11 @@
\psk@ArrowInsidePos\space 1 gt {
/Alpha y2 y1 sub x2 x1 sub Atan def
/ArrowPos \psk@ArrowInsideOffset\space def
- /Length x2 x1 sub y2 y1 sub Pyth def
+ /ALength x2 x1 sub y2 y1 sub Pyth def
/dArrowPos \psk@ArrowInsidePos\space abs def
{
/ArrowPos ArrowPos dArrowPos add def
- ArrowPos Length gt { exit } if
+ ArrowPos ALength gt { exit } if
x1 Alpha cos ArrowPos mul add
y1 Alpha sin ArrowPos mul add
ArrowInside
@@ -619,11 +627,11 @@
\psk@ArrowInsidePos\space 1 gt {
/Alpha y12 y11 sub x12 x11 sub atan def
/ArrowPos \psk@ArrowInsideOffset\space def
- /Length x12 x11 sub y12 y11 sub Pyth def
+ /ALength x12 x11 sub y12 y11 sub Pyth def
/dArrowPos \psk@ArrowInsidePos\space abs def
{
/ArrowPos ArrowPos dArrowPos add def
- ArrowPos Length gt { exit } if
+ ArrowPos ALength gt { exit } if
x11 Alpha cos ArrowPos mul add
y11 Alpha sin ArrowPos mul add
currentdict /ArrowInside known { ArrowInside } if
@@ -744,11 +752,11 @@
\psk@ArrowInsidePos\space 1 gt {
/Alpha y2 y1 sub x2 x1 sub atan def
/ArrowPos \psk@ArrowInsideOffset\space def
- /Length x2 x1 sub y2 y1 sub Pyth def
+ /ALength x2 x1 sub y2 y1 sub Pyth def
/dArrowPos \psk@ArrowInsidePos\space abs def
{%
/ArrowPos ArrowPos dArrowPos add def
- ArrowPos Length gt { exit } if
+ ArrowPos ALength gt { exit } if
x1 Alpha cos ArrowPos mul add
y1 Alpha sin ArrowPos mul add
ArrowInside
@@ -2649,7 +2657,8 @@
dup 4 -1 roll mul 2 index 2 add 1 roll
} repeat
pop pop } def
- /divvect { ylength exch 1 index { dup 4 -1 roll exch div 2 index 2 add 1 roll } repeat pop pop } def
+ /divvect { ylength exch 1 index { dup 4 -1 roll exch div 2
+ index 2 add 1 roll } repeat pop pop } def
/k0 0 def /k1 0 def /k2 0 def /k3 0 def
\ifPst@algebraic /F@pstplot (#4) tx@addDict begin AlgParser end cvx def \fi
/Func {
@@ -2659,7 +2668,8 @@
\ifPst@buildvector\else ylength array astore \fi
\fi
} def
- \ifx\psk@method\@adams /F1 0 def /F2 0 def /F3 0 def /F4 0 def /F5 0 def /F6 0 def /INIT 1 def \fi
+ \ifx\psk@method\@adams /F1 0 def /F2 0 def /F3 0 def /F4 0 def
+ /F5 0 def /F6 0 def /INIT 1 def \fi
\ifx\psk@method\@empty\else
\ifx\psk@method\@varrkiv %% RUNGE-KUTTA method with var step algorithm
/VarStep false def /VarStepRatio 1 def
@@ -2699,7 +2709,8 @@
%{ \psk@varsteptol\space div .1 lt { /VarStep true def } if pop exit } if
%pop /dx dx 4 div def exch /y exch def } loop
{ .001 div dup .1 lt
- { dup 1e-6 lt { pop 3 } { log neg } ifelse /VarStepRatio exch def /VarStep true def }
+ { dup 1e-6 lt { pop 3 } { log neg } ifelse
+ /VarStepRatio exch def /VarStep true def }
{ pop } ifelse pop exit } if
pop /dx dx 4 div def exch /y exch def } loop
} def
@@ -2759,15 +2770,15 @@
\ifx\psk@whichabs\@empty x \else y \psk@whichabs\space get \fi
\else \psk@plotfuncx\space \fi
\pst@number\psxunit mul y
- \ifx\psk@method\@empty %% EULER method
+ \ifx\psk@method\@empty %% EULER method
/y Func { dx mul } forall y aload pop addvect ylength array astore def
\else%
- \ifx\psk@method\@varrkiv %% RUNGE-KUTTA method
+ \ifx\psk@method\@varrkiv %% RUNGE-KUTTA method
VARRK
- \else\ifx\psk@method\@rkiv %% RUNGE-KUTTA method
+ \else\ifx\psk@method\@rkiv %% RUNGE-KUTTA method
RK
\else
- /F1 F2 def /F2 F3 def /F3 F4 def /F4 %% ADAMS method
+ /F1 F2 def /F2 F3 def /F3 F4 def /F4 %% ADAMS method
\ifcase\psk@adamsorder\or\or\or\or
%% ORDRE 4
Func def
@@ -2795,9 +2806,8 @@
\if@pst\psplot@ii\else\psplot@iii\fi
\endgroup%
\ignorespaces%
-}
-%
-%
+}%
+%%
\def\psGTriangle{\pst@object{psGTriangle}}
\def\psGTriangle@i(#1)(#2)(#3)#4#5#6{{%
\def\solid@star{}%
@@ -2819,11 +2829,11 @@
[ \pst@colorB ] aload length 1 eq { dup dup } if 3 array astore
[ \pst@colorA ] aload length 1 eq { dup dup } if 3 array astore
tx@addDict begin GTriangle end % PS part
- }%
- \if@star\pspolygon(#1)(#2)(#3)\fi% draw borderline
+ }
+ \if@star\pspolygon(#1)(#2)(#3)\fi
\def\pst@linetype{2}%
\end@ClosedObj%
-}}
+}\ignorespaces}
%
\define@key[psset]{pstricks-add}{dicescale}{\def\psk@dicescale{#1}}
\def\psdice{\pst@object{psdice}}
diff --git a/Master/texmf-dist/tpm/pstricks-add.tpm b/Master/texmf-dist/tpm/pstricks-add.tpm
index 85d91234e1c..306ebef1532 100644
--- a/Master/texmf-dist/tpm/pstricks-add.tpm
+++ b/Master/texmf-dist/tpm/pstricks-add.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/pstricks-add.zip">
<TPM:Name>pstricks-add</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/11/03 06:16:00</TPM:Date>
+ <TPM:Date>2006/11/27 06:06:20</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -24,13 +24,13 @@ pst-plot, pst-node, pst-tree and pst-grad.
<TPM:Size>2024731</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="140198">
+ <TPM:RunFiles size="140420">
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
</TPM:RunFiles>
- <TPM:DocFiles size="1884533">
+ <TPM:DocFiles size="1968393">
texmf-dist/doc/generic/pstricks-add/Changes
texmf-dist/doc/generic/pstricks-add/README
texmf-dist/doc/generic/pstricks-add/examples/12-1.txt
@@ -53,6 +53,9 @@ texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.ltx
texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
</TPM:DocFiles>
+ <TPM:SourceFiles size="1092">
+texmf-dist/source/generic/pstricks-add/Makefile
+ </TPM:SourceFiles>
<TPM:Provides>Package/pstricks-add</TPM:Provides>
</rdf:Description>
</rdf:RDF>
diff --git a/Master/texmf/lists/pstricks-add b/Master/texmf/lists/pstricks-add
index fdc6f727f7a..6326336a51d 100644
--- a/Master/texmf/lists/pstricks-add
+++ b/Master/texmf/lists/pstricks-add
@@ -19,7 +19,7 @@ texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.ltx
texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
-
+texmf-dist/source/generic/pstricks-add/Makefile
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