pstricks (6jan18)

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

16 files changed, 180 insertions, 634 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/Makefile b/Master/texmf-dist/doc/generic/pstricks/Makefile
deleted file mode 100644
index 0b4f5519d33..00000000000
--- a/Master/texmf-dist/doc/generic/pstricks/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# `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/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-news10.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
index 4780230be3e..98de904ecd9 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
index e338a162ab3..d4c018d92e4 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex
@@ -1,17 +1,23 @@
-%% $Id: pst-news10.tex 165 2015-07-26 07:27:55Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
-    headexclude,footexclude,oneside]{pst-doc}
+%% $Id: pst-news10.tex 697 2017-12-30 19:04:03Z herbert $
+\documentclass[11pt,english,BCOR=10mm,DIV12,bibliography=totoc,parskip=false,headings=small,,
+    headinclude=false,footinclude=false,oneside]{pst-doc}
 \listfiles
 \let\Lfile\LFile
 \usepackage[utf8]{inputenc}
-\usepackage{pstricks,pst-plot,xkvview}
+\usepackage{pstricks}
+\let\pstricksFV\fileversion
+\let\pstricksFD\filedate
+\usepackage{pst-plot}
 \let\pstplotFV\fileversion
 \let\pstplotFD\filedate
+%\usepackage{xkvview}
 \usepackage{pst-eucl,pst-func}
 \renewcommand\bgImage{\psscalebox{15}{\color{blue!20}2010}}
 \def\textat{\char064}
 \lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
     escapechar=?}
+
+\addbibresource{PSTricks.bib}
 \begin{document}
 
 %\psset{PstDebug=1}
@@ -78,16 +84,19 @@ and the horizontal line
 is taken into account and the placement of the argument of \Lcs{uput} is different to
 the default behaviour. 
 
-\begin{LTXexample}[width=6cm,wide=true]
-\begin{pspicture}[showgrid](5,6)
-\pnode(0,4){A}\psdot(A)
-\pnode(3,2){B}\psdot(B)
-\psline(A)(B)
+\begin{LTXexample}[width=7cm]
+\begin{pspicture}[showgrid](-0.25,-0.25)(6,5)
+\pnodes(0,3){A}(3,1){B}
+\psline[showpoints](A)(B)
+\uput[-90](A){A}\uput[-90](B){B}
 \psline[linestyle=dashed](A)(3,4)
-\psline[linestyle=dashed](A)(3,6)
-\psline[linestyle=dashed](B)
-\uput{1cm}[(B)](A){foo}
-\uput{1cm}[(B)](>A){bar}
+\psline[linestyle=dashed](A)(3,5)
+\psline[linestyle=dashed](A)(3,3)
+\psline[linestyle=dashed](6,2)
+\psline[linestyle=dashed](B)(6,1)
+\psarc{->}(0,3){2.5}{0}{(3,1)}
+\psarc{->}(3,1){2.5}{0}{(3,1)}
+\uput*{1cm}[(B)](A){foo} \uput*{1cm}[(B)](>A){bar}
 \end{pspicture}
 \end{LTXexample}
 
@@ -434,11 +443,11 @@ The default values for these new
 optional keywords are:
 
 \begin{Xverbatim}{}
-\psset[pstricks]{symbolStep=20pt}
-\psset[pstricks]{symbolWidth=10pt}
-\psset[pstricks]{symbolFont=Dingbats}
-\psset[pstricks]{rotateSymbol=false}
-\psset[pstricks]{startAngle=0}
+\psset[pst-base]{symbolStep=20pt}
+\psset[pst-base]{symbolWidth=10pt}
+\psset[pst-base]{symbolFont=Dingbats}
+\psset[pst-base]{rotateSymbol=false}
+\psset[pst-base]{startAngle=0}
 \end{Xverbatim}
 
 \begin{LTXexample}[pos=t,preset=\centering]
@@ -903,13 +912,13 @@ why it moved from the base into the contrib sections, where all packages uses \L
 \clearpage
 \section{List of all optional arguments for \texttt{pstricks}}
 
-\xkvview{family=pstricks,columns={key,type,default}}
+\xkvview{family=pst-base,columns={key,type,default}}
+%\xkvview{family=pst-tools,columns={key,type,default}}
 
 
 
 \nocite{*}
-\bibliographystyle{plain}
-\bibliography{PSTricks}
+\printbibliography
 
 \printindex
 
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
index 2a991b265ab..e3d09c094d2 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
+++ 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
index 563c5943ec8..53cf23c2cee 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex
@@ -1,12 +1,9 @@
-%% $Id: pst-news17.tex 444 2017-04-19 10:55:35Z herbert $
+%% $Id: pst-news17.tex 699 2017-12-31 10:27:45Z herbert $
 \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
     headinclude=false,footinclude=false,twoside]{pst-doc}
 \listfiles
 \let\Lfile\LFile
 \usepackage[utf8]{inputenc}
-\usepackage{pstricks}
-\let\pstricksFV\fileversion
-\let\pstricksFD\filedate
 \usepackage{pst-node}
 \let\pstnodeFV\fileversion
 \let\pstnodeFD\filedate
@@ -38,25 +35,102 @@ basic package \nxLFile{pstricks}}
 \clearpage
 \part{\texttt{pstricks} -- package}
 
-\iffalse
 %--------------------------------------------------------------------------------------
 \section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}}
 %--------------------------------------------------------------------------------------
+
+There is now a new optional argument for the package: \Loption{psfonts}. If it is
+enabled PSTricks will use the original PostScript fonts like Helvetica, Times, \ldots.
+The default is to use the URW fonts (Nimbus Roman, Nimbus Sans, \ldots) which are embedded by default!
+The PostScript fonts are only embedded if present on your system.
  
 %--------------------------------------------------------------------------------------
-\section{\texttt{pstricks-pdf.sty}}
+\section{\texttt{pstricks-tex.tex}}
 %--------------------------------------------------------------------------------------
-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.
+This package collects all additional latex macros which must be definied
+when running PSTricks with tex.  They all moved from the base \texttt{pstricks.tex} into
+this new file.
 
-\fi
 
 %--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (\pstricksFV -- \pstricksFD)}
+\section{\texttt{pstricks.tex} (v. 2.76 -- 2017/09/17)}
 %--------------------------------------------------------------------------------------
+
+
+\subsection{PostScript Fonts}
+This version of PSTricks uses the Ghostscript fonts from URW instead of the
+original base 14 fonts of PostScript. For example: instead of Helvetica we use
+NimbusSanL-Regu. The URW fonts are always embedded in the created ps or pdf output.
+This is not the default for the PostScript fonts. You change this setting with the optional
+argument to \LPack{pstricks.sty}.
+
+
+\subsection{Error message}
+
+Using PSTricks with \Lprog{pdflatex} will work only when using package
+\LPack{auto-pst-pdf} and running the \TeX-file with
+
+\begin{verbatim}
+pdflatex -shell-escape <file>
+\end{verbatim}
+
+otherwise you'll get an error message which was misleading in the past:
+
+\begin{verbatim}
+[...]
+! Undefined control sequence.
+<recently read> \c@lor@to@ps 
+\end{verbatim}
+
+This changes now to 
+
+
+\begin{verbatim}
+[...]
+! Undefined control sequence.
+\c@lor@to@ps ->\PSTricks 
+                         _Not_Configured_For_This_Format
+\end{verbatim}
+
+\subsection{Random colors}
+There are now four predefined random ''colors``:
+
+\begin{verbatim}
+  \definecolor[ps]{randomgray}{gray}{Rand}%
+  \definecolor[ps]{randomrgb}{rgb}{Rand Rand Rand}%
+  \definecolor[ps]{randomcmyk}{cmyk}{Rand Rand Rand Rand}%
+  \definecolor[ps]{randomhsb}{hsb}{Rand Rand Rand}%
+\end{verbatim}
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(10,5)
+\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomgray,linewidth=1mm](0,\rA)(10,\rA)}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(10,5)
+\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomrgb,linewidth=1mm](0,\rA)(10,\rA)}
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(10,5)
+\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomcmyk,linewidth=1mm](0,\rA)(10,\rA)}
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(10,5)
+\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomhsb,linewidth=1mm](0,\rA)(10,\rA)}
+\end{pspicture}
+\end{LTXexample}
+
+
+The random counter can be initialized with \verb|\pstVerb{rrand srand}|.
+
 \subsection{refangle}
 
 This version fixes a bug with \verb|pst@refangle| which is used inside PostScript.
@@ -89,12 +163,12 @@ area of the \Lenv{pspicture}  coordinates is seen by a rectangle (only for \LaTe
 \end{LTXexample}
 
 
-\subsection{\Lcs{newpsstyle}}
+\subsection{\nxLcs{newpsstyle}}
 
 The command \Lcs{newpsstyle} has a new syntax:
 
 \begin{BDef}
-\Lcs{newpssytle}\OptArg{package name}\Largb{name}\Largb{definitions}
+\Lcs{newpsstyle}\OptArg{package name}\Largb{name}\Largb{definitions}
 \end{BDef}
 
 For example
@@ -105,6 +179,42 @@ For example
 \end{verbatim}
 
 
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.pro}}
+%--------------------------------------------------------------------------------------
+
+A full circle has by default an angle of 360 degrees. 
+Setting the circle with \Lcs{degrees}\Largs{17} to another value doesn't work for the 
+PostScript function \texttt{PtoC} (Polat to Cartesian -- $(r,\phi)\rightarrow (x,y)$).
+Now there is a \texttt{PtoCrel} for the new definition 
+which now takes
+the setting of \Lcs{pst@angleunit}  into account.
+
+\bigskip
+\begin{LTXexample}[pos=t]
+\degrees[16]
+\begin{pspicture}[showgrid](-2,-2)(2,2)
+\psline[linecolor=blue](!1.8 2 PtoCrel)%  45 degrees
+\end{pspicture}
+\end{LTXexample}
+
+The command \Lcs{framed} was build by clockwise line sequence. Now it is the
+other way round to get the same  behaviour as for all other commands
+with closed lines.
+
+
+There are some new PS functions
+
+\begin{verbatim}
+/AnytoDeg { pst@angleunit } def 
+/DegtoAny { 1 pst@angleunit div} def
+/AnytoRad { AnytoDeg DegtoRad } def 
+/RadtoAny { RadtoDeg DegtoAny } def
+\end{verbatim}
+
+See \LPack{pst-node} documentation for an example.
+
+
 \clearpage
 \nocite{*}
 \printbibliography
@@ -114,4 +224,3 @@ For example
 
 \end{document}
 
-
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
index a3ddcfa3262..b0be347d0f0 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
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/dvips/pstricks/pstricks-fonts-lm.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
deleted file mode 100644
index 5ab5e436dfd..00000000000
--- a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
+++ /dev/null
@@ -1,69 +0,0 @@
-% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
-%
-%% PostScript font prologue for pstricks.tex.
-%% Version 0.01, 2016/04/22
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%
-%
-%true setglobal globaldict begin 
-
-%dd-lmbx10 LMRoman10-Bold <dotdigits-clm.enc <lmbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmbxi10 LMRoman10-BoldItalic <dotdigits-clm.enc <lmbxi10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmbxo10 LMRomanSlant10-Bold <dotdigits-clm.enc <lmbxo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmcsc10 LMRomanCaps10-Regular <dotdigits-clm.enc <lmcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmcsco10 LMRomanCaps10-Oblique <dotdigits-clm.enc <lmcsco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmdunh10 LMRomanDunh10-Regular <dotdigits-clm.enc <lmdunh10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmduno10 LMRomanDunh10-Oblique <dotdigits-clm.enc <lmduno10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmr10 LMRoman10-Regular <dotdigits-clm.enc <lmr10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmri10 LMRoman10-Italic <dotdigits-clm.enc <lmri10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmro10 LMRomanSlant10-Regular <dotdigits-clm.enc <lmro10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-
-/Times-Roman /LMRoman10-Regular def
-/Times-Bold /LMRoman10-Bold def
-/Times-Italic /LMRoman10-Italic def
-/Times-BoldItalic /LMRoman10-BoldItalic def
-
-%mss8ttl10 LMSans10-Regular <t1-clm.enc <lmss10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " 
-%lmssbo8ttl10 LMSans10-BoldOblique <t1-clm.enc <lmssbo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " 
-%lmssbx8ttl10 LMSans10-Bold <t1-clm.enc <lmssbx10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " 
-%lmssdc8ttl10 LMSansDemiCond10-Regular <t1-clm.enc <lmssdc10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " 
-%lmssdo8ttl10 LMSansDemiCond10-Oblique <t1-clm.enc <lmssdo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " 
-%lmsso8ttl10 LMSans10-Oblique <t1-clm.enc <lmsso10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " 
-%dd-lmss10 LMSans10-Regular <dotdigits-clm.enc <lmss10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmssbo10 LMSans10-BoldOblique <dotdigits-clm.enc <lmssbo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmssbx10 LMSans10-Bold <dotdigits-clm.enc <lmssbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmssdc10 LMSansDemiCond10-Regular <dotdigits-clm.enc <lmssdc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmssdo10 LMSansDemiCond10-Oblique <dotdigits-clm.enc <lmssdo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmsso10 LMSans10-Oblique <dotdigits-clm.enc <lmsso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-
-/Helvetica /LMSans10-Regular def
-/Helvetica-Bold /LMSans10-Bold def
-/Helvetica-Oblique /LMSans10-Oblique def
-/Helvetica-BoldOblique /LMSans10-BoldOblique def
-
-%dd-lmtcsc10 LMMonoCaps10-Regular <dotdigits-clm.enc <lmtcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtcso10 LMMonoCaps10-Oblique <dotdigits-clm.enc <lmtcso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtk10 LMMonoLt10-Bold <dotdigits-clm.enc <lmtk10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtko10 LMMonoLt10-BoldOblique <dotdigits-clm.enc <lmtko10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtl10 LMMonoLt10-Regular <dotdigits-clm.enc <lmtl10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtlc10 LMMonoLtCond10-Regular <dotdigits-clm.enc <lmtlc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtlco10 LMMonoLtCond10-Oblique <dotdigits-clm.enc <lmtlco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtlo10 LMMonoLt10-Oblique <dotdigits-clm.enc <lmtlo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtt10 LMMono10-Regular <dotdigits-clm.enc <lmtt10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtti10 LMMono10-Italic <dotdigits-clm.enc <lmtti10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-%dd-lmtto10 LMMonoSlant10-Regular <dotdigits-clm.enc <lmtto10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " 
-
-/Courier /LMMono10-Regular def
-/Courier-Bold /LMMono10-Bold def
-/Courier-Oblique /LMMono10-Italic def
-/Courier-BoldOblique /LMMono10-BoldOblique def
-
-/Symbol /StandardSymL def 
-
-%end false setglobal 
-%
-% end of file
-
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
deleted file mode 100644
index da5cdb7a1ee..00000000000
--- a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
-%
-%% PostScript font prologue for pstricks.tex.
-%% Version 0.01, 2016/04/22
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%
-%
-%true setglobal globaldict begin 
-
-/Times-Roman /Times-Roman def
-/Times-Bold /Times-Bold def
-/Times-Italic /Times-Italic def
-/Times-BoldItalic /Times-BoldItalic def
-
-/Helvetica /Helvetica def
-/Helvetica-Bold /Helvetica-Bold def
-/Helvetica-Oblique /Helvetica-Oblique def
-/Helvetica-BoldOblique /Helvetica-BoldOblique def
-
-/Courier /Courier def
-/Courier-Bold /Courier-Bold def
-/Courier-Oblique /Courier-Oblique def
-/Courier-BoldOblique /Courier-BoldOblique def
-
-/Symbol /Symbol def 
-
-%end false setglobal 
-%
-% end of file
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
deleted file mode 100644
index a0dd8bdda59..00000000000
--- a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
+++ /dev/null
@@ -1,61 +0,0 @@
-% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
-%
-%% PostScript font prologue for pstricks.tex.
-%% Version 0.01, 2016/04/22
-%%
-%% This program can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License Distributed from CTAN archives
-%% in directory macros/latex/base/lppl.txt.
-%
-%
-%true setglobal globaldict begin 
-
-%n021003l.pfa:/FontName /NimbusRomNo9L-Regu def
-%n021004l.pfa:/FontName /NimbusRomNo9L-Medi def
-%n021023l.pfa:/FontName /NimbusRomNo9L-ReguItal def
-%n021024l.pfa:/FontName /NimbusRomNo9L-MediItal def
-
-/Times-Roman /NimbusRomNo9L-Regu def
-/Times-Roman-Bold /NimbusRomNo9L-Medi def
-/Times-Italic /NimbusRomNo9L-ReguItal def
-/Times-BoldItalic /NimbusRomNo9L-MediItal def
-
-%n019003l.pfa:/FontName /NimbusSanL-Regu def
-%n019004l.pfa:/FontName /NimbusSanL-Bold def
-%n019023l.pfa:/FontName /NimbusSanL-ReguItal def
-%n019024l.pfa:/FontName /NimbusSanL-BoldItal def
-%n019043l.pfa:/FontName /NimbusSanL-ReguCond def
-%n019044l.pfa:/FontName /NimbusSanL-BoldCond def
-%n019063l.pfa:/FontName /NimbusSanL-ReguCondItal def
-%n019064l.pfa:/FontName /NimbusSanL-BoldCondItal def
-
-%/Helvetica /dd-lmss10 def
-/Helvetica /LMSans10-Regular def
-%/Helvetica /NimbusSanL-Regu def
-/Helvetica-Bold /NimbusSanL-Bold def
-/Helvetica-Oblique /NimbusSanL-ReguItal def
-/Helvetica-BoldOblique /NimbusSanL-BoldItal def
-
-%n022003l.pfa:/FontName /NimbusMonL-Regu cvn def
-%n022004l.pfa:/FontName /NimbusMonL-Bold cvn def
-%n022023l.pfa:/FontName /NimbusMonL-ReguObli cvn def
-%n022024l.pfa:/FontName /NimbusMonL-BoldObli cvn def
-
-/Courier /NimbusMonL-Regu def
-/Courier-Bold /NimbusMonL-Bold def
-/Courier-Oblique /NimbusMonL-ReguObli def
-/Courier-BoldOblique /NimbusMonL-BoldObli def
-
-%s050000l.pfa:/FontName /StandardSymL def
-
-/Symbol /StandardSymL def 
-
-%p052003l.pfa:/FontName /URWPalladioL-Roma def
-%p052004l.pfa:/FontName /URWPalladioL-Bold def
-%p052023l.pfa:/FontName /URWPalladioL-Ital def
-%p052024l.pfa:/FontName /URWPalladioL-BoldItal def
-%z003034l.pfa:/FontName /URWChanceryL-MediItal def
-
-%end false setglobal 
-%
-% end of file
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 14d9d975188..8232b1a2872 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,8 +1,8 @@
-%% $Id: pstricks.tex 700 2018-01-01 14:21:06Z herbert $
+%% $Id: pstricks.tex 702 2018-01-06 08:43:54Z herbert $
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2017 Herbert Voss
+%% Copyright 2004-2018 Herbert Voss
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -78,8 +78,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.81}
-\def\filedate{2018/01/01}
+\def\fileversion{2.82}
+\def\filedate{2018/01/06}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -179,7 +179,7 @@
 }
 \def\pshskip#1{\vrule \@width\z@\nobreak \hskip #1\hskip \z@skip}
 % end bugfix
-\typeout{`PSTricks' v\fileversion\space\space <\filedate> (tvz)}
+\typeout{`PSTricks' v\fileversion\space\space <\filedate> (tvz,hv)}
 \def\@pstrickserr#1#2{%
   \begingroup
   \newlinechar`\^^J
@@ -3784,14 +3784,18 @@ pop
 \def\psRing@iii[#1,#2]#3#4{%   origin, inner radius, outer radius
   \begin@ClosedObj
   \pssetlength\pst@dimc{#3}%
+  \edef\pst@tempA{\ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi}%
   \pssetlength\pst@dimd{#4}%
+  \edef\pst@tempB{\ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimd \fi}%
   \pst@getangle{#1}\pst@tempa
   \pst@getangle{#2}\pst@tempb
   \def\pst@linetype{4}%
   \addto@pscode{
     \pst@coor translate 
-    \pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED
-    \pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED
+%    \pst@number\pst@dimc \psk@dimen CLW mul sub /InnerRadius ED
+%    \pst@number\pst@dimd \psk@dimen CLW mul sub /OuterRadius ED
+    \pst@tempA\space \psk@dimen CLW mul sub /InnerRadius ED
+    \pst@tempB\space \psk@dimen CLW mul sub /OuterRadius ED
     InnerRadius 0 moveto newpath
     0 0 InnerRadius \pst@tempa\space \pst@tempb\space arc 
     OuterRadius \pst@tempb\space PtoC 
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index 15f71fd95b5..526e5aade0c 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -1,4 +1,4 @@
-% $Id: pst-doc.cls 444 2017-04-19 10:55:35Z herbert $
+% $Id: pst-doc.cls 680 2017-12-05 12:22:55Z herbert $
 %
 %%
 %% The PSTricks Project
@@ -26,8 +26,8 @@
 \RequirePackage{amsmath, amssymb} 
 \ifxetex
   \usepackage{unicode-math}
-  \usepackage{libertinus}
-  \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro}
+  \usepackage{libertinus-otf}
+  \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{DejaVu Sans Mono}
   \setmathfont{XITS Math}
 \else
   \RequirePackage[T1]{fontenc}
@@ -35,6 +35,7 @@
   %\RequirePackage[euler-digits]{eulervm}
   \RequirePackage{bera}
   %\RequirePackage[scaled=0.85]{luximono}
+  \RequirePackage[utf8]{inputenc}
 \fi
 \usepackage[includeheadfoot,lmargin=2cm,tmargin=1cm,bmargin=1.5cm,rmargin=1.5cm]{geometry}
 \RequirePackage{ifpdf}
@@ -56,7 +57,7 @@
       \pagenumbering{roman}}
 }{}
 \@ifundefined{mainmatter}{%
-   % scrpage2 benoetigt den folgenden switch
+   % scrpage benoetigt den folgenden switch
    % wenn \mainmatter definiert ist.
    \newif\if@mainmatter\@mainmattertrue
    \newcommand{\mainmatter}{%
@@ -102,6 +103,7 @@
 \RequirePackage{subfig} 
 \RequirePackage{setspace}
 \RequirePackage{paralist}
+\RequirePackage{biblatex}
 %
 \RequirePackage{fancyvrb} 
 \newenvironment{Xverbatim}[2][]%
@@ -190,7 +192,7 @@ xleftmargin=0pt,xrightmargin=0pt,
 \colorlet{pdffilecolor}{DOrange}
 \colorlet{stringcolor}{green!40!black!100}
 \colorlet{commencolor}{blue!0!black!100}
-\RequirePackage[automark,nouppercase]{scrpage2}
+\RequirePackage[automark]{scrlayer-scrpage}
 
 \pagestyle{scrheadings} 
 \clearscrheadings
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
deleted file mode 100644
index a1bde247b6b..00000000000
--- a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
+++ /dev/null
@@ -1,142 +0,0 @@
-% $Id: pst-platform.sty 446 2017-04-19 11:40:55Z herbert $
-%%
-%% 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
deleted file mode 100644
index c363a62f801..00000000000
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
+++ /dev/null
@@ -1,179 +0,0 @@
-% $Id: pstricks-pdf.sty 446 2017-04-19 11:40:55Z herbert $
-%%
-%% This is file `pstricks-pdf.sty'.
-%%
-%% IMPORTANT NOTICE:
-%%
-%% 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.
-%% Either version 1.0 or, at your option, any later version.
-%%
-
-\NeedsTeXFormat{LaTeX2e}
-
-\ProvidesPackage{pstricks-pdf}[2017/03/17 v0.01 creating pdf output (HV)]
-% 
-\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
-\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}{}%
-  \ifxetex\else
-    \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}%
-  \fi
-  \if@app@crop@
-    \ifxetex\else
-      \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}%
-    \fi
-    \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}%
-  \else
-    \ifxetex\else
-      \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}%
-    \fi
-  \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"}
-  \def\app@cmd@latex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\let\APPmakepictures\empty\input} #1"}
-  \def\app@cmd@extralatex#1#2{xelatex \app@latex@opts\space "\unexpanded{\AtBeginDocument{\pagestyle{empty}}\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"}
-  \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"}
-\fi
-\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 fddb37756c0..bebc8480004 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -8,7 +8,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>
+%%                            2018-     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.
@@ -17,7 +17,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{pstricks}[2017/11/27 v0.66 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2018/01/06 v0.67 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%
@@ -37,16 +37,16 @@
 \def\pst@ColorPackage{xcolor}
 \DeclareOption{noxcolor}{\def\pst@ColorPackage{color}}
 %
-%---------------------------------DISTILLER --------------------------------
-\newif\ifpst@distiller\pst@distillerfalse
 \newif\ifpst@psfonts  \pst@psfontsfalse
 \newif\if@check@engine  \@check@enginetrue 
-\DeclareOption{distiller}{\pst@distillertrue\pst@psfontstrue}
-%
+
 \DeclareOption{psfonts}{\pst@psfontstrue}
-%
 \DeclareOption{noEngineCheck}{\@check@enginefalse}
 %
+%---------------------------------DISTILLER --------------------------------
+\newif\ifpst@distiller\pst@distillerfalse
+\DeclareOption{distiller}{\pst@distillertrue\pst@psfontstrue}
+%
 %---------------------------------COLOR --------------------------------
 \DeclareOption{monochrome}{%
   \AtBeginDocument{\special{ps: