From e21a88a2939200a6c5bf21b50d1243d9f8614da6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 11 Oct 2006 18:08:25 +0000 Subject: update pstricks-add git-svn-id: svn://tug.org/texlive/trunk@2305 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pstricks-add/Changes | 4 + Master/texmf-dist/doc/generic/pstricks-add/README | 18 +- .../doc/generic/pstricks-add/pstricks-add-doc.pdf | Bin 1493444 -> 1497464 bytes .../doc/generic/pstricks-add/pstricks-add-doc.tex | 45 ++- .../texmf-dist/dvips/pstricks-add/pstricks-add.pro | 41 ++- .../tex/generic/pstricks-add/pstricks-add.tex | 319 ++++++++++----------- .../tex/latex/pstricks-add/pstricks-add.sty | 2 +- Master/texmf-dist/tpm/pstricks-add.tpm | 6 +- 8 files changed, 229 insertions(+), 206 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index cc11cf78461..95655bb1206 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/Changes +++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes @@ -1,4 +1,5 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv) + v 0.09 2006-10-10 cvi for the wavelength to get an integer v 0.08 2006-06-17 more improvements to the code (hv) v 0.07 2006-04-03 remove whitespace (dr) v 0.06 2006-01-16 EXP -> Exp, to prevent missmatch with pst-math (hv) @@ -12,6 +13,9 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv) pstricks-add ----------- + v 2.81 2006-10-10 - fix a trailing space in \pstScalePoints + - add macro \psforeach + - 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) - added macro \psforeach diff --git a/Master/texmf-dist/doc/generic/pstricks-add/README b/Master/texmf-dist/doc/generic/pstricks-add/README index 0b2dc753ee5..06c8ae2b1ca 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/README +++ b/Master/texmf-dist/doc/generic/pstricks-add/README @@ -1,8 +1,8 @@ pstricks-add redefines a lot of the pstricks macros and uses the extended -version of the keyval package. So be sure that you -- pstricks-add depends on the pstricks.pro Version 1.00, 2005/09/18 +version of the keyval package. +- pstricks-add depends at least on the pstricks.pro Version 1.01, 2005/09/18 you can get it from http://perce.de/LaTeX/pstricks/ or CTAN -- load pstricks-add at last pstricks related package +- load pstricks-add at _last_ pstricks related package - have installed xkeyval with the special pst-xkey (CTAN: tex-archive/macros/latex/contrib/xkeyval/) - do not load another package after pstricks-add, which loads @@ -33,7 +33,6 @@ to the pstricks mailing list and has some more new features: o new option changeOrder - pst-node - o new macro nclineII for a two-colored line o new option lineAngle for ncdiag o new macros for interpolation nodes and linear combination of two vectors @@ -44,7 +43,10 @@ pstricks-add.pro : the prolog file for pstricks-add pstricks-add-doc.ltx: the main doc file pstricks-add-doc.tex: the included doc file -Save the files pstricks-add.sty|tex|pro in the TeX tree, -where the pstricks-add.pro file should go in texmf/dvips/pstricks/, then -run texhash or mktexlsr to update the TeX file base. -The document needs the data files in example/. +Save the files pst-func.sty|pro|tex in a directory, which is part of your +local TeX tree. The pro file should go into $TEXMF/dvips/pstricks/ +Then do not forget to run texhash to update this tree. +For more information see the documentation of your LATEX distribution +on installing packages into your local TeX system or read the +TeX Frequently Asked Questions: +(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). 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 80c3a7ff8f8..6b4259f4820 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 e27102dba61..7857b51a165 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 @@ -6271,7 +6271,7 @@ est remarquable. %-------------------------------------------------------------------------------------- -\subsection{\CMD{psMatrixPlot}} +\section{\CMD{psMatrixPlot}} %-------------------------------------------------------------------------------------- \begin{filecontents}{matrix.dat} /dotmatrix [ % @@ -6346,9 +6346,39 @@ the above view. \end{center} \egroup +%-------------------------------------------------------------------------------------- +\section{\CMD{psforeach}} +%-------------------------------------------------------------------------------------- + +The macro \CMD{psforeach} allows a loop with an individuell increment. + +\begin{verbatim} +\psforeach{variable}{value list}{action} +\end{verbatim} + +\begin{LTXexample} +\begin{pspicture}[showgrid=true](5,5) + \psforeach{\nA}{0, 1, 1.5, 3, 5}{% + \psdot[dotscale=3](\nA,\nA)} +\end{pspicture} +\end{LTXexample} + %-------------------------------------------------------------------------------------- -\subsection{PostScript} +\section{\CMD{resetOptions}} +%-------------------------------------------------------------------------------------- + +Sometimes it is difficult to know what options, which are changed inside a long document, +are different to the default one. With this +macro all options depending to \verb+pst-plot+ can be reset. This depends to all +options of the packages \verb+pstricks+, \verb+pst-plot+ and \verb+pst-node+. + + +\appendix + + +%-------------------------------------------------------------------------------------- +\section{PostScript} %-------------------------------------------------------------------------------------- PostScript uses the stack system and the LIFO system, "'Last In, First Out"`. @@ -6384,16 +6414,6 @@ PostScript uses the stack system and the LIFO system, "'Last In, First Out"`. \end{table} -%-------------------------------------------------------------------------------------- -\section{\CMD{resetOptions}} -%-------------------------------------------------------------------------------------- - -Sometimes it is difficult to know what options, which are changed inside a long document, -are different to the default one. With this -macro all options depending to \verb+pst-plot+ can be reset. This depends to all -options of the packages \verb+pstricks+, \verb+pst-plot+ and \verb+pst-node+. - - %-------------------------------------------------------------------------------------- \section{Credits} %-------------------------------------------------------------------------------------- @@ -6409,6 +6429,7 @@ options of the packages \verb+pstricks+, \verb+pst-plot+ and \verb+pst-node+. {Jens-Uwe Morawski |} {Tobias N\"ahring |} {Rolf Niepraschk |} +{Alan Ristow |} {Arnaud Schmittbuhl |} {Timothy Van Zandt} diff --git a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro index df844e2828e..8d385084718 100644 --- a/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro +++ b/Master/texmf-dist/dvips/pstricks-add/pstricks-add.pro @@ -1,20 +1,19 @@ -%! % PostScript prologue for pstricks-add.tex. -% Version 0.08, 2006/06/17 +% Version 0.09, 2006/10/06 % For distribution, see pstricks.tex. % % HISTORY -% 2006/06/17 : - changes to the code (hv) -% 2006/04/21 : - Improved parser -> generic with derivative and translator into ps (dr) -% 2006/01/16 : - EXP -> Exp to prevent missmatch with pst-math (hv) +% 2006/08/10 : - cvi for the wavelength to get an integer +% 2006/05/31 : - changes to the code +% 2006/04/21 : - Improved parser -> generic with derivative and translator into ps +% 2006/01/16 : - EXP -> Exp to prevent missmatch with pst-math % 2005/09/28 : - rename it to pstricks-add.pro -% - add support for Gouraud shading (hv) +% - add support for Gouraud shading % 2005/05/20 : small (unimportant) changes (hv) -% 2005/02/25 : white space removal from expression (dr) -% 2004/12/16 : addition of Sum and IfTE (dr) +% 2005/02/25 : white space removal from expression +% 2004/12/16 : addition of Sum and IfTE % 2004/11/14 : correction of a priority problem % ^ before unary - (new rule FS) -% /tx@addDict 410 dict def tx@addDict begin %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Pi and Euler are defined in pstricks.pro @@ -72,20 +71,20 @@ % /Gamma 0.8 def /calculateRGB { - lambda 379 le {/Red 0 def /Green 0 def /Blue 0 def} if - lambda 781 ge {/Red 0 def /Green 0 def /Blue 0 def} if + /Red 0 def /Green 0 def /Blue 0 def lambda 380 ge {lambda 439 le { /R {lambda 440 sub neg 440 380 sub div} def /Red R factor mul Gamma exp def /G 0 def /Green G factor mul Gamma exp def /B 1 def - /Blue B factor mul Gamma exp def} if + /Blue B factor mul Gamma exp def } if } if lambda 440 ge { lambda 489 le { /G {lambda 440 sub 490 440 sub div} def /Green G factor mul Gamma exp def - /R 0 def /Red 0 def +% /R 0 def +% /Red 0 def /B 1 def /Blue B factor mul Gamma exp def } if } if @@ -99,22 +98,22 @@ lambda 510 ge {lambda 579 le { /R {lambda 510 sub 580 510 sub div } def /Red R factor mul Gamma exp def - /Blue 0 def +% /Blue 0 def /G 1 def /Green G factor mul Gamma exp def } if } if lambda 580 ge {lambda 644 le { /G {lambda 645 sub neg 645 580 sub div } def /Green G factor mul Gamma exp def - /Blue 0 def +% /Blue 0 def /R 1 def /Red R factor mul Gamma exp def } if } if lambda 645 ge { lambda 780 le { /Red 1 factor mul Gamma exp def - /Blue 0 def - /Green 0 def } if - } if +% /Blue 0 def +% /Green 0 def + } if } if } def % /factor { @@ -124,9 +123,9 @@ } def /wavelengthToRGB { % the wavelength in nm must be on top of the stack - /lambda exch def + cvi /lambda exch def % no floating point here calculateRGB -} def +} def % now the colors are saved in Red Green Blue /axfill { @@ -946,7 +945,7 @@ end%%%tx@CoreAnalyzerDict /Argth { dup 1 add exch 1 exch sub div ln 2 div } def %% modified exponential funtion for 0 %% x n -> x^n -/Exp { dup 0 eq { pop pop 1 } { exp } ifelse } bind def +/Exp { exch dup 0 eq { pop pop 0 }{ exch dup 0 eq { pop pop 1 } { exp } ifelse } ifelse } bind def %% modified exponential funtion for 0 %% x -> e^x /Ex { 2.71828182846 exch exp } bind def 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 01b77c4a427..ebb26370977 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -26,13 +26,13 @@ \ifx\MultidoLoaded\endinput\else \input multido \fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{2.80} -\def\filedate{2006/09/25} +\def\fileversion{2.81} +\def\filedate{2006/10/03} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax \SpecialCoor -\pst@addfams{pstricksadd} +\pst@addfams{pstricks-add} % %% prologue for postcript \pstheader{pstricks-add.pro}% @@ -109,7 +109,7 @@ \begingroup \edef\reserved@a{#2}% \@for#1:=\reserved@a\do{#3}% - \endgroup + \endgroup% } % % A modulo macro for integer values @@ -158,8 +158,8 @@ % and view with Acrobat >= 5.0 % use transpalpha= to the the opacity level % -\define@key[psset]{pstricksadd}{transpalpha}{\pst@checknum{#1}\pstranspalpha } -%\psset[pstricksadd]{transpalpha=1} +\define@key[psset]{pstricks-add}{transpalpha}{\pst@checknum{#1}\pstranspalpha } +%\psset[pstricks-add]{transpalpha=1} \def\psfs@transparent{% \addto@pscode{/Normal .setblendmode \pstranspalpha .setshapealpha }% \psfs@solid} @@ -212,7 +212,7 @@ \define@key[psset]{}{dash}{% defined in pstricks.tex \pst@expandafter\psset@@dash{#1}\@nil% Error handling for empty argument. } -\define@key[psset]{pstricksadd}{maxdashes}{\def\psk@maxdashes{#1}} +\define@key[psset]{pstricks-add}{maxdashes}{\def\psk@maxdashes{#1}} %\psset{maxdashes=11} \def\psset@@dash#1\@nil{% \def\psk@dash{}% @@ -277,7 +277,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -\define@key[psset]{pstricksadd}{intSeparator}{\def\psk@intSeparator{#1}} +\define@key[psset]{pstricks-add}{intSeparator}{\def\psk@intSeparator{#1}} %\psset{intSeparator={,}} % \def\psFormatInt{\def\pst@par{}\pst@object{psFormatInt}} @@ -313,8 +313,8 @@ }\ignorespaces} % \newdimen\pst@braceWidth -\define@key[psset]{pstricksadd}{braceWidth}{\pssetlength\pst@braceWidth{#1}} -\define@key[psset]{pstricksadd}{bracePos}{\def\psk@bracePos{#1}} +\define@key[psset]{pstricks-add}{braceWidth}{\pssetlength\pst@braceWidth{#1}} +\define@key[psset]{pstricks-add}{bracePos}{\def\psk@bracePos{#1}} %\psset{braceWidth=10pt,bracePos=0.5} % \def\@@rput@iv(#1){\pst@killglue\pst@makebox{\@@rput@v{#1}}} @@ -380,8 +380,8 @@ % HookLeft/RightArrow \newdimen\pshooklength \newdimen\pshookwidth -\define@key[psset]{pstricksadd}{hooklength}{\pssetlength\pshooklength{#1}} -\define@key[psset]{pstricksadd}{hookwidth}{\pssetlength\pshookwidth{#1}} +\define@key[psset]{pstricks-add}{hooklength}{\pssetlength\pshooklength{#1}} +\define@key[psset]{pstricks-add}{hookwidth}{\pssetlength\pshookwidth{#1}} %\psset{hooklength=3mm,hookwidth=1mm} % \edef\pst@arrowtable{\pst@arrowtable,H-H,h-h} % add new arrow @@ -416,7 +416,7 @@ 0 \psk@arrowlength \psk@arrowsize \tx@Rhook } % New parameter "arrowfill", with default as "true" -\define@boolkey[psset]{pstricksadd}[ps]{ArrowFill}[true]{} +\define@boolkey[psset]{pstricks-add}[ps]{ArrowFill}[true]{} % % Modification of the PostScript macro Arrow to choose to fill or not the arrow % (it require to restore the current linewidth, despite of the scaling) @@ -434,9 +434,9 @@ 0 h a sub moveto }> % -\define@key[psset]{pstricksadd}{nArrowsA}{\def\psk@nArrowsA{#1}} -\define@key[psset]{pstricksadd}{nArrowsB}{\def\psk@nArrowsB{#1}} -\define@key[psset]{pstricksadd}{nArrows}{\def\psk@nArrowsA{#1}\def\psk@nArrowsB{#1}} +\define@key[psset]{pstricks-add}{nArrowsA}{\def\psk@nArrowsA{#1}} +\define@key[psset]{pstricks-add}{nArrowsB}{\def\psk@nArrowsB{#1}} +\define@key[psset]{pstricks-add}{nArrows}{\def\psk@nArrowsA{#1}\def\psk@nArrowsB{#1}} %\psset{nArrows=2} % \@namedef{psas@>>}{% @@ -465,10 +465,9 @@ % % DG addition begin - Dec. 18/19, 1997 and Oct. 11, 2002 % Adapted from \psset@arrows - \def\psk@ArrowInside{} - \define@key[psset]{pstricksadd}{ArrowInside}{% - \def\pst@tempA{#1}% - \ifx\pst@tempA\@empty \def\psk@ArrowInside{} % +\define@key[psset]{pstricks-add}{ArrowInside}{% + \def\pst@tempArrow{#1}% + \ifx\pst@tempArrow\@empty \def\psk@ArrowInside{} % \else% \begingroup% \pst@activearrows% @@ -488,7 +487,7 @@ {\def\psk@ArrowInside{#2}}% } % Default value empty -%\psset{ArrowInside={}} +\psset{ArrowInside={}} % Modified version of \pst@addarrowdef \def\pst@addarrowdef{% \addto@pscode{% @@ -520,7 +519,7 @@ \tx@EndArrow% } % ArrowInsidePos parameter (default value 0.5) -\define@key[psset]{pstricksadd}{ArrowInsidePos}{\pst@checknum{#1}\psk@ArrowInsidePos}% +\define@key[psset]{pstricks-add}{ArrowInsidePos}{\pst@checknum{#1}\psk@ArrowInsidePos}% %\psset{ArrowInsidePos=0.5} % % Modified version of \begin@ClosedObj @@ -538,14 +537,14 @@ % Redefinition of the PostScript /Line macro to print the intermediate % arrow on each segment of the line % -\define@key[psset]{pstricksadd}{ArrowInsideNo}{\pst@checknum{#1}\psk@ArrowInsideNo}% hv 20031001 -\define@key[psset]{pstricksadd}{ArrowInsideOffset}{\pst@checknum{#1}\psk@ArrowInsideOffset}% hv 20031001 +\define@key[psset]{pstricks-add}{ArrowInsideNo}{\pst@checknum{#1}\psk@ArrowInsideNo}% hv 20031001 +\define@key[psset]{pstricks-add}{ArrowInsideOffset}{\pst@checknum{#1}\psk@ArrowInsideOffset}% hv 20031001 %\psset{ArrowInsideNo=1,ArrowInsideOffset=0} % \def\arrowType@H{H} -\pst@def{Line}<{% +\pst@def{Line}< NArray n 0 eq not { n 1 eq { 0 0 /n 2 def } if - (\psk@ArrowInside) length 0 gt { + (\psk@ArrowInside) length 0 gt { \ifx\psk@arrowA\arrowType@H % do we have a Hook arrow at the beginning? \pst@number\pshooklength % yes \else @@ -554,7 +553,7 @@ /arrowlength exch def 4 copy % copy all four values for the arrow line /y1 ED /x1 ED /y2 ED /x2 ED % save them - /Alpha y2 y1 sub x2 x1 sub atan def % the gradient of the line + /Alpha y2 y1 sub x2 x1 sub Atan def % the gradient of the line % 2 copy /y1 ED /x1 ED ArrowA x1 y1 ArrowA % draw arrowA x1 Alpha cos arrowlength mul add % dx add @@ -565,7 +564,7 @@ /y1 ED /x1 ED /y2 ED /x2 ED x1 y1 \psk@ArrowInsidePos\space 1 gt { - /Alpha y2 y1 sub x2 x1 sub atan def + /Alpha y2 y1 sub x2 x1 sub Atan def /ArrowPos \psk@ArrowInsideOffset\space def /Length x2 x1 sub y2 y1 sub Pyth def /dArrowPos \psk@ArrowInsidePos\space abs def @@ -593,8 +592,7 @@ pop pop Lineto } repeat }{ ArrowA /n n 2 sub def n { Lineto } repeat } ifelse - CP 4 2 roll ArrowB L pop pop } if% -}> + CP 4 2 roll ArrowB L pop pop } if > % % Redefinition of the PostScript /Polygon macro to print the intermediate % arrow on each segment of the line @@ -855,11 +853,11 @@ % %\def\psDashColorI{black} %\def\psDashColorII{red} -\define@key[psset]{pstricksadd}{dashColorI}{\pst@getcolor{#1}\psDashColorI} -\define@key[psset]{pstricksadd}{dashColorII}{\pst@getcolor{#1}\psDashColorII} -\define@key[psset]{pstricksadd}{dashNo}{\def\psk@dashNo{#1}} +\define@key[psset]{pstricks-add}{dashColorI}{\pst@getcolor{#1}\psDashColorI} +\define@key[psset]{pstricks-add}{dashColorII}{\pst@getcolor{#1}\psDashColorII} +\define@key[psset]{pstricks-add}{dashNo}{\def\psk@dashNo{#1}} % -\define@key[psset]{pstricksadd}{linecap}{\def\psk@linecap{#1}} +\define@key[psset]{pstricks-add}{linecap}{\def\psk@linecap{#1}} %\psset{dashColorI=black,dashColorII=red,dashNo=0.2,linecap=0} % \pst@def{LineII}<{% @@ -872,10 +870,10 @@ n { /y2 ED /x2 ED /y0 y1 def /x0 x1 def - /length x2 x1 sub y2 y1 sub Pyth def + /linelength x2 x1 sub y2 y1 sub Pyth def \psk@dashNo\space 1.0 lt {/cntMax 1.0 \psk@dashNo\space div .49 add cvi def} - {/cntMax length \psk@dashNo\space div .49 add cvi def} ifelse + {/cntMax linelength \psk@dashNo\space div .49 add cvi def} ifelse x2 x1 sub cntMax div /dx ED y2 y1 sub cntMax div /dy ED /cnt 0 def @@ -913,8 +911,8 @@ \end@OpenObj% } % -\define@key[psset]{pstricksadd}{randomPoints}{\def\psk@randomPoints{#1}} -\define@boolkey[psset]{pstricksadd}[Pst@]{color}[true]{} +\define@key[psset]{pstricks-add}{randomPoints}{\def\psk@randomPoints{#1}} +\define@boolkey[psset]{pstricks-add}[Pst@]{color}[true]{} %\psset{randomPoints=1000,color=false} % \def\psRandom{\pst@object{psRandom}}% hv 2004-11-12 @@ -994,10 +992,10 @@ /y1 ED /x1 ED x1 y1 ArrowA x1 y1 moveto /y2 ED /x2 ED /y0 y1 def /x0 x1 def - /length x2 x1 sub y2 y1 sub Pyth def + /linelength x2 x1 sub y2 y1 sub Pyth def \psk@dashNo\space 1.0 lt {/cntMax 1.0 \psk@dashNo\space div .49 add cvi def} - {/cntMax length \psk@dashNo\space div .49 add cvi def} ifelse + {/cntMax linelength \psk@dashNo\space div .49 add cvi def} ifelse x2 x1 sub cntMax div /dx ED y2 y1 sub cntMax div /dy ED /cnt 0 def @@ -1025,7 +1023,7 @@ \def\pclineII{\pst@object{pclineII}}% \def\pclineII@i{\pc@object\nclineII@ii}% % -\define@key[psset]{pstricksadd}{lineAngle}{\psset{armB=0.5}\def\psk@lineAngle{#1}}% +\define@key[psset]{pstricks-add}{lineAngle}{\psset{armB=0.5}\def\psk@lineAngle{#1}}% %\psset{lineAngle=0}% % \pst@def{NCDiag}<{ @@ -1142,7 +1140,7 @@ } % % -\define@boolkey[psset]{pstricksadd}[Pst@]{trueAngle}[true]{} +\define@boolkey[psset]{pstricks-add}[Pst@]{trueAngle}[true]{} %\psset{trueAngle=false} % \def\psRelNode{\pst@object{psRelNode}} @@ -1254,7 +1252,7 @@ % #1: node A #2: node B #3: dimen measured from A #4: node name \pst@getcoor{#1}\pst@tempA% \pst@getcoor{#2}\pst@tempB% - \pssetlength\pst@dima{#3}% + \pssetlength\pst@dimp{#3}% \pnode(!% \pst@tempA /YA exch \pst@number\psyunit div def /XA exch \pst@number\psxunit div def @@ -1263,50 +1261,50 @@ /dx XB XA sub def /dy YB YA sub def /angle dy dx Atan def - /length \pst@number\pst@dima \pst@number\psunit div def - XA length angle cos mul add YA length angle sin mul add ){#4}% + /linelength \pst@number\pst@dimp \pst@number\psunit div def + XA linelength angle cos mul add YA linelength angle sin mul add ){#4}% } \def\nlput{\pst@object{nlput}} \def\nlput@i(#1)(#2)#3#4{% \begin@SpecialObj - \psLDNode(A)(B){#3}{@temp@lnput} - \pcline[linestyle=none](#1)(@temp@lnput)% + \psLDNode(#1)(#2){#3}{temp@lnput} + \pcline[linestyle=none](#1)(temp@lnput)% \ncput[npos=1]{#4}% \end@SpecialObj -} % +}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%% %%%%%%%%%% %%%%%%%%%%% pst-plot %%%%%%%%%% %%%%%%%%%%% %%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -\define@key[psset]{pstricksadd}{labelFontSize}{\def\psk@labelFontSize{#1}}% +\define@key[psset]{pstricks-add}{labelFontSize}{\def\psk@labelFontSize{#1}}% \psset{labelFontSize={}} \def\pshlabel#1{\psk@labelFontSize$#1$}% \def\psvlabel#1{\psk@labelFontSize$#1$} % -\define@boolkey[psset]{pstricksadd}[Pst@]{comma}[true]{} +\define@boolkey[psset]{pstricks-add}[Pst@]{comma}[true]{} % -\define@boolkey[psset]{pstricksadd}[Pst@]{xAxis}[true]{} -\define@boolkey[psset]{pstricksadd}[Pst@]{yAxis}[true]{} -\define@boolkey[psset]{pstricksadd}[Pst@]{xyAxes}[true]{% +\define@boolkey[psset]{pstricks-add}[Pst@]{xAxis}[true]{} +\define@boolkey[psset]{pstricks-add}[Pst@]{yAxis}[true]{} +\define@boolkey[psset]{pstricks-add}[Pst@]{xyAxes}[true]{% \@nameuse{Pst@xAxis#1}\@nameuse{Pst@yAxis#1}}% %\psset{xyAxes=true}% % -\define@key[psset]{pstricksadd}{xyDecimals}{\def\psk@xDecimals{#1}\def\psk@yDecimals{#1}} -\define@key[psset]{pstricksadd}{xDecimals}{\def\psk@xDecimals{#1}} -\define@key[psset]{pstricksadd}{yDecimals}{\def\psk@yDecimals{#1}} +\define@key[psset]{pstricks-add}{xyDecimals}{\def\psk@xDecimals{#1}\def\psk@yDecimals{#1}} +\define@key[psset]{pstricks-add}{xDecimals}{\def\psk@xDecimals{#1}} +\define@key[psset]{pstricks-add}{yDecimals}{\def\psk@yDecimals{#1}} %\psset{xyDecimals={}}% % -\define@key[psset]{pstricksadd}{xlogBase}{\def\psk@xlogBase{#1}} -\define@key[psset]{pstricksadd}{ylogBase}{\def\psk@ylogBase{#1}} -\define@key[psset]{pstricksadd}{xylogBase}{\def\psk@xlogBase{#1}\def\psk@ylogBase{#1}}% +\define@key[psset]{pstricks-add}{xlogBase}{\def\psk@xlogBase{#1}} +\define@key[psset]{pstricks-add}{ylogBase}{\def\psk@ylogBase{#1}} +\define@key[psset]{pstricks-add}{xylogBase}{\def\psk@xlogBase{#1}\def\psk@ylogBase{#1}}% %\psset{xylogBase={}}% % -\define@key[psset]{pstricksadd}{trigLabelBase}{\pst@getint{#1}{\psk@trigLabelBase}} +\define@key[psset]{pstricks-add}{trigLabelBase}{\pst@getint{#1}{\psk@trigLabelBase}} \psset{trigLabelBase=0} -\define@boolkey[psset]{pstricksadd}[Pst@]{trigLabels}[true]{% +\define@boolkey[psset]{pstricks-add}[Pst@]{trigLabels}[true]{% \ifPst@trigLabels \def\pst@@@hlabel##1{\pshlabel{##1}} \def\pshlabel##1{% @@ -1355,7 +1353,7 @@ \psset{trigLabels=false} % %logLines=all|x|y|none (0,1,2,3) -\define@key[psset]{pstricksadd}{logLines}{\pst@expandafter\psset@@logLines{#1}\@nil\psk@logLines} +\define@key[psset]{pstricks-add}{logLines}{\pst@expandafter\psset@@logLines{#1}\@nil\psk@logLines} \def\psset@@logLines#1#2\@nil#3{% \ifx#1a\let#3\z@\else \ifx#1x\let#3\@ne\else @@ -1368,8 +1366,8 @@ % Define "ticklines" parameter (ticklines=all|x|y|none with default=none) %\def\psset@ticklines#1{\pst@expandafter\psset@@ticklines{#1}\@nil\psk@ticklines} %\psset@ticklines{none} -\define@key[psset]{pstricksadd}{ylabelFactor}{\def\psk@ylabelFactor{#1}} -\define@key[psset]{pstricksadd}{xlabelFactor}{\def\psk@xlabelFactor{#1}} +\define@key[psset]{pstricks-add}{ylabelFactor}{\def\psk@ylabelFactor{#1}} +\define@key[psset]{pstricks-add}{xlabelFactor}{\def\psk@xlabelFactor{#1}} %\psset{xlabelFactor=\relax,ylabelFactor=\relax}% % The parameter styles for the tick lines % (default=arrows=-,linestyle=dotted,dotsep=5pt) @@ -1555,8 +1553,8 @@ \fi% } \define@key[psset]{}{ticksize}{\set@xticksize{#1}\set@yticksize{#1}} -\define@key[psset]{pstricksadd}{xticksize}{\set@xticksize{#1}} -\define@key[psset]{pstricksadd}{yticksize}{\set@yticksize{#1}}% overwrites the definition in pstricks +\define@key[psset]{pstricks-add}{xticksize}{\set@xticksize{#1}} +\define@key[psset]{pstricks-add}{yticksize}{\set@yticksize{#1}}% overwrites the definition in pstricks %\psset{ticksize=-4pt 4pt} % % full= 0, top=1, bottom=-1 @@ -1576,61 +1574,59 @@ %\psset{tickstyle=full}% % % -\define@key[psset]{pstricksadd}{subticks}{\def\psk@xsubticks{#1}\def\psk@ysubticks{#1}} -\define@key[psset]{pstricksadd}{xsubticks}{\def\psk@xsubticks{#1}} -\define@key[psset]{pstricksadd}{ysubticks}{\def\psk@ysubticks{#1}} +\define@key[psset]{pstricks-add}{subticks}{\def\psk@xsubticks{#1}\def\psk@ysubticks{#1}} +\define@key[psset]{pstricks-add}{xsubticks}{\def\psk@xsubticks{#1}} +\define@key[psset]{pstricks-add}{ysubticks}{\def\psk@ysubticks{#1}} % -\define@key[psset]{pstricksadd}{subticksize}{\def\psk@xsubticksize{#1}\def\psk@ysubticksize{#1}} -\define@key[psset]{pstricksadd}{xsubticksize}{\def\psk@xsubticksize{#1}} -\define@key[psset]{pstricksadd}{ysubticksize}{\def\psk@ysubticksize{#1}} +\define@key[psset]{pstricks-add}{subticksize}{\def\psk@xsubticksize{#1}\def\psk@ysubticksize{#1}} +\define@key[psset]{pstricks-add}{xsubticksize}{\def\psk@xsubticksize{#1}} +\define@key[psset]{pstricks-add}{ysubticksize}{\def\psk@ysubticksize{#1}} % -\define@key[psset]{pstricksadd}{tickwidth}{% +\define@key[psset]{pstricks-add}{tickwidth}{% \pst@getlength{#1}\psk@xtickwidth% \pst@getlength{#1}\psk@ytickwidth} -\define@key[psset]{pstricksadd}{xtickwidth}{\pst@getlength{#1}\psk@xtickwidth} -\define@key[psset]{pstricksadd}{ytickwidth}{\pst@getlength{#1}\psk@ytickwidth} -\define@key[psset]{pstricksadd}{subtickwidth}{% +\define@key[psset]{pstricks-add}{xtickwidth}{\pst@getlength{#1}\psk@xtickwidth} +\define@key[psset]{pstricks-add}{ytickwidth}{\pst@getlength{#1}\psk@ytickwidth} +\define@key[psset]{pstricks-add}{subtickwidth}{% \pst@getlength{#1}\psk@xsubtickwidth% \pst@getlength{#1}\psk@ysubtickwidth} -\define@key[psset]{pstricksadd}{xsubtickwidth}{\pst@getlength{#1}\psk@xsubtickwidth} -\define@key[psset]{pstricksadd}{ysubtickwidth}{\pst@getlength{#1}\psk@ysubtickwidth} +\define@key[psset]{pstricks-add}{xsubtickwidth}{\pst@getlength{#1}\psk@xsubtickwidth} +\define@key[psset]{pstricks-add}{ysubtickwidth}{\pst@getlength{#1}\psk@ysubtickwidth} % -\define@key[psset]{pstricksadd}{tickcolor}{\def\psk@xtickcolor{#1}\def\psk@ytickcolor{#1}} -\define@key[psset]{pstricksadd}{xtickcolor}{\def\psk@xtickcolor{#1}} -\define@key[psset]{pstricksadd}{ytickcolor}{\def\psk@ytickcolor{#1}} -\define@key[psset]{pstricksadd}{subtickcolor}{% +\define@key[psset]{pstricks-add}{tickcolor}{\def\psk@xtickcolor{#1}\def\psk@ytickcolor{#1}} +\define@key[psset]{pstricks-add}{xtickcolor}{\def\psk@xtickcolor{#1}} +\define@key[psset]{pstricks-add}{ytickcolor}{\def\psk@ytickcolor{#1}} +\define@key[psset]{pstricks-add}{subtickcolor}{% \pst@getcolor{#1}\psk@xsubtickcolor% \pst@getcolor{#1}\psk@ysubtickcolor} -\define@key[psset]{pstricksadd}{xsubtickcolor}{\pst@getcolor{#1}\psk@xsubtickcolor} -\define@key[psset]{pstricksadd}{ysubtickcolor}{\pst@getcolor{#1}\psk@ysubtickcolor} +\define@key[psset]{pstricks-add}{xsubtickcolor}{\pst@getcolor{#1}\psk@xsubtickcolor} +\define@key[psset]{pstricks-add}{ysubtickcolor}{\pst@getcolor{#1}\psk@ysubtickcolor} % -\define@key[psset]{pstricksadd}{xticklinestyle}{% +\define@key[psset]{pstricks-add}{xticklinestyle}{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psxticklinestyle{#1}}} -\define@key[psset]{pstricksadd}{xsubticklinestyle}{% +\define@key[psset]{pstricks-add}{xsubticklinestyle}{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psxsubticklinestyle{#1}}} -\define@key[psset]{pstricksadd}{yticklinestyle}{% +\define@key[psset]{pstricks-add}{yticklinestyle}{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psyticklinestyle{#1}}} -\define@key[psset]{pstricksadd}{ysubticklinestyle}{% +\define@key[psset]{pstricks-add}{ysubticklinestyle}{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psysubticklinestyle{#1}}} -\define@key[psset]{pstricksadd}{ticklinestyle}{% +\define@key[psset]{pstricks-add}{ticklinestyle}{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psxticklinestyle{#1}\def\psyticklinestyle{#1}}} -\define@key[psset]{pstricksadd}{subticklinestyle}{% +\define@key[psset]{pstricks-add}{subticklinestyle}{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psxsubticklinestyle{#1}\def\psysubticklinestyle{#1}}} % -\define@key[psset]{pstricksadd}{ticklinestyle}{\psset{xticklinestyle=#1,yticklinestyle=#1}} -\define@key[psset]{pstricksadd}{subticklinestyle}{\psset{xsubticklinestyle=#1,ysubticklinestyle=#1}} %\psset{subticksize=0.75,subticks=1,tickcolor=black,ticklinestyle=solid,% % subticklinestyle=solid,% % subtickcolor=gray,% @@ -1723,10 +1719,10 @@ } def /LSstroke { % set linestyle and stroke \ifis@yAxis\@nameuse{psls@\psyticklinestyle} - \else\@nameuse{psls@\psxticklinestyle}\fi } def + \else\@nameuse{psls@\psxticklinestyle}\fi stroke} def /subLSstroke { % set sublinestyle and stroke \ifis@yAxis\@nameuse{psls@\psysubticklinestyle} - \else\@nameuse{psls@\psxsubticklinestyle}\fi } def + \else\@nameuse{psls@\psxsubticklinestyle}\fi stroke} def %\iffalse % start ticks --------------------------------------------------------- 0 dT MaxValue { % the positive part of the axes @@ -1916,19 +1912,19 @@ \vss% }} % -\define@key[psset]{pstricksadd}{nStep}{\def\psk@nStep{#1}} -\define@key[psset]{pstricksadd}{nStart}{\def\psk@nStart{#1}} -\define@key[psset]{pstricksadd}{nEnd}{\def\psk@nEnd{#1}} -\define@key[psset]{pstricksadd}{xStep}{\def\psk@xStep{#1}} -\define@key[psset]{pstricksadd}{yStep}{\def\psk@yStep{#1}} +\define@key[psset]{pstricks-add}{nStep}{\def\psk@nStep{#1}} +\define@key[psset]{pstricks-add}{nStart}{\def\psk@nStart{#1}} +\define@key[psset]{pstricks-add}{nEnd}{\def\psk@nEnd{#1}} +\define@key[psset]{pstricks-add}{xStep}{\def\psk@xStep{#1}} +\define@key[psset]{pstricks-add}{yStep}{\def\psk@yStep{#1}} % -\define@key[psset]{pstricksadd}{xStart}{\def\psk@xStart{#1}} -\define@key[psset]{pstricksadd}{xEnd}{\def\psk@xEnd{#1}} -\define@key[psset]{pstricksadd}{yStart}{\def\psk@yStart{#1}} -\define@key[psset]{pstricksadd}{yEnd}{\def\psk@yEnd{#1}} +\define@key[psset]{pstricks-add}{xStart}{\def\psk@xStart{#1}} +\define@key[psset]{pstricks-add}{xEnd}{\def\psk@xEnd{#1}} +\define@key[psset]{pstricks-add}{yStart}{\def\psk@yStart{#1}} +\define@key[psset]{pstricks-add}{yEnd}{\def\psk@yEnd{#1}} % -\define@key[psset]{pstricksadd}{plotNo}{\def\psk@plotNo{#1}} -\define@key[psset]{pstricksadd}{plotNoMax}{\def\psk@plotNoMax{#1}} +\define@key[psset]{pstricks-add}{plotNo}{\def\psk@plotNo{#1}} +\define@key[psset]{pstricks-add}{plotNoMax}{\def\psk@plotNoMax{#1}} % %\psset{nStep=1, nStart=0, nEnd={},% % xStep=0, yStep=0, xStart={}, xEnd={}, yStart={}, yEnd={}, comma=false,% @@ -1945,7 +1941,7 @@ #4\space y mul #2\space mul m 1 roll #3\space x mul #1\space mul m 1 roll /m m 2 sub - def } repeat> + def } repeat>% } %\pstScalePoints(1,1){}{}% the default -> no special operators % @@ -1962,7 +1958,7 @@ \@nameuse{endplot@\psplotstyle}% } % -\define@boolkey[psset]{pstricksadd}[Pst@]{ChangeOrder}[true]{} +\define@boolkey[psset]{pstricks-add}[Pst@]{ChangeOrder}[true]{} \pst@def{PreparePoints}<{% counttomark /m exch def \ifPst@ChangeOrder @@ -2035,24 +2031,24 @@ }> % % -\define@key[psset]{pstricksadd}{xAxisLabel}{\def\psk@xAxisLabel{#1}} -\define@key[psset]{pstricksadd}{yAxisLabel}{\def\psk@yAxisLabel{#1}} +\define@key[psset]{pstricks-add}{xAxisLabel}{\def\psk@xAxisLabel{#1}} +\define@key[psset]{pstricks-add}{yAxisLabel}{\def\psk@yAxisLabel{#1}} %\psset{xAxisLabel=x,yAxisLabel=y} -\define@key[psset]{pstricksadd}{xAxisLabelPos}{\def\psk@xAxisLabelPos{#1}} -\define@key[psset]{pstricksadd}{yAxisLabelPos}{\def\psk@yAxisLabelPos{#1}} +\define@key[psset]{pstricks-add}{xAxisLabelPos}{\def\psk@xAxisLabelPos{#1}} +\define@key[psset]{pstricks-add}{yAxisLabelPos}{\def\psk@yAxisLabelPos{#1}} %\psset{yAxisLabelPos={},xAxisLabelPos={}} % \newdimen\psk@llx \newdimen\psk@lly \newdimen\psk@urx \newdimen\psk@ury -\define@key[psset]{pstricksadd}{llx}{\pssetxlength\psk@llx{#1}} -\define@key[psset]{pstricksadd}{lly}{\pssetylength\psk@lly{#1}} -\define@key[psset]{pstricksadd}{urx}{\pssetxlength\psk@urx{#1}} -\define@key[psset]{pstricksadd}{ury}{\pssetylength\psk@ury{#1}} +\define@key[psset]{pstricks-add}{llx}{\pssetxlength\psk@llx{#1}} +\define@key[psset]{pstricks-add}{lly}{\pssetylength\psk@lly{#1}} +\define@key[psset]{pstricks-add}{urx}{\pssetxlength\psk@urx{#1}} +\define@key[psset]{pstricks-add}{ury}{\pssetylength\psk@ury{#1}} %\psset{llx=\z@, lly=\z@, urx=\z@, ury=\z@}% prevents rounding errors \newif\ifPst@plot@box -\define@key[psset]{pstricksadd}{box}[true]{\@nameuse{Pst@plot@box#1}} +\define@key[psset]{pstricks-add}{box}[true]{\@nameuse{Pst@plot@box#1}} % \newdimen\pst@xunit \newdimen\pst@yunit @@ -2133,7 +2129,7 @@ \@namedef{psgraph*}{\psgraph*} \@namedef{endpsgraph*}{\endpsgraph} % -\define@key[psset]{pstricksadd}{ignoreLines}{\def\psk@ignoreLines{#1}} +\define@key[psset]{pstricks-add}{ignoreLines}{\def\psk@ignoreLines{#1}} \newcount\linecnt \begingroup @@ -2187,27 +2183,27 @@ % D.G. addition - Jun. 9, 1998 - Polar plots using the \psplot macro % Code added according the way suggested by Ulrich Dirr % For polar plots -\define@boolkey[psset]{pstricksadd}[Pst@]{polarplot}[true]{} -\define@boolkey[psset]{pstricksadd}[Pst@]{algebraic}[true]{} -\psset[pstricksadd]{polarplot=false,algebraic=false}% remark of ML -% -\define@key[psset]{pstricksadd}{method}{\def\psk@method{#1}}% adams - rk4 -\define@key[psset]{pstricksadd}{whichabs}{\def\psk@whichabs{#1}}% -\define@key[psset]{pstricksadd}{whichord}{\def\psk@whichord{#1}}% -\define@key[psset]{pstricksadd}{plotfuncx}{\def\psk@plotfuncx{#1}}% -\define@key[psset]{pstricksadd}{plotfuncy}{\def\psk@plotfuncy{#1}}% -\define@key[psset]{pstricksadd}{expression}{\def\psk@expression{#1}}% -\define@boolkey[psset]{pstricksadd}[Pst@]{buildvector}[true]{}% +\define@boolkey[psset]{pstricks-add}[Pst@]{polarplot}[true]{} +\define@boolkey[psset]{pstricks-add}[Pst@]{algebraic}[true]{} +\psset[pstricks-add]{polarplot=false,algebraic=false}% remark of ML +% +\define@key[psset]{pstricks-add}{method}{\def\psk@method{#1}}% adams - rk4 +\define@key[psset]{pstricks-add}{whichabs}{\def\psk@whichabs{#1}}% +\define@key[psset]{pstricks-add}{whichord}{\def\psk@whichord{#1}}% +\define@key[psset]{pstricks-add}{plotfuncx}{\def\psk@plotfuncx{#1}}% +\define@key[psset]{pstricks-add}{plotfuncy}{\def\psk@plotfuncy{#1}}% +\define@key[psset]{pstricks-add}{expression}{\def\psk@expression{#1}}% +\define@boolkey[psset]{pstricks-add}[Pst@]{buildvector}[true]{}% \def\@rkiv{rk4}% Runge-Kutta 4 method \def\@adams{adams}% Adams method \def\@default{default}% Adams method % -\define@boolkey[psset]{pstricksadd}[Pst@]{VarStep}[true]{} -\define@key[psset]{pstricksadd}{PlotDerivative}{\def\psk@PlotDerivative{#1}}% -\define@key[psset]{pstricksadd}{VarStepEpsilon}{\def\psk@VarStepEpsilon{#1}}% -\define@key[psset]{pstricksadd}{varsteptol}{\def\psk@varsteptol{#1}}% adams - rk4 -\define@key[psset]{pstricksadd}{adamsorder}{\def\psk@adamsorder{#1}}% adams - rk4 -%\define@key[psset]{pstricksadd}{varstepincrease}{\def\psk@varstepincrease{#1}}% varrk4 +\define@boolkey[psset]{pstricks-add}[Pst@]{VarStep}[true]{} +\define@key[psset]{pstricks-add}{PlotDerivative}{\def\psk@PlotDerivative{#1}}% +\define@key[psset]{pstricks-add}{VarStepEpsilon}{\def\psk@VarStepEpsilon{#1}}% +\define@key[psset]{pstricks-add}{varsteptol}{\def\psk@varsteptol{#1}}% adams - rk4 +\define@key[psset]{pstricks-add}{adamsorder}{\def\psk@adamsorder{#1}}% adams - rk4 +%\define@key[psset]{pstricks-add}{varstepincrease}{\def\psk@varstepincrease{#1}}% varrk4 % \def\psplot@i#1#2#3{% \pst@killglue @@ -2444,8 +2440,8 @@ \fi% \@nameuse{endplot@\psplotstyle}} % -\define@key[psset]{pstricksadd}{barwidth}{\pst@getlength{#1}\Add@barwidth} -\psset[pstricksadd]{barwidth=0.25cm} +\define@key[psset]{pstricks-add}{barwidth}{\pst@getlength{#1}\Add@barwidth} +\psset[pstricks-add]{barwidth=0.25cm} % \def\psbar@ii{\addto@pscode{false \tx@NArray \psbar@iii}} \def\psbar@iii{% @@ -2464,7 +2460,7 @@ \end@SpecialObj% } % -\define@key[psset]{pstricksadd}{StepType}{\pst@expandafter\psset@@StepType{#1}\@nil}% +\define@key[psset]{pstricks-add}{StepType}{\pst@expandafter\psset@@StepType{#1}\@nil}% \def\psset@@StepType#1#2\@nil{% \ifx#1u\let\psk@StepType\@ne \else\ifx#1l\let\psk@StepType\z@\else\let\psk@StepType\tw@\fi\fi} @@ -2525,7 +2521,7 @@ \end@ClosedObj% } % -\define@key[psset]{pstricksadd}{Derive}{\def\psk@Derive{#1}}% +\define@key[psset]{pstricks-add}{Derive}{\def\psk@Derive{#1}}% \def\@NOTEMPTY{NOT@EMPTY}%%dr 0606 % %% #1 : x value @@ -2829,7 +2825,7 @@ \end@ClosedObj% }} % -\define@key[psset]{pstricksadd}{dicescale}{\def\psk@dicescale{#1}} +\define@key[psset]{pstricks-add}{dicescale}{\def\psk@dicescale{#1}} \def\psdice{\pst@object{psdice}} \def\psdice@i#1{{% \pst@killglue @@ -2886,12 +2882,33 @@ \def\resetOptions{% \@zero=0% \def\pst@linetype{0}% - \psset[pstricksadd]{% + \psset[pstricks-add]{% transpalpha=1, hooklength=3mm, hookwidth=1mm, ArrowFill=true,% ArrowInside={}, ArrowInsidePos=0.5,% - ArrowInsideNo=1, ArrowInsideOffset=0} + ArrowInsideNo=1, ArrowInsideOffset=0, + dashColorI=black,dashColorII=red,dashNo=0.2,linecap=0,% + xyAxes=true,% + trigLabels=false,trigLabelBase=0,% + xDecimals={},yDecimals={},% + xlogBase={},ylogBase={},% + logLines=none,% + ignoreLines=0,% + nStep=1,nStart=0,nEnd={},% + xStep=0,yStep=0,xStart={},xEnd={},yStart={},yEnd={},comma=false,% + plotNo=1,plotNoMax=1,% + xAxisLabel=x,yAxisLabel=y,% + yAxisLabelPos={},xAxisLabelPos={},% + llx=\z@, lly=\z@, urx=\z@, ury=\z@,% prevents rounding errors + randomPoints=1000,color=false,% + method={},whichabs={},whichord={},% + plotfuncx={},plotfuncy={},buildvector=false, +% algebraic=false, % indivisuelly set + Derive={},adamsorder=4,% + VarStep=false, PlotDerivative=none, VarStepEpsilon=default,% + varsteptol=.001% + } \psset{% %%%% pstricks %%%%%%%% unit=1cm,% @@ -2950,26 +2967,6 @@ ChangeOrder=false,% braceWidth=0.35,bracePos=0.5,% arrowscale=1,% - dashColorI=black,dashColorII=red,dashNo=0.2,linecap=0,% - xyAxes=true,% - trigLabels=false,trigLabelBase=0,% - xDecimals={},yDecimals={},% - xlogBase={},ylogBase={},% - logLines=none,% - ignoreLines=0,% - nStep=1,nStart=0,nEnd={},% - xStep=0,yStep=0,xStart={},xEnd={},yStart={},yEnd={},comma=false,% - plotNo=1,plotNoMax=1,% - xAxisLabel=x,yAxisLabel=y,% - yAxisLabelPos={},xAxisLabelPos={},% - llx=\z@, lly=\z@, urx=\z@, ury=\z@,% prevents rounding errors - randomPoints=1000,color=false,% - method={},whichabs={},whichord={},% - plotfuncx={},plotfuncy={},buildvector=false, -% algebraic=false, % indivisuelly set - Derive={},adamsorder=4,% - VarStep=false, PlotDerivative=none, VarStepEpsilon=default,% - varsteptol=.001,% %%%%%%%%% pst-node %%%%%%%%%% lineAngle=0,% nodealign=false,% diff --git a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty index 3c9e52ce789..dd50854a444 100644 --- a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty +++ b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty @@ -3,7 +3,7 @@ pstricks-add.tex (hv)] \input{pstricks-add.tex} \ProvidesFile{pstricks-add.tex} - [\filedate\space v\fileversion\space `PSTricks-add' (hv)] + [\filedate\space v\fileversion\space `PSTricks-add' (hv,dr)] \IfFileExists{pstricks-add.pro}{\@addtofilelist{pstricks-add.pro}}{}% \InputIfFileExists{pstricks-add.cfg}{% \PackageInfo{pstricks-add}{Local config file pstricks-add.cfg used} diff --git a/Master/texmf-dist/tpm/pstricks-add.tpm b/Master/texmf-dist/tpm/pstricks-add.tpm index 6e2ecf2d82f..9ab207a5b31 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/09/25 15:52:00 + 2006/10/10 11:37:00 1.0 rahtz @@ -23,13 +23,13 @@ pst-plot, pst-node, pst-tree and pst-grad. Herbert Voss 2020323 - + 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