pstricks (27nov13)

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

3 files changed, 14 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 69c6d6c0d71..fc4c7f472fe 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,7 +1,7 @@
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2013 Herbert Voss
+%% Copyright 2004-2014 Herbert Voss
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -110,8 +110,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.46}
-\def\filedate{2013/08/20}
+\def\fileversion{2.47}
+\def\filedate{2013/11/26}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -162,7 +162,7 @@
 \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}
+  \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%
@@ -966,15 +966,17 @@
   \edef\pst@coor{\pst@number\pst@dimb \pst@angle \tx@PtoC }%
 }
 %
-\def\raw@coor#1;#2\@nil{%		PostScript code 
-  \edef\pst@coor{%
-    #1 \tx@ScreenCoor }}
+\def\raw@coor{\@ifnextchar!\raw@@coor\raw@@@coor}
+\def\raw@@coor!#1;#2\@nil{%		PostScript code without using \tx@ScreenCoor 
+  \edef\pst@coor{#1}}
+\def\raw@@@coor#1;#2\@nil{%		PostScript code 
+  \edef\pst@coor{ #1 \tx@ScreenCoor }}
 %
 \def\alg@coor{\@ifnextchar*{\alg@@coor}{\alg@@@@coor}}
 \def\alg@@coor*#1;#2\@nil{\expandafter\alg@@@coor#1\@nil}
 \def\alg@@@coor#1 #2\@nil{%			algebraic PostScript code 
-\typeout{Nummer1: #1}%
-\typeout{Nummer2: #2}%
+%\typeout{Nummer1: #1}%
+%\typeout{Nummer2: #2}%
   \edef\pst@coor{%
     /Func (#1) AlgParser cvx def    
     /y #2 def
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty
index 4882c2287b4..6b17210bbd6 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty
@@ -4,8 +4,9 @@
 %% IMPORTANT NOTICE:
 %%
 %% Copyright (C) 1997 Timothy Van Zandt
-%% Copyright (C) 2004-2008 Herbert Voss <voss@perce.de>
+%% Copyright (C) 2004-2008 Herbert Voss <hvoss@tug.org>
 %%                         Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%%               2008--    Herbert Voss <hvoss@tug.org>
 %%
 %% This package may be distributed under the terms of the LaTeX Project 
 %% Public License, as described in lppl.txt in the base LaTeX distribution.
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
index 29c4affd9f9..2ba36d0b042 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
@@ -2,6 +2,7 @@
 %% pstcol.sty Copyright (C) 1994--1996 1999 David Carlisle
 %%                          2004--2007 Herbert Voss <voss@perce.de>
 %%                                     Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%%                          2007--     Herbert Voss <hvoss@tug.org>
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pstcol}