diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
| -rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/Changes | 22 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 72 |
2 files changed, 52 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/Changes b/Master/texmf-dist/tex/generic/pstricks/Changes index f34f21b2105..7cea60d5129 100644 --- a/Master/texmf-dist/tex/generic/pstricks/Changes +++ b/Master/texmf-dist/tex/generic/pstricks/Changes @@ -1,12 +1,9 @@ -pstricks.sty -------- -0.24 2005-08-30 drop support for \scalebox check, it is now renamed - in pstricks.tex (hv) -0.23 2005-06-02 Option DIA to prevent a clash with \scalebox (hv) -0.22 2005-02-25 changes were done in the wrong version -0.21 2005-02-21 fix problem with \newrgbcolor (RN,hv) - - pstricks.tex -------- +1.14c 2006-04-29 - add option linecap for dashed lines +1.14b 2006-04-20 - fix a bug in \psset@linetype +1.14a 2006-02-06 - revert the changes for pslongbox (introduced bug) +1.14 2005-12-17 - make the color part compatible to color/xcolor +1.13 2005-12-15 - fix bug of \psdot* 1.12 2005-10-25 - spurious blank for \multirput - shift only for an absolute length - add the missing arrows ]-[)-( @@ -27,12 +24,3 @@ pstricks.tex -------- 1.07 2005-05-06 make \nccircle working for counter-clockwise orientation (hv) 1.06 2005-02-24 fix spurious blank in doublestroke (hv) - - ----- pstricks.pro -1.00 2005-09-19 (hv) move the code for arcs of an ellipse from - the main pstricks.tex into this pro -97, patch 7 2005-09-11 (hv) added new fillstyles -97, patch 6 2005-05-17 (hv) added some helper stuff - RadtoDeg, DegtoRad, Pi, TwoPi, ATAN -97, patch 5 2005-03-08 (hv) bugfix for DashLine diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index dc3ea08413c..f9fa9535fcf 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -20,8 +20,8 @@ % See the PSTricks User's Guide for description. % This uses the header file `pstricks.pro'. % -\def\fileversion{1.12} -\def\filedate{2005/10/25} +\def\fileversion{1.14c} +\def\filedate{2006/04/29} % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput @@ -309,7 +309,8 @@ \endgroup \def\@newcolor#1#2{% \expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}% -\expandafter\edef\csname color@#1\endcsname{#2}% +%\expandafter\edef\csname color@#1\endcsname{#2}% +\expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 \ignorespaces} \def\pst@color#1{% \def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor} @@ -328,7 +329,9 @@ setmatrix moveto } -\def\pst@usecolor#1{\csname color@#1\endcsname\space} +%\def\pst@usecolor#1{\csname color@#1\endcsname\space}% hv 1.14 2005--12-17 +\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} +% \def\newgray#1#2{% \pst@checknum{#2}\pst@tempg \@newcolor{#1}{\pst@tempg setgray}% @@ -379,7 +382,8 @@ %------------ hv 1.10 end ------------------- \def\@none{none} \def\pst@getcolor#1#2{% - \@ifundefined{color@#1}% +% \@ifundefined{color@#1}% hv 1.14 2005-12-17 + \@ifundefined{\string\color@#1}% {\@pstrickserr{Color `#1' not defined}\@eha}% {\edef#2{#1}}% } @@ -668,9 +672,12 @@ \psset@dashadjust{true} \def\tx@DashLine{DashLine } \def\psls@dashed{% +%%--------------------------------- hv 2006-04-29 beg --------------------- + \psk@linecap\space setlinecap +%%--------------------------------- hv 2006-04-29 end --------------------- \ifpsdashadjust % \psk@dash \pst@linetype\space \tx@DashLine - \psk@dash \@ifundefined\pst@linetype{2}{\pst@linetype}\space \tx@DashLine + \psk@dash \@ifundefined{pst@linetype}{2}{\pst@linetype}\space \tx@DashLine \else [ \psk@dash ] 0 setdash stroke \fi} @@ -690,6 +697,17 @@ {\edef\pslinestyle{#1}}% } \psset@linestyle{solid} +%%--------------------------------- hv 2006-04-29 beg --------------------- +\def\psset@linecap#1{% + \def\psk@linecap{0}% + \ifnum#1>-1 + \ifnum#1<3 + \pst@getint{#1}\psk@linecap% + \fi\fi% +} +\psset{linecap=0} +%%--------------------------------- hv 2006-04-29 end --------------------- + \def\psfs@none{} \def\psset@fillcolor#1{\pst@getcolor{#1}\psfillcolor} \psset@fillcolor{white} @@ -835,7 +853,7 @@ 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.1.2 +% end of new definitions of the missing arrows ---- hv 1.12 \@namedef{psas@>}{% false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow } @@ -1221,7 +1239,10 @@ grestore}} % \def\psset@linetype#1{% \pst@getint{#1}\pslinetype - \ifnum\pst@dimg<-3 +%----------------- hv begin 2006-04-20 ------------- patch 1.14b + \ifnum\pst@cntg<-3 +% \ifnum\pst@dimg<-3 +%----------------- hv end 2004-05-07 ------------- patch 1.14b \@pstrickserr{linetype must be greater than -3}\@ehpa %----------------- hv begin 2004-05-07 ------------- patch 15 % \def\pslinetype{0}% @@ -1289,7 +1310,8 @@ grestore}} \def\setcolor#1{% % ----------------hv begin 2004-05-07-------------------- patch 15 % \@ifundefined{color@#1}{}{\addto@pscode{\use@color{#1}}}}% - \@ifundefined{color@#1}{}{\addto@pscode{\pst@usecolor{#1}}}}% +% \@ifundefined{color@#1}{}{\addto@pscode{\pst@usecolor{#1}}}}% + \@ifundefined{\string\color@#1}{}{\addto@pscode{\pst@usecolor{#1}}}}% hv 1.14 2005-12-17 % ----------------hv end 2004-05-07-------------------- \def\arrows#1{{\psset@arrows{#1}\pst@addarrowdef}}% \let\file\pst@rawfile @@ -1492,6 +1514,9 @@ grestore}} \def\psdot@i{\@ifnextchar({\psdot@ii}{\psdot@ii(\z@,\z@)}} \def\psdot@ii(#1){% \begin@SpecialObj +% hv modification 1.13 2005-11-28 + \solid@star +% hv modification end \pst@@getcoor{#1}% \addto@pscode{% \psk@dotsize @@ -1871,11 +1896,8 @@ DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED \egroup% } \def\pslongbox#1#2{% -%--------------- hv begin 2004-05-07 ---------- patch 15 - \@namedef{#1}{\pst@longbox#2\ignorespaces}% -% \@namedef{#1}{\pst@longbox#2}% -%--------------- hv end 2004-05-07 ---------- patch 15 - \@namedef{end#1}{\pst@endlongbox}% +\@namedef{#1}{\pst@longbox#2}% +\@namedef{end#1}{\pst@endlongbox}% } \newdimen\psframesep \def\psset@framesep#1{\pssetlength\psframesep{#1}} @@ -2692,16 +2714,16 @@ closepath}% \kern-\pst@dimh\vbox to\z@{\vss\box#1\kern-\pst@dimg}\hss}} \def\psset@ref#1{\pst@expandafter\psset@@ref{#1}\@empty,,\@nil} \def\psset@@ref#1#2,#3,#4\@nil{% -\def\psk@xref{.5}% -\def\psk@yref{.5}% -\let\pst@makesmall\pst@@@makesmall -\ifx\@empty#3\@empty -\@nameuse{getref@#1}% -\@nameuse{getref@#2}% -\else -\pst@checknum{#1#2}\psk@xref -\pst@checknum{#3}\psk@yref -\fi} + \def\psk@xref{.5}% + \def\psk@yref{.5}% + \let\pst@makesmall\pst@@@makesmall + \ifx\@empty#3\@empty + \@nameuse{getref@#1}% + \@nameuse{getref@#2}% + \else + \pst@checknum{#1#2}\psk@xref + \pst@checknum{#3}\psk@yref + \fi} \def\getref@c{\let\pst@makesmall\pst@@makesmall} \def\getref@t{\def\psk@yref{1}} \def\getref@b{\def\psk@yref{0}} @@ -2997,7 +3019,7 @@ closepath}% \egroup \ifdim\wd\pst@hbox=\z@\else %\@pstrickserr{Extraneous space in the pspicture environment}% - %{Type \space <return> \space to procede.}% + %{Type \space <return> \space to proceed.}% \fi \ht\pst@hbox=\pst@dimd \dp\pst@hbox=-\pst@dimb |