pstricks (15nov15)

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

6 files changed, 31 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.generic b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
index 60de386381d..a1a16dd2d7a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.generic
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.generic
@@ -2,6 +2,7 @@ pstricks.tex --------
 versions like 2.47a have only changes in other files, but not
 in this main package.
 
+2.64b 2015-14-11  - fix bug in pstricks.sty
 2.64a 2015-11-11  - new  package pstricks-pdf.sty
 2.64  2015-10-09  - fix for xetex and \psput@special
 2.63  2015-09-11  - fix for xetex and \psput@special
diff --git a/Master/texmf-dist/doc/generic/pstricks/Changes.latex b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
index e3c6fa58c5b..7fa345b106f 100644
--- a/Master/texmf-dist/doc/generic/pstricks/Changes.latex
+++ b/Master/texmf-dist/doc/generic/pstricks/Changes.latex
@@ -4,7 +4,9 @@ Main version number is that of pstricks.tex
 pstricks-pdf.sty --------
 0.01  2015-11-11  - itial version
 
+
 pstricks.sty --------
+0.62  2015-11-14  - set distiller option adter loadung pstricks
 0.61  2015-11-11  - move auto-pst-pdf to a new package
 0.60  2013-12-12  - test, if babel was loaded for \shorthandoff
 0.59  2013-10-21  - fix for introduced bug with ifpdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index 785c3da9c9b..23309af8e2a 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,4 @@
-PSTricks 2015
+PSTricks 2016
 
 -----------------------------------------------------------------------
 PSTricks is the original work of Timothy van Zandt <tvz@econ.insead.fr>
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
index 00eee7d6b6b..d7cc3f10572 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.pdf
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 447da532c3a..fcafe181116 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -116,8 +116,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.64a}
-\def\filedate{2015/11/11}
+\def\fileversion{2.64b}
+\def\filedate{2015/14/11}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 195e12d54bf..8720b0b42b9 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -15,7 +15,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{pstricks}[2015/11/11 v0.61 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2015/11/14 v0.62 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%
@@ -63,6 +63,30 @@
 \DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
 \ProcessOptions\relax
 
+\RequirePackage{\pst@ColorPackage}
+%
+\@ifundefined{PSTricksLoaded}
+{%
+  \let\saved@scalebox\scalebox
+  \input{pstricks}%
+  \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)]
+  \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)]
+        \@addtofilelist{pstricks.pro}}{}%
+  \IfFileExists{pst-algparser.pro}{%
+    \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04,  PostScript prologue file (hv)]
+        \@addtofilelist{pst-algparser.pro}}{}%
+  \IfFileExists{pst-tools.pro}{%
+    \ProvidesFile{pst-tools.pro}[2012/01/01 v. 0.02,  PostScript prologue file (hv)]
+        \@addtofilelist{pst-tools.pro}}{}%
+  \IfFileExists{pst-dots.pro}{%
+    \ProvidesFile{pst-dots.pro}[2006/12/19 v. 2.00,  PostScript prologue file (hv)]
+        \@addtofilelist{pst-dots.pro}}{}%
+}{}
+%
 \ifpst@distiller
   \pst@def{setTransparency}<
     [ /ca \psk@opacityalpha 
@@ -92,30 +116,6 @@
       /ca \psk@shapealpha /CA \psk@opacityalpha /SetTransparency pdfmark >%
 \fi
 %
-\RequirePackage{\pst@ColorPackage}
-%
-\@ifundefined{PSTricksLoaded}
-{%
-  \let\saved@scalebox\scalebox
-  \input{pstricks}%
-  \ProvidesFile{pstricks.tex}[\filedate\space v\fileversion\space `PSTricks' (tvz,hv)]
-  \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)]
-        \@addtofilelist{pstricks.pro}}{}%
-  \IfFileExists{pst-algparser.pro}{%
-    \ProvidesFile{pst-algparser.pro}[2011/10/31 v. 0.04,  PostScript prologue file (hv)]
-        \@addtofilelist{pst-algparser.pro}}{}%
-  \IfFileExists{pst-tools.pro}{%
-    \ProvidesFile{pst-tools.pro}[2012/01/01 v. 0.02,  PostScript prologue file (hv)]
-        \@addtofilelist{pst-tools.pro}}{}%
-  \IfFileExists{pst-dots.pro}{%
-    \ProvidesFile{pst-dots.pro}[2006/12/19 v. 2.00,  PostScript prologue file (hv)]
-        \@addtofilelist{pst-dots.pro}}{}%
-}{}
-%
 \@ifpackageloaded{xcolor}{%
   \@ifpackagelater{xcolor}{2004/05/02}%
   {%