From 5b38ea096283729f26d79088180038e9ca575faf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 23 Dec 2018 23:03:56 +0000 Subject: pstricks (23dec18) git-svn-id: svn://tug.org/texlive/trunk@49486 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pstricks') 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 +%% pstricks.sty Copyright (C) 2004- Rolf Niepraschk %% Herbert Voss -%% 2018- Herbert Voss +%% 2019- Herbert Voss %% %% 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'. -- cgit v1.2.3