pstricks 2.27 (11mar12)

git-svn-id: svn://tug.org/texlive/trunk@25606 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 32 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 23974eed06f..2e0c4e83b5e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -66,8 +66,8 @@
 \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex\fi
 %
-\def\fileversion{2.24}
-\def\filedate{2012/02/09}
+\def\fileversion{2.27}
+\def\filedate{2012/03/11}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -1072,11 +1072,13 @@
     [ 0 \psk@dotsep CLW add ] 0 setdash 1 setlinecap stroke
   \fi
 }
+%
 \define@key[psset]{pstricks}{linestyle}[solid]{%
   \@ifundefined{psls@#1}%
     {\@pstrickserr{Line style `#1' not defined}\@eha}%
     {\def\pslinestyle{#1}}}
 \psset[pstricks]{linestyle=solid}
+%
 \define@key[psset]{pstricks}{linecap}[0]{%
   \def\psk@linecap{0}%
   \ifnum#1>-1
@@ -2318,15 +2320,20 @@
 \define@key[psset]{pstricks}{symbolStep}[20pt]{\pst@expandafter\pst@@symbolStep#1\@nil}
 \def\pst@@symbolStep#1#2\@nil{\if-#1\pssetlength\pst@symbolStep{-#2pt}\else\pssetlength\pst@symbolStep{#1#2}\fi}
 \psset[pstricks]{symbolStep=20pt}
+
 \newdimen\pst@symbolWidth
+\newdimen\pst@symbolLinewidth
 \define@key[psset]{pstricks}{symbolWidth}[10pt]{\pssetlength\pst@symbolWidth{#1}}
-\psset[pstricks]{symbolWidth=10pt}
+\define@key[psset]{pstricks}{symbolLinewidth}[0.5pt]{\pssetlength\pst@symbolLinewidth{#1}}
+\psset[pstricks]{symbolWidth=10pt,symbolLinewidth=0.5pt}
+
 \define@key[psset]{pstricks}{symbolFont}[Dingbats]{\def\psk@symbolFont{/#1 }}
 \psset[pstricks]{symbolFont=Dingbats}
 \define@boolkey[psset]{pstricks}[Pst@]{rotateSymbol}[true]{}
 \psset[pstricks]{rotateSymbol=false}
 \define@key[psset]{pstricks}{startAngle}[0]{\pst@getangle{#1}\psk@startAngle}
-\psset[pstricks]{startAngle=0}
+\define@key[psset]{pstricks}{tickAngle}[0]{\pst@getangle{#1}\psk@tickAngle}
+\psset[pstricks]{startAngle=0,tickAngle=0}
 \define@boolkey[psset]{pstricks}[Pst@]{curveticks}[true]{}
 \psset[pstricks]{curveticks=false}
 
@@ -2334,14 +2341,17 @@
 \def\psls@symbol{
   /Symbol \psk@symbol def
   /SymbolWidth \pst@number\pst@symbolWidth def
+  /SymbolLinewidth \pst@number\pst@symbolLinewidth def
   /SymStep \pst@number\pst@symbolStep def
   \psk@symbolFont findfont %0. [1.0 0.0 0.0 1.0 0.0 0.0]
   \pst@number\pst@symbolWidth scalefont %dup 
   setfont 
   /rotateSymbol \ifPst@rotateSymbol true \else false \fi def
+  /tickAngle \psk@tickAngle\space def
   /startAngle \psk@startAngle\space def
   /CorrAngle \ifx\psk@rot\@empty 0 \else \psk@rot \fi def
   /curveticks \ifPst@curveticks true \else false \fi def
+  \pst@number\pslinewidth SLW
 }
 \def\psls@@symbol{symbol}
 %
@@ -2586,6 +2596,7 @@
     \ifnum\psk@subgriddiv>1\relax
       \addto@pscode{
         gsave
+        \tx@setStrokeTransparency
         \psk@subgridwidth SLW 
         \pst@usecolor\pssubgridcolor
         \pst@tempB \pst@coor \pst@tempA                 % hv 1.11
@@ -2600,6 +2611,7 @@
     \fi%
     \addto@pscode{
       gsave
+      \tx@setStrokeTransparency
       \psk@gridwidth SLW 
       \pst@usecolor\psgridcolor
       \pst@tempB \pst@coor \pst@tempA                 % hv 1.11
@@ -2618,11 +2630,12 @@
 \def\pst@mathflag{\z@}
 \newtoks\everypsbox
 \let\pst@thisbox\relax
+%
 \long\def\pst@makenotverbbox#1#2{%
   \edef\pst@mathflag{%
   \ifpsmathbox\ifmmode\ifinner 1\else 2\fi\else\z@\fi\else\z@\fi}%
   \setbox\pst@hbox=\hbox{%
-    \ifcase\pst@mathflag\or$\m@th\textstyle\or$\m@th\displaystyle\fi
+    \ifcase\pst@mathflag\or$\m@th\textstyle\or$\m@th\displaystyle\fi%
     {\pst@thisbox\the\everypsbox#2}%
     \ifnum\pst@mathflag>\z@$\fi%                                     $
   }%
@@ -3923,9 +3936,19 @@ pop
 \def\OldPsput{\let\psput\oldpsput}
 \def\NewPsput{\let\psput\rput}
 %
-% ----------- 1.10/12 beg hv -------------------
+% -----------  hv 20120219 -------------------
 \newpsstyle{gridstyle}{subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt}
-\define@boolkey[psset]{pstricks}[]{showgrid}[true]{}
+%\define@boolkey[psset]{pstricks}[]{showgrid}[true]{}
+\newif\ifshowgrid
+\define@key[psset]{pstricks}{showgrid}[b]{\pst@@showgrid#1\@nil}
+\def\pst@@showgrid#1#2\@nil{%
+  \ifx#1b\showgridtrue\def\showgridp@s{0}\else%            bottom
+    \ifx#1f\showgridfalse\else
+      \ifx#1t
+        \ifx#2r\showgridtrue\def\showgridp@s{0}\else%      true->bottom
+               \showgridtrue\def\showgridp@s{1}\fi%        top
+  \fi\fi\fi%
+}
 \psset[pstricks]{showgrid=false}
 %
 \newdimen\pst@shift
@@ -3973,13 +3996,14 @@ pop
   \psset{showgrid=false}%                % for nested pspicture environemnets
   \def\pst@tempA{#1}%
   \ifx\pst@tempA\@empty\else\psset{#1}\fi% sets the shift and grid option
-  \ifshowgrid\psgrid[style=gridstyle]\fi%
+  \ifshowgrid\ifnum\showgridp@s=0\psgrid[style=gridstyle]\fi\fi%
 % ----------- 1.10/12 end hv -------------------
   \ignorespaces%			% 2008-12-07
 }
 \def\pic@coor{(0,0)(0,0)(10,10)}
 %\newdimen\pst@shift
 \def\endpspicture{%
+  \ifshowgrid\ifnum\showgridp@s>0\psgrid[style=gridstyle]\fi\fi%
   \pst@killglue
 %  \global\pst@shift=\pst@shift% in fact of the following endgroup
   \endgroup