pstricks (31dec17)

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

14 files changed, 545 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/images/tiger.pdf b/Master/texmf-dist/doc/generic/pstricks/images/tiger.pdf
index ff53d6b4e43..cc016e95de0 100644
--- a/Master/texmf-dist/doc/generic/pstricks/images/tiger.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/images/tiger.pdf
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 35ee030bec5..7381b5e10d5 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 8d0669e3d0f..f7119ae14ff 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-news17.tex 616 2017-10-04 16:14:42Z herbert $
+%% $Id: pst-news17.tex 618 2017-10-04 16:46:46Z herbert $
 \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
     headinclude=false,footinclude=false,twoside]{pst-doc}
 \listfiles
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
new file mode 100644
index 00000000000..5ab5e436dfd
--- /dev/null
+++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-lm.pro
@@ -0,0 +1,69 @@
+% $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
new file mode 100644
index 00000000000..da5cdb7a1ee
--- /dev/null
+++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-ps.pro
@@ -0,0 +1,32 @@
+% $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
new file mode 100644
index 00000000000..a0dd8bdda59
--- /dev/null
+++ b/Master/texmf-dist/dvips/pstricks/pstricks-fonts-urw.pro
@@ -0,0 +1,61 @@
+% $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/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 9fc3be31019..03148f97d34 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,7 +1,7 @@
-% $Id: pstricks.pro 616 2017-10-04 16:14:42Z herbert $
+% $Id: pstricks.pro 698 2017-12-30 19:08:50Z herbert $
 %
 %% PostScript prologue for pstricks.tex.
-%% Version 1.27, 2017/09/18
+%% Version 1.28, 2017/12/30
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -55,8 +55,13 @@ tx@Dict begin
   sub			% yB-yA xA-xB
   Pyth } def
 /PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian (origimal)
-/PtoCrel { pst@angleunit 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian with \degrees[??]
+/PtoCrel { pst@angleunit PtoC } def % Polar to Cartesian with \degrees[??]
 /PtoCab { dup cos 4 -1 roll mul 3 1 roll sin mul } def % Polar to Cartesian (Ellipse) a b phi-> x y 
+/AnytoDeg { pst@angleunit } def 
+/DegtoAny { 1 pst@angleunit div} def
+/AnytoRad { AnytoDeg DegtoRad } def 
+/RadtoAny { RadtoDeg DegtoAny } def
+%
 %/Rand { rand 4294967295 div } def		% a real random number
 /Rand { rand 2147483447 div } def		% a real random number between 0 and 1
 %----------------- hv added 20050516 ---------------
@@ -985,7 +990,7 @@ gsave
 %    Helvetica findfont b scalefont setfont 
 %    is set in pstricks.tex
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
-     /NimbusSanL-Regu findfont b scalefont setfont   
+%     /NimbusSanL-Regu findfont b scalefont setfont   
   /b b .95 mul CLW 2 div add def } if 
   systemdict /setstrokeadjust known 
     { true setstrokeadjust /t { } def }
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 3c8c5edd124..93dbb8c388a 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks.tex 617 2017-10-04 16:16:21Z herbert $
+%% $Id: pstricks.tex 698 2017-12-30 19:08:50Z herbert $
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
@@ -28,8 +28,10 @@
 \edef\PstAtCode{\the\catcode`\@}
 \catcode`\@=11\relax
 %
-\ifx\c@lor@to@ps\@undefined
-  \def\c@lor@to@ps{\PSTricks_Not_Configured_For_This_Format}%  message for a pdflatex run
+\if@check@engine
+  \ifx\c@lor@to@ps\@undefined
+    \def\c@lor@to@ps{\PSTricks_Not_Configured_For_This_Format}%  message for a pdflatex run
+  \fi
 \fi
 \expandafter\ifx\csname @latexerr\endcsname\relax %	do we have TeX? then @latexerr isn't defined
   \input pstricks-tex.def
@@ -76,8 +78,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.78}
-\def\filedate{2017/11/26}
+\def\fileversion{2.80a}
+\def\filedate{2017/12/30}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -791,9 +793,10 @@
   \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}%
   \ignorespaces}
 %
-\def\radians{\def\pst@angleunit{57.2956 mul }}%
+\def\radians{\def\pst@angleunit{57.2956 mul }
+  \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}}%
 \def\pst@angleunit{}%
-\pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}%
+
 %
 \def\SpecialCoor{%
   \def\pst@@getcoor##1{%
@@ -3721,8 +3724,9 @@ pop
     \def\pst@linetype{4}%
     \addto@pscode{
       \pst@coor 2 copy moveto
-      \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi      
-      \psk@dimen CLW mul sub
+      \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi 
+      \psk@dimen CLW mul round % prevent rounding errors
+      sub 
       dup 0 rmoveto
       0 360 arc
       \ifPst@variableLW \pst@flattenpath \fi
@@ -4213,13 +4217,17 @@ pop
 \def\uput{\def\pst@par{}\pst@ifstar{\@ifnextchar[{\uput@ii}{\uput@i}}} 
 % DG/SR modification end
 \def\uput@i#1{\addto@par{labelsep=#1}\uput@ii}
+%
 \def\uput@ii[#1]{%
   \addto@par{refangle={#1}}%
   \@ifnextchar({\uput@iv}{\uput@iii}}
+%
 \def\uput@iii#1{%
   \addto@par{rot={#1}}%
   \@ifnextchar({\uput@iv}{\uput@iv(\z@,\z@)}}
+%
 \def\uput@iv(#1){\pst@killglue\pst@makebox{\uput@v{#1}}}
+%
 \def\uput@v#1{%
   \begingroup
   \use@par
@@ -4239,7 +4247,7 @@ pop
 % 
 \def\uput@vii#1#2{%
   \edef\pst@coor{%
-    \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pslabelsep \fi
+    \ifPst@SpecialLength\pst@SpecialLength\else\pst@number\pslabelsep\fi
 %    \pst@number\pslabelsep % \ifdim\pslabelsep<\z@  neg \fi
     #2%
     \pst@number{\wd\pst@hbox}%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index f0a84e5347e..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 533 2017-08-24 14:56:30Z herbert $
+% $Id: pst-doc.cls 680 2017-12-05 12:22:55Z herbert $
 %
 %%
 %% The PSTricks Project
@@ -57,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}{%
@@ -192,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
new file mode 100644
index 00000000000..a1bde247b6b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
@@ -0,0 +1,142 @@
+% $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
new file mode 100644
index 00000000000..c363a62f801
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
@@ -0,0 +1,179 @@
+% $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 571c7c06979..91ed143b210 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -89,7 +89,7 @@
   \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)]
   \IfFileExists{pstricks.pro}{%
     \ProvidesFile{pstricks.pro}
-      [2017/09/18 v. 1.27,  PostScript prologue file (hv)]
+      [2017/12/08 v. 1.27,  PostScript prologue file (hv)]
         \@addtofilelist{pstricks.pro}}{}%
   \IfFileExists{pst-algparser.pro}{%
     \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04,  PostScript prologue file (hv)]