pstricks (27nov17)

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

7 files changed, 31 insertions, 241 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index 90b2b170cd4..1ab7a0ef1e6 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,8 @@
-PSTricks 2017
+PSTricks 2018
+
+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.3 or, at your option, any later version.
 
 -----------------------------------------------------------------------
 PSTricks is the original work of Timothy van Zandt <tvz@econ.insead.fr>
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf
index 9360b231c20..35ee030bec5 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/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/dvips/pstricks/pstricks-fonts.pro b/Master/texmf-dist/dvips/pstricks/pstricks-fonts.pro
deleted file mode 100644
index a0dd8bdda59..00000000000
--- a/Master/texmf-dist/dvips/pstricks/pstricks-fonts.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 e2d1405feda..3c8c5edd124 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -76,8 +76,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.77}
-\def\filedate{2017/10/04}
+\def\fileversion{2.78}
+\def\filedate{2017/11/26}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -489,11 +489,13 @@
 %-----------------------% hv 20100413
 \def\pst@checknum#1#2{%
   \edef\ps@next{#1}%
-  \ifx\ps@next\@empty\let\pst@num\z@%
-  \else\expandafter\pst@@checknum\ps@next..\@nil%
-  \fi%
-  \ifcase\pst@num%  0
-    \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa%
+  \ifx\ps@next\@empty
+    \let\pst@num\z@
+  \else
+    \expandafter\pst@@checknum\ps@next..\@nil
+  \fi
+  \ifcase\pst@num\relax
+    \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa
     \def#2{0 }%
   \or%              1
     \edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.%
@@ -1266,7 +1268,7 @@
 \def\psfs@none{}
 \def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }}
 \def\psfs@eofill{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency eofill}}
-\def\psfs@oefill{\pst@fill{\pst@usecolor\psk@oefillcolor  \tx@setTransparency fill } \psfs@eofill }
+\def\psfs@oefill{\pst@fill{\pst@usecolor\psk@oefillcolor \tx@setTransparency fill }\psfs@eofill }
 \def\psfs@shape{\pst@fill{\pst@usecolor\psfillcolor \tx@setBlendmode fill }}
 \def\psfs@spiral{\pst@fill{\pst@fsOrigin \pst@usecolor\psfillcolor clip newpath
     0 .1 500 { dup dup sqrt 4 div 0 360 arc fill \pst@fsAngle rotate } for }}
@@ -1664,10 +1666,11 @@
   \fi%
 }
 \def\use@par{%
-  \ifx\pst@par\@empty\else%
-    \expandafter\@psset\pst@par,\@nil%
+  \ifx\pst@par\@empty\else
+    \expandafter\@psset\pst@par,\@nil
     \def\pst@par{}%
-  \fi}
+  \fi
+}
 \def\use@keep@par{%			same as \use@par, but keeps the values
   \ifx\pst@par\@empty\else
     \expandafter\@psset\pst@par,\@nil
@@ -1695,7 +1698,13 @@
 %\def\pst@@getarrows#1#2{\addto@par{arrows=#2}#1}
 \def\pst@@getarrows#1#2{%
   \def\pst@tempa{#2}% prevent empty arrow arguments, to allow \psline{}(...)(...)
-  \ifx\pst@tempa\@empty\addto@par{arrows=-}\else\addto@par{arrows=#2}\fi#1}
+  \ifx\pst@tempa\@empty
+    \addto@par{arrows=-}%
+  \else
+    \addto@par{arrows=#2}%
+  \fi
+  #1%
+}
 % ------------------------- hv 1.10 end ------------------------
 %
 \def\begin@ClosedObj{%
@@ -2477,14 +2486,14 @@
 }
 \def\psline@ii{%
   \ifx\pslinestyle\psls@@symbol\addto@pscode{ \psls@symbol SymbolLine }%
-  \else%
+  \else
     \addto@pscode{
       \ifPst@noCurrentPoint\else\pst@cp\fi 	  % current point?
       \psline@iii % arc and lineto type
       \tx@Line	  % .pro function
     }%
-  \fi%
-  \end@OpenObj%
+  \fi
+  \end@OpenObj
 }
 \def\psline@iii{%
   \ifdim\pslinearc>\z@
@@ -4071,11 +4080,11 @@ pop
   \fi%
 }
 \def\psput@cartesian#1{%
-  \hbox to \z@{\kern\pst@dimg{\vbox to \z@{\vss\box#1\vskip\pst@dimh}\hss}}%
+\hbox to \z@{\kern\pst@dimg{\vbox to \z@{\vss\box#1\vskip\pst@dimh}\hss}}%
 }
 \def\psput@special#1{%
   \hbox{%
-    \pst@Verb{ { \pst@coor \pstnodescale } \tx@PutCoor \tx@PutBegin }%  20150911 hv
+    \pst@Verb{{ \pst@coor \pstnodescale } \tx@PutCoor \tx@PutBegin }%  20150911 hv
     \box#1%
     \pst@Verb{ \tx@PutEnd }%
   }%