diff options
Diffstat (limited to 'graphics/pstricks/base/generic/pstricks.tex')
-rw-r--r-- | graphics/pstricks/base/generic/pstricks.tex | 258 |
1 files changed, 11 insertions, 247 deletions
diff --git a/graphics/pstricks/base/generic/pstricks.tex b/graphics/pstricks/base/generic/pstricks.tex index 8b1edd58e0..10cd89eba5 100644 --- a/graphics/pstricks/base/generic/pstricks.tex +++ b/graphics/pstricks/base/generic/pstricks.tex @@ -18,10 +18,11 @@ \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% !! loading additional TeX packages see line 38,39 and 72ff -%% !! loading config file pstricks.con line 439 -%% !! loading pro files line 452ff -%% !! fileversion and date see line 83 +%% !! loading additional TeX packages see line 43,44 and 77ff +%% !! loading config file pstricks.con line 445 +%% !! loading pro files line 458ff +%% !! fileversion and date see line 84f +%% !! loaded arrow stuff line 1482 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \edef\PstAtCode{\the\catcode`\@} @@ -80,8 +81,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{3.03} -\def\filedate{2021/08/23} +\def\fileversion{3.05} +\def\filedate{2021/08/25} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -1103,6 +1104,8 @@ \psset[pstricks]{doublesep=1.25\pslinewidth} \define@key[psset]{pstricks}{doublecolor}[white]{\pst@getcolor{#1}\psdoublecolor} \psset[pstricks]{doublecolor=white} + +\let\pst@setrepeatarrowsflag\relax % \define@boolkey[psset]{pstricks}[ps]{shadow}[true]{\pst@setrepeatarrowsflag} \psset[pstricks]{shadow=false} @@ -1113,12 +1116,6 @@ \define@key[psset]{pstricks}{shadowcolor}[darkgrey]{\pst@getcolor{#1}\psshadowcolor} \psset[pstricks]{shadowcolor=darkgray} % -\def\pst@repeatarrowsflag{\z@} -\def\pst@setrepeatarrowsflag{% - \edef\pst@repeatarrowsflag{% - \ifdim\psk@border\p@>\z@ 1\else\ifpsdoubleline 1\else - \ifpsshadow 1\else \z@\fi\fi\fi}} -% \def\psls@none{} \def\psls@solid{ \psk@linejoin\space setlinejoin \psk@linecap\space setlinecap stroke } \def\psls@coloreddashed{ \psls@solid grestore gsave \pst@usecolor\psdashcolor \tx@setlinejoin \psls@dashed } @@ -1482,192 +1479,9 @@ % %--------------------------- A R R O W S --------------------------- -% -\def\psk@arrowA{} -\def\psk@arrowB{} -\def\pst@arrowtable{,-,<->,<<->>,>-<,>>-<<,(-),[-],)-(,]-[,|>-<|,<D-D>,D>-<D,<D<D-D>D>,<T-T>} % hv --1.16 -\edef\pst@arrowtable{\pst@arrowtable,|<*->|*,|<->|} -\begingroup - \catcode`\<=13 - \catcode`\>=13 - \catcode`\|=13 - \gdef\pst@activearrows{\def<{\string<}\def>{\string>}\def|{\string|}} -\endgroup -\def\tx@BeginArrow{BeginArrow } -\def\tx@EndArrow{EndArrow } -% -\def\tx@Arrow{ \tx@setStrokeTransparency Arrow }% hv 2008-01-13 -\def\tx@ArrowD{ \tx@setStrokeTransparency ArrowD }% hv 2008-01-13 -\def\tx@ArrowT{ \tx@setStrokeTransparency ArrowT }% hv 2021-05-31 -% -\@namedef{psas@<|}{ - \psk@tbarsize\space \tx@Tbar - 0 CLW 2 div T - newpath - true - \psk@arrowinset - \psk@arrowlength - \psk@arrowsize - \tx@Arrow -} -% ]-[ arrow -\def\tx@BracketOut{BracketOut } -\@namedef{psas@[}{% - /BracketOut {% - CLW mul add dup CLW sub 2 div -%/x ED mul CLW add - /x ED mul neg - /y ED - /z CLW 2 div def - x neg y moveto - x neg CLW 2 div L x CLW 2 div L x y L stroke 0 CLW moveto } def - \psk@bracketlength\space \psk@tbarsize\space \tx@BracketOut -} -% )-( arrow -\def\tx@RoundBracketOut{ \tx@setStrokeTransparency RoundBracketOut }% hv 2008-01-13 -\@namedef{psas@(}{% - /RoundBracketOut {% - CLW mul add dup 2 div -%/x ED mul - /x ED mul neg - /y ED - /mtrx CM def - 0 CLW - 2 div T x y mul 0 ne { x y scale } if - 1 1 moveto - .85 .5 .35 0 0 0 curveto - -.35 0 -.85 .5 -1 1 curveto - mtrx setmatrix stroke 0 CLW moveto } def - \psk@rbracketlength\space \psk@tbarsize\space \tx@RoundBracketOut -} -% end of new definitions of the missing arrows ---- hv 1.12 -\@namedef{psas@>}{ false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow } -\@namedef{psas@>>}{% - false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow - 0 h T gsave newpath - false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow - CP grestore CP newpath moveto 2 copy - CLW \pst@arrowscale\space div SLW % set the original line width - L stroke moveto -} -\@namedef{psas@<}{true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow} -\@namedef{psas@<<}{ - true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow - CP newpath moveto 0 a neg - gsave - CLW \pst@arrowscale\space div SLW % set the original line width - L stroke - grestore - 0 h neg T - false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow -} -\@namedef{psas@D>}{ false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowD }% hv 20071211 -\@namedef{psas@D>D>}{ % hv 20071211 - false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowD - 0 h Inset sub T gsave newpath - false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowD - CP grestore moveto -} -\@namedef{psas@<D}{ % hv 20071211 - true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowD -} -\@namedef{psas@<D<D}{ % hv 20071211 - true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowD - CP newpath moveto 0 a neg L stroke 0 h neg T - true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowD -} -\@namedef{psas@T>}{ false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowT }% hv 20210531 -\@namedef{psas@<T}{ % hv 20071211 - true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowT -} -\define@key[psset]{pstricks}{tbarsize}[2pt 5]{% - \pst@expandafter\pst@getdimnum{#1} 0 {} {}\@nil - \edef\psk@tbarsize{\pst@number\pst@dimg \pst@tempg}} -\psset[pstricks]{tbarsize=2pt 5} -% -\def\tx@Tbar{Tbar } -\@namedef{psas@|}{\psk@tbarsize \tx@Tbar} -\@namedef{psas@|*}{0 CLW -2 div T \psk@tbarsize \tx@Tbar} -\@namedef{psas@>|}{% - \psk@tbarsize \tx@Tbar - 0 CLW 2 div T - newpath - false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow -} -\@namedef{psas@>|*}{% - 0 CLW -2 div T - \psk@tbarsize \tx@Tbar - 0 CLW 2 div T - newpath - false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow -} -% -\define@key[psset]{pstricks}{bracketlength}[0.15]{\pst@checknum{#1}\psk@bracketlength} -\psset[pstricks]{bracketlength=.15} -\def\tx@Bracket{Bracket } -\@namedef{psas@]}{\psk@bracketlength \psk@tbarsize \tx@Bracket} -\define@key[psset]{pstricks}{rbracketlength}[0.15]{\pst@checknum{#1}\psk@rbracketlength} -\psset[pstricks]{rbracketlength=.15} -\def\tx@RoundBracket{RoundBracket } -\@namedef{psas@)}{\psk@rbracketlength \psk@tbarsize \tx@RoundBracket} -% -\def\psas@c{1 \psas@@c} -\def\psas@cc{0 CLW 2 div T 1 \psas@@c} -\def\psas@C{2 \psas@@c} -\def\psas@@c{% - setlinecap - 0 0 moveto - 0 0.1 L % changed value from 0.5 to 0.1 - stroke - 0 0 moveto } -% -\def\psas@{} -% -\define@key[psset]{pstricks}{arrowLW}{\pst@getlength{#1}\psk@arrowLW} -\psset[pstricks]{arrowLW=0} -% arrowLW as LineWidth for the circled line ends -% -\def\psas@o{\psk@arrowLW\space dup 0 eq { pop }{ SLW } ifelse - {\pst@usecolor\psfillcolor true} false \psk@dotsize \tx@EndDot } -\def\psas@oo{\psk@arrowLW\space dup 0 eq { pop }{ SLW } ifelse - {\pst@usecolor\psfillcolor true} true \psk@dotsize \tx@EndDot } -\@namedef{psas@*}{\psk@arrowLW\space dup 0 eq { pop }{ SLW } ifelse - {false} false \psk@dotsize \tx@EndDot } -\@namedef{psas@**}{\psk@arrowLW\space dup 0 eq { pop }{ SLW } ifelse - {false} true \psk@dotsize \tx@EndDot } -% -\define@key[psset]{pstricks}{arrows}[-]{% - \begingroup - \pst@activearrows - \xdef\pst@tempg{#1}% - \endgroup - \expandafter\psset@@arrows\pst@tempg\@empty-\@empty\@nil - \if@pst\else\@pstrickserr{Bad arrows specification: #1}\@ehpa\fi} -\def\psset@@arrows#1-#2\@empty#3\@nil{% - \@psttrue - \def\ps@next##1,#1-##2,##3\@nil{\def\pst@tempg{##2}}% - \expandafter\ps@next\pst@arrowtable,#1-#1,\@nil - \@ifundefined{psas@\pst@tempg}{\@pstfalse\def\psk@arrowA{}}{\let\psk@arrowA\pst@tempg}% - \@ifundefined{psas@#2}{\@pstfalse\def\psk@arrowB{}}{\def\psk@arrowB{#2}}} -\psset[pstricks]{arrows=-} -% -\define@key[psset]{pstricks}{arrowscale}[1]{% hv --1.12 - \pst@getscale{#1}\psk@arrowscale - \pst@@arrowscale@i#1 \@nil}% hv --1.12 -\def\pst@@arrowscale@i#1 #2\@nil{\edef\pst@arrowscale{#1}}% hv --1.12 -\psset[pstricks]{arrowscale=1} -% -\define@key[psset]{pstricks}{arrowsize}[1.5pt 2]{% - \pst@expandafter\pst@getdimnum{#1} 0 {} {}\@nil - \edef\psk@arrowsize{\pst@number\pst@dimg \pst@tempg}% -} -\psset[pstricks]{arrowsize=1.5pt 2} -\define@key[psset]{pstricks}{arrowlength}[1.4]{\pst@checknum{#1}\psk@arrowlength} -\psset[pstricks]{arrowlength=1.4} -\define@key[psset]{pstricks}{arrowinset}[0.4]{\pst@checknum{#1}\psk@arrowinset}% -\psset[pstricks]{arrowinset=0.4} -% +\input pstricks-arrows + %% ---------------------- end arrow part ---------------------- % \def\tx@SD{ \tx@setTransparency SD } @@ -1718,20 +1532,6 @@ \@namedef{#1@i}{\addbefore@par{#3}\@nameuse{#2@i}}}% \ignorespaces} % -\def\pst@getarrows#1{\@ifnextchar({#1}{\pst@@getarrows{#1}}} -% ------------------------- hv 1.10 beg ------------------------ -%\def\pst@@getarrows#1#2{\addto@par{arrows=#2}#1} -\def\pst@@getarrows#1#2{% - \def\pst@tempa{#2}% prevent empty arrow arguments, to allow \psline{}(...)(...) - \ifx\pst@tempa\@empty - \addto@par{arrows=-}% - \else - \addto@par{arrows=#2}% - \fi - #1% -} -% ------------------------- hv 1.10 end ------------------------ -% \def\begin@ClosedObj{% \leavevmode \pst@killglue @@ -1913,42 +1713,6 @@ grestore }} % -\def\pst@arrowtype{% - \ifx\psk@arrowB\@empty 0 \else -2 \fi - \ifx\psk@arrowA\@empty 0 \else -1 \fi - add } -% -\def\pst@addarrowdef{% - \addto@pscode{% - /ArrowA { - \ifx\psk@arrowA\@empty - \pst@oplineto - \else - \pst@arrowdef{A} - moveto - \fi - } def - /ArrowB { \ifx\psk@arrowB\@empty \else \pst@arrowdef{B} \fi } def -}} -% -\def\pst@arrowdef#1{% - \ifnum\pst@repeatarrowsflag>\z@ - /Arrow#1c [ 6 2 roll ] cvx def Arrow#1c - \fi - \tx@BeginArrow - \psk@arrowscale - \@nameuse{psas@\@nameuse{psk@arrow#1}} - \tx@EndArrow -} -% -\def\pst@repeatarrows{% - \addto@pscode{% - gsave - \ifx\psk@arrowA\@empty\else ArrowAc ArrowA pop pop \fi - \ifx\psk@arrowB\@empty\else ArrowBc ArrowB pop pop pop pop \fi - grestore -}} -% \def\pst@OpenShowPoints{% \addto@pscode{% gsave |