summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-03-05 16:48:40 +0000
committerKarl Berry <karl@freefriends.org>2009-03-05 16:48:40 +0000
commit2fc1044994b1fb6b87f31e03f19550390e2433d6 (patch)
tree184ba9ae6a314e034e8e77c102c2d4b7211252c4 /Master/texmf-dist/tex
parentee0a8f0a1356961de5774c1001ae13f270da85ba (diff)
pstricks-add 3.18 (3mar09)
git-svn-id: svn://tug.org/texlive/trunk@12315 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex318
1 files changed, 185 insertions, 133 deletions
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 31c7715954b..e86aaf65755 100644
--- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
+++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 83 2009-01-23 19:59:51Z herbert $
+%% $Id: pstricks-add.tex 99 2009-03-03 10:37:34Z herbert $
%%
%%
%% This is file `pstricks-add.tex',
@@ -29,8 +29,8 @@
\ifx\MultidoLoaded\endinput\else \input multido \fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{3.17}
-\def\filedate{2009/01/21}
+\def\fileversion{3.18}
+\def\filedate{2009/03/03}
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -110,7 +110,7 @@
\expandafter\@fornoop \else
#4\relax\expandafter\@iforloop\fi#2\@@#3{#4}}
\def\psforeach#1#2#3{%
- \begingroup
+ \begingroup%
\edef\reserved@a{#2}%
\@for#1:=\reserved@a\do{#3}%
\endgroup%
@@ -262,7 +262,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]{pstricks-add}{maxdashes}[11]{\def\psk@maxdashes{#1}}
%\psset{maxdashes=11}
\def\psset@@dash#1\@nil{%
\def\psk@dash{}%
@@ -434,20 +434,20 @@
\edef\pst@arrowtable{\pst@arrowtable,v-v,V-V,f-f,F-F,t-t,T-T}
% Vee arrow
-\define@key[psset]{pstricks-add}{veearrowlength}{\pst@getlength{#1}\psk@veearrowlength}
+\define@key[psset]{pstricks-add}{veearrowlength}[3mm]{\pst@getlength{#1}\psk@veearrowlength}
\psset[pstricks-add]{veearrowlength=3mm} % default projected length
-\define@key[psset]{pstricks-add}{veearrowangle}{\pst@getangle{#1}\psk@veearrowangle}
+\define@key[psset]{pstricks-add}{veearrowangle}[30]{\pst@getangle{#1}\psk@veearrowangle}
\psset[pstricks-add]{veearrowangle=30} % default angle
-\define@key[psset]{pstricks-add}{veearrowlinewidth}{\pst@getlength{#1}\psk@veearrowlinewidth}
-\psset[pstricks-add]{veearrowlinewidth=.35mm} % default vee arrow line width
+\define@key[psset]{pstricks-add}{veearrowlinewidth}[0.35mm]{\pst@getlength{#1}\psk@veearrowlinewidth}
+\psset[pstricks-add]{veearrowlinewidth=0.35mm} % default vee arrow line width
% Filled vee arrow
-\define@key[psset]{pstricks-add}{filledveearrowlength}{\pst@getlength{#1}\psk@filledveearrowlength}
+\define@key[psset]{pstricks-add}{filledveearrowlength}[3mm]{\pst@getlength{#1}\psk@filledveearrowlength}
\psset[pstricks-add]{filledveearrowlength=3mm} % default projected length
-\define@key[psset]{pstricks-add}{filledveearrowangle}{\pst@getangle{#1}\psk@filledveearrowangle}
+\define@key[psset]{pstricks-add}{filledveearrowangle}[15]{\pst@getangle{#1}\psk@filledveearrowangle}
\psset[pstricks-add]{filledveearrowangle=15} % default angle
-\define@key[psset]{pstricks-add}{filledveearrowlinewidth}{\pst@getlength{#1}\psk@filledveearrowlinewidth}
-\psset[pstricks-add]{filledveearrowlinewidth=.35mm} % default vee arrow line width
+\define@key[psset]{pstricks-add}{filledveearrowlinewidth}[0.35mm]{\pst@getlength{#1}\psk@filledveearrowlinewidth}
+\psset[pstricks-add]{filledveearrowlinewidth=0.35mm} % default vee arrow line width
\define@key[psset]{pstricks-add}{arrowLW}{\pst@getlength{#1}\psk@arrowLW}
% arrowLW as LineWidth for the circled line ends
%
@@ -487,10 +487,10 @@
% architectural tick / oblique arrow
% Tick arrow
-\define@key[psset]{pstricks-add}{tickarrowlength}{\pst@getlength{#1}\psk@tickarrowlength}
+\define@key[psset]{pstricks-add}{tickarrowlength}[1.5mm]{\pst@getlength{#1}\psk@tickarrowlength}
\psset[pstricks-add]{tickarrowlength=1.5mm} % default projected length
-\define@key[psset]{pstricks-add}{tickarrowlinewidth}{\pst@getlength{#1}\psk@tickarrowlinewidth}
-\psset[pstricks-add]{tickarrowlinewidth=.35mm} % default tick arrow line width
+\define@key[psset]{pstricks-add}{tickarrowlinewidth}[0.35mm]{\pst@getlength{#1}\psk@tickarrowlinewidth}
+\psset[pstricks-add]{tickarrowlinewidth=0.35mm} % default tick arrow line width
\pst@def{TickArrow}<%
1 setlinecap % round caps
@@ -510,8 +510,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]{pstricks-add}{hooklength}[3mm]{\pssetlength\pshooklength{#1}}
+\define@key[psset]{pstricks-add}{hookwidth}[1mm]{\pssetlength\pshookwidth{#1}}
%\psset{hooklength=3mm,hookwidth=1mm}
%
\edef\pst@arrowtable{\pst@arrowtable,H-H,h-h} % add new arrow
@@ -564,9 +564,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]{pstricks-add}{nArrowsA}[2]{\def\psk@nArrowsA{#1}}
+\define@key[psset]{pstricks-add}{nArrowsB}[2]{\def\psk@nArrowsB{#1}}
+\define@key[psset]{pstricks-add}{nArrows}[2]{\def\psk@nArrowsA{#1}\def\psk@nArrowsB{#1}}
%\psset{nArrows=2}
%
\@namedef{psas@>>}{%
@@ -629,9 +629,7 @@
moveto
\fi
} def
- /ArrowB {
- \ifx\psk@arrowB\@empty \else \pst@arrowdef{B} \fi
- } def
+ /ArrowB { \ifx\psk@arrowB\@empty \else \pst@arrowdef{B} \fi } def
% DG addition
/ArrowInside {
\ifx\psk@ArrowInside\@empty \else \pst@arrowdefA{Inside} \fi
@@ -640,9 +638,7 @@
}
% Adapted from \pst@arrowdef
\def\pst@arrowdefA#1{%
- \ifnum\pst@repeatarrowsflag>\z@
- /Arrow#1c [ 6 2 roll ] cvx def Arrow#1c
- \fi
+ \ifnum\pst@repeatarrowsflag>\z@ /Arrow#1c [ 6 2 roll ] cvx def Arrow#1c\fi
\tx@BeginArrow
\psk@arrowscale
\@nameuse{psas@\@nameuse{psk@Arrow#1}}
@@ -982,7 +978,7 @@
%
\define@key[psset]{pstricks-add}{dashNo}{\def\psk@dashNo{#1}}
\define@key[psset]{pstricks-add}{linecap}{\def\psk@linecap{#1}}
-\define@key[psset]{pstricks-add}{randomPoints}{\def\psk@randomPoints{#1}}
+\define@key[psset]{pstricks-add}{randomPoints}[1000]{\def\psk@randomPoints{#1}}
\define@boolkey[psset]{pstricks-add}[Pst@]{color}[true]{}
%\psset{randomPoints=1000,color=false}
%
@@ -1019,6 +1015,25 @@
\ignorespaces
}
%
+\def\psComment{\pst@object{psComment}}
+\def\psComment@i{\pst@getarrows\psComment@ii}
+\def\psComment@ii(#1)(#2)#3{\@ifnextchar[
+ {\psComment@iii(#1)(#2){#3}}
+ {\psComment@iii(#1)(#2){#3}[\ncput]}}
+\def\psComment@iii(#1)(#2)#3[#4]{%
+ \let\pst@Comment#4
+ \addbefore@par{npos=0}%
+ \begin@SpecialObj%
+ \pcline(#1)(#2)
+ \ifx#4\rput\relax
+ \if@star\rput*(#1){#3}\else\rput(#1){#3}\fi
+ \else
+ \if@star\pst@Comment*{#3}\else\pst@Comment*{#3}\fi
+ \fi
+ \end@SpecialObj%
+ \ignorespaces%
+}
+%
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%% %%%%%%%%%%
@@ -1228,10 +1243,7 @@
% #6 node name
\def\psParallelLine{\pst@object{psParallelLine}}
\def\psParallelLine@i{\@ifnextchar({\psParallelLine@iii}{\psParallelLine@ii}}
-\def\psParallelLine@ii#1{%
- \addto@par{arrows=#1}%
- \psParallelLine@iii%
-}
+\def\psParallelLine@ii#1{\addto@par{arrows=#1}\psParallelLine@iii}
\def\psParallelLine@iii(#1)(#2)(#3)#4#5{{
\pst@killglue
\use@par
@@ -1353,7 +1365,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
%the following works only for plotstyle line, polygon and bezier
-\define@key[psset]{pstricks-add}{yMaxValue}{\def\psk@yMaxValue{#1 }}
+\define@key[psset]{pstricks-add}{yMaxValue}[-1.0]{\def\psk@yMaxValue{#1 }}
\psset{yMaxValue=-1.0}
% can be in PS syntax (eg 1e1.2) and must be positiv! negative values
% will beignored
@@ -1459,7 +1471,7 @@
\def\ps@ir@unit{#2}%
}
%
-\define@key[psset]{pstricks-add}{labelFontSize}{\def\psk@labelFontSize{#1}}%
+\define@key[psset]{pstricks-add}{labelFontSize}[{}]{\def\psk@labelFontSize{#1}}%
\define@boolkey[psset]{pstricks-add}[Pst@]{mathLabel}[true]{%
\ifPst@mathLabel%
\def\pshlabel##1{$\psk@labelFontSize##1$}%
@@ -1477,8 +1489,8 @@
\@nameuse{Pst@xAxis#1}\@nameuse{Pst@yAxis#1}}%
%\psset{xyAxes=true}%
%
-\define@key[psset]{pstricks-add}{xlabelPos}{\pst@expandafter\psset@@xlabelPos{#1}\@nil}
-\define@key[psset]{pstricks-add}{ylabelPos}{\pst@expandafter\psset@@ylabelPos{#1}\@nil}
+\define@key[psset]{pstricks-add}{xlabelPos}[b]{\pst@expandafter\psset@@xlabelPos{#1}\@nil}
+\define@key[psset]{pstricks-add}{ylabelPos}[l]{\pst@expandafter\psset@@ylabelPos{#1}\@nil}
\def\psset@@xlabelPos#1#2\@nil{%
\ifx#1t
\def\psk@xlabelPos{\tw@}% 2=top
@@ -1505,17 +1517,17 @@
\fi\fi}
%\psset{xlabelPos=b, ylabelPos=l}%
%
-\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]{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]{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]{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]{pstricks-add}{trigLabelBase}{\pst@getint{#1}{\psk@trigLabelBase}}
+\define@key[psset]{pstricks-add}{trigLabelBase}[0]{\pst@getint{#1}{\psk@trigLabelBase}}
\psset{trigLabelBase=0}
%
\define@boolkey[psset]{pstricks-add}[Pst@]{trigLabelsSimplify}[true]{}
@@ -1601,7 +1613,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]{pstricks-add}{logLines}[none]{\pst@expandafter\psset@@logLines{#1}\@nil\psk@logLines}
\def\psset@@logLines#1#2\@nil#3{%
\ifx#1a
\let#3\z@
@@ -1626,8 +1638,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]{pstricks-add}{ylabelFactor}[\relax]{\def\psk@ylabelFactor{#1}}
+\define@key[psset]{pstricks-add}{xlabelFactor}[\relax]{\def\psk@xlabelFactor{#1}}
%\psset{xlabelFactor=\relax,ylabelFactor=\relax}%
%% #1 : optional arguments passed to psline
@@ -1895,57 +1907,57 @@
\fi\fi\fi\fi
}
%
-\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]{pstricks-add}{subticks}[1]{\def\psk@xsubticks{#1}\def\psk@ysubticks{#1}}
+\define@key[psset]{pstricks-add}{xsubticks}[1]{\def\psk@xsubticks{#1}}
+\define@key[psset]{pstricks-add}{ysubticks}[1]{\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]{pstricks-add}{subticksize}[0.75]{\def\psk@xsubticksize{#1}\def\psk@ysubticksize{#1}}
+\define@key[psset]{pstricks-add}{xsubticksize}[0.75]{\def\psk@xsubticksize{#1}}
+\define@key[psset]{pstricks-add}{ysubticksize}[0.75]{\def\psk@ysubticksize{#1}}
%
-\define@key[psset]{pstricks-add}{tickwidth}{%
+\define@key[psset]{pstricks-add}{tickwidth}[0.5\pslinewidth]{%
\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]{pstricks-add}{xtickwidth}[0.5\pslinewidth]{\pst@getlength{#1}\psk@xtickwidth}
+\define@key[psset]{pstricks-add}{ytickwidth}[0.5\pslinewidth]{\pst@getlength{#1}\psk@ytickwidth}
+\define@key[psset]{pstricks-add}{subtickwidth}[0.25\pslinewidth]{%
\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]{pstricks-add}{xsubtickwidth}[0.25\pslinewidth]{\pst@getlength{#1}\psk@xsubtickwidth}
+\define@key[psset]{pstricks-add}{ysubtickwidth}[0.25\pslinewidth]{\pst@getlength{#1}\psk@ysubtickwidth}
%
-\define@key[psset]{pstricks-add}{tickcolor}{%
+\define@key[psset]{pstricks-add}{tickcolor}[black]{%
\pst@getcolor{#1}\psk@xtickcolor%
\pst@getcolor{#1}\psk@ytickcolor}
-\define@key[psset]{pstricks-add}{xtickcolor}{\pst@getcolor{#1}\psk@xtickcolor}
-\define@key[psset]{pstricks-add}{ytickcolor}{\pst@getcolor{#1}\psk@ytickcolor}
-\define@key[psset]{pstricks-add}{subtickcolor}{%
+\define@key[psset]{pstricks-add}{xtickcolor}[black]{\pst@getcolor{#1}\psk@xtickcolor}
+\define@key[psset]{pstricks-add}{ytickcolor}[black]{\pst@getcolor{#1}\psk@ytickcolor}
+\define@key[psset]{pstricks-add}{subtickcolor}[gray]{%
\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]{pstricks-add}{xsubtickcolor}[gray]{\pst@getcolor{#1}\psk@xsubtickcolor}
+\define@key[psset]{pstricks-add}{ysubtickcolor}[gray]{\pst@getcolor{#1}\psk@ysubtickcolor}
%
-\define@key[psset]{pstricks-add}{xticklinestyle}{%
+\define@key[psset]{pstricks-add}{xticklinestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psxticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{xsubticklinestyle}{%
+\define@key[psset]{pstricks-add}{xsubticklinestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psxsubticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{yticklinestyle}{%
+\define@key[psset]{pstricks-add}{yticklinestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psyticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{ysubticklinestyle}{%
+\define@key[psset]{pstricks-add}{ysubticklinestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psysubticklinestyle{#1}}}
-\define@key[psset]{pstricks-add}{ticklinestyle}{%
+\define@key[psset]{pstricks-add}{ticklinestyle}[solid]{%
\@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]{pstricks-add}{subticklinestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psxsubticklinestyle{#1}\def\psysubticklinestyle{#1}}}
@@ -2287,19 +2299,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]{pstricks-add}{nStep}[1]{\def\psk@nStep{#1}}
+\define@key[psset]{pstricks-add}{nStart}[0]{\def\psk@nStart{#1}}
+\define@key[psset]{pstricks-add}{nEnd}[{}]{\def\psk@nEnd{#1}}
+\define@key[psset]{pstricks-add}{xStep}[0]{\def\psk@xStep{#1}}
+\define@key[psset]{pstricks-add}{yStep}[0]{\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]{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]{pstricks-add}{plotNo}{\def\psk@plotNo{#1}}
-\define@key[psset]{pstricks-add}{plotNoMax}{\def\psk@plotNoMax{#1}}
+\define@key[psset]{pstricks-add}{plotNo}[1]{\def\psk@plotNo{#1}}
+\define@key[psset]{pstricks-add}{plotNoMax}[1]{\def\psk@plotNoMax{#1}}
%
%\psset{nStep=1, nStart=0, nEnd={},%
% xStep=0, yStep=0, xStart={}, xEnd={}, yStart={}, yEnd={}, comma=false,%
@@ -2324,11 +2336,11 @@
\@nameuse{beginplot@\psplotstyle}%
\addto@pscode{/D {} def mark}%
#1%
- \addto@pscode{%
+ \addto@pscode{
\tx@PreparePoints
\pst@number\psxunit
\pst@number\psyunit
- \tx@ScalePoints%
+ \tx@ScalePoints
}%
\@nameuse{endplot@\psplotstyle}%
}
@@ -2416,8 +2428,8 @@
}>
%
%
-\define@key[psset]{pstricks-add}{xAxisLabel}{\def\psk@xAxisLabel{#1}}
-\define@key[psset]{pstricks-add}{yAxisLabel}{\def\psk@yAxisLabel{#1}}
+\define@key[psset]{pstricks-add}{xAxisLabel}[x]{\def\psk@xAxisLabel{#1}}
+\define@key[psset]{pstricks-add}{yAxisLabel}[y]{\def\psk@yAxisLabel{#1}}
%\psset{xAxisLabel=x,yAxisLabel=y}
\iffalse
\define@key[psset]{pstricks-add}{xAxisLabelPos}{%
@@ -2429,8 +2441,8 @@
\ifx\pst@tempA\@empty\let\psk@yAxisLabelPos\relax\else
\pst@getcoor{#1}\psk@yAxisLabelPos\fi}
\fi
-\define@key[psset]{pstricks-add}{xAxisLabelPos}{\def\psk@xAxisLabelPos{#1}}
-\define@key[psset]{pstricks-add}{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={}}
%
@@ -2438,10 +2450,10 @@
\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]{pstricks-add}{llx}[\z@]{\pssetxlength\psk@llx{#1}}
+\define@key[psset]{pstricks-add}{lly}[\z@]{\pssetylength\psk@lly{#1}}
+\define@key[psset]{pstricks-add}{urx}[\z@]{\pssetxlength\psk@urx{#1}}
+\define@key[psset]{pstricks-add}{ury}[\z@]{\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}}
@@ -2451,28 +2463,47 @@
%
\def\psgraph{\pst@object{psgraph}}
\def\psgraph@i{\pst@getarrows\psgraph@ii}
-\def\psgraph@ii(#1,#2){\catcode`\!=12\@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
% minX | minY | maxX | maxY | Length x-axis | length y-axis%
\pst@killglue%
\begingroup%
- \pst@dimo=#3\p@\advance\pst@dimo by -#1\p@% delta x
- \pst@divide{#5}{\pst@dimo}\pst@tempA%
- \pst@xunit=\pst@tempA\p@%
- \pst@dimo=#4\p@\advance\pst@dimo by -#2\p@% delta y
- \ifx!#6 \pst@dima=\pst@tempA\pst@dimo\else\pst@dima=#6\fi
- \pst@divide\pst@dima{\pst@dimo}\pst@tempA%
- \pst@yunit=\pst@tempA\p@%
+ \pst@dimo=#3\p@
+ \pst@dimp=#1\p@ \multiply\pst@dimp by \m@ne
+ \advance\pst@dimo by \pst@dimp% delta x
+ \pst@dimm=#5
+ \pst@cntm=\pst@dimm
+ \pst@cntn=\pst@dimo
+ \divide\pst@cntm by \pst@cntn
+ \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
+ \pst@xunit=\pst@tempA\p@%
+ \else\pst@xunit=\pst@cntm\p@\fi
+%
+ \pst@dimo=#4\p@
+ \pst@dimp=#2\p@ \multiply\pst@dimp by \m@ne
+ \advance\pst@dimo by \pst@dimp% delta y
+ \ifx!#6 \pst@dimm=\pst@cntm\pst@dimo\else\pst@dimm=#6\fi
+ \pst@cntm=\pst@dimm
+ \pst@cntn=\pst@dimo
+ \divide\pst@cntm by \pst@cntn
+ \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
+ \pst@yunit=\pst@tempA\p@%
+ \else\pst@yunit=\pst@cntm\p@\fi
%
- \pst@dima=#1\pst@xunit \advance\pst@dima by \psk@llx%
- \pst@dimb=#2\pst@yunit \advance\pst@dimb by \psk@lly%
- \pst@dimc=#3\pst@xunit \advance\pst@dimc by \psk@urx%
- \pst@dimd=#4\pst@yunit \advance\pst@dimd by \psk@ury%
- \if@star\pspicture*(\pst@dima,\pst@dimb)(\pst@dimc,\pst@dimd)\else%
- \pspicture(\pst@dima,\pst@dimb)(\pst@dimc,\pst@dimd)\fi%
- \psset{xunit=\pst@xunit,yunit=\pst@yunit}%
+ \pst@dimm=#1\pst@xunit
+ \advance\pst@dimm by \psk@llx%
+ \pst@dimn=#2\pst@yunit
+ \advance\pst@dimn by \psk@lly%
+ \pst@dimo=#3\pst@xunit
+ \advance\pst@dimo by \psk@urx%
+ \pst@dimp=#4\pst@yunit
+ \advance\pst@dimp by \psk@ury%
+ \if@star\pspicture*(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\else
+ \pspicture(\pst@dimm,\pst@dimn)(\pst@dimo,\pst@dimp)\fi
+ \psset{xunit=\pst@xunit,yunit=\pst@yunit}
\bgroup%
\use@par%
\psaxes(#1,#2)(#3,#4)%
@@ -2483,6 +2514,28 @@
% Xorig | yorig | minX | minY | maxX | maxY | Length x-axis | length y-axis%
\pst@killglue%
\begingroup%
+ \pst@dimo=#5\p@
+ \pst@dimp=#3\p@ \multiply\pst@dimp by \m@ne
+ \advance\pst@dimo by \pst@dimp% delta x
+ \pst@dimm=#7
+ \pst@cntm=\pst@dimm
+ \pst@cntn=\pst@dimo
+ \divide\pst@cntm by \pst@cntn
+ \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
+ \pst@xunit=\pst@tempA\p@%
+ \else\pst@xunit=\pst@cntm\p@\fi
+%
+ \pst@dimo=#6\p@
+ \pst@dimp=#4\p@ \multiply\pst@dimp by \m@ne
+ \advance\pst@dimo by \pst@dimp% delta y
+ \ifx!#8 \pst@dimm=\pst@cntm\pst@dimo\else\pst@dimm=#8\fi
+ \pst@cntm=\pst@dimm
+ \pst@cntn=\pst@dimo
+ \divide\pst@cntm by \pst@cntn
+ \ifnum\pst@cntm=0 \pst@divide{\pst@dimm}{\pst@dimo}\pst@tempA
+ \pst@yunit=\pst@tempA\p@%
+ \else\pst@yunit=\pst@cntm\p@\fi
+\iffalse
\pst@dimo=#5\p@\advance\pst@dimo by -#3\p@% delta x
\pst@divide{#7}{\pst@dimo}\pst@tempA%
\pst@xunit=\pst@tempA\p@%
@@ -2490,6 +2543,7 @@
\ifx!#8 \pst@dima=\pst@tempA\pst@dimo\else\pst@dima=#8\fi
\pst@divide\pst@dima{\pst@dimo}\pst@tempA%
\pst@yunit=\pst@tempA\p@%
+\fi
%
\pst@dima=#3\pst@xunit \advance\pst@dima by \psk@llx%
\pst@dimb=#4\pst@yunit \advance\pst@dimb by \psk@lly%
@@ -3601,18 +3655,16 @@
\pst@cnta=1% number of entries
\pst@dimn=\z@% greatest entry
\psforeach{\chart@tempA}{#1}{%
- \global\advance\pst@cnta by \@ne % no of entries
- \global\advance\pst@dimm by \chart@tempA pt % sum of all entries
- \pst@dima=\chart@tempA pt
+ \global\advance\pst@cnta by \@ne% % no of entries
+ \global\advance\pst@dimm by \chart@tempA pt% % sum of all entries
+ \pst@dima=\chart@tempA pt%
\ifdim\pst@dima>\pst@dimn \global\pst@dimn=\pst@dima\fi}%
\addbefore@par{dimen=outer}%
- \typeout{<psChart>: pst@par=\pst@par}%
\begin@SpecialObj%
\ifnum\psk@chartColor>0
\chart@ColorStep=400\p@\else\chart@ColorStep=\p@\fi % the "numerical color"
\divide\chart@ColorStep by \pst@cnta% % step =1/no or 400/no
\chart@ColorIndex=\psk@chartColor pt% % the start color (gray or wave)
- \psDEBUG[psChart]{psk@chartStack=\psk@chartStack}%
\@nameuse{pscs@\psk@chartStyle}%
\end@SpecialObj%
\endgroup%
@@ -3626,20 +3678,20 @@
\global\chart@Toggle=1
\ifpsshadow% create shadow first
\psforeach{\chart@tempA}{\psk@chartValues}{%
- \global\advance\pst@dimm by \chart@tempA pt%
- \global\advance\pst@dimn by \chart@alpha pt%
- \global\advance\pst@cnta by \@ne%
+ \global\advance\pst@dimm by \chart@tempA pt
+ \global\advance\pst@dimn by \chart@alpha pt
+ \global\advance\pst@cnta by \@ne
\pst@dimo=0.5\pst@dimn\advance\pst@dimo by 0.5\pst@dimm% half angle of the chart
\global\@chartSepfalse%
\psforeach{\chart@tempC}{\psk@chartSepValues}{\ifnum\chart@tempC=\the\pst@cnta
\global\@chartSeptrue\fi}%
- \if@chartSep
+ \if@chartSep%
\pswedge(\psk@chartSep pt;\pst@number\pst@dimo){\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
- \else
+ \else%
\pswedge{\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}
\fi%
\global\let\chart@alpha\chart@tempA%
- }
+ }%
\psshadowfalse%
\fi%
\def\chart@alpha{0}%
@@ -3650,40 +3702,40 @@
\def\pst@tempB{\pst@number\chart@ColorIndex}%
\psDEBUG[psChart:wave:color]{\pst@tempB}%
\global\advance\pst@cnta by \@ne%
- \if@chartUserColor\else
- \def\chart@FillColor{chartFillColor\the\pst@cnta}
+ \if@chartUserColor\else%
+ \def\chart@FillColor{chartFillColor\the\pst@cnta}%
\ifnum\psk@chartColor>0 \xglobal\definecolor{\chart@FillColor}{wave}{\pst@tempB}%
\else\xglobal\definecolor{\chart@FillColor}{gray}{\pst@tempB}\fi%
- \fi
+ \fi%
\pst@dimo=0.5\pst@dimn\advance\pst@dimo by 0.5\pst@dimm% half angle of the chart
\global\@chartSepfalse%
- \psforeach{\chart@tempC}{\psk@chartSepValues}{\ifnum\chart@tempC=\the\pst@cnta
+ \psforeach{\chart@tempC}{\psk@chartSepValues}{\ifnum\chart@tempC=\the\pst@cnta\relax%
\global\@chartSeptrue\fi}%
\if@chartSep%
\pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}]%
(\psk@chartSep pt;\pst@number\pst@dimo){\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
- \pst@dima=\pst@chartRadius\advance\pst@dima by \psk@chartSep pt
+ \pst@dima=\pst@chartRadius\advance\pst@dima by \psk@chartSep pt%
\pnode(\pst@dima;\pst@number\pst@dimo){psChart\the\pst@cnta}%
- \pst@dimb=\psk@chartNodeI\pst@dima
- \pst@dimc=\psk@chartNodeO\pst@dima
+ \pst@dimb=\psk@chartNodeI\pst@dima%
+ \pst@dimc=\psk@chartNodeO\pst@dima%
\pnode(\pst@dimb;\pst@number\pst@dimo){psChartI\the\pst@cnta}%
\pnode(\pst@dimc;\pst@number\pst@dimo){psChartO\the\pst@cnta}%
- \else
+ \else%
\pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}]%
- {\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}
+ {\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}%
\pnode(\pst@chartRadius;\pst@number\pst@dimo){psChart\the\pst@cnta}%
\pst@dima=\pst@chartRadius%
- \pst@dimb=\psk@chartNodeI\pst@dima
- \pst@dimc=\psk@chartNodeO\pst@dima
+ \pst@dimb=\psk@chartNodeI\pst@dima%
+ \pst@dimc=\psk@chartNodeO\pst@dima%
\pnode(\pst@dimb;\pst@number\pst@dimo){psChartI\the\pst@cnta}%
\pnode(\pst@dimc;\pst@number\pst@dimo){psChartO\the\pst@cnta}%
\fi%
\global\let\chart@alpha\chart@tempA%
- \global\advance\chart@Toggle by \@ne
- \ifnum\chart@Toggle<3
- \global\advance\chart@ColorIndex by 2\chart@ColorStep
- \else
- \global\chart@Toggle=0
+ \global\advance\chart@Toggle by \@ne%
+ \ifnum\chart@Toggle<3\relax
+ \global\advance\chart@ColorIndex by 2\chart@ColorStep%
+ \else%
+ \global\chart@Toggle=0%
\global\advance\chart@ColorIndex by -\chart@ColorStep%
\fi%
}% end foreach