pstricks (7Apr17)

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

9 files changed, 546 insertions, 42 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/Makefile b/Master/texmf-dist/doc/generic/pstricks/Makefile
new file mode 100644
index 00000000000..0b4f5519d33
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/Makefile
@@ -0,0 +1,95 @@
+# `Makefile' for `pst-news.pdf', hv, 2007/03/17
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = pst-news$(shell date +%y)
+
+MAIN = $(PACKAGE)
+
+BASE = pstricks-base
+
+TDSBASE = pstricks
+
+LATEX = latex
+
+TDS = ~/PSTricks/PSTricks-TDS
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+
+all : doc clean
+doc: $(MAIN).pdf
+
+$(MAIN).pdf : $(MAIN).ps
+	GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+
+$(MAIN).ps : $(MAIN).dvi
+	dvips $<
+
+$(MAIN).dvi : $(MAIN).tex
+	$(LATEX) $<
+	$(LATEX) $<
+	if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
+	if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
+	makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
+	  $(basename $<).glo
+	makeindex -t $(basename $<).ilg -o $(basename $<).ind \
+	  $(basename $<).idx
+	biber $(basename $<)
+	$(LATEX) $<
+	$(LATEX) $<
+
+clean : 
+	$(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
+	$(RM) $(addprefix $(MAIN), .dvi .ps .bcf .run.xml)
+
+veryclean : clean
+	$(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+	zip $(ARCHNAME).zip $(ARCHFILES)
+
+tds:
+#################### base #########################
+	cp -u ../config/*        ../.base/$(BASE)/config/
+#
+	cp -u ../Changes            ../.base/$(BASE)/
+	cp -u pst-doc.*          ../.base/$(BASE)/doc/
+	cp -u PSTricks.bib*      ../.base/$(BASE)/doc/
+	cp -u pst-news*          ../.base/$(BASE)/doc/
+	cp -u pst-user*          ../.base/$(BASE)/doc/
+	cp -u *.sty              ../.base/$(BASE)/doc/
+	cp -u pstricks-*         ../.base/$(BASE)/doc/
+	cp -u test*              ../.base/$(BASE)/doc/
+	cp -u images/*           ../.base/$(BASE)/doc/images/
+#
+	cp -u ../dvips/*         ../.base/$(BASE)/dvips/
+	cp -u ../generic/*       ../.base/$(BASE)/generic/
+	cp -u ../latex/*         ../.base/$(BASE)/latex/
+	cp -u ../README          ../.base/$(BASE)/
+#
+#################### TDS #########################
+	cp -u ../Changes     $(TDS)/doc/generic/$(TDSBASE)/
+#	cp -u README      $(TDS)/doc/generic/$(TDSBASE)/
+	cp -u $(MAIN).pdf $(TDS)/doc/generic/$(TDSBASE)/
+#
+#	cp -u ../latex/Changes        $(TDS)/tex/latex/$(TDSBASE)/
+	cp -u ../latex/* $(TDS)/tex/latex/$(TDSBASE)/
+#
+#	cp -u ../generic/Changes        $(TDS)/tex/generic/$(TDSBASE)/
+	cp -u ../generic/* $(TDS)/tex/generic/$(TDSBASE)/
+#
+#	cp -u ../dvips/Changes        $(TDS)/dvips/$(TDSBASE)/
+#	cp -u ../dvips/$(BASE).pro $(TDS)/dvips/$(TDSBASE)/
+#	cp -u ../dvips/$(BASE)97.pro $(TDS)/dvips/$(TDSBASE)/
+	cp -u ../dvips/*.pro $(TDS)/dvips/$(TDSBASE)/
+#
+#	cp -u Changes     $(TDS)/source/$(TDSBASE)/
+	cp -u $(MAIN).tex $(TDS)/source/$(TDSBASE)/
+#	cp -u $(MAIN).bib $(TDS)/source/$(TDSBASE)/
+	cp -u Makefile    $(TDS)/source/$(TDSBASE)/
+
+	cp -u ../dvips/*.pro ~/Links/dvips-local/
+
+# EOF
diff --git a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
index b77962ea5a0..daaa78d4452 100644
--- a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
+++ b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
@@ -9,26 +9,22 @@
   year           = 1989,
 }
 
-@Manual{pdftricks,
+@online{pdftricks,
   Title          = {PSTricks Support for pdf},
-  Author         = {Herbert Voss},
-  Organization   = {},
-  Address        = {\url{http://PSTricks.tug.org/main.cgi?file=pdf/pdfoutput}},
-  Note           = {},
+  Author         = {Herbert Voß},
+  url        = {http://PSTricks.tug.org/main.cgi?file=pdf/pdfoutput},
   year           = 2002,
 }
 
-@Manual{miwi,
+@online{miwi,
   Title          = {References for \TeX{} and Friends},
   Author         = {Michael Wiedmann and Peter Karp},
-  Organization   = {},
-  Address        = {\url{http://www.miwie.org/tex-refs/}},
-  Note           = {},
+  url        = {http://www.miwie.org/tex-refs/},
   year           = 2003,
 }
 
 @Article{dtk02.2:jackson.voss:plot-funktionen,
-  author	= {Laura E. Jackson and Herbert Vo{\ss}},
+  author	= {Laura E. Jackson and Herbert Voß},
   title		= {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
   journal	= dtk,
   year		= 2002,
@@ -38,7 +34,6 @@
   month		= jun,
   pages		= {27--34},
   annote	= bretter,
-  keywords	= {},
   abstract	= { Im letzten Heft wurden die mathematischen Funktionen von
 		  \PS~im Zusammenhang mit dem {\LaTeX}-Paket
 		  \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
@@ -48,7 +43,7 @@
 }
 
 @Article{dtk02.1:voss:mathematischen,
-  author	= {Herbert Vo{\ss}},
+  author	= {Herbert Voß},
   title		= {Die mathematischen {F}unktionen von {P}ostscript},
   journal	= dtk,
   year		= 2002,
@@ -58,11 +53,10 @@
   month		= mar,
   pages		= {40-47},
   annote	= bretter,
-  keywords	= {},
   abstract	= { \PS, faktisch genauso alt wie {\TeX}, ist im
 		  Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
 		  darum geht zu beurteilen, was es denn nun im eigentlichen
-		  Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
+		  Sinne ist. Außerdem wird h{\"a}ufig vergessen, dass
 		  sich mit den \PS-Funktionen viele Dinge erledigen lassen,
 		  bei denen sonst auf externe Programme zur{\"u}ckgegriffen
 		  wird. Dies wird im Folgenden f{\"u}r die mathematischen
@@ -71,44 +65,44 @@
 }
 
 @Book{companion,
-  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
+  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Voß},
   title		= {The {\LaTeX} {G}raphics {C}ompanion},
   publisher	= {{Addison-Wesley Publishing Company}},
-  edition	= second,
+  edition	= 2,
   year		= {2007},
   address	= {Reading, Mass.}
 }
 
 @Book{PSTricks2,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
   edition	= 7,
   publisher	= {DANTE -- Lehmanns Media},
   year		= {2016},
-  address	= {Heidelberg and Berlin}
+  location	= {Heidelberg and Berlin}
 }
 
 @Book{PSTricksE,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {\texttt{PSTricks} -- {G}raphics for \LaTeX},
-  edition	= {1.},
+  edition	= {1},
   publisher	= {UIT},
   year		= {2011},
   address	= {Cambridge/UK}
 }
 
 @Book{LaTeXRef,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {\LaTeX\ Referenz},
-  edition	= {2.},
+  edition	= {3},
   publisher	= {DANTE -- lehmanns media},
-  year		= {2010},
+  year		= {2014},
   address	= {Heidelberg and Berlin}
 }
 @Book{LaTeXRefE,
-  author	= {Herbert Vo\ss},
+  author	= {Herbert Voß},
   title		= {\LaTeX\ Quick Reference},
-  edition	= {1.},
+  edition	= {1},
   publisher	= {UIT},
   year		= {2011},
   address	= {Cambridge/UK}
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index 23309af8e2a..90b2b170cd4 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,4 @@
-PSTricks 2016
+PSTricks 2017
 
 -----------------------------------------------------------------------
 PSTricks is the original work of Timothy van Zandt <tvz@econ.insead.fr>
@@ -98,11 +98,29 @@ base    : main PSTricks files
     latex   : LaTeX wrappers
 
 
-5 - Documentation
+5 - Running pdflatex or lualatex
+     Load package pstricks-pdf instead of pstricks and run your example with
+the optional argument --shell-escape (MikTeX allows also -enable-write18)
+
+lualatex --shell-escape <file>
+pdflatex --shell-escape <file>
+
+pstricks-pdf creates in the background all pspicture environment as single
+pdf graphic files. In difference to auto-pst-pdf the package pstricks-pdf allows running
+lualatex.
+All optional arguments of package auto-pst-pdf are possible.
+See documentation for more informations. The package pst-platform is
+loaded by default and similiar to ifplatform.sty, it fixes a problem with
+lualatex.
+
+
+
+6 - Documentation
     -------------
 There is a mailing list devoted to discussions on PSTricks usage.
 The informations to subscribe to this list and to consult the archives can
 be found on the Web page.
 
+
 --
-Denis Girou, Sebastian Rahtz and Herbert Voss (updated Novermber 03, 2010)
+Denis Girou, Sebastian Rahtz and Herbert Voss (updated November 2017)
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
new file mode 100644
index 00000000000..37ee8889755
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex
new file mode 100644
index 00000000000..60d0094b465
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex
@@ -0,0 +1,113 @@
+%% $Id: pst-news15.tex 163 2015-07-26 07:20:23Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+    headexclude,footexclude,oneside]{pst-doc}
+\listfiles
+\let\Lfile\LFile
+\usepackage[utf8]{inputenc}
+\usepackage{pst-node,pst-plot}
+\let\pstnodeFV\fileversion
+\let\pstnodeFD\filedate
+\usepackage{pst-solides3d}
+\usepackage{pst-node}
+\usepackage{pstricks-add}
+\usepackage{xkvview}
+\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}\the\year}}
+\def\textat{\char064}
+\usepackage{biblatex}
+\addbibresource{PSTricks.bib}
+
+\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
+    escapechar=?}
+\begin{document}
+
+%\psset{PstDebug=1}
+\title{\texttt{News -- \the\year}\\ \Large new macros and bugfixes for the
+basic package \nxLFile{pstricks}}
+\author{Herbert Voß}
+\date{\today}
+
+\maketitle
+
+\clearpage
+\tableofcontents
+
+\clearpage
+\part{\texttt{pstricks} -- package}
+
+\iffalse
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}}
+%--------------------------------------------------------------------------------------
+ 
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks-pdf.sty}}
+%--------------------------------------------------------------------------------------
+This package allows to use pstricks code with \Lprog{pdflatex} or \Lprog{lualatex}.
+All optional arguments of package \LPack{auto-pst-pdf} are possible. In difference to
+this package \LPack{pstricks-pdf} has no problems with running \Lprog{lualatex}.
+Internally \Lprog{lualatex} starts \Lprog{xelatex} for creating the environments
+\Lenv{pspicture} as single images.
+
+\fi
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
+%--------------------------------------------------------------------------------------
+\subsection{refangle}
+
+This version fixes a bug with \verb|pst@refangle| which is used inside PostScript.
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(-1,-1)(10,3.5)
+\psparametricplot[algebraic]{0}{9}{t^2/9 | sin(t)+1}%
+\pscurvepoints{0}{9}{(t^2)/9 | sin(t)+1}{P}%
+\pspolylineticks[metricInitValue=1,ticksize=-2pt 2pt,Os=1,Ds=.2]{P}{ ds }{1}{56}%
+\pspolylineticks[metricInitValue=1,Os=1,Ds=2]{P}{ ds }{0}{6}%
+\multido{\iA=1+1,\iB=3+2}{5}{\Put{6pt;(PNormal\iA)}(PTick\iA){\tiny \iB}}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{sloppypar}
+There is a new optional argument \Lkeyword{draft} which has the same meaning as
+the one for \Lcs{includegraphics}. The PSTricks image is not drawn, only the 
+area of the \Lenv{pspicture}  coordinates is seen by a rectangle (only for \LaTeX).
+\end{sloppypar}
+
+\begin{LTXexample}[pos=t]
+\psset{draft}
+\begin{pspicture}(-1,-1)(10,3.5)
+\psparametricplot[algebraic]{0}{9}{t^2/9 | sin(t)+1}%
+\pscurvepoints{0}{9}{(t^2)/9 | sin(t)+1}{P}%
+\pspolylineticks[metricInitValue=1,ticksize=-2pt 2pt,Os=1,Ds=.2]{P}{ ds }{1}{56}%
+\pspolylineticks[metricInitValue=1,Os=1,Ds=2]{P}{ ds }{0}{6}%
+\multido{\iA=1+1,\iB=3+2}{5}{\Put{6pt;(PNormal\iA)}(PTick\iA){\tiny \iB}}
+\end{pspicture}
+\end{LTXexample}
+
+
+\subsection{\Lcs{newpsstyle}}
+
+The command \Lcs{newpsstyle} has a new syntax:
+
+\begin{BDef}
+\Lcs{newpssytle}\OptArg{package name}\Largb{name}\Largb{definitions}
+\end{BDef}
+
+For example
+
+\begin{verbatim}
+\newpsstyle[pst-shell]{Epiteonium}{D=1,A=9.5,alpha=85.9,beta=9,mu=0,Omega=0,
+  phi=81,a=2.1,b=1.6,L=1.3,P=-60,W1=200,W2=20,N=8.3}
+\end{verbatim}
+
+
+\clearpage
+\nocite{*}
+\printbibliography
+
+\printindex
+
+
+\end{document}
+
+
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index c471a7fd9af..edebe9db183 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -132,13 +132,13 @@
 \catcode`\@=\PstAtCode\relax
 \ifx\PSTFPloaded\endinput\else   \input pst-fp.tex\fi
 %
-\input pgfutil-common.tex
-\input pgfkeys.code.tex
-\input pgffor.code.tex
+\@ifundefined{pgfutil@empty}{\input pgfutil-common.tex}{}
+\@ifundefined{pgkeys@empty}{\input pgfkeys.code.tex}{}
+\@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{}
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.71}
-\def\filedate{2016/12/23}
+\def\fileversion{2.72}
+\def\filedate{2017/04/06}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
new file mode 100644
index 00000000000..7daaf9f0df8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
@@ -0,0 +1,141 @@
+%%
+%% This is file `pst-platform.sty',
+%%
+%%   Copyright (C) 2017  Herbert Voß <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.
+%% Either version 1.0 or, at your option, any later version.
+%%
+\ProvidesPackage{pst-platform}
+  [2017/03/17 v0.01  Testing for the operating system, patch for luatex]
+\RequirePackage{shellesc,pdftexcmds,catchfile,ifluatex}
+%%
+% The following code is from ifplatform.sty, it fixes a bug with lualatex
+%%
+\newif\ifshellescape
+\newif\ifwindows
+\newif\ifmacosx
+\newif\iflinux
+\newif\ifcygwin
+\newcommand\windowsname{Windows}
+\newcommand\notwindowsname{*NIX}
+\newcommand\linuxname{Linux}
+\newcommand\macosxname{Mac\,OS\,X}
+\newcommand\cygwinname{Cygwin}
+\newcommand\unknownplatform{[Unknown]}
+\edef\ip@file{\jobname.w18}
+\newif\if@ip@nix@
+\ifnum\pdf@shellescape=1\relax
+  \shellescapetrue
+\else
+  \ifluatex\else
+  \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+    shell escape is disabled,
+    so I can only detect \@backslashchar ifwindows%
+  }
+  \fi
+\fi
+\def\ip@cantdecide{%
+  \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+    I can't tell if this is Windows or *nix;
+    you appear to be both%
+  }%
+}
+\ifluatex
+  \csname\directlua{
+      if os.type == "unix" then
+        tex.sprint("@ip@nix@true")
+      elseif os.type == "windows" then
+        tex.sprint("windowstrue")
+      end
+    }\endcsname
+\else
+ \IfFileExists{nul:}{\@ip@nix@false}{\@ip@nix@true}
+ \IfFileExists{/dev/null}{\windowsfalse}{\windowstrue}
+ \edef\ip@windows@echo@test{echo \string# > "\ip@file"}
+ \def\ip@backupplan{%
+  \IfFileExists{\ip@file}{%
+    \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+      Please delete the file "\ip@file" and try again%
+    }%
+    \ip@cantdecide
+  }{%
+    \ShellEscape{\ip@windows@echo@test}%
+    \IfFileExists{\ip@file}{%
+      \ShellEscape{del "\ip@file"}%
+      \windowstrue
+    }{%
+      \@ip@nix@true
+    }%
+  }%
+ }
+ \ifwindows
+  \if@ip@nix@
+    \PackageWarningNoLine{ifplatform}{^^J \space\space\space
+      I can't tell if this is Windows or *nix;
+      you appear to be neither%
+    }
+  \fi
+ \else
+  \if@ip@nix@\else
+    \ifshellescape
+      \ip@backupplan
+    \else
+      \ip@cantdecide
+    \fi
+  \fi
+ \fi
+ \fi
+ \def\ip@only@six#1#2#3#4#5#6#7\@nil{#1#2#3#4#5#6}
+ \if@ip@nix@
+ \ifshellescape
+  \ifwindows\else
+    \ShellEscape{uname -s > "\ip@file"}
+    \CatchFileDef\@tempa{\ip@file}{}
+    \ShellEscape{rm -- "\ip@file"}
+    \edef\@tempa{\expandafter\zap@space\@tempa\@empty}
+    \def\@tempb{Linux}
+    \ifx\@tempa\@tempb
+      \linuxtrue
+    \else
+      \def\@tempb{Darwin}
+      \ifx\@tempa\@tempb
+        \macosxtrue
+      \else
+        \def\@tempb{CYGWIN}
+        \edef\@tempc{\expandafter\ip@only@six\@tempa------\@nil}
+        \ifx\@tempb\@tempc
+          \cygwintrue
+        \else
+          \edef\unknownplatform{\@tempa}
+        \fi
+      \fi
+    \fi
+  \fi
+\fi\fi
+\edef\platformname{%
+  \ifwindows
+    \noexpand\windowsname
+  \else
+    \ifshellescape
+      \iflinux
+        \noexpand\linuxname
+      \else
+        \ifmacosx
+          \noexpand\macosxname
+        \else
+          \ifcygwin
+            \noexpand\cygwinname
+          \else
+            \noexpand\unknownplatform
+          \fi
+        \fi
+      \fi
+    \else
+      \noexpand\notwindowsname
+    \fi
+  \fi
+}
+%%
+%% End of file `pst-platform.sty'.
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
index e3907c28d7e..71e462a98d6 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
@@ -3,7 +3,7 @@
 %%
 %% IMPORTANT NOTICE:
 %%
-%% pstricks-pdf.sty Copyright (C) 2016 Herbert Voss <hvoss@tug.org>
+%% pstricks-pdf.sty Copyright (C) 2017 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.
@@ -14,15 +14,157 @@
 
 \ProvidesPackage{pstricks-pdf}[2015/11/11 v0.01 wrapper for `pstricks.sty' (HV)]
 % 
-\DeclareOption*{%
-  \PassOptionsToPackage\CurrentOption{auto-pst-pdf}%
-  \PassOptionsToPackage\CurrentOption{pstricks}}%
-\ProcessOptions\relax
-%
-\RequirePackage{auto-pst-pdf}%
+\RequirePackage{ifpdf,xkeyval,pst-platform,ifluatex,ifxetex}
+
+\newif\if@app@off@
+\newif\if@app@crop@
+\newcounter{app@runs}
+\def\app@suffix{autopp}
+\edef\app@jobname{\jobname-\app@suffix}
+\edef\app@pics{\jobname-pics.pdf}
+
+%%%
+% the following code is adapted from auto-pst-pdf
+%%%
+\DeclareOptionX{off}[]{\@app@off@true}
+\define@choicekey{pstricks-pdf.sty}{crop}[\@tempa\@tempb]{on,off}{%
+  \ifcase\@tempb\relax
+    \@app@crop@true
+  \or
+    \@app@crop@false
+  \fi}
+\DeclareOptionX{on}[]{\@app@off@false}
+\DeclareOptionX{ext}{\def\app@ext{#1}}
+\DeclareOptionX{latex}{%
+  \def\app@latex@opts{%
+    \ifwindows
+      -disable-write18
+    \else
+      -no-shell-escape
+    \fi
+    -jobname="\app@jobname"
+    -interaction=batchmode
+    #1}}
+\DeclareOptionX{dvips}{\def\app@dvips@opts{#1}}
+\DeclareOptionX{pspdf}{\def\app@pspdf@opts{#1}}
 \def\app@pdfcrop@opts{--hres}%%%                hv 20130405
-\@ifclassloaded{beamer}{\ifpdf\else\setbeamertemplate{navigation symbols}\fi}{}% 
+\DeclareOptionX{pdfcrop}{\def\app@pdfcrop@opts{#1}}
+
+\DeclareOptionX{cleanup}{%
+  \let\app@rm@files\@empty
+  \@for\@ii:=#1\do{%
+    \edef\app@rm@files{\app@rm@files,\app@jobname.\@ii}}}
+
+\DeclareOptionX{runs}{%
+  \setcounter{app@runs}{#1}% support calc
+  \ifnum\c@app@runs > \z@
+  \else
+    \app@PackageWarning{The number of runs must be at least one.}%
+    \c@app@runs\@ne
+  \fi}
+
+\DeclareOptionX*{%
+  \PassOptionsToPackage{prologue}{xcolor}%  to get named colors into the ps file
+  \PassOptionsToPackage\CurrentOption{pstricks}%
+  \PassOptionsToPackage\CurrentOption{pst-pdf}%
+}
+
+\ExecuteOptionsX{%
+    ext=tex,
+    crop=on,
+    latex={},
+    dvips={-Ppdf},
+    pdfcrop={},
+    cleanup={log,aux,dvi,ps,pdf},
+    runs=1
+}
+\ifwindows
+  \ExecuteOptionsX{pspdf={}}
+\else
+  \ExecuteOptionsX{pspdf={-dAutoRotatePages=/None}}
+\fi
+%
+\ProcessOptionsX\relax
+%
+\ifxetex\@app@off@true\fi
+%
+\def\app@nl{^^J\space\space\space\space}
+\newcommand\app@PackageError[2]{\PackageError{pstricks-pdf}{\app@nl #1^^J}{#2}}
+\newcommand\app@PackageWarning[1]{%
+  \PackageWarning{pstricks-pdf}{\app@nl #1^^JThis warning occured}}
+\newcommand\app@PackageInfo[1]{\PackageInfo{pstricks-pdf}{#1}}
+\newcommand\OnlyIfFileExists[2]{\IfFileExists{#1}{#2}{}}
+\newcommand\NotIfFileExists[2]{\IfFileExists{#1}{}{#2}}
+\def\app@convert#1#2#3{%
+  \OnlyIfFileExists{#2}{%
+%    \expandafter\typeout\expandafter{\csname app@cmd@#1\endcsname}%
+    \typeout{filenameIN: #2}%
+    \typeout{filenameOUT: #3}%
+    \ShellEscape{\csname app@cmd@#1\endcsname{#2}{#3}}%
+    \NotIfFileExists{#3}{\app@PackageWarning{Creation of #3 failed.}}}}
+\def\app@compile{%
+  \app@cleanup
+  \app@remove@container
+  \loop\ifnum\c@app@runs > \@ne
+     \app@convert{extralatex}{\jobname.\app@ext}{}%
+     \advance\c@app@runs\m@ne
+  \repeat
+  \app@convert{latex}{\jobname.\app@ext}{}%
+  \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}%
+  \if@app@crop@
+    \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}%
+    \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}%
+  \else
+    \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}%
+  \fi
+  \IfFileExists{\app@pics}
+    {\app@cleanup}
+    {\app@PackageWarning{Could not create \app@pics.
+      Auxiliary files not deleted.}}}
+\edef\app@rm{\ifwindows del \else rm -- \fi}
+\newcommand\app@try@rm[1]{%
+  \@for\@tempa:=#1\do{%
+    \OnlyIfFileExists{\@tempa}{\ShellEscape{\app@rm "\@tempa"}}}}
+\def\app@remove@container{\app@try@rm{\app@pics}}
+\def\app@cleanup{\app@try@rm{\app@rm@files}}
+\ifluatex
+  \def\app@cmd@latex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"}
+  \def\app@cmd@extralatex#1#2{lualatex --output-format=dvi \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"}
+\else
+  \def\app@cmd@latex#1#2{latex \app@latex@opts\space "\unexpanded{\let\APPmakepictures\empty\input} #1"}
+  \def\app@cmd@extralatex#1#2{\@app@prog\space \app@latex@opts\space "\unexpanded{\let\APPmakepictures\undefined\input} #1"}
+\fi
+\def\app@cmd@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"}
+\def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"}
+\def\app@cmd@pdfcrop#1#2{pdfcrop \app@pdfcrop@opts\space "#1" "#2"}
+\ifpdf
+  \if@app@off@\else
+      \ShellEscape{echo "  "}
+      \ShellEscape{echo "-------------------------------------------------"}
+      \ShellEscape{echo "pstricks-pdf: Auxiliary LaTeX compilation"}
+      \ShellEscape{echo "-------------------------------------------------"}
+      \app@compile
+      \ShellEscape{echo "-------------------------------------------------"}
+      \ShellEscape{echo "pstricks-pdf: End auxiliary LaTeX compilation"}
+      \ShellEscape{echo "-------------------------------------------------"}
+  \fi
+  \if@app@crop@
+    \PassOptionsToPackage{notightpage}{pst-pdf}
+  \fi
+\else
+  \ifx\APPmakepictures\@undefined
+    \PassOptionsToPackage{inactive}{pst-pdf}
+  \else
+    \if@app@crop@
+      \PassOptionsToPackage{notightpage}{pst-pdf}
+    \fi
+  \fi
+\fi
+\RequirePackage{pst-pdf}
 \RequirePackage{pstricks}
+\@ifclassloaded{beamer}{\setbeamertemplate{navigation symbols}}{}% 
+%
+\let\app@ig\includegraphics
 %
 %%
 %% End of file `pstricks-pdf.sty'.
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 8720b0b42b9..3c4db535775 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -7,6 +7,7 @@
 %% pstcol.sty   Copyright (C) 1994-1996 1999 David Carlisle
 %% pstricks.sty Copyright (C) 2004-2016 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %%                                      Herbert Voss <hvoss@tug.org>
+%%                            2017-     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.
@@ -15,7 +16,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{pstricks}[2015/11/14 v0.62 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2017/03/17 v0.63 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%