From 1e0cf33a2c4ee1f510b36e7fc5eb408c349ba1bb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 24 Aug 2021 23:54:24 +0000 Subject: pstricks (25aug21) git-svn-id: svn://tug.org/texlive/trunk@60317 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pstricks/config/xdvipdfmx.cfg | 20 +++++----- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 44 ++++++++++++++++------ 2 files changed, 43 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pstricks') diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg index 75a596ca353..668ba419055 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg @@ -1,20 +1,22 @@ -% $Id: xdvipdfmx.cfg 4 2020-06-09 08:32:19Z herbert $ +% $Id: xdvipdfmx.cfg 152 2021-08-19 11:24:26Z herbert $ % -%% BEGIN: pstricks.con (for xdvipdfmx driver) +%% BEGIN: pstricks.con (for dvipdfmx driver) %% %% Configuration file for PSTricks %% -%% Version 0.05 (2015/09/11) +%% Version 0.06 (2021/08/21) %% -%% For use with xdvipdfmx +%% For use with dvipdfmx %% Created by SMiyata based on standard pstricks.con from TeXLive distribution. %% This file may be distributed, used and modified freely. %% Modified by Denis Girou, Herbert Voss %% -\def\pstdriver{xdvipdfmx}% -\def\pstverb#1{\special{pst: #1}}% Check catcode of " +\def\pstdriver{dvipdfmx}% +%%\def\pstverb#1{\special{pst: #1}}% Check catcode of " +\def\pstverb#1{\special{ps: #1}}% Check catcode of " \def\pstunit{1bp}% -\def\pstVerb#1{\immediate\special{PST: #1}}% +\def\pstVerb#1{\immediate\special{ps: #1}}% +%\def\pstVerb#1{\immediate\special{PST: #1}}% \def\pstverbscale{72.27 72 div dup scale }% \def\pstnodescale{72 72.27 div dup scale }% % DG/SR modification begin - Apr. 28, 1997 (D. Carlisle + S. Rahtz) @@ -39,7 +41,7 @@ %% \tx@NET means neg exch neg exch translate. \def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}% %% -%% ****************** END xdvipdfmx ***************************** +%% ****************** END dvipdfmx ***************************** %%%%%%%%%%%%%%%%%%% !! CUSTOMIZATION STUFF GOES HERE: !! %%%%%%%%%%%%%%%%%% @@ -53,7 +55,7 @@ \def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor}% \def\c@lor@ps@gray#1\@@{#1 setgray}% \pstcustomize -\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}% +\typeout{Using PSTricks configuration for LaTeX+dvipdfmx}% \def\@@scalebox{% \leavevmode \hbox{% diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 52a58656555..8b1edd58e05 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -80,8 +80,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{3.02} -\def\filedate{2021/05/31} +\def\fileversion{3.03} +\def\filedate{2021/08/23} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -1668,8 +1668,10 @@ \define@key[psset]{pstricks}{arrowinset}[0.4]{\pst@checknum{#1}\psk@arrowinset}% \psset[pstricks]{arrowinset=0.4} % +%% ---------------------- end arrow part ---------------------- +% \def\tx@SD{ \tx@setTransparency SD } -\def\tx@EndDot{EndDot } +\def\tx@EndDot{ EndDot } % \def\pst@par{} \def\addto@par#1{% @@ -2367,13 +2369,13 @@ \@namedef{psds@triangle}{% /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def /y2 y1 CLW add def /x2 y2 1.732 mul neg def - \pst@gdot{x1 y1 \tx@ST \pst@usecolor\psfillcolor x2 y2 \tx@ST}} + \pst@gdot{x1 y1 \tx@ST x2 y2 \tx@ST}} \@namedef{psds@pentagon*}{% /r1 DS 1.149 mul def \pst@gdot{r1 \tx@SP}} \@namedef{psds@pentagon}{% DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED - \pst@gdot{r1 \tx@SP \pst@usecolor\psfillcolor r2 \tx@SP}} + \pst@gdot{r1 \tx@SP r2 \tx@SP}} \@namedef{psds@+}{% /DS DS 1.253 mul def \pst@gdot{DS 0 moveto DS neg 0 L stroke 0 DS moveto 0 DS neg L stroke}} @@ -2428,16 +2430,29 @@ \newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} \newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} % DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14 -%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{} -%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{} + +\ifpstGSfonts + %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{} + %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{} +\else + %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{} + %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{} +\fi % D.G. modification begin - Jan. 17, 2000 \newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)} \newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)} \newpsfontdot{diamond*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)} % DG/SR modification end -\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{} -\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{} -\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{} + +\ifpstGSfonts + \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{} + \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{} + \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{} +\else + \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{} + \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{} + \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{} +\fi \newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{NimbusRomNo9L-Regu}{<2B>} \newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{NimbusRomNo9L-Regu}{<2A>} \newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{NimbusRomNo9L-Bold}{<2B>} @@ -2452,8 +2467,13 @@ % DG/SR modification end \iffalse -\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{} -\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{} +\ifpstGSfonts + \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{} + \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{} +\else + \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{} + \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{} +\fi \newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{} \fi % Etienne Riga -- cgit v1.2.3