pstricks (14sep17)

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

2 files changed, 30 insertions, 26 deletions

diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index 7166d95c1ea..f0a84e5347e 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 461 2017-05-18 10:17:06Z herbert $
+% $Id: pst-doc.cls 533 2017-08-24 14:56:30Z 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}
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 28e511fb174..2a4b86e7b63 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 474 2017-06-15 16:40:57Z herbert $
+% $Id: pstricks.sty 545 2017-09-12 18:45:32Z herbert $
 %%
 %% This is file `pstricks.sty'.
 %%
@@ -17,7 +17,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{pstricks}[2017/03/17 v0.63 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2017/07/16 v0.64 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%
@@ -82,11 +82,11 @@
   \let\saved@scalebox\scalebox
   \input{pstricks}%
   \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)]
-  \input{pst-fp.tex}
+  \input{pst-fp.tex}%
   \ProvidesFile{pst-fp.tex}[\filedate\space v\fileversion\space `PST-fp' (hv)]
   \IfFileExists{pstricks.pro}{%
     \ProvidesFile{pstricks.pro}
-      [2012/10/16 v. 1.15,  PostScript prologue file (hv)]
+      [2017/09/12 v. 1.25,  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)]
@@ -107,25 +107,29 @@
     [ /ca \psk@strokeopacityalpha 
       /CA \psk@strokeopacityalpha /SetTransparency pdfmark >
   \pst@def{setBlendmode}<
-    [ /BM\ifcase\psk@blendmode%
-        /Normal \or	% 0
-	/Multiply \or	% 1
-	/Screen \or	% 2
-	/Overlay \or	% 3
-	/Darken \or	% 4
-	/Lighten \or	% 5
-	/ColorDodge \or	% 6
-	/ColorBurn \or	% 7
-	/HardLight \or	% 8
-	/SoftLight \or	% 9
-	/Difference \or	% 10
-	/Exclusion \or	% 11
-	/Hue \or	% 12
-	/Color \or	% 13
-	/Saturation \or	% 14
-	/Luminosity 	% 15
-      \else /Normal \fi
-      /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >%
+    [ /BM%
+     \ifcase\psk@blendmode
+      /Normal \or
+      /Compatible \or
+      /Screen \or
+      /Multiply \or
+      /HardLight \or
+      /Darken \or
+      /Lighten \or
+      /Difference \or
+      /ColorDodge \or
+      /ColorBurn \or
+      /SoftLight \or
+      /Hue \or
+      /Saturation \or
+      /Luminosity \or
+      /Overlay \or
+      /Exclusion \or
+      /Color
+    \else 
+      /Normal 
+    \fi
+    /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >
 \fi
 %
 \@ifpackageloaded{xcolor}{%