pstricks (19apr17)

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

7 files changed, 58 insertions, 43 deletions

diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty
index 6b17210bbd6..3c9d1a8ddbe 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty
@@ -1,3 +1,4 @@
+% $Id: pst-all.sty 446 2017-04-19 11:40:55Z herbert $
 %%
 %% This is file `pst-all.sty'
 %%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index 85015b16e53..15f71fd95b5 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -1,11 +1,11 @@
-% $Id: pst-doc.cls 532 2011-07-09 13:02:57Z herbert $
+% $Id: pst-doc.cls 444 2017-04-19 10:55:35Z herbert $
 %
 %%
 %% The PSTricks Project
 %%
 %% ``pst-doc'' class for use with the PSTricks documentation.
 %%
-%% Copyright (C) 2009-2011 Herbert Voss
+%% Copyright (C) 2009-2017 Herbert Voss
 %%
 %% It may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
 %%
 %
 \listfiles
-\ProvidesClass{pst-doc}[2011/04/30 v 0.19 PSTricks documentation class (hv)]
+\ProvidesClass{pst-doc}[2017/04/18 v 0.20 PSTricks documentation class (hv)]
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
 \ProcessOptions\relax
 %
@@ -23,10 +23,11 @@
 %
 \RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor}
 \RequirePackage{ifxetex}
+\RequirePackage{amsmath, amssymb} 
 \ifxetex
-  \usepackage{unicode.math}
-  \usepackage{libertine}
-  \usepackage[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro}
+  \usepackage{unicode-math}
+  \usepackage{libertinus}
+  \setmonofont[Scale=MatchLowercase,FakeStretch=0.92]{Anonymous Pro}
   \setmathfont{XITS Math}
 \else
   \RequirePackage[T1]{fontenc}
@@ -85,14 +86,13 @@
 \RequirePackage{pst-xkey}
 \RequirePackage{pstricks}
 \RequirePackage{xkvview}
-\let\pstricksFV\fileversion
-\let\pstricksFD\filedate
+%\let\pstricksFV\fileversion
+%\let\pstricksFD\filedate
 \RequirePackage{multido}
 \RequirePackage{lscape}
 \RequirePackage{graphicx}
 \RequirePackage{eso-pic}
 \definecolor{DOrange}{rgb}{1,.4,.2}
-\RequirePackage{amsmath, amssymb} 
 \RequirePackage{tabularx,ragged2e}
 \RequirePackage{booktabs}
 \RequirePackage[bottom,stable,ragged]{footmisc}
@@ -470,39 +470,40 @@ xleftmargin=0pt,xrightmargin=0pt,
 \thispagestyle{empty}%
 \begin{titlepage}
 \ifpdf
-\AddToShipoutPicture*{\includegraphics{pst-doc.pdf}}
-\vspace*{0.3\textheight}
-\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}\\[5pt]
-\parbox{15cm}{\sffamily\Large\@subtitle}
+  \AddToShipoutPicture*{\includegraphics{pst-doc.pdf}}
+  \vspace*{0.3\textheight}
+  \parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}\\[5pt]
+  \parbox{15cm}{\sffamily\Large\@subtitle}
 
-\vspace{5cm}
-\parbox{10cm}{\sffamily\@date}
+  \vspace{5cm}
+  \parbox{10cm}{\sffamily\@date}
 
-\vfill
-~\\
-\makebox[.5\textwidth]{\put(0,0){\bgImage}}\\
-~
+  \vfill
+  ~\\
+  \makebox[.5\textwidth]{\put(0,0){\bgImage}}\\
+  ~
 
-\vfill
-\parbox[b]{19cm}{\sffamily\RaggedRight 
+  \vfill
+  \parbox[b]{19cm}{\sffamily\RaggedRight 
     \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\
     \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{%
       \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}}
 \else
-\begin{pspicture}(1.6in,0)(21,21.7)
-  \psframe[fillstyle=solid,linecolor=lightgray,fillcolor=lightgray,linestyle=solid](0,-5.75)(21.5,10)
-  \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,10)(21.5,10.5)
-  \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,21.1)(21.5,21.2)
-  \rput[lb](3,22){\Huge\sffamily\color{Orange!65!Red}\psscalebox{2}{\textbf{PSTricks}}}
-  \rput[lb](3,14.1){\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}}
-  \rput[lb](3,12.6){\parbox{15cm}{\sffamily\Large\@subtitle}}
-  \rput[lb](3,7.6){\parbox{15cm}{\sffamily\@date}}
-  \rput[lb](3,-2.6){\parbox[b]{19cm}{\sffamily\RaggedRight 
-    \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\
-    \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{%
-      \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}}}
-  \rput[C](11,4){\bgImage}%
-\end{pspicture}%
+  \psset{unit=1cm}
+  \begin{pspicture}(1.6in,0)(23cm,21.7cm)
+    \psframe[fillstyle=solid,linecolor=lightgray,fillcolor=lightgray,linestyle=solid](0,-5.75)(23,10)
+    \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,10)(23,10.5)
+    \psframe[fillstyle=solid,linecolor=Orange!85!Red,fillcolor=Orange!85!Red,linestyle=solid](0,21.1)(23,21.2)
+    \rput[lb](3,22){\Huge\sffamily\color{Orange!65!Red}\psscalebox{2}{\textbf{PSTricks}}}
+    \rput[lb](3,14.1){\parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}}
+    \rput[lb](3,12.6){\parbox{15cm}{\sffamily\Large\@subtitle}}
+    \rput[lb](3,7.6){\parbox{15cm}{\sffamily\@date}}
+    \rput[lb](3,-2.6){\parbox[b]{19cm}{\sffamily\RaggedRight 
+      \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\
+      \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{%
+        \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}}}
+    \rput[C](11,4){\bgImage}%
+  \end{pspicture}%
 \fi
 \end{titlepage}
 \setcounter{footnote}{0}%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-key.sty b/Master/texmf-dist/tex/latex/pstricks/pst-key.sty
index 74db6c70a9a..e1550d293e6 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-key.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-key.sty
@@ -1,3 +1,4 @@
+% $Id: pst-key.sty 446 2017-04-19 11:40:55Z herbert $
 \RequirePackage{pstricks}
 \ProvidesPackage{pst-key}[2004/07/15 package wrapper for pst-key.tex]
 \input{pst-key.tex}
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
index 7daaf9f0df8..a1bde247b6b 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-platform.sty
@@ -1,3 +1,4 @@
+% $Id: pst-platform.sty 446 2017-04-19 11:40:55Z herbert $
 %%
 %% This is file `pst-platform.sty',
 %%
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
index 2ba36d0b042..7a83dd1fd93 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty
@@ -1,3 +1,4 @@
+% $Id: pstcol.sty 446 2017-04-19 11:40:55Z herbert $
 %% 
 %% pstcol.sty Copyright (C) 1994--1996 1999 David Carlisle
 %%                          2004--2007 Herbert Voss <voss@perce.de>
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
index 71e462a98d6..c363a62f801 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty
@@ -1,3 +1,4 @@
+% $Id: pstricks-pdf.sty 446 2017-04-19 11:40:55Z herbert $
 %%
 %% This is file `pstricks-pdf.sty'.
 %%
@@ -12,7 +13,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{pstricks-pdf}[2015/11/11 v0.01 wrapper for `pstricks.sty' (HV)]
+\ProvidesPackage{pstricks-pdf}[2017/03/17 v0.01 creating pdf output (HV)]
 % 
 \RequirePackage{ifpdf,xkeyval,pst-platform,ifluatex,ifxetex}
 
@@ -110,12 +111,18 @@
      \advance\c@app@runs\m@ne
   \repeat
   \app@convert{latex}{\jobname.\app@ext}{}%
-  \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}%
+  \ifxetex\else
+    \app@convert{dvips}{\app@jobname.dvi}{\app@jobname.ps}%
+  \fi
   \if@app@crop@
-    \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}%
+    \ifxetex\else
+      \app@convert{pstopdf}{\app@jobname.ps}{\app@jobname.pdf}%
+    \fi
     \app@convert{pdfcrop}{\app@jobname.pdf}{\app@pics}%
   \else
-    \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}%
+    \ifxetex\else
+      \app@convert{pstopdf}{\app@jobname.ps}{\app@pics}%
+    \fi
   \fi
   \IfFileExists{\app@pics}
     {\app@cleanup}
@@ -128,14 +135,16 @@
 \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{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@dvips#1#2{dvips \app@dvips@opts\space -o "#2" "#1"}
-\def\app@cmd@pstopdf#1#2{ps2pdf \app@pspdf@opts\space "#1" "#2"}
 \def\app@cmd@pdfcrop#1#2{pdfcrop \app@pdfcrop@opts\space "#1" "#2"}
 \ifpdf
   \if@app@off@\else
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 3c4db535775..6d2703b2ba8 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -1,3 +1,4 @@
+% $Id: pstricks.sty 446 2017-04-19 11:40:55Z herbert $
 %%
 %% This is file `pstricks.sty'.
 %%