diff options
author | Karl Berry <karl@freefriends.org> | 2018-12-23 23:03:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-12-23 23:03:56 +0000 |
commit | 5b38ea096283729f26d79088180038e9ca575faf (patch) | |
tree | 7c48bb2ec21c9ed03228de0ad112dba28518a500 /Master/texmf-dist | |
parent | 5d2dcd21fe1a9dab2e0922eece7f14db3d4901e0 (diff) |
pstricks (23dec18)
git-svn-id: svn://tug.org/texlive/trunk@49486 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf | bin | 68761 -> 74224 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news18.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/dvips/pstricks/pstricks.pro | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def | 34 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 18 |
6 files changed, 73 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf Binary files differindex bcdd9dcea26..dda81799150 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex index d80e380af20..dde1638e586 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex @@ -14,6 +14,7 @@ \usepackage{xkvview} \renewcommand\bgImage{\psscalebox{15}{\color{blue!20}\the\year}} \def\textat{\char064} +\usepackage{dtk-logos} \usepackage{biblatex} \addbibresource{PSTricks.bib} @@ -148,6 +149,26 @@ There are now four predefined random ''colors``: The random counter can be initialized with \verb|\pstVerb{rrand srand}|. +\subsection{Optional argument \texttt{xetex}} +The output driver \Lprog{xdvipdfmx} for using \XeTeX\ or \XeLaTeX\ is not fully +compatible to \Lprog{dvips}. Especially some node operations will not work. If the +\LaTeX\ package detects a programm run with \XeLaTeX\ it automatically loads the file +\Lfile{pstricks-xetex.def} which defines some macros with a new name to keep the existing +ones. By now there is only +\Lcs{NCput}, which is the same as \Lcs{ncput}, but works with \XeLaTeX. + +If someone wants to use these macros though he/she runs not \XeLaTeX\ then these macros are +available too by using the optional argument \Loption{xetex}: + +\begin{verbatim} +\usepackage[xetex]{pstricks} +\end{verbatim} + + + + + + %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.pro}} %-------------------------------------------------------------------------------------- diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 0cdc0b29f1f..0911f0eb0b9 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,4 +1,4 @@ -% $Id: pstricks.pro 838 2018-11-14 19:00:45Z herbert $ +% $Id: pstricks.pro 872 2018-12-21 20:39:31Z herbert $ % %% PostScript prologue for pstricks.tex. %% Version 1.30, 2018/12/17 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'. |