diff options
author | Karl Berry <karl@freefriends.org> | 2011-08-14 23:07:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-08-14 23:07:44 +0000 |
commit | 04dc31dcd61adf9924a90ff4d450ab25b3010646 (patch) | |
tree | 51e0a93a6afa05a4363d551e078d88e9c6a2612d /Master/texmf-dist/tex | |
parent | a6f1bf5e02c8819c63809f345c5a803cb274c9d5 (diff) |
pstricks
git-svn-id: svn://tug.org/texlive/trunk@23559 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 0b5d6f9e63a..157db5fb99a 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -66,8 +66,8 @@ \pst@addfams{pstricks} \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\def\fileversion{2.20} -\def\filedate{2011/04/23} +\def\fileversion{2.21} +\def\filedate{2011/06/07} % % stolen from latex.ltx to make it TeX compatible \newcount\psLoopIndex @@ -86,11 +86,11 @@ #4\relax\expandafter\@iforloop\fi#2\@@#3{#4}} % \long\def\psforeach#1#2#3{% - \global\psLoopIndex=0\relax - \if$\ifnum9<1#2$ \else \fi \psforeach@ii{#1}{#2}{#3} + \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} + \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% @@ -108,24 +108,25 @@ \pst@dimm=\pst@tempA pt% \ifdim\pst@dimm<\pst@dimn% \pstFPadd\pst@tempA{\pst@tempA}{\pst@tempB}% - \pstFPstripZeros{\pst@tempA}\pst@tempA + \pstFPstripZeros{\pst@tempA}\pst@tempA% \edef\pst@tempa{\pst@tempa,\pst@tempA}% \repeat% \psforeach@ii{#1}{\pst@tempa}{#5}} % \long\def\psForeach#1#2#3{% without grouping the contents - \global\psLoopIndex=0\relax - \if$\ifnum9<1#2$ \else \fi \psforeach@ii{#1}{#2}{#3} - \else \expandafter\psForeach@i#2,..,,..,\@nil{#1}{#3}\fi} + \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} + \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{% \edef\reserved@a{#2}% \@for#1:=\reserved@a\do{#3}} \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}% @@ -137,12 +138,13 @@ \pstFPstripZeros{\pst@tempA}\pst@tempA \edef\pst@tempa{\pst@tempa,\pst@tempA}% \repeat% - \psForeach@ii{#1}{\pst@tempa}{#5}} + \psForeach@ii{#1}{\pst@tempa}{#5} +} \def\psrecur@i#1{\csname ps@rn#1\psrecur@i} \long\def\ps@rnm#1{\endcsname{#1}#1\global\advance\psLoopIndex by \@ne} \long\def\ps@rn#1{} -\def\psLoop#1{\global\psLoopIndex=0 +\def\psLoop#1{\global\psLoopIndex=0\relax% \csname ps@rn\expandafter\psrecur@i \romannumeral\number\number#1 000\endcsname\endcsname} |