summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/Changes5
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdfbin1497801 -> 1493444 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex51
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex289
-rw-r--r--Master/texmf-dist/tpm/pstricks-add.tpm6
5 files changed, 215 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes
index 951c45a1d33..2d016009a1e 100644
--- a/Master/texmf-dist/doc/generic/pstricks-add/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes
@@ -12,6 +12,11 @@ pstricks-add.pro ----------- (Dominik Rodriguez/hv)
pstricks-add -----------
+ v 2.79 2006-09-21 - make ! not active (for french language and SpecialCoor)
+ - added macro \psforeach
+ - added transalpha option for tranparency color
+ - rename the family name to pstricksadd (pst-xkey)
+ allows using the interla macros of xkeyval
v 2.78 2006-08-07 - allow ! for the y Length in \psgraph
fix bug with undefined \psk@barwidth (missing \psset}
v 2.77 2006-07-12 - use of abs(dx) to get labels for negative \pst@dx
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 6ad86fc8626..80c3a7ff8f8 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 574dfebd400..e27102dba61 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
@@ -14,6 +14,7 @@
This version of \verb+pstricks-add+ needs \verb+pstricks.tex+ version >1.04 from June 2004,
otherwise the additional macros may not work as espected. The ellipsis
material and the option \verb+asolid+ (renamed to \verb+eofill+) are
+\index{fillstyle!eofill@\texttt{eofill}}
now part of the new \verb+pstricks.tex+ package, available at CTAN or at
\url{http://perce.de/LaTeX/}. \verb+pstricks-add+ will for ever be an experimental and
dynamical package, try it at your own risk.
@@ -57,8 +58,10 @@ or put the macro inside of the \verb+\makeatletter+ -- \verb+\makeatother+ seque
\subsection{\CMD{pst\textat{}divide}}
%--------------------------------------------------------------------------------------
-\verb+pstricks+ itself has its own divide macro, called \verb+\pst@divide+ which can divide two lengthes and saves the quotient as a floating point number:
-
+\verb+pstricks+ itself has its own divide macro, called \verb+\pst@divide+ which
+can divide two lengthes and saves the quotient as a floating point number:
+\index{Division}
+%
\begin{verbatim}
\pst@divide{<dividend>}{<divisor>}{<result as a macro>}
\end{verbatim}
@@ -76,6 +79,7 @@ or put the macro inside of the \verb+\makeatletter+ -- \verb+\makeatother+ seque
\subsection{\CMD{pst\textat{}mod}}
%--------------------------------------------------------------------------------------
\verb+pstricks-add+ defines an additional numeric function for the modulus:
+\index{Modulus}
\begin{verbatim}
\pst@mod{<integer>}{<integer>}{<result as a macro>}
@@ -1274,9 +1278,50 @@ With the option \verb|intSeparator| the symbol can be changed to any any non-num
%--------------------------------------------------------------------------------------
\section{Color}
%--------------------------------------------------------------------------------------
+%--------------------------------------------------------------------------------------
+\subsection{Transparent colors}
+%--------------------------------------------------------------------------------------
+With the new defined fillstyle \verb|transparent|
+\index{transparent@\texttt{transparent}}
+\index{fillstyle!transparent@\texttt{transparent}}
+and running the \verb|ps2pdf14| script to create the \verb|pdf| document, one can use the
+\verb+transpalpha+ keyword to define a value for the alpha channel to get a transparent
+color. Possible values are $0\le\mathrm{transpalpha}\le1$ which is a range from
+totally transparent and not transparent. Without using the \verb|pdf14| format
+it is not possible to get the transparency effect. The following example shows
+the transparency effect for the values \verb|transpalpha=0.4| and \verb|transpalpha=0.8|.
+
+% run through latex -> dvips -> ps2pdf14(!) and view
+% with Acrobat >= 5.0
+
+\vfill
+\begin{center}
+\bgroup
+\psset{fillstyle=transparent,linestyle=none}
+\multido{\rA=0.4+0.4}{2}{
+ \begin{pspicture}(-3.25,-3.25)(3.25,3.25)
+ \pscircle[fillcolor=green,transpalpha=\rA](2;135){2cm}
+ \pscircle[fillcolor=red,transpalpha=\rA](2;45){2cm}
+ \pscircle[fillcolor=blue,transpalpha=\rA](1;-90){2cm}
+ \end{pspicture}
+}
+\egroup
+\end{center}
+
+
+\begin{lstlisting}
+\psset{fillstyle=transparent,linestyle=none}
+\multido{\rA=0.4+0.4}{2}{
+ \begin{pspicture}(-3.25,-3.25)(3.25,3.25)
+ \pscircle[fillcolor=green,transpalpha=\rA](2;135){2cm}
+ \pscircle[fillcolor=red,transpalpha=\rA](2;45){2cm}
+ \pscircle[fillcolor=blue,transpalpha=\rA](1;-90){2cm}
+ \end{pspicture}
+}
+\end{lstlisting}
%--------------------------------------------------------------------------------------
-\subsection{,,Transparent colors''}
+\subsection{,,Manipulating Transparent colors''}
%--------------------------------------------------------------------------------------
\verb+pstricks-add+ simulates transparency with hatch lines:
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 42d066f3fb2..68508375775 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -21,18 +21,18 @@
%
% Requires some packages
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
-\ifx\PSTplotLoaded\endinput\else\input pst-plot \fi
+\ifx\PSTplotLoaded\endinput\else \input pst-plot \fi
\ifx\PSTnodesLoaded\endinput\else\input pst-node \fi
-\ifx\MultidoLoaded\endinput\else\input multido \fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
+\ifx\MultidoLoaded\endinput\else \input multido \fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{2.78}
-\def\filedate{2006/08/08}
+\def\fileversion{2.79}
+\def\filedate{2006/09/23}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\SpecialCoor
-\pst@addfams{pstricks-add}
+\pst@addfams{pstricksadd}
%
%% prologue for postcript
\pstheader{pstricks-add.pro}%
@@ -93,6 +93,25 @@
\fi%
}
%
+% stolen from latex.ltx to make it TeX compatible
+%
+\def\@fornoop#1\@@#2#3{}
+\long\def\@for#1:=#2\do#3{%
+ \expandafter\def\expandafter\@fortmp\expandafter{#2}%
+ \ifx\@fortmp\@empty \else
+ \expandafter\@forloop#2,\@nil,\@nil\@@#1{#3}\fi}
+\long\def\@forloop#1,#2,#3\@@#4#5{\def#4{#1}\ifx #4\@nnil \else
+ #5\def#4{#2}\ifx #4\@nnil \else#5\@iforloop #3\@@#4{#5}\fi\fi}
+\long\def\@iforloop#1,#2\@@#3#4{\def#3{#1}\ifx #3\@nnil
+ \expandafter\@fornoop \else
+ #4\relax\expandafter\@iforloop\fi#2\@@#3{#4}}
+\def\psforeach#1#2#3{%
+ \begingroup
+ \edef\reserved@a{#2}%
+ \@for#1:=\reserved@a\do{#3}%
+ \endgroup
+}
+%
% A modulo macro for integer values
% \pst@mod{34}{6}\value ==> \value is 4
%
@@ -135,8 +154,18 @@
}
%
%--------------------------------------- small stuff -------------------------------
+% transalpha needs a run through latex -> dvips -> ps2pdf14(!)
+% and view with Acrobat >= 5.0
+% use transpalpha=<mumber> to the the opacity level
+%
+\define@key[psset]{pstricksadd}{transpalpha}{\pst@checknum{#1}\pstranspalpha }
+%\psset[pstricksadd]{transpalpha=1}
+\def\psfs@transparent{%
+ \addto@pscode{/Normal .setblendmode \pstranspalpha .setshapealpha }
+ \psfs@solid}
+%
\def\defineTColor{\@ifnextchar[{\defineTColor@i}{\defineTColor@i[]}}
-\def\defineTColor@i[#1]#2#3{% transparency "colors"
+\def\defineTColor@i[#1]#2#3{% "semi transparency colors"
\def\pst@tempA{#1}%
\newpsstyle{#2}{%
fillstyle=vlines,hatchwidth=0.1\pslinewidth,
@@ -183,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]{pstricks-add}{maxdashes}{\def\psk@maxdashes{#1}}
+\define@key[psset]{pstricksadd}{maxdashes}{\def\psk@maxdashes{#1}}
%\psset{maxdashes=11}
\def\psset@@dash#1\@nil{%
\def\psk@dash{}%
@@ -248,7 +277,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
%
-\define@key[psset]{pstricks-add}{intSeparator}{\def\psk@intSeparator{#1}}
+\define@key[psset]{pstricksadd}{intSeparator}{\def\psk@intSeparator{#1}}
%\psset{intSeparator={,}}
%
\def\psFormatInt{\def\pst@par{}\pst@object{psFormatInt}}
@@ -284,8 +313,8 @@
}\ignorespaces}
%
\newdimen\pst@braceWidth
-\define@key[psset]{pstricks-add}{braceWidth}{\pssetlength\pst@braceWidth{#1}}
-\define@key[psset]{pstricks-add}{bracePos}{\def\psk@bracePos{#1}}
+\define@key[psset]{pstricksadd}{braceWidth}{\pssetlength\pst@braceWidth{#1}}
+\define@key[psset]{pstricksadd}{bracePos}{\def\psk@bracePos{#1}}
%\psset{braceWidth=10pt,bracePos=0.5}
%
\def\@@rput@iv(#1){\pst@killglue\pst@makebox{\@@rput@v{#1}}}
@@ -351,8 +380,8 @@
% HookLeft/RightArrow
\newdimen\pshooklength
\newdimen\pshookwidth
-\define@key[psset]{pstricks-add}{hooklength}{\pssetlength\pshooklength{#1}}
-\define@key[psset]{pstricks-add}{hookwidth}{\pssetlength\pshookwidth{#1}}
+\define@key[psset]{pstricksadd}{hooklength}{\pssetlength\pshooklength{#1}}
+\define@key[psset]{pstricksadd}{hookwidth}{\pssetlength\pshookwidth{#1}}
%\psset{hooklength=3mm,hookwidth=1mm}
%
\edef\pst@arrowtable{\pst@arrowtable,H-H,h-h} % add new arrow
@@ -387,7 +416,7 @@
0 \psk@arrowlength \psk@arrowsize \tx@Rhook
}
% New parameter "arrowfill", with default as "true"
-\define@boolkey[psset]{pstricks-add}[ps]{ArrowFill}[true]{}
+\define@boolkey[psset]{pstricksadd}[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)
@@ -405,9 +434,9 @@
0 h a sub moveto
}>
%
-\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}}
+\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}}
%\psset{nArrows=2}
%
\@namedef{psas@>>}{%
@@ -437,7 +466,7 @@
% DG addition begin - Dec. 18/19, 1997 and Oct. 11, 2002
% Adapted from \psset@arrows
\def\psk@ArrowInside{}
- \define@key[psset]{pstricks-add}{ArrowInside}{%
+ \define@key[psset]{pstricksadd}{ArrowInside}{%
\def\pst@tempA{#1}%
\ifx\pst@tempA\@empty \def\psk@ArrowInside{} %
\else%
@@ -491,7 +520,7 @@
\tx@EndArrow%
}
% ArrowInsidePos parameter (default value 0.5)
-\define@key[psset]{pstricks-add}{ArrowInsidePos}{\pst@checknum{#1}\psk@ArrowInsidePos}%
+\define@key[psset]{pstricksadd}{ArrowInsidePos}{\pst@checknum{#1}\psk@ArrowInsidePos}%
%\psset{ArrowInsidePos=0.5}
%
% Modified version of \begin@ClosedObj
@@ -509,8 +538,8 @@
% Redefinition of the PostScript /Line macro to print the intermediate
% arrow on each segment of the line
%
-\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
+\define@key[psset]{pstricksadd}{ArrowInsideNo}{\pst@checknum{#1}\psk@ArrowInsideNo}% hv 20031001
+\define@key[psset]{pstricksadd}{ArrowInsideOffset}{\pst@checknum{#1}\psk@ArrowInsideOffset}% hv 20031001
%\psset{ArrowInsideNo=1,ArrowInsideOffset=0}
%
\def\arrowType@H{H}
@@ -826,11 +855,11 @@
%
%\def\psDashColorI{black}
%\def\psDashColorII{red}
-\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}{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}{linecap}{\def\psk@linecap{#1}}
+\define@key[psset]{pstricksadd}{linecap}{\def\psk@linecap{#1}}
%\psset{dashColorI=black,dashColorII=red,dashNo=0.2,linecap=0}
%
\pst@def{LineII}<{%
@@ -884,8 +913,8 @@
\end@OpenObj%
}
%
-\define@key[psset]{pstricks-add}{randomPoints}{\def\psk@randomPoints{#1}}
-\define@boolkey[psset]{pstricks-add}[Pst@]{color}[true]{}
+\define@key[psset]{pstricksadd}{randomPoints}{\def\psk@randomPoints{#1}}
+\define@boolkey[psset]{pstricksadd}[Pst@]{color}[true]{}
%\psset{randomPoints=1000,color=false}
%
\def\psRandom{\pst@object{psRandom}}% hv 2004-11-12
@@ -996,7 +1025,7 @@
\def\pclineII{\pst@object{pclineII}}%
\def\pclineII@i{\pc@object\nclineII@ii}%
%
-\define@key[psset]{pstricks-add}{lineAngle}{\psset{armB=0.5}\def\psk@lineAngle{#1}}%
+\define@key[psset]{pstricksadd}{lineAngle}{\psset{armB=0.5}\def\psk@lineAngle{#1}}%
%\psset{lineAngle=0}%
%
\pst@def{NCDiag}<{
@@ -1113,7 +1142,7 @@
}
%
%
-\define@boolkey[psset]{pstricks-add}[Pst@]{trueAngle}[true]{}
+\define@boolkey[psset]{pstricksadd}[Pst@]{trueAngle}[true]{}
%\psset{trueAngle=false}
%
\def\psRelNode{\pst@object{psRelNode}}
@@ -1251,35 +1280,33 @@
%%%%%%%%%%% %%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-\define@key[psset]{pstricks-add}{labelFontSize}{\def\psk@labelFontSize{#1}}%
+\define@key[psset]{pstricksadd}{labelFontSize}{\def\psk@labelFontSize{#1}}%
\psset{labelFontSize={}}
\def\pshlabel#1{\psk@labelFontSize$#1$}%
\def\psvlabel#1{\psk@labelFontSize$#1$}
%
-\define@boolkey[psset]{pstricks-add}[Pst@]{comma}[true]{}
+\define@boolkey[psset]{pstricksadd}[Pst@]{comma}[true]{}
%
-\define@boolkey[psset]{pstricks-add}[Pst@]{xAxis}[true]{}
-\define@boolkey[psset]{pstricks-add}[Pst@]{yAxis}[true]{}
-%\define@boolkey[psset]{pstricks-add}[Pst@]{xAxis}[true]{\@nameuse{Pst@xAxis#1}}
-%\define@boolkey[psset]{pstricks-add}[Pst@]{yAxis}[true]{\@nameuse{Pst@yAxis#1}}
-\define@boolkey[psset]{pstricks-add}[Pst@]{xyAxes}[true]{%
+\define@boolkey[psset]{pstricksadd}[Pst@]{xAxis}[true]{}
+\define@boolkey[psset]{pstricksadd}[Pst@]{yAxis}[true]{}
+\define@boolkey[psset]{pstricksadd}[Pst@]{xyAxes}[true]{%
\@nameuse{Pst@xAxis#1}\@nameuse{Pst@yAxis#1}}%
%\psset{xyAxes=true}%
%
-\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}}
+\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}}
%\psset{xyDecimals={}}%
%
-\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}}%
+\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}}%
%\psset{xylogBase={}}%
%
-\define@key[psset]{pstricks-add}{trigLabelBase}{\pst@getint{#1}{\psk@trigLabelBase}}
+\define@key[psset]{pstricksadd}{trigLabelBase}{\pst@getint{#1}{\psk@trigLabelBase}}
\psset{trigLabelBase=0}
-\define@boolkey[psset]{pstricks-add}[Pst@]{trigLabels}[true]{%
+\define@boolkey[psset]{pstricksadd}[Pst@]{trigLabels}[true]{%
\ifPst@trigLabels
\def\pst@@@hlabel##1{\pshlabel{##1}}
\def\pshlabel##1{%
@@ -1328,7 +1355,7 @@
\psset{trigLabels=false}
%
%logLines=all|x|y|none (0,1,2,3)
-\define@key[psset]{pstricks-add}{logLines}{\pst@expandafter\psset@@logLines{#1}\@nil\psk@logLines}
+\define@key[psset]{pstricksadd}{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
@@ -1341,8 +1368,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]{pstricks-add}{ylabelFactor}{\def\psk@ylabelFactor{#1}}
-\define@key[psset]{pstricks-add}{xlabelFactor}{\def\psk@xlabelFactor{#1}}
+\define@key[psset]{pstricksadd}{ylabelFactor}{\def\psk@ylabelFactor{#1}}
+\define@key[psset]{pstricksadd}{xlabelFactor}{\def\psk@xlabelFactor{#1}}
%\psset{xlabelFactor=\relax,ylabelFactor=\relax}%
% The parameter styles for the tick lines
% (default=arrows=-,linestyle=dotted,dotsep=5pt)
@@ -1528,8 +1555,8 @@
\fi%
}
\define@key[psset]{}{ticksize}{\set@xticksize{#1}\set@yticksize{#1}}
-\define@key[psset]{pstricks-add}{xticksize}{\set@xticksize{#1}}
-\define@key[psset]{pstricks-add}{yticksize}{\set@yticksize{#1}}% overwrites the definition in pstricks
+\define@key[psset]{pstricksadd}{xticksize}{\set@xticksize{#1}}
+\define@key[psset]{pstricksadd}{yticksize}{\set@yticksize{#1}}% overwrites the definition in pstricks
%\psset{ticksize=-4pt 4pt}
%
% full= 0, top=1, bottom=-1
@@ -1549,61 +1576,61 @@
%\psset{tickstyle=full}%
%
%
-\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}{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}{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}{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}{tickwidth}{%
+\define@key[psset]{pstricksadd}{tickwidth}{%
\pst@getlength{#1}\psk@xtickwidth%
\pst@getlength{#1}\psk@ytickwidth}
-\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}{%
+\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}{%
\pst@getlength{#1}\psk@xsubtickwidth%
\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}{xsubtickwidth}{\pst@getlength{#1}\psk@xsubtickwidth}
+\define@key[psset]{pstricksadd}{ysubtickwidth}{\pst@getlength{#1}\psk@ysubtickwidth}
%
-\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}{%
+\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}{%
\pst@getcolor{#1}\psk@xsubtickcolor%
\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}{xsubtickcolor}{\pst@getcolor{#1}\psk@xsubtickcolor}
+\define@key[psset]{pstricksadd}{ysubtickcolor}{\pst@getcolor{#1}\psk@ysubtickcolor}
%
-\define@key[psset]{pstricks-add}{xticklinestyle}{%
+\define@key[psset]{pstricksadd}{xticklinestyle}{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psxticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{xsubticklinestyle}{%
+\define@key[psset]{pstricksadd}{xsubticklinestyle}{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psxsubticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{yticklinestyle}{%
+\define@key[psset]{pstricksadd}{yticklinestyle}{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psyticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{ysubticklinestyle}{%
+\define@key[psset]{pstricksadd}{ysubticklinestyle}{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psysubticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{ticklinestyle}{%
+\define@key[psset]{pstricksadd}{ticklinestyle}{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psxticklinestyle{#1}\def\psyticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{subticklinestyle}{%
+\define@key[psset]{pstricksadd}{subticklinestyle}{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psxsubticklinestyle{#1}\def\psysubticklinestyle{#1}}}
%
-\define@key[psset]{pstricks-add}{ticklinestyle}{\psset{xticklinestyle=#1,yticklinestyle=#1}}
-\define@key[psset]{pstricks-add}{subticklinestyle}{\psset{xsubticklinestyle=#1,ysubticklinestyle=#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,%
@@ -1889,19 +1916,19 @@
\vss%
}}
%
-\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}{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}{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}{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}{plotNo}{\def\psk@plotNo{#1}}
-\define@key[psset]{pstricks-add}{plotNoMax}{\def\psk@plotNoMax{#1}}
+\define@key[psset]{pstricksadd}{plotNo}{\def\psk@plotNo{#1}}
+\define@key[psset]{pstricksadd}{plotNoMax}{\def\psk@plotNoMax{#1}}
%
%\psset{nStep=1, nStart=0, nEnd={},%
% xStep=0, yStep=0, xStart={}, xEnd={}, yStart={}, yEnd={}, comma=false,%
@@ -1935,7 +1962,7 @@
\@nameuse{endplot@\psplotstyle}%
}
%
-\define@boolkey[psset]{pstricks-add}[Pst@]{ChangeOrder}[true]{}
+\define@boolkey[psset]{pstricksadd}[Pst@]{ChangeOrder}[true]{}
\pst@def{PreparePoints}<{%
counttomark /m exch def
\ifPst@ChangeOrder
@@ -2008,31 +2035,31 @@
}>
%
%
-\define@key[psset]{pstricks-add}{xAxisLabel}{\def\psk@xAxisLabel{#1}}
-\define@key[psset]{pstricks-add}{yAxisLabel}{\def\psk@yAxisLabel{#1}}
+\define@key[psset]{pstricksadd}{xAxisLabel}{\def\psk@xAxisLabel{#1}}
+\define@key[psset]{pstricksadd}{yAxisLabel}{\def\psk@yAxisLabel{#1}}
%\psset{xAxisLabel=x,yAxisLabel=y}
-\define@key[psset]{pstricks-add}{xAxisLabelPos}{\def\psk@xAxisLabelPos{#1}}
-\define@key[psset]{pstricks-add}{yAxisLabelPos}{\def\psk@yAxisLabelPos{#1}}
+\define@key[psset]{pstricksadd}{xAxisLabelPos}{\def\psk@xAxisLabelPos{#1}}
+\define@key[psset]{pstricksadd}{yAxisLabelPos}{\def\psk@yAxisLabelPos{#1}}
%\psset{yAxisLabelPos={},xAxisLabelPos={}}
%
\newdimen\psk@llx
\newdimen\psk@lly
\newdimen\psk@urx
\newdimen\psk@ury
-\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}}
+\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}}
%\psset{llx=\z@, lly=\z@, urx=\z@, ury=\z@}% prevents rounding errors
\newif\ifPst@plot@box
-\define@key[psset]{pstricks-add}{box}[true]{\@nameuse{Pst@plot@box#1}}
+\define@key[psset]{pstricksadd}{box}[true]{\@nameuse{Pst@plot@box#1}}
%
\newdimen\pst@xunit
\newdimen\pst@yunit
%
\def\psgraph{\pst@object{psgraph}}
\def\psgraph@i{\pst@getarrows\psgraph@ii}
-\def\psgraph@ii(#1,#2){\@ifnextchar({\psgraph@iii(#1,#2)}{\psgraph@iv(0,0)(#1,#2)}}
+\def\psgraph@ii(#1,#2){\catcode`\!=12\@ifnextchar({\psgraph@iii(#1,#2)}{\psgraph@iv(0,0)(#1,#2)}}
\def\psgraph@iii(#1,#2)(#3,#4){\@ifnextchar({\psgraph@v(#1,#2)(#3,#4)}{\psgraph@iv(#1,#2)(#3,#4)}}
%
\def\psgraph@iv(#1,#2)(#3,#4)#5#6{% no special origin defined
@@ -2106,7 +2133,7 @@
\@namedef{psgraph*}{\psgraph*}
\@namedef{endpsgraph*}{\endpsgraph}
%
-\define@key[psset]{pstricks-add}{ignoreLines}{\def\psk@ignoreLines{#1}}
+\define@key[psset]{pstricksadd}{ignoreLines}{\def\psk@ignoreLines{#1}}
\newcount\linecnt
\begingroup
@@ -2160,28 +2187,27 @@
% D.G. addition - Jun. 9, 1998 - Polar plots using the \psplot macro
% Code added according the way suggested by Ulrich Dirr <udirr@das-team.com>
% For polar plots
-\define@boolkey[psset]{pstricks-add}[Pst@]{polarplot}[true]{}
-%\psset{polarplot=false}
-%
-\define@boolkey[psset]{pstricks-add}[Pst@]{algebraic}[true]{}%
-%\psset{dimen=middle}% 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]{}%
+\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]{}%
\def\@rkiv{rk4}% Runge-Kutta 4 method
\def\@adams{adams}% Adams method
\def\@default{default}% Adams method
%
-\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
+\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
%
\def\psplot@i#1#2#3{%
\pst@killglue
@@ -2418,17 +2444,17 @@
\fi%
\@nameuse{endplot@\psplotstyle}}
%
-\define@key[psset]{pstricks-add}{barwidth}{\pst@getlength{#1}\psk@barwidth}
-%\psset{barwidth=0.25cm}
+\define@key[psset]{pstricksadd}{barwidth}{\pst@getlength{#1}\Add@barwidth}
+\psset[pstricksadd]{barwidth=0.25cm}
%
\def\psbar@ii{\addto@pscode{false \tx@NArray \psbar@iii}}
\def\psbar@iii{%
newpath
n {
/Yval exch def /Xval exch def
- Xval \number\psk@barwidth 0.5 mul sub 0 moveto
- 0 Yval rlineto \number\psk@barwidth 0 rlineto
- 0 Yval neg rlineto \number\psk@barwidth neg 0 rlineto
+ Xval \number\Add@barwidth 0.5 mul sub 0 moveto
+ 0 Yval rlineto \number\Add@barwidth 0 rlineto
+ 0 Yval neg rlineto \number\Add@barwidth neg 0 rlineto
} repeat
}%
\def\beginplot@bar{\begin@SpecialObj}
@@ -2438,7 +2464,7 @@
\end@SpecialObj%
}
%
-\define@key[psset]{pstricks-add}{StepType}{\pst@expandafter\psset@@StepType{#1}\@nil}%
+\define@key[psset]{pstricksadd}{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}
@@ -2499,7 +2525,7 @@
\end@ClosedObj%
}
%
-\define@key[psset]{pstricks-add}{Derive}{\def\psk@Derive{#1}}%
+\define@key[psset]{pstricksadd}{Derive}{\def\psk@Derive{#1}}%
\def\@NOTEMPTY{NOT@EMPTY}%%dr 0606
%
%% #1 : x value
@@ -2803,7 +2829,7 @@
\end@ClosedObj%
}}
%
-\define@key[psset]{pstricks-add}{dicescale}{\def\psk@dicescale{#1}}
+\define@key[psset]{pstricksadd}{dicescale}{\def\psk@dicescale{#1}}
\def\psdice{\pst@object{psdice}}
\def\psdice@i#1{{%
\pst@killglue
@@ -2860,6 +2886,12 @@
\def\resetOptions{%
\@zero=0%
\def\pst@linetype{0}%
+ \psset[pstricksadd]{%
+ transpalpha=1,
+ hooklength=3mm, hookwidth=1mm,
+ ArrowFill=true,%
+ ArrowInside={}, ArrowInsidePos=0.5,%
+ ArrowInsideNo=1, ArrowInsideOffset=0}
\psset{%
%%%% pstricks %%%%%%%%
unit=1cm,%
@@ -2882,10 +2914,6 @@
arrows=-, arrowscale=1, arrowsize=1.5pt 2, arrowlength=1.4, arrowinset=.4,%
tbarsize=2pt 5,%
bracketlength=.15, rbracketlength=.15,%
- hooklength=3mm,hookwidth=1mm,
- ArrowFill=true,%
- ArrowInside={},ArrowInsidePos=0.5,%
- ArrowInsideNo=1,ArrowInsideOffset=0,%
liftpen=0, linetype=0,%
gangle=0,%
curvature=1 .1 0,%
@@ -2908,7 +2936,7 @@
labelFontSize={},%
StepType=lower, % alternative SumType=upper
plotstyle=line,plotpoints=50,%
- barwidth=0.25cm,%
+% barwidth=0.25cm,% individuell set
ticksize=-4pt 4pt,
tickstyle=full, ticks=all,%
subticksize=0.75,subticks=1,tickcolor=black,%
@@ -2937,7 +2965,8 @@
llx=\z@, lly=\z@, urx=\z@, ury=\z@,% prevents rounding errors
randomPoints=1000,color=false,%
method={},whichabs={},whichord={},%
- plotfuncx={},plotfuncy={},buildvector=false,algebraic=false,
+ plotfuncx={},plotfuncy={},buildvector=false,
+% algebraic=false, % indivisuelly set
Derive={},adamsorder=4,%
VarStep=false, PlotDerivative=none, VarStepEpsilon=default,%
varsteptol=.001,%
diff --git a/Master/texmf-dist/tpm/pstricks-add.tpm b/Master/texmf-dist/tpm/pstricks-add.tpm
index 2ff90d6a066..cdb436fc6cd 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/08/09 14:04:06</TPM:Date>
+ <TPM:Date>2006/09/23 07:56:11</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -23,13 +23,13 @@ pst-plot, pst-node, pst-tree and pst-grad.
<TPM:Author>Herbert Voss</TPM:Author>
<TPM:Size>2021726</TPM:Size>
<TPM:Build/>
- <TPM:RunFiles size="139992">
+ <TPM:RunFiles size="140863">
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="1881734">
+ <TPM:DocFiles size="1879390">
texmf-dist/doc/generic/pstricks-add/Changes
texmf-dist/doc/generic/pstricks-add/README
texmf-dist/doc/generic/pstricks-add/examples/12-1.txt