pstricks (26jul15)

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

1 files changed, 17 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 9f662edb996..802ea10fe22 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -116,8 +116,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.61}
-\def\filedate{2015/06/28}
+\def\fileversion{2.62}
+\def\filedate{2015/07/25}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -125,40 +125,42 @@
 \newcount\psLoopIndex
 \def\@fornoop#1\@@#2#3{}
 \long\def\@for#1:=#2\do#3{%
-  \pst@cntm=0%
+  \pst@cntm=0
   \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\global\advance\psLoopIndex by \@ne\relax%
+%
+\long\def\@forloop#1,#2,#3\@@#4#5{\def#4{#1}\ifx#4\@nnil \else
+       #5\def#4{#2}\ifx#4\@nnil \else\global\advance\psLoopIndex by \@ne\relax
        #5\@iforloop #3\@@#4{#5}\fi\fi}
+
 \long\def\@iforloop#1,#2\@@#3#4{\global\advance\psLoopIndex by \@ne\relax%
    \def#3{#1}\ifx #3\@nnil
      \expandafter\@fornoop \else
      #4\relax\expandafter\@iforloop\fi#2\@@#3{#4}}
 %
 \long\def\psforeach#1#2#3{%
-  \global\psLoopIndex=0\relax%
+  \global\psLoopIndex=0\relax
   \if$\ifnum9<1#2$\else\fi\psforeach@ii{#1}{#2}{#3}%
   \else                      \expandafter\psforeach@i#2,..,,..,\@nil{#1}{#3}\fi}
 \long\def\psforeach@i#1,#2,..,#3,..,#4\@nil#5#6{% 
   \ifx\relax#3\relax\psforeach@ii{#5}{#1,#2}{#6}%
   \else\psforeach@iii{#5}{#1}{#2}{#3}{#6}\fi}
 \long\def\psforeach@ii#1#2#3{%
-  \begingroup%
+  \begingroup
   \edef\reserved@a{#2}%
   \@for#1:=\reserved@a\do{#3}%
   \endgroup}
 \long\def\psforeach@iii#1#2#3#4#5{%
   \pstFPsub\pst@tempA{#3}{#2}%
-  \pst@dimm=\pst@tempA pt
+  \pst@dimm=\pst@tempA pt%
   \pstFPstripZeros{\pst@tempA}\pst@tempB%
   \def\pst@tempA{#2}%
   \def\pst@tempa{#2}%
   \pst@dimn=#4pt%
-  \loop%
-    \pst@dimm=\pst@tempA pt%
-    \ifdim\pst@dimm<\pst@dimn%
+  \loop
+    \pst@dimm=\pst@tempA pt
+    \ifdim\pst@dimm<\pst@dimn
       \pstFPadd\pst@tempA{\pst@tempA}{\pst@tempB}%
       \pstFPstripZeros{\pst@tempA}\pst@tempA%
       \edef\pst@tempa{\pst@tempa,\pst@tempA}%
@@ -678,6 +680,9 @@
 \newrgbcolor{cyan}{0 1 1}
 \newrgbcolor{magenta}{1 0 1}
 %
+\define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture
+\psset[pstricks]{bgcolor={}}% \pst@bgcolor is \@empty
+
 \define@key[psset]{pstricks}{style}{%
   \@ifundefined{pscs@#1}%
     {\@pstrickserr{Custom style `#1' undefined}\@ehpa}%
@@ -4376,6 +4381,7 @@ 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
+  \ifx\pst@bgcolor\@empty \else\psframe*[linecolor=\pst@bgcolor](#2,#3)(#4,#5)\fi
   \ifshowgrid\ifnum\showgridp@s=0\psgrid[style=gridstyle]\fi\fi%
 % ----------- 1.10/12 end hv -------------------
   \ignorespaces%			% 2008-12-07