pstricks (23dec18)

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

3 files changed, 51 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def
new file mode 100644
index 00000000000..8e9efc20260
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def
@@ -0,0 +1,34 @@
+%% $Id: pstricks-xetex.def 872 2018-12-21 20:39:31Z herbert $
+%%
+%% Copyright 2019-  Herbert Voss
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+% The xdvipdfmx driver does not support all node macros. In the following
+% there are alternatives defined:
+%
+%%  \ncput -> \NCput
+%
+\def\NCput{\pst@object{NCput}}
+\def\NCput@i#1{%
+  \begingroup
+  \use@par
+  \pst@getcoor{@@A}\pst@tempA% defined by \pcline and \ncline
+  \pst@getcoor{@@B}\pst@tempB
+  \if@star\def\next{\rput*}\else\def\next{\rput}\fi
+  \next(!
+  	  \pst@tempA /yA ED /xA ED
+  	  \pst@tempB /yB ED /xB ED
+  	  xA xB add 2 div
+  	  yA yB add 2 div \tx@UserCoor){#1}
+  \endgroup
+  \ignorespaces
+}
+%%
+%% END: pstricks-xetex.def
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 3934d1b1111..e5bcb18202f 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 869 2018-12-16 12:19:43Z herbert $
+%% $Id: pstricks.tex 872 2018-12-21 20:39:31Z herbert $
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
@@ -80,8 +80,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.90}
-\def\filedate{2018/12/17}
+\def\fileversion{2.90a}
+\def\filedate{2018/12/22}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index f3753709a61..36014b1d9b7 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 736 2018-02-26 08:04:35Z herbert $
+% $Id: pstricks.sty 872 2018-12-21 20:39:31Z herbert $
 %%
 %% This is file `pstricks.sty'.
 %%
@@ -6,9 +6,9 @@
 %%
 %% pstricks.sty Copyright (C) 1997 Timothy Van Zandt
 %% pstcol.sty   Copyright (C) 1994-1996 1999 David Carlisle
-%% pstricks.sty Copyright (C) 2004-2016 Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% pstricks.sty Copyright (C) 2004-     Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
 %%                                      Herbert Voss <hvoss@tug.org>
-%%                            2018-     Herbert Voss <hvoss@tug.org>
+%%                            2019-     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.
@@ -17,7 +17,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{pstricks}[2018/02/08 v0.68 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2018/12/21 v0.69 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%
@@ -39,9 +39,11 @@
 %
 \newif\ifpst@psfonts  \pst@psfontsfalse
 \newif\if@check@engine  \@check@enginetrue 
+\newif\ifpst@xetex  \pst@xetexfalse
 
 \DeclareOption{psfonts}{\pst@psfontstrue}
 \DeclareOption{noEngineCheck}{\@check@enginefalse}
+\DeclareOption{xetex}{\global\pst@xetextrue}
 %
 %---------------------------------DISTILLER --------------------------------
 \newif\ifpst@distiller\pst@distillerfalse
@@ -75,6 +77,7 @@
 \DeclareOption*{\PassOptionsToPackage\CurrentOption{\pst@ColorPackage}}
 \ProcessOptions\relax
 
+
 \RequirePackage{iftex}
 \RequirePackage{shellesc}
 %\ifPDFTeX
@@ -233,5 +236,12 @@
 %  \let\pst@color=\relax%
 % LaTeX used `\color@endgroup' instead. RN 2004-05-06
 }
+\pst@cntm=0
+\ifXeTeX\pst@cntm=1\else\ifpst@xetex\pst@cntm=1\fi\fi
+
+\ifnum\pst@cntm>\z@
+  \typeout{>>> Loading XeTeX special macros}%
+  \input{pstricks-xetex.def}%
+\fi
 %
 %% End of file `pstricks.sty'.