10 files changed, 46 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes b/Master/texmf-dist/doc/generic/pstricks/Changes
index 329a70e1b07..a4dd00430ef 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes
@@ -1,3 +1,4 @@
+2013-11-26  - updated news2013
 2013-04-17  - updated news2013
 2011-04-30  - extensions to pst-doc.cls v 0.19
 2011-04-20  - extensions to pst-doc.cls v 0.18
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 0a61e657449..b406cd0de7a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,5 +1,7 @@
 pstricks.tex --------
-2.46  2013-08-20  - fixed bug with \pstcustomize (delete a line)
+2.47  2013-11-26  - added special coor type !! for Postfix notation
+                    in user coordinates
+2.46  2013-08-13  - fixed bug with \pstcustomize (delete a line)
 2.45  2013-07-08  - moved the overlay part into pst-ovl
                   - added \@tfor macros if used without \LaTeX
 2.44  2013-06-24  - add macros \pssetMonochrome and \pssetGrayscale
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index add9b0ed78f..993cb771801 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -22,7 +22,7 @@ news articles in the doc directory!
 COPYRIGHT 1993, 1994, 2000 by Timothy Van Zandt, <tvz@econ.insead.fr>.
 COPYRIGHT 2004, 2005 by Herbert Voss <voss@PSTricks.de> and 
                         Rolf Niepraschk <Rolf.Niepraschk@ptb.de>.
-COPYRIGHT 2006-2013  by Herbert Voss <hvoss@tug.org>  
+COPYRIGHT 2006--  by Herbert Voss <hvoss@tug.org>  
 
 This program can be redistributed and/or modified under the terms
 of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
index 4757a487c9a..f42fc5b81b8 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
index 5cfe09e9751..7c03e08542b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news13.tex 808 2013-07-15 08:16:58Z herbert $
+%% $Id: pst-news13.tex 853 2013-11-26 20:32:06Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \listfiles
@@ -70,6 +70,25 @@ ist not allowed and leads to an error!
 
 
 \subsection{Coordinates}
+\subsubsection{Postscript mode}
+A preceeding \verb|!| in coordinates will interpret the following expressing in Postfix notation.
+The expression is automatically translated from user into screen coordinates. With a double \verb|!!|
+this can be omitted and the Postscript expression will not be translated. This is useful in some
+special cases:
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid](2,2)(5,5)
+\pscustom{
+  \psarc(3,3){1}{0}{90}
+  \rmoveto(.5;-90)
+  \psarc[liftpen=2](!!CP){.5}{90}{180}}
+\end{pspicture}
+\end{LTXexample}
+
+\verb|CP| is the internal abbreviation for the Postscript function \texttt{currentpoint}.
+
+
+\subsubsection{Algebraic mode}
 Additionally to the special pair of coordinates \verb|(*x f(x))| where $x$ must be a value in
 PostScript notation and $f(x)$ in algebraic noatation, there is now a \verb|(**{f(y), y})| 
 which is vice versa, $f(y)$ in algebraic and $y$ in PostScript notation. And there is also
@@ -77,9 +96,6 @@ a \verb|(+{x}, {f(x)})|, where both expressions must be in algebraic notation an
 or an expression which uses known system or user defined PostScript functions.
 
 
-
-
-
 \begin{LTXexample}[width=5cm]
 \def\f(#1){#1^2} \def\y{2}
 \begin{pspicture}[showgrid](5,5)
@@ -100,6 +116,11 @@ for the complete coordinate argument \verb|(...)| which then gives an error.
 
 
 
+
+
+
+
+
 \subsection{Fillstyle \texttt{dots}}
 A fix for the fill style \Lkeyval{dots} to make it work again:
 
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data b/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
deleted file mode 100644
index 8bd09389cc7..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstricks-add-data9.data
+++ /dev/null
@@ -1,4 +0,0 @@
-some nonsense in this line ---time forcex forcey
-0 0.2
-1 1
-2 4
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 3995ab2d79f..aeffd84d929 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
-% $Id: pstricks.pro 845 2013-11-08 19:01:48Z herbert $
+% $Id: pstricks.pro 853 2013-11-26 20:32:06Z herbert $
 %
 %% PostScript prologue for pstricks.tex.
-%% Version 1.20, 2013/11/25
+%% Version 1.20, 2013/11/26
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
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}