pstricks

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

21 files changed, 465 insertions, 1062 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 729373ff700..8cd77b42e0e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -1,4 +1,8 @@
 pstricks.tex --------
+2.19  2011-03-25  - fixed a bug with missing coordinates for pspicture
+2.18  2011-02-15  - fixed a bug with correctAngle and showpoints of
+                    \psellipticarc
+                  - fixed introduced bug with arrowscale=...
 2.17  2011-01-30  - added \psLoop for loops without a defined counter
 2.16  2010-12-18  - added optional argument dashcolor and new linestyle
                     coloreddashed
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index 9fc9cfc49ad..57a09e61690 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -1,4 +1,6 @@
 pstricks.sty --------
+0.49  2011-03-26  - test for pdflatex/lualatex
+0.48  2010-11-26  - cgode changes
 0.47  2010-09-18  - fix bug with option 97, load pstricks97.pro and 
                     pst-dots97.pro
 0.46  2010-08-28  - fix bug with auto-pst-pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
index f287b1130e9..eeefc35e22e 100644
--- a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
+++ b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
@@ -82,17 +82,17 @@
 @Book{PSTricks2,
   author	= {Herbert Vo\ss},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {5.},
+  edition	= {6.},
   publisher	= {DANTE -- Lehmanns Media},
-  year		= {2008},
+  year		= {2010},
   address	= {Heidelberg/Hamburg}
 }
 
 @Book{LaTeXRef,
   author	= {Herbert Vo\ss},
   title		= {\LaTeX\ Referenz},
-  edition	= {1.},
-  publisher	= {DANTE -- Lehmanns},
-  year		= {2007},
+  edition	= {2.},
+  publisher	= {DANTE -- lehmanns media},
+  year		= {2010},
   address	= {Heidelberg/Hamburg}
 }
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
index 0aa215fdb1a..742660045b6 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-doc.cls
@@ -5,7 +5,7 @@
 %%
 %% ``pst-doc'' class for use with the PSTricks documentation.
 %%
-%% Copyright (C) 2009/2010 Herbert Voss
+%% Copyright (C) 2009-2011 Herbert Voss
 %%
 %% It may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
 %%
 %
 \listfiles
-\ProvidesClass{pst-doc}[2010/11/03 v 0.16 PSTricks documentation class (hv)]
+\ProvidesClass{pst-doc}[2010/11/10 v 0.17 PSTricks documentation class (hv)]
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
 \ProcessOptions\relax
 %
@@ -287,6 +287,11 @@ xleftmargin=0pt,xrightmargin=0pt,
 \def\Lkeyword#1{\texttt{#1}\xLkeyword{#1}}
 \def\xLkeyword#1{\index{#1@\texttt{#1}}\index{Keyword!#1@\texttt{#1}}}
 \def\nxLkeyword#1{\texttt{#1}}
+
+\def\LKeyword#1{\LKeyword@i#1!!}
+\def\LKeyword@i#1=#2!!{\Lkeyword{#1}\nxLkeyword{=#2}}
+\let\nxLKeyword\nxLenv % same formatting
+
 \let\nxLkeyval\nxLkeyword
 \let\nxLenv\nxLkeyword
 \let\nxLps\nxLkeyword
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf
deleted file mode 100644
index 6666f0a0244..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pst-docfull.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news.tex
new file mode 100644
index 00000000000..783b3c24f06
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news.tex
@@ -0,0 +1,274 @@
+%% $Id: pst-news09.tex 62 2008-11-25 19:52:07Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+    headexclude,footexclude,oneside]{pst-doc}
+\listfiles
+\let\Lfile\LFile
+\usepackage[utf8]{inputenc}
+\usepackage{pstricks,pst-plot,xkvview}
+\let\pstplotFV\fileversion
+\let\pstplotFD\filedate
+\usepackage{pst-eucl,pst-func}
+\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}2011}}
+\def\textat{\char064}
+\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
+    escapechar=?}
+\begin{document}
+
+%\psset{PstDebug=1}
+\title{\texttt{News}\\ \Large new macros and bugfixes for the
+basic package \nxLFile{pstricks}}
+\subtitle{Summary of the yearly posted news}
+\author{Herbert Voß}
+\date{\today}
+
+\maketitle
+
+\clearpage
+\tableofcontents
+
+\clearpage
+\part{\texttt{pstricks} -- package}
+
+\section{General}
+There exists a new document class \LClass{pst-doc} for writing PSTricks documentations,
+like this news document. It depends on the KOMA-Script document class \LClass{scrartcl}.
+\LClass{pst-doc} defines a lot of special macros to create a good index. Take one of
+the already existing package documentation and look into the source file. Then it will be
+easy to understand, how all these macros have to be used.
+
+When running \Lprog{pdflatex} the title page is created with boxes and inserted 
+with the macro \Lcs{AddToShipoutPicture} from the package \LPack{eso-pic}. It
+inserts the background title page image \Lfile{pst-doc-pdf} to use directly
+\Lprog{pdflatex}.
+When running \Lprog{latex} the title page
+ is created with \PST\ macros.This allows to use the Perl script \Lprog{pst2pdf} or
+the package \LPack{pst-pdf} or \LPack{auto-pst-pdf} or any other program/package which
+supports \PS\ code in the document.
+
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.sty}}
+%--------------------------------------------------------------------------------------
+\subsection{New optional argument}
+
+\begin{description}
+\item[\texttt{noxcolor}] load package \LPack{color} instead of  \LPack{xcolor};
+\item[\texttt{plain}] do nothing else as a \Lcs{input}\Largb{\nxLPack{pstricks}}; 
+\item[\texttt{DIA}] a bug fix for the \verb+PSTricks+-export of the grafic program DIA.
+\end{description}
+
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
+%--------------------------------------------------------------------------------------
+
+\subsection{New and modified option for {pspicture}}\label{sec:option}
+
+Table~\ref{tab:pspicture} shows the two new options for the  \verb+pspicture+ environment.
+
+\begin{table}[htb]
+\caption{Optionen der \texttt{pspicture}-Umgebung}\label{tab:pspicture}
+\centering
+\begin{tabular}{@{}lll@{}}
+\textrm{\emph{name}}  & \emph{meaning}   & \emph{default}\\\hline
+\Lkeyword{shift}  & vertical shift & 0 \\
+\Lkeyword{showgrid} & show grid & \verb+false+\\
+\end{tabular}
+\end{table}
+
+
+% ---------------------------------------------------------------------------------------
+\subsubsection{\nxLkeyword{shift}}\label{subsubsec:shift}
+% ---------------------------------------------------------------------------------------
+This option is the known one from older \texttt{PSTricks} versions, but now with the
+common syntax for options. The shift is relative to the height of the defined \Lenv{pspicture}
+environment, its lower left corner is by deafult on the base line. For older versions
+the shift depends with its value to the baseline, a negative value raised up the \Lenv{pspicture}
+box. Now the \verb+shift+ option works similiar to the known \Lcs{raisebox} makro, except that
+\Lkeyword{shift} is relative to the box height. A positive \Lkeyword{shift} value raises up the box
+and vice versa for a negative value.
+
+\begin{figure}[htb]
+\centering
+\textcolor{red}{\rule{5mm}{1pt}}%
+\begin{pspicture}[shift=0.5](-0.5,-0.5)(0.5,0.5)
+	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5}
+\end{pspicture}%
+\textcolor{red}{\rule{5mm}{1pt}}
+\hspace{1cm}%
+\textcolor{red}{\rule{5mm}{1pt}}%
+\begin{pspicture}(-0.5,-0.5)(0.5,0.5)
+	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0}
+\end{pspicture}\textcolor{red}{\rule{5mm}{1pt}}
+\hspace{1cm}%
+\textcolor{red}{\rule{5mm}{1pt}}%
+\begin{pspicture}[shift=-0.5](-0.5,-0.5)(0.5,0.5)
+	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5}
+\end{pspicture}%
+\textcolor{red}{\rule{5mm}{1pt}}
+\caption{Meaning of the \texttt{shift} option}\label{fig:baseline}
+\end{figure}
+
+%\begin{lstlisting}[caption={Vertikale Verschiebung der Baseline}]
+\begin{lstlisting}
+\textcolor{red}{\rule{5mm}{1pt}}%
+\begin{pspicture}[shift=0.5](-0.5,-0.5)(0.5,0.5)
+	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5}
+\end{pspicture}%
+\textcolor{red}{\rule{5mm}{1pt}}
+\hspace{1cm}%
+\textcolor{red}{\rule{5mm}{1pt}}%
+\begin{pspicture}(-0.5,-0.5)(0.5,0.5)
+	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0}
+\end{pspicture}\textcolor{red}{\rule{5mm}{1pt}}
+\hspace{1cm}%
+\textcolor{red}{\rule{5mm}{1pt}}%
+\begin{pspicture}[shift=-0.5](-0.5,-0.5)(0.5,0.5)
+	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5}
+\end{pspicture}%
+\textcolor{red}{\rule{5mm}{1pt}}
+\end{lstlisting}
+
+With \Lkeyword{shift}=\Lkeyval{*}, instead of a value or a length
+it is possible to center the \Lenv{pspicture} box vertically to the baseline
+of the current line.
+
+\begin{LTXexample}[width=4cm]
+\usepackage{pstricks}
+\rule{5mm}{0.5pt}%
+\psframebox{%
+\begin{pspicture}[showgrid=true,
+    shift=*](-0.3,-0.4)(3.2,3.3)
+  \psarc[showpoints=true](1,1){2}{-45}{120} 
+\end{pspicture}}\rule{5mm}{0.5pt}
+\end{LTXexample}
+
+
+% ---------------------------------------------------------------------------------------
+\subsubsection{\texttt{showgrid}}\label{subsubsec:showgrid}
+% ---------------------------------------------------------------------------------------
+This version of \texttt{PSTricks} defines internally a special grid style
+
+\begin{lstlisting}
+\newpsstyle{gridstyle}{subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt}
+\end{lstlisting}
+
+which can be overwritten by the user. This style is only used for the \Lkeyword{showgrid}
+option of the \Lenvpspicture} environment. The macro \Lcs{psgrid} doesn't use this predefined
+style and works in the usual way. However, the user can use it like all
+other self defined styles: \Lcs{psgrid}\Largs{\Lkeyset{style=gridstyle}}.
+
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=true](-1,0)(2,1)
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\newpsstyle{gridstyle}{%
+  subgriddiv=2,subgridcolor=lightgray}
+\begin{pspicture}[showgrid=true](-1,0)(2,1)
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\newpsstyle{gridstyle}{}
+\begin{pspicture}[showgrid=true](-1,0)(2,1)
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(-1,0)(2,1)
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(-1,0)(2,1)
+  \psgrid
+\end{pspicture}
+\end{LTXexample}
+
+Depending to the internal structure of the \Lenv{pspicture} environment it is not possible
+to set the \Lkeyword{shift} option global by \Lcs{psset}, it must always be locally defined
+with optional part of the parameter, as seen in the above examples.
+
+\subsection{Option \nxLkeyword{gridfont}}
+By default the \Index{grid label}s were printed always in \Index{Helvetica}. With the new keyword \Lkeyword{gridfont}
+one can define another \Index{PostScript Font}. Available are at least
+
+\medskip
+{\ttfamily\noindent
+\Lkeyval{Helvetica} (default) -- \Lkeyval{Helvetica-Narrow} -- \Lkeyval{Times-Roman} -- \Lkeyval{Courier} -- \Lkeyval{AvantGard} --\Lkeyval{NewCenturySchlbk} -- 
+\Lkeyval{Palatino-Roman} -- \Lkeyval{Bookman-Demi} -- \linebreak \Lkeyval{ZapfDingbats} -- \Lkeyval{Symbol}}
+
+\begin{LTXexample}[width=4cm]
+\usepackage{pstricks}
+\begin{pspicture}[showgrid=true](3,2)
+\end{pspicture}\\[20pt]
+\begin{pspicture}(3,2)
+  \psgrid[style=gridstyle,gridfont=AvantGard-Demi]
+\end{pspicture}\\[20pt]
+\begin{pspicture}(3,2)
+  \psgrid[style=gridstyle,gridfont=ZapfDingbats]
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
+\subsection{Macro \nxLcs{psLoop}}
+\PST\marginpar[2.17]{2.17} already knows \Lcs{psforeach} and \Lcs{psForeach} for loops. The new
+macro \Lcs{psLoop} allows a loop without defining a variable:
+
+\begin{BDef}
+\Lcs{psLoop}\Largb{n}\Largb{argument}
+\end{BDef}
+
+However, the internal \TeX\ counter \Lctr{psLoopIndex} can be used for own purposes.
+
+\begin{LTXexample}[width=7cm]
+  \psLoop{4}{PSTricks }
+\end{LTXexample}
+
+\begin{LTXexample}[width=7cm]
+\tabular{|c|c|c|c|}
+  \psLoop{3}{PSTricks &}\\\hline
+  A & B & C & D\\\hline
+\endtabular
+\end{LTXexample}
+
+\begin{LTXexample}[width=6cm]
+\begin{pspicture}[showgrid](3,3)
+\psLoop{4}{%
+  \psdots(\the\psLoopIndex,\the\psLoopIndex)}
+\end{pspicture}
+\end{LTXexample}
+
+
+%--------------------------------------------------------------------------------------
+\section{The PostScript header files}
+\subsection{\nxLFile{pstricks.pro}}
+%--------------------------------------------------------------------------------------
+
+
+%--------------------------------------------------------------------------------------
+\subsection{\nxLFile{pst-algparser.pro}}
+%--------------------------------------------------------------------------------------
+
+\section{\nxLcs{psforeach} and \nxLcs{psForeach}}
+%--------------------------------------------------------------------------------------
+
+\section{List of all optional arguments for \texttt{pstricks}}
+
+\xkvview{family=pstricks,columns={key,type,default}}
+
+
+
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+
+\printindex
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news11.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news11.pdf
new file mode 100644
index 00000000000..b21d8dfb5b0
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news11.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
new file mode 100644
index 00000000000..5a4bb7a2ab8
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex
@@ -0,0 +1,113 @@
+%% $Id: pst-news09.tex 62 2008-11-25 19:52:07Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+    headexclude,footexclude,oneside]{pst-doc}
+\listfiles
+\let\Lfile\LFile
+\usepackage[utf8]{inputenc}
+\usepackage{pstricks,pst-plot,xkvview}
+\let\pstplotFV\fileversion
+\let\pstplotFD\filedate
+\usepackage{pst-eucl,pst-func}
+\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}2011}}
+\def\textat{\char064}
+\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
+    escapechar=?}
+\begin{document}
+
+%\psset{PstDebug=1}
+\title{\texttt{News -- 2010}\\ \Large new macros and bugfixes for the
+basic package \nxLFile{pstricks}}
+\author{Herbert Voß}
+\date{\today}
+
+\maketitle
+
+\clearpage
+\tableofcontents
+
+\clearpage
+\part{\texttt{pstricks} -- package}
+
+\section{General}
+There exists a new document class \LClass{pst-doc} for writing PSTricks documentations,
+like this news document. It depends on the KOMA-Script document class \LClass{scrartcl}.
+\LClass{pst-doc} defines a lot of special macros to create a good index. Take one of
+the already existing package documentation and look into the source file. Then it will be
+easy to understand, how all these macros have to be used.
+
+When running \Lprog{pdflatex} the title page is created with boxes and inserted 
+with the macro \Lcs{AddToShipoutPicture} from the package \LPack{eso-pic}. It
+inserts the background title page image \Lfile{pst-doc-pdf} to use directly
+\Lprog{pdflatex}.
+When running \Lprog{latex} the title page
+ is created with \PST\ macros.This allows to use the Perl script \Lprog{pst2pdf} or
+the package \LPack{pst-pdf} or \LPack{auto-pst-pdf} or any other program/package which
+supports \PS\ code in the document.
+
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.sty}}
+%--------------------------------------------------------------------------------------
+\subsection{New optional argument}
+
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
+%--------------------------------------------------------------------------------------
+
+\subsection{Macro \nxLcs{psLoop}}
+\PST\marginpar[2.17]{2.17} already knows \Lcs{psforeach} and \Lcs{psForeach} for loops. The new
+macro \Lcs{psLoop} allows a loop without defining a variable:
+
+\begin{BDef}
+\Lcs{psLoop}\Largb{n}\Largb{argument}
+\end{BDef}
+
+However, the internal \TeX\ counter \Lctr{psLoopIndex} can be used for own purposes.
+
+\begin{LTXexample}[width=7cm]
+  \psLoop{4}{PSTricks }
+\end{LTXexample}
+
+\begin{LTXexample}[width=7cm]
+\tabular{|c|c|c|c|}
+  \psLoop{3}{PSTricks &}\\\hline
+  A & B & C & D\\\hline
+\endtabular
+\end{LTXexample}
+
+\begin{LTXexample}[width=6cm]
+\begin{pspicture}[showgrid](3,3)
+\psLoop{4}{%
+  \psdots(\the\psLoopIndex,\the\psLoopIndex)}
+\end{pspicture}
+\end{LTXexample}
+
+
+%--------------------------------------------------------------------------------------
+\section{The PostScript header files}
+\subsection{\nxLFile{pstricks.pro}}
+%--------------------------------------------------------------------------------------
+
+
+%--------------------------------------------------------------------------------------
+\subsection{\nxLFile{pst-algparser.pro}}
+%--------------------------------------------------------------------------------------
+
+\section{\nxLcs{psforeach} and \nxLcs{psForeach}}
+%--------------------------------------------------------------------------------------
+
+\section{List of all optional arguments for \texttt{pstricks}}
+
+\xkvview{family=pstricks,columns={key,type,default}}
+
+
+
+\nocite{*}
+\bibliographystyle{plain}
+\bibliography{PSTricks}
+
+\printindex
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf
deleted file mode 100644
index 24d8d07b21e..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pst-quickref.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-usrfull.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-usrfull.pdf
deleted file mode 100644
index ea5caefd0f1..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pst-usrfull.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.pdf
deleted file mode 100644
index 3c12c2e6d24..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.tex
deleted file mode 100644
index 22d2d5ca3fb..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-10.tex
+++ /dev/null
@@ -1,237 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%\usepackage{geometry}
-\usepackage{pst-all}
-\usepackage{showexpl}
-\SpecialCoor
-%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref}
-\usepackage[colorlinks,linktocpage]{hyperref}
-\def\UrlFont{\small\ttfamily}
-\makeatletter
-\def\verbatim@font{\small\normalfont\ttfamily}
-\makeatother
-%\usepackage{color}
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{colKeys}{rgb}{0,0,1}
-\definecolor{colIdentifier}{rgb}{0,0,0}
-\definecolor{colComments}{rgb}{1,0,0}
-\definecolor{colString}{rgb}{0,0.5,0}
-%
-\usepackage{listings}
-\lstset{%
-    language=[PSTricks]TEX,%
-    float=hbp,%
-    basicstyle=\ttfamily\small, %
-    identifierstyle=\color{colIdentifier}, %
-    keywordstyle=\color{colKeys}, %
-    stringstyle=\color{colString}, %
-    commentstyle=\color{colComments}, %
-    columns=flexible, %
-    tabsize=4, %
-    frame=single, %
-    extendedchars=true, %
-    showspaces=false, %
-    showstringspaces=false, %
-    numbers=left, %
-    numberstyle=\tiny, %
-    breaklines=true, %
-%    backgroundcolor=\color{hellgelb}, %
-    breakautoindent=true, %
-    captionpos=b,%
-	xleftmargin=0pt%
-}
-
-%\parindent=0pt
-\newcommand\verbI[1]{{\small\texttt{#1}}}
-\newcommand\CMD[1]{{\texttt{\textbackslash#1}}}
-%
-%\psset{subgriddiv=0,griddots=5,gridlabels=7pt}
-%
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-\def\PS{PostScript}
-%
-\begin{document}
-\title{\texttt{PSTricks -- version 1.10}\\new macros and bugfixes for \texttt{pstricks}}
-\author{Herbert Voß\thanks{%
-\url{Herbert.Voss@perce.de}}}
-\date{\today}
-
-\maketitle
-
-\begin{abstract}
-This new version 1.10 has some minor but important changes; it is not compatible
-to older versions when using the vertical shift option for the \verb+pspicture+
-environment.
-\end{abstract}
-
-\clearpage
-\tableofcontents
-
-\clearpage
-
-\section{New and modified option for {pspicture}}\label{sec:option}
-
-Table~\ref{tab:pspicture} shows the two new options for the  \verb+pspicture+ environment.
-
-\begin{table}[htb]
-\caption{Optionen der \texttt{pspicture}-Umgebung}\label{tab:pspicture}
-\centering
-\begin{tabular}{@{}lll@{}}
-\textrm{\emph{name}}  & \emph{meaning}   & \emph{default}\\\hline
-\verb+shift+  & vertical shift & $0$ \\
-\verb+showgrid+ & show grid & \verb+false+\\
-\end{tabular}
-\end{table}
-
-
-% ---------------------------------------------------------------------------------------
-\subsection{\texttt{shift}}\label{subsubsec:shift}
-% ---------------------------------------------------------------------------------------
-This option is the known one from older \texttt{PSTricks} version, but now with the
-usual syntax for options. The shift is relative to the height of the defined \verb+pspicture+
-environment, its lower left corner is by deafult on the base line. For older versions
-the shift depends with its value to the baseline, a negative value raised up the \verb+pspicture+
-box. Now the \verb+shift+ option works similiar to the known \CMD{raisebox} makro, except that
-\verb+shift+ is relative to the box height. A positive \verb+shift+ value raises up the box
-and vice versa for a negative value.
-
-\begin{figure}[htb]
-\centering
-\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}[shift=0.5](-0.5,-0.5)(0.5,0.5)
-	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5}
-\end{pspicture}%
-\textcolor{red}{\rule{5mm}{1pt}}
-\hspace{1cm}%
-\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}(-0.5,-0.5)(0.5,0.5)
-	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0}
-\end{pspicture}\textcolor{red}{\rule{5mm}{1pt}}
-\hspace{1cm}%
-\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}[shift=-0.5](-0.5,-0.5)(0.5,0.5)
-	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5}
-\end{pspicture}%
-\textcolor{red}{\rule{5mm}{1pt}}
-\caption{Meaning of the \texttt{shift} option}\label{fig:baseline}
-\end{figure}
-
-%\begin{lstlisting}[caption={Vertikale Verschiebung der Baseline}]
-\begin{lstlisting}
-\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}[shift=0.5](-0.5,-0.5)(0.5,0.5)
-	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5}
-\end{pspicture}%
-\textcolor{red}{\rule{5mm}{1pt}}
-\hspace{1cm}%
-\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}(-0.5,-0.5)(0.5,0.5)
-	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0}
-\end{pspicture}\textcolor{red}{\rule{5mm}{1pt}}
-\hspace{1cm}%
-\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}[shift=-0.5](-0.5,-0.5)(0.5,0.5)
-	\psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5}
-\end{pspicture}%
-\textcolor{red}{\rule{5mm}{1pt}}
-\end{lstlisting}
-
-
-% ---------------------------------------------------------------------------------------
-\subsection{\texttt{showgrid}}\label{subsubsec:showgrid}
-% ---------------------------------------------------------------------------------------
-This new version of \texttt{PSTricks} defines internally a special grid style
-
-\begin{lstlisting}
-\newpsstyle{gridstyle}{%
-  subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt}
-\end{lstlisting}
-
-which can be overwritten by the user. This style is only used for the \verb+showgrid+
-option of the \verb+pspicture+ environment. The macro \verb+\psgrid+ doesn't use this predefined
-style and works in the usual way. However, the user can use it like all
-other self defined styles: \verb+\psgrid[style=gridstyle]+.
-
-
-\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}[showgrid=true](-1,0)(2,1)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[width=3.5cm]
-\newpsstyle{gridstyle}{%
-  subgriddiv=2,subgridcolor=lightgray}
-\begin{pspicture}[showgrid=true](-1,0)(2,1)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[width=3.5cm]
-\newpsstyle{gridstyle}{}
-\begin{pspicture}[showgrid=true](-1,0)(2,1)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(-1,0)(2,1)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(-1,0)(2,1)
-  \psgrid
-\end{pspicture}
-\end{LTXexample}
-
-Depending to the internal structure of the \verb+pspicture+ environment it is not possible
-to set the \verb+shift+ option global by \CMD{psset}, it must always be locally defined
-with optional part of the parameter, as seen in the above examples.
-
-
-\section{Bugfixes}
-\subsection{\texttt{origin}}
-
-There were several mailings in the past to the \verb+origin+ option, which worked the other
-way round than expected. Now the coordinates work realtive to the current origin.
-
-
-\begin{LTXexample}[width=3cm]
-\begin{pspicture}(-1,-1)(2,1.25)
-  \psaxes{->}(0,0)(-1,-1)(2,1.25)
-  \psset{linewidth=1.5pt}
-  \parabola[linestyle=dashed](-1,1)(0,0)
-  \parabola[origin={0.5,-0.5}](-1,1)(0,0)
-  \qdisk(0.5,-0.5){2pt}
-\end{pspicture}
-\end{LTXexample}
-
-\subsection{Empty parameter}
-\sloppy
-To prevent some problems with empty arrow definitions in macros like \verb+\psline[...]{}(..)(...)+,
-which makes no sense, but should be possible, there is now a check before setting the values.
-
-\subsection{\CMD{nccircle}}
-With some modification to \CMD{psarc\@iv} it is now possible to get the loops in any direction
-and above or below the node.
-
-\begin{LTXexample}[width=.35\linewidth]
-\psscalebox{1.5}{%
-  \circlenode{A}{A}
-  \nccircle{->}{A}{1.5em} \nbput{foo}
-  \nccircle{<-}{A}{-1.5em}\naput{bar}}
-%
-\hspace{1cm}
-\psscalebox{1.5}{%
-  \circlenode{A}{A}
-  \nccircle{<-}{A}{1.5em} \nbput{foo}
-  \nccircle{->}{A}{-1.5em}\naput{bar}}
-\end{LTXexample}
-
-\subsection{\CMD{psscalebox} and \CMD{psscaleboxto}}
-To prevent clashes with the \verb+graphicx+ package, which also defines a \CMD{scalebox} macro
-with different syntax,
-\verb+PSTricks+ now defines \CMD{psscalebox} and \CMD{psscaleboxto}. For some compatibility reasons the old
-names are still supported. With the new names it doesn'r matter if \verb+pstricks+ is loaded before or after
-\verb+graphicx+.
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.pdf
deleted file mode 100644
index 1b3d3772dc5..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.tex
deleted file mode 100644
index 3c5b922e112..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-11.tex
+++ /dev/null
@@ -1,167 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%\usepackage{geometry}
-\usepackage{pst-all}
-\usepackage{showexpl}
-\usepackage{tabularx}
-\SpecialCoor
-%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref}
-\usepackage[colorlinks,linktocpage]{hyperref}
-\def\UrlFont{\small\ttfamily}
-\makeatletter
-\def\verbatim@font{\small\normalfont\ttfamily}
-\makeatother
-%\usepackage{color}
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{colKeys}{rgb}{0,0,1}
-\definecolor{colIdentifier}{rgb}{0,0,0}
-\definecolor{colComments}{rgb}{1,0,0}
-\definecolor{colString}{rgb}{0,0.5,0}
-%
-\usepackage{listings}
-\lstset{%
-    language=PSTricks,%
-    float=hbp,%
-    basicstyle=\ttfamily\small, %
-    identifierstyle=\color{colIdentifier}, %
-    keywordstyle=\color{colKeys}, %
-    stringstyle=\color{colString}, %
-    commentstyle=\color{colComments}, %
-    columns=flexible, %
-    tabsize=4, %
-    frame=single, %
-    extendedchars=true, %
-    showspaces=false, %
-    showstringspaces=false, %
-    numbers=left, %
-    numberstyle=\tiny, %
-    breaklines=true, %
-%    backgroundcolor=\color{hellgelb}, %
-    breakautoindent=true, %
-    captionpos=b,%
-	xleftmargin=0pt%
-}
-
-%\parindent=0pt
-\newcommand\verbI[1]{{\small\texttt{#1}}}
-\newcommand\CMD[1]{{\texttt{\textbackslash#1}}}
-%
-%\psset{subgriddiv=0,griddots=5,gridlabels=7pt}
-%
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-\def\PS{PostScript}
-%
-\begin{document}
-\title{\texttt{PSTricks -- version 1.11}\\new macros and bugfixes for \texttt{pstricks}}
-\author{Herbert Voß\thanks{%
-\url{Herbert.Voss@perce.de}}}
-\date{\today}
-
-\maketitle
-
-\begin{abstract}
-This new version of \texttt{pstricks.tex} depends on the also new prologue file
-\texttt{pstricks.pro} (v 1.00), which should go into the local \TeX-directoory \url{$TEXMFLOCAL/dvips/}.
-\end{abstract}
-
-
-\tableofcontents
-
-%--------------------------------------------------------------------------------------
-\section{New macro names}
-%--------------------------------------------------------------------------------------
-In general \texttt{PSTricks} uses macronames with a preceeding \verb+ps+ to prevent 
-clashes with other packages. However, some macros have names without the \verb+ps+ and
-these ones have now new names:
-
-\begin{verbatim}
-  \scalebox    -> \psscalebox
-  \scaleboxto  -> \psscaleboxto
-  \rotateleft  -> \psrotateleft
-  \rotateright -> \psrotateright
-  \rotatedown  -> \psrotatedown
-\end{verbatim}
-
-The first change is important, because there were a lot of problems in the past;
-\verb+graphicx+ also defines a \verb+scalebox+ but with diffent syntax.
-
-%--------------------------------------------------------------------------------------
-\section{New fill options}
-%--------------------------------------------------------------------------------------
-For the fillstyles \verb+hlines+, \verb+vlines+ and \verb+crosshatch+ there are two new
-options to get increasing line widths and/or increasing whitespace. Both options are 
-lengths and can be set as usual for PSTricks, with or without a unit.
-
-\bigskip\noindent
-\begin{tabularx}{\linewidth}{lXc}
-\emph{name} & \emph{meaning} & \emph{default}\\\hline
-\verb|hatchsepinc| & additional increasing space between two hatch lines & 0\tabularnewline
-\verb|hatchwidthinc| & value for the increasing line width of two hatch lines & 0
-\end{tabularx}
-
-
-
-\bigskip
-\begin{LTXexample}[pos=t]
-\begin{pspicture}(\linewidth,3)
-  \psframe[fillstyle=vlines,hatchangle=0,hatchsep=.5pt,%
-     hatchwidth=1pt,hatchwidthinc=0.25pt](\linewidth,3)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[pos=t]
-\begin{pspicture}(\linewidth,3)
-  \psframe[fillstyle=hlines,hatchangle=0,%
-     hatchwidth=1pt,hatchsep=0.5pt,hatchsepinc=0.1pt](\linewidth,3)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[pos=t]
-\begin{pspicture}(\linewidth,3)
-  \psframe[fillstyle=vlines,hatchangle=0,hatchsep=0.6pt,%
-     hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=60,
-     hatchcolor=red](\linewidth,3)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[pos=t]
-\begin{pspicture}(\linewidth,3)
-  \psframe[fillstyle=hlines,hatchangle=0,hatchangle=-60,%
-     hatchwidth=1pt,hatchsep=0.5pt,hatchsepinc=0.1pt,
-     hatchcolor=blue](\linewidth,3)
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[pos=t]
-\begin{pspicture}(\linewidth,4)
-  \pscircle[fillstyle=vlines,hatchangle=0,hatchsep=0.6pt,%
-     hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=90,
-     hatchcolor=red](2,2){2}
-  \pscircle[fillstyle=vlines,hatchangle=0,hatchsep=0.6pt,%
-     hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=-45,
-     hatchcolor=green](7,2){2}
-  \pscircle[fillstyle=hlines,hatchangle=0,hatchsep=0.6pt,%
-     hatchwidth=1pt,hatchwidthinc=0.3pt,hatchangle=45,
-     hatchcolor=blue](12,2){2}
-\end{pspicture}
-\end{LTXexample}
-
-\begin{LTXexample}[pos=t]
-\begin{pspicture}(\linewidth,3)
-  \psframe[fillstyle=crosshatch,hatchangle=0,hatchangle=-90,%
-     hatchwidth=1pt,hatchsep=0.5pt,hatchsepinc=0.1pt,
-     hatchcolor=blue](\linewidth,3)
-\end{pspicture}
-\end{LTXexample}
-
-%--------------------------------------------------------------------------------------
-\section{Other changes}
-%--------------------------------------------------------------------------------------
-\texttt{pstricks.tex} defined the PostScript subroutines for arcs of an ellipse.
-This code now moved into the appropriate \texttt{pstricks.pro}, which holds the
-pure PostScript code of \texttt{PSTricks}. This in not important for user until
-the newest \texttt{pstricks.pro} \textbf{and} \texttt{pstricks.tex} are installed. 
-
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.pdf
deleted file mode 100644
index 19d4c37b1d5..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.tex
deleted file mode 100644
index 037668123b1..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews1-12.tex
+++ /dev/null
@@ -1,147 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%\usepackage{geometry}
-\usepackage{pst-all}
-\usepackage{showexpl}
-\usepackage{tabularx}
-\SpecialCoor
-%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref}
-\usepackage[colorlinks,linktocpage]{hyperref}
-\def\UrlFont{\small\ttfamily}
-\makeatletter
-\def\verbatim@font{\small\normalfont\ttfamily}
-\makeatother
-%\usepackage{color}
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{colKeys}{rgb}{0,0,1}
-\definecolor{colIdentifier}{rgb}{0,0,0}
-\definecolor{colComments}{rgb}{1,0,0}
-\definecolor{colString}{rgb}{0,0.5,0}
-%
-\usepackage{listings}
-\lstset{%
-    language=PSTricks,%
-    float=hbp,%
-    basicstyle=\ttfamily\small, %
-    identifierstyle=\color{colIdentifier}, %
-    keywordstyle=\color{colKeys}, %
-    stringstyle=\color{colString}, %
-    commentstyle=\color{colComments}, %
-    columns=flexible, %
-    tabsize=4, %
-    frame=single, %
-    extendedchars=true, %
-    showspaces=false, %
-    showstringspaces=false, %
-    numbers=left, %
-    numberstyle=\tiny, %
-    breaklines=true, %
-%    backgroundcolor=\color{hellgelb}, %
-    breakautoindent=true, %
-    captionpos=b,%
-	xleftmargin=0pt%
-}
-
-%\parindent=0pt
-\newcommand\verbI[1]{{\small\texttt{#1}}}
-\newcommand\CMD[1]{{\texttt{\textbackslash#1}}}
-%
-%\psset{subgriddiv=0,griddots=5,gridlabels=7pt}
-%
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-\def\PS{PostScript}
-%
-\begin{document}
-\title{\texttt{PSTricks -- version 1.12}\\new macros and bugfixes for \texttt{pstricks}}
-\author{Herbert Voß\thanks{%
-\url{Herbert.Voss@perce.de}}}
-\date{\today}
-
-\maketitle
-
-\begin{abstract}
-This new version of \texttt{pstricks.tex} depends on the also new prologue file
-\texttt{pstricks.pro} (v 1.00), which should go into the local \TeX-directory \url{$TEXMFLOCAL/dvips/}.
-\end{abstract}
-
-
-\tableofcontents
-
-%--------------------------------------------------------------------------------------
-\section{New macro names}
-%--------------------------------------------------------------------------------------
-In general \texttt{PSTricks} uses macronames with a preceeding \verb+ps+ to prevent 
-clashes with other packages. However, some macros have names without the \verb+ps+ and
-these ones have now new names:
-
-\begin{verbatim}
-  \scalebox    -> \psscalebox
-  \scaleboxto  -> \psscaleboxto
-  \rotateleft  -> \psrotateleft
-  \rotateright -> \psrotateright
-  \rotatedown  -> \psrotatedown
-\end{verbatim}
-
-The first change is important, because there were a lot of problems in the past;
-\verb+graphicx+ also defines a \verb+scalebox+ but with diffent syntax.
-
-
-%--------------------------------------------------------------------------------------
-\section{\texttt{shift} Option}
-%--------------------------------------------------------------------------------------
-The new \verb+shift+ option now expects a length with a \verb+PSTricks+ compatible dimension.
-
-\bgroup
-\begin{LTXexample}[pos=t]
-\small
-\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}[shift=0.5cm](-0.5,-0.5)(0.5,0.5)
-  \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0.5cm}
-\end{pspicture}%
-\textcolor{red}{\rule{5mm}{1pt}}\hspace{1cm}\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}(-0.5,-0.5)(0.5,0.5)
-  \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){0}
-\end{pspicture}%
-\textcolor{red}{\rule{5mm}{1pt}}\hspace{1cm}\textcolor{red}{\rule{5mm}{1pt}}%
-\begin{pspicture}[shift=-0.5cm](-0.5,-0.5)(0.5,0.5)
-  \psframe[linecolor=blue](-0.5,-0.5)(0.5,0.5)\rput(0,0){-0.5cm}
-\end{pspicture}%
-\textcolor{red}{\rule{5mm}{1pt}}
-\end{LTXexample}
-\egroup
-
-%--------------------------------------------------------------------------------------
-\section{New arrows}
-%--------------------------------------------------------------------------------------
-
-\verb+pstricks now contains the missing arrow ends \verb+]-[+ and \verb+)-(+.
-
-\begin{LTXexample}[width=4cm]
-\begin{pspicture}(4,3)
-  \psset{arrowscale=2,linewidth=1pt}
-  \psline{]-[}(4,0)
-  \psline{)-(}(0,1)(4,1)
-  \psline{)->}(0,2)(4,2)
-  \psline{]->>}(0,3)(4,3)
-\end{pspicture}
-\end{LTXexample}
-
-%--------------------------------------------------------------------------------------
-\section{New otions for \texttt{pstricks.sty}}
-%--------------------------------------------------------------------------------------
-
-\begin{description}
-\item[\texttt{noxcolor}] load package \verb+color+ instead of  \verb+xcolor+;
-\item[\texttt{plain}] do nothing else as a \CMD{input\{pstricks\}}; 
-\item[\texttt{DIA}] a bug fix for the \verb+PSTricks+-export of the garfic program DIA.
-\end{description}
-
-
-%--------------------------------------------------------------------------------------
-\section{New \texttt{pstricks.pro}}
-%--------------------------------------------------------------------------------------
-
-this file now contains the PostScript code for arcs of an ellipse.
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.pdf b/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.pdf
deleted file mode 100644
index eeb545bc825..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.tex b/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.tex
deleted file mode 100644
index f870ba62b38..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/pstnews97-15.tex
+++ /dev/null
@@ -1,470 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%\usepackage{geometry}
-\usepackage{url,calc}
-\usepackage{pstricks}
-\usepackage{pst-plot}
-\SpecialCoor
-%\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref}
-\usepackage[colorlinks,linktocpage]{hyperref}
-\def\UrlFont{\small\ttfamily}
-\makeatletter
-\def\verbatim@font{\small\normalfont\ttfamily}
-\makeatother
-%\usepackage{color}
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{colKeys}{rgb}{0,0,1}
-\definecolor{colIdentifier}{rgb}{0,0,0}
-\definecolor{colComments}{rgb}{1,0,0}
-\definecolor{colString}{rgb}{0,0.5,0}
-%
-\usepackage{listings}
-\lstset{%
-    language=[LaTeX]TEX,%
-    float=hbp,%
-    basicstyle=\ttfamily\small, %
-    identifierstyle=\color{colIdentifier}, %
-    keywordstyle=\color{colKeys}, %
-    stringstyle=\color{colString}, %
-    commentstyle=\color{colComments}, %
-    columns=flexible, %
-    tabsize=4, %
-    frame=single, %
-    extendedchars=true, %
-    showspaces=false, %
-    showstringspaces=false, %
-    numbers=left, %
-    numberstyle=\tiny, %
-    breaklines=true, %
-%    backgroundcolor=\color{hellgelb}, %
-    breakautoindent=true, %
-    captionpos=b,%
-	xleftmargin=0pt%
-}
-
-%\parindent=0pt
-\newcommand\verbI[1]{{\small\texttt{#1}}}
-\newcommand\CMD[1]{{\texttt{\textbackslash#1}}}
-%
-\psset{subgriddiv=0,griddots=5,gridlabels=7pt}
-%
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-\def\PS{PostScript}
-%
-\begin{document}
-\title{\texttt{pstricks -- patch 15}\\new macros and bugfixes for \texttt{pstricks}}
-\author{Herbert Voß\thanks{%
-\url{Herbert.Voss@perce.de}} \and Rolf Niepraschk\thanks{\url{Rolf.Niepraschk@ptb.de}}}
-\date{2004/05/12}
-
-\maketitle
-
-\begin{abstract}
-It is long time ago since \verb+pstricks.tex patch 14+ came out. The new version
-\verb+patch 15+ fixes some bugs and provides three new elliptic macros, which were
-already present in the old beta version of \verb+PSTricks+.
-
-There is also a new \verb+pstricks.sty+, which makes the \verb+\pstcol+ package
-obsolete. It uses the new color package \verb+xcolor+, which provides a much more
-powerful color management than \verb+color.sty+ does. The \verb+pstricks.sty+ is
-a real \LaTeX{} package, it makes no sense for \TeX{} users. Nevertheless, using
-of \verb+pstcol+ or package \verb+color+ is still possible.
-
-Timothy Van Zandt was the one, who creates \verb+PSTricks+, but Denis Girou was
-the one who makes it run over many years. Needless to say, how important his work is
-for \verb+PSTricks+. Since more than nine month we are unable to get in touch with
-Denis, which is the reason why this update of \verb+PSTricks+ comes without any
-comments from Denis.
-\end{abstract}
-
-\clearpage
-\tableofcontents
-
-\clearpage
-
-\section{New fill style \texttt{eofill}}
-\PS\ has a special fillstyle, called \verb|eofill|, which is now available 
-with the option
-\verb|fillstyle=eofill|. The following two images show the difference, 
-the first one is filled with
-\verb|fillstyle=solid| and the second one with the new option \verb|fillstyle=eofill|.
-
-\begin{minipage}{5.5cm}
-\begin{pspicture}(5,2.5)
-\pspolygon[unit=0.5cm,%
-     fillstyle=solid,%
-     fillcolor=yellow](7,3)(0,0)(1,3)
-     (5,5)(10,3)(2,2)(7,5)(7,3)
-\end{pspicture}
-\end{minipage}\hfill%
-\begin{minipage}{\linewidth-6cm}
-\begin{lstlisting}
-\begin{pspicture}(5,2.5)
-\pspolygon[unit=0.5cm,%
-     fillstyle=solid,%
-     fillcolor=yellow](7,3)(0,0)(1,3)
-     (5,5)(10,3)(2,2)(7,5)(7,3)
-\end{pspicture}
-\end{lstlisting}
-\end{minipage}
-
-
-\begin{minipage}{5.5cm}
-\begin{pspicture}(5,2.5)
-\pspolygon[unit=0.5cm,%
-    fillstyle=eofill,%
-    fillcolor=yellow](7,3)(0,0)(1,3)%
-    (5,5)(10,3)(2,2)(7,5)(7,3)
-\end{pspicture}
-\end{minipage}\hfill%
-\begin{minipage}{\linewidth-6cm}
-\begin{lstlisting}
-\begin{pspicture}(5,2.5)
-\pspolygon[unit=0.5cm,%
-    fillstyle=eofill,%
-    fillcolor=yellow](7,3)(0,0)(1,3)%
-    (5,5)(10,3)(2,2)(7,5)(7,3)
-\end{pspicture}
-\end{lstlisting}
-\end{minipage}
-
-\section{Dashed lines}
-By default a dash line can be set with the option \verb+dash=<black> <white>+, 
-e.g. \verb+dash=10pt 5pt+. This definition makes it impossible to define a 
-dashed/dotted line. \verb+pstricks-add+ redefines this option for a use with 
-four parameters \verb+dash=<black> <white> <black> <white>+,
-where the last two can be omit. The following examples show different values for these
-parameters:
-
-
-\medskip
-\begin{center}
-\begin{minipage}{10.5cm}%
-\psset{linestyle=dashed,dashadjust=false}
-\noindent
-\psline[dash=1 1](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 0.5](0,0)(10,0)\\
-\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\
-\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0)\\
-
-\psset{dashadjust=true}
-\noindent
-\psline[dash=1 1](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 0](0,0)(10,0)\\
-\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\
-\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0)
-\end{minipage}
-\end{center}
-
-
-\medskip
-\begin{lstlisting}
-{\psset{linestyle=dashed,dashadjust=false}
-\psline[dash=1 1](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 0.5](0,0)(10,0)\\
-\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\
-\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0)\\
-
-\psset{dashadjust=true}
-\psline[dash=1 1](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 0](0,0)(10,0)\\
-\psline[dash=1 0.2 0.05 0.2](0,0)(10,0)\\
-\psline[dash=0.05 0.2 1 0.2](0,0)(10,0)\\
-\psline[linewidth=1mm,dash=2 1 1 2](0,0)(10,0)}
-\end{lstlisting}
-
-
-As seen in the above code, it is no problem to use dashed lines in the usual way 
-with two parameters.
-
-
-\section{Ellipses}
-\verbI{pstricks - patch 14} has only the following macro for drawing an ellipse:
-
-{\small\begin{verbatim}
-\psellipse[<option>](x,y)(a,b)
-\psellipse*[<option>](x,y)(a,b)
-\end{verbatim}}
-
-\noindent whith \verbI{(x,y)} as the center and \verbI{(a,b)} as the two radians 
-(figure \ref{pstricks}).
-
-\begin{figure}[htb]
-\begin{minipage}{0.39\columnwidth}
-\begin{pspicture}(0,-0.25)(5,3.25)
-  \psgrid
-  \psellipse[%
-    linewidth=0.2,%
-    linecolor=red](2.5,1.5)(2,1)
-  \psellipse*[%
-  	linecolor=blue](2.5,1.5)(0.5,1.5)
-\end{pspicture}%
-\end{minipage}%
-\hfill%
-\begin{minipage}{0.59\columnwidth}
-\begin{lstlisting}
-\begin{pspicture}(0,-0.25)(5,3.25)
-  \psgrid
-  \psellipse[%
-    linewidth=0.2,%
-    linecolor=red](2.5,1.5)(2,1)
-  \psellipse*[%
-    linecolor=blue](2.5,1.5)(0.5,1.5)
-\end{pspicture}%
-\end{lstlisting}
-\end{minipage}%
-\caption{The \verbI{pstricks} macro \CMD{psellipse}}\label{pstricks}
-\end{figure}
-
-\subsection{Ellipse based on \texttt{pst-plot}}
-
-With the \CMD{parametricplot} macro from \verbI{pst-plot} we can define a new macro for 
-drawing ellipses:
-
-\begin{lstlisting}
-% #1 options
-% #2 a
-% #3 b
-% #4 start angle
-% #5 end angle
-\newcommand{\pstEllipse}[5][]{%
-  \psset{#1}
-  \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}}
-\end{lstlisting}
-
-\noindent which has the syntax
-
-{\small\begin{verbatim}
-\pstEllipse[<options>]{a}{b}{start angle}{end angle}
-\end{verbatim}}
-
-This macro is not part of of \verb|pstricks.tex|, it is only defined for some demonstration.
-
-\newcommand*{\pstEllipse}[5][]{%
-  \psset{#1}
-  \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}%
-}
-
-\begin{figure}[htb]
-\begin{minipage}{0.39\columnwidth}
-\begin{pspicture}(-2.25,-1.75)(2.25,1.75)
-	\psgrid
-	\pstEllipse[%
-		linewidth=0.2,%
-		linecolor=red]{2}{1}{0}{360}
-	\pstEllipse[%
-		linewidth=0.1,%
-		arrows=|->,%
-		arrowsize=0.5,%
-		linecolor=blue]{1}{2}{-30}{250}
-\end{pspicture}%
-\end{minipage}%
-\hfill%
-\begin{minipage}{0.59\columnwidth}
-\begin{lstlisting}
-\begin{pspicture}(-2.25,-1.75)(2.25,1.75)
-  \psgrid
-  \pstEllipse[%
-    linewidth=0.2,%
-    linecolor=red]{2}{1}{0}{360}
-  \pstEllipse[%
-    linewidth=0.1,arrows=|->,%
-    arrowsize=0.5,%
-    linecolor=blue]{1}{2}{-30}{250}
-\end{pspicture}%
-\end{lstlisting}
-\end{minipage}%
-\caption{The macro \CMD{pstEllipse} which uses the \CMD{parametricplot} macro 
-from \verbI{pst-plot}}\label{parametric}
-\end{figure}
-
-As seen in figure \ref{parametric} it is no problem to draw arcs of an ellipse. 
-The center of these ellipses are by default $(0,0)$, with the \CMD{rput} macro 
-it is also not a problem to put the ellipse anywhere in the coordinate system with
-any angle of rotating.
-
-
-\subsubsection{Wedge of an ellipse}
-To define a macro for a wedge of an ellipse (figure \ref{parametric-wedge}) is also easy with
-the \verb+\pscustom+ macro. which uses the following code:
-
-
-%
-\newcommand*{\pstEllipseWedge}[5][]{%
-  \psset{#1}%
-  \pscustom{%
-    \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}%
-      \psline(! #2\space #5\space cos mul #3\space #5\space sin mul)%
-        (0,0)%
-	(! #2\space #4\space cos mul #3\space #4\space sin mul)%
-  }%
-}
-%
-
-\begin{lstlisting}
-% #1 options
-% #2 a
-% #3 b
-% #4 start angle
-% #5 end angle
-\newcommand{\pstEllipseWedge}[5][]{%
-  \psset{#1}
-  \pscustom{%
-    \parametricplot{#4}{#5}{#2\space t cos mul #3\space t sin mul}%
-    \psline(! #2\space #5\space cos mul #3\space #5\space sin mul)%
-	(0,0)%
-	(! #2\space #4\space cos mul #3\space #4\space sin mul)%
-  }%
-}
-\end{lstlisting}
-
-This macro is also not part of of \verb|pstricks.tex|, it is only defined for some 
-demonstration.
-
-\begin{figure}[htb]
-\begin{minipage}{0.39\columnwidth}
-\begin{pspicture}(-2.25,-1.75)(2.25,1.75)
-  \psgrid
-  \pstEllipseWedge[%
-    linewidth=0.05,linecolor=red,%
-    fillstyle=hlines,%
-    fillcolor=red]{2}{1}{0}{130}
-  \pstEllipseWedge[%
-    linewidth=0.1,%
-    linecolor=blue,%
-    fillstyle=vlines,%
-    fillcolor=blue]{1}{2}{-30}{190}
-\end{pspicture}%
-\end{minipage}%
-\hfill%
-\begin{minipage}{0.59\columnwidth}
-\begin{lstlisting}
-\begin{pspicture}(-2.25,-1.75)(2.25,1.75)
-  \psgrid
-  \pstEllipseWedge[%
-    linewidth=0.05,linecolor=red,%
-    fillstyle=hlines,%
-    fillcolor=red]{2}{1}{0}{130}
-  \pstEllipseWedge[%
-    linewidth=0.1,linecolor=blue,%
-    fillstyle=vlines,%
-    fillcolor=blue]{1}{2}{-30}{190}
-\end{pspicture}%
-\end{lstlisting}
-\end{minipage}%
-\caption{The macro \CMD{pstEllipseWedge} which uses the \CMD{parametricplot} 
-macro from \verbI{pst-plot}}\label{parametric-wedge}
-\end{figure}
-
-\subsection{New ellipse macros}
-
-All macros defined in this package are original from Timothy Van Zandt and Denis Girou and 
-modified by several other authors. The available macros are
-
-{\small\begin{verbatim}
-\psellipticarc[<options>]
-    {<arrows>}(<center>)(a,b){start angle}{end angle}
-\psellipticarcn[<options>]
-    {<arrows>}(<center>)(a,b){start angle}{end angle}
-\psellipticwedge[<options>]
-    {<arrows>}(<center>)(a,b){start angle}{end angle}
-\end{verbatim}}
-
-\subsubsection{Arc of an ellipse}
-
-Figure \ref{pst-ellipse-arc} shows different examples for this macro.
-
-\begin{figure}[htb]
-\begin{minipage}{0.39\columnwidth}
-\begin{pspicture}(-2.25,-2.25)(2.25,2.25)
-  \psgrid
-  \psellipticarc[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180}
-  \psellipticarc[linecolor=red](0,0)(0.5,1.5){30}{320}
-\end{pspicture}
-\end{minipage}%
-\hfill%
-\begin{minipage}{0.59\columnwidth}
-\begin{lstlisting}
-\begin{pspicture}(-2.25,-2.25)(2.25,2.25)
-  \psellipticarc[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180}
-  \psellipticarc[linecolor=red](0,0)(0.5,1.5){30}{320}
-\end{pspicture}
-\end{lstlisting}
-\end{minipage}%
-\caption{The macro \CMD{psellipticarc}}\label{pst-ellipse-arc}
-\end{figure}
-
-\subsection{Arc of an ellipse with anti clockwise direction}
-
-Figure \ref{pst-ellipse-arcN} shows different examples for this macro which is the same than the one figure \ref{{pst-ellipse-arc}} only drawn anti clockwise.
-
-\begin{figure}[htb]
-\begin{minipage}{0.39\columnwidth}
-\begin{pspicture}(-2.25,-2.25)(2.25,2.25)
-	\psgrid
-	\psellipticarcn[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180}
-	\psellipticarcn[linecolor=red](0,0)(0.5,1.5){30}{320}
-\end{pspicture}
-\end{minipage}%
-\hfill%
-\begin{minipage}{0.59\columnwidth}
-\begin{lstlisting}
-\begin{pspicture}(-2.25,-2.25)(2.25,2.25)
-  \psellipticarcn[linewidth=0.1]{|->}(0,0)(1.5,1){0}{180}
-  \psellipticarcn[linecolor=red](0,0)(0.5,1.5){30}{320}
-\end{pspicture}
-\end{lstlisting}
-\end{minipage}%
-\caption{The macro \CMD{psellipticarcn}}\label{pst-ellipse-arcN}
-\end{figure}
-
-
-\subsubsection{Wedge of an ellipse}
-
-Figure \ref{pst-ellipse-wedge} shows different examples for this macro.
-
-\begin{figure}[htb]
-\begin{minipage}{0.39\columnwidth}
-\begin{pspicture}(-2.25,-2.25)(2.25,2.25)
-	\psgrid
-	\psellipticwedge[%
-		fillstyle=vlines,%
-		linewidth=0.1](0,0)(1.5,1){0}{200}
-	\psellipticwedge[%
-		fillstyle=hlines,%
-		linecolor=red](0,0)(0.5,1.5){30}{220}
-\end{pspicture}
-\end{minipage}%
-\hfill%
-\begin{minipage}{0.59\columnwidth}
-\begin{lstlisting}
-\begin{pspicture}(-2.25,-2.25)(2.25,2.25)
-  \psgrid
-  \psellipticwedge[%
-    fillstyle=vlines,%
-    linewidth=0.1](0,0)(1.5,1){0}{200}
-  \psellipticwedge[%
-    fillstyle=hlines,%
-    linecolor=red](0,0)(0.5,1.5){30}{220}
-\end{pspicture}
-\end{lstlisting}
-\end{minipage}%
-\caption{The macro \CMD{psellipticwedge}}\label{pst-ellipse-wedge}
-\end{figure}
-
-\section{\texttt{pstricks.sty}}
-In the past there were some problems with \verb+pstricks.tex+ and the package \verb+color.sty+. 
-\verb+pstcol.sty+ tried to get rid of them but not with success in any case. The
-new package \verb+pstricks.sty+ loads first \verb+pstricks.tex+, does some modifcation
-to \verb+pstricks+, loads \verb+xcolor.sty+ and some more modifications to the the code to
-get \verb+pstricks+ and colors work in a right way. It also renames the \verb+\scalebox+
-macro to \verb+\psscalebox+ to prevend clashes with the one from the package \verb+graphicx.sty+ which has the
-same name but another syntax. If you want to use the macro from \verb+graphicx+, then load this
-package as the last one.
-
-
-\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index bc406da7684..cb1830485a3 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.17}
-\def\filedate{2011/01/30}
+\def\fileversion{2.19}
+\def\filedate{2011/03/25}
 %
 % stolen from latex.ltx to make it TeX compatible
 \newcount\psLoopIndex
@@ -491,8 +491,8 @@
 \def\pst@@@@checknum#1\relax\@nil{\ifx\@nil#1\@nil\else\let\pst@num\z@\fi}
 %
 \def\pst@getnumii#1 #2 #3\@nil{%
-\pst@checknum{#1}\pst@tempg%
-\pst@checknum{#2}\pst@temph}
+  \pst@checknum{#1}\pst@tempg%
+  \ifx\relax#2\relax\let\pst@temph\pst@tempg\else\pst@checknum{#2}\pst@temph\fi}
 \def\pst@getnumiii#1 #2 #3 #4\@nil{%
 \pst@checknum{#1}\pst@tempg%
 \pst@checknum{#2}\pst@temph%
@@ -1446,8 +1446,8 @@
 \psset[pstricks]{arrows=-}
 %
 \define@key[psset]{pstricks}{arrowscale}[1]{%                                   hv --1.12
-  \pst@@arrowscale@i#1 \@nil%                               hv -- 1.12 
-  \pst@getscale{\pst@arrowscale}\psk@arrowscale}%           hv --1.12
+  \pst@getscale{#1}\psk@arrowscale
+  \pst@@arrowscale@i#1 \@nil}%           hv --1.12
 \def\pst@@arrowscale@i#1 #2\@nil{\edef\pst@arrowscale{#1}}% hv --1.12
 \psset[pstricks]{arrowscale=1}
 %
@@ -2558,11 +2558,11 @@
 \def\psgrid@ii(#1){\@ifnextchar({\psgrid@iii(#1)}{\psgrid@iv(0,0)(0,0)(#1)}}
 \def\psgrid@iii(#1)(#2){\@ifnextchar({\psgrid@iv(#1)(#2)}{\psgrid@iv(#1)(#1)(#2)}}
 \def\psgrid@iv(#1)(#2)(#3){%
-  \begin@SpecialObj
+  \begin@SpecialObj%
     \pst@getcoor{#1}\pst@tempA%  hv 1.11
-    \pst@getcoor{#2}\pst@tempB % hv 1.11
+    \pst@getcoor{#2}\pst@tempB%  hv 1.11
     \pst@@getcoor{#3}%
-    \ifnum\psk@subgriddiv>1
+    \ifnum\psk@subgriddiv>1\relax
       \addto@pscode{
         gsave
         \psk@subgridwidth SLW 
@@ -2576,7 +2576,7 @@
 	\tx@Grid 
 	grestore
       }%
-    \fi
+    \fi%
     \addto@pscode{
       gsave
       \psk@gridwidth SLW 
@@ -2736,13 +2736,15 @@
     \end@psclip%
     \endgroup}%
   \ignorespaces}
+%
 \def\endpsclip{\pst@misplaced\endpsclip}
 \let\begin@psclip\relax
 \def\end@psclip{\pstVerb{currentpoint initclip moveto}}
+%
 \def\AltClipMode{%
-\def\end@psclip{\pstVerb{\pst@grestore}}%
-\def\begin@psclip{\pstVerb{gsave}}}
-\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
+  \def\end@psclip{\pstVerb{\pst@grestore}}%
+  \def\begin@psclip{\pstVerb{gsave}}}
+  \def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
 % DG modification begin - Apr. 3, 1997
 % From paulus@immd5.informatik.uni-erlangen.de (Dietrich Paulus)
 %\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}}
@@ -2769,6 +2771,7 @@
     setmatrix}%
   \unhbox\pst@hbox%
   \end@psclip}}
+%
 \def\psshadowbox{\def\pst@par{}\pst@object{psshadowbox}}
 \def\psshadowbox@i{\pst@makebox\psshadowbox@ii}
 \def\psshadowbox@ii{%
@@ -3250,6 +3253,7 @@ pop
 \def\psellipticarc@iii(#1){%
   \@ifnextchar({\psellipticarc@iv(#1)}{\psellipticarc@iv(0,0)(#1)}}
 \def\psellipticarc@iv(#1)(#2)#3#4{%
+%  \addbefore@par{correctAngle=false}
   \begin@OpenObj
   \pst@getcoor{#1}\pst@tempa%	origin
   \pst@getcoor{#2}\pst@tempb%	a,b
@@ -3330,7 +3334,19 @@ pop
   xOrig yOrig T
   rx ry scale
   0 0 moveto
-  0 0 1 \pst@tempc \pst@tempd
+  0 0 1 
+  \pst@tempc 
+  \ifPst@correctAngle
+     cvi 90 mod 0 eq { \pst@tempc } 
+       { rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan 
+          \pst@tempc 180 div .5 add floor 180 mul sub } ifelse 
+    \fi
+  \pst@tempd
+   \ifPst@correctAngle
+     cvi 90 mod 0 eq { \pst@tempd } 
+       { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan 
+          \pst@tempd 180 div .5 add floor 180 mul sub } ifelse 
+    \fi
   \ifcase\psarc@type arc \or arcn \fi
   closepath
   mtrx setmatrix
@@ -3896,7 +3912,8 @@ pop
 %
 \def\pspicture{\begingroup\pst@ifstar\pst@picture}
 \def\pst@picture{\@ifnextchar[{\pst@@picture}{\pst@@picture[]}}
-\def\pst@@picture[#1]#2(#3,#4){\@ifnextchar(%
+\def\pst@@picture[#1]{\@ifnextchar({\pst@@picture@i[#1]}{\pst@@picture@i[#1](10,10)}}%
+\def\pst@@picture@i[#1]#2(#3,#4){\@ifnextchar(%   ignore anything between [] and ()
   {\pst@@@picture[#1](#3,#4)}%
   {\pst@@@picture[#1](0,0)(#3,#4)}}
 %
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index a12b8cd2499..15fb4d7c767 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -5,8 +5,8 @@
 %%
 %% pstricks.sty Copyright (C) 1997 Timothy Van Zandt
 %% pstcol.sty   Copyright (C) 1994-1996 1999 David Carlisle
-%% pstricks.sty Copyright (C) 2004-2010 Herbert Voss <voss@perce.de>
-%%                                 Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%% pstricks.sty Copyright (C) 2004-2011 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%%                                      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.
@@ -16,7 +16,7 @@
 \NeedsTeXFormat{LaTeX2e}
 
 \ProvidesPackage{pstricks}
-  [2010/09/18 v0.48 LaTeX wrapper for `PSTricks' (RN,HV)]
+  [2011/03/27 v0.49 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%
@@ -54,17 +54,6 @@
 
 \ProcessOptions\relax
 
-\iffalse
-\def\c@lor@to@ps{%
-    \@latex@error
-      {You have run the document with pdflatex, but PSTricks\MessageBreak
-      requires latex->dvips->ps2pdf or alternatively the use\MessageBreak
-      of the package auto-pst-pdf. Then you can run\MessageBreak
-      `pdflatex -shell-escape PSTfile.tex'}%
-      {See also the PSTricks web pages http://PSTricks.tug.org}\@gobble
-}
-\fi
-
 \ifpst@PDF
    \typeout{>>> Loading package auto-pst-pdf <<<}
    \AtBeginDocument{\usepackage{auto-pst-pdf}}%
@@ -75,9 +64,30 @@
     or a "pdflatex -enable-write18 <file>"           \MessageBreak
     (if you are using MikTeX)                        \MessageBreak  
 ************************************}
-  \fi%
+  \fi
 \fi
 
+\RequirePackage{ifpdf,ifluatex}
+
+\AtBeginDocument{%
+  \ifpdf
+    \ifluatex
+      \def\pst@tempA{lualatex} 
+    \else
+      \def\pst@tempA{pdflatex}
+    \fi
+    \@ifpackageloaded{pst-pdf}{}{%
+      \@latex@error{%
+        You have run the document with pdflatex, but PSTricks\MessageBreak
+        requires latex->dvips->ps2pdf or alternatively the use\MessageBreak
+        of the package `auto-pst-pdf'. Then you can run\MessageBreak
+        \space\space`\pst@tempA\space -shell-escape <file>' (TeX Live)
+        \MessageBreak or\MessageBreak
+        \space\space`\pst@tempA\space -enable-write18 <file>' (MikTeX)}%
+        {See also the PSTricks web pages http://PSTricks.tug.org}}%
+  \fi
+}
+
 \@ifundefined{PSTricksLoaded}
 {%
   \let\saved@scalebox\scalebox
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index a8d0005fdc3..a361032e69e 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3481,11 +3481,11 @@ sub MAKEltt {
   &runjob("$CP * $DEST/doc/ltt");
  }
 
-sub MAKEpstricks
-{
+sub MAKEpstricks {
   # move the directories.
   &xchdir ($packagedir);
   &xmkdir ("$DEST/doc/generic");
+  &SYSTEM ("$RM generic/zzz.*");
   #
   my $docdir = "$DEST/doc/generic/pstricks";
   &SYSTEM ("$MV doc $docdir");
@@ -3506,8 +3506,7 @@ sub MAKEpstricks
   &SYSTEM ("$MV latex $DEST/tex/latex/pstricks");
 }
 
-sub MAKEwilson
-{
+sub MAKEwilson {
  &setup;
 
  my $docdir = "$DEST/doc/$whichdocformat/$package";