summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-06 21:14:44 +0000
committerKarl Berry <karl@freefriends.org>2021-09-06 21:14:44 +0000
commitebf646b3f72db03de82b02580e5a68b878a5a067 (patch)
tree21e0d00387766a355ab1a02ab0dd760d5a4f2169 /Master/texmf-dist/tex/generic
parent6b55d156e26232afcb59f5e05cc912afa1fac942 (diff)
pstricks (6sep21)
git-svn-id: svn://tug.org/texlive/trunk@60436 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/textures.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg10
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg.orig244
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-fp.tex12
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex54
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.con7
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex113
12 files changed, 114 insertions, 338 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
index 9ade3312156..db654b14d73 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg
@@ -1,4 +1,4 @@
-% $Id: distiller.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: distiller.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN: distiller.con (for distiller driver)
%%
%% Configuration file for PSTricks
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg
index f9c5da698e2..d9648c1d0a0 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg
@@ -1,4 +1,4 @@
-% $Id: dvips.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: dvips.cfg 797 2018-08-23 18:33:16Z herbert $
%% BEGIN: pstricks.con (for dvips driver)
%%
%% Configuration file for PSTricks
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
index bb59975bfa0..965e635fd53 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg
@@ -1,4 +1,4 @@
-% $Id: dvipsone.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: dvipsone.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN pstricks.con (for DVIPSONE driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
index f0fe5486cde..b3549c8c562 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg
@@ -1,4 +1,4 @@
-% $Id: gastex.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: gastex.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN: pstricks.con (for xdvipdfmx driver)
%%
%% Configuration file for PSTricks
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
index ef088b5791f..48667d39502 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg
@@ -1,4 +1,4 @@
-% $Id: textures.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: textures.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN pstricks.con (for Textures 1.7 and 1.8 driver)
%%
%% Configuration file for PSTricks 97: must be renamed `pstricks.con'
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
index 7cb84c0f9e1..e4b71844047 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg
@@ -1,4 +1,4 @@
-% $Id: vtex.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: vtex.cfg 446 2017-04-19 11:40:55Z herbert $
%% BEGIN: pstricks.con (for VTeX)
%%
%% Configuration file for PSTricks 97
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
index 663e342f79c..8a0b1f5c344 100644
--- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
+++ b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg
@@ -1,10 +1,10 @@
-% $Id: xdvipdfmx.cfg 158 2021-08-24 06:57:13Z herbert $
+% $Id: xdvipdfmx.cfg 191 2021-09-05 20:07:31Z herbert $
%
%% BEGIN: pstricks.con (for dvipdfmx driver)
%%
%% Configuration file for PSTricks
%%
-%% Version 0.06 (2021/08/21)
+%% Version 0.07 (2021/09/05)
%%
%% For use with dvipdfmx
%% Created by SMiyata based on standard pstricks.con from TeXLive distribution.
@@ -12,11 +12,9 @@
%% Modified by Denis Girou, Herbert Voss
%%
\def\pstdriver{dvipdfmx}%
-%%\def\pstverb#1{\special{pst: #1}}% Check catcode of "
-\def\pstverb#1{\special{ps: #1}}% Check catcode of "
+\def\pstverb#1{\special{pst: #1}}% Check catcode of "
\def\pstunit{1bp}%
-\def\pstVerb#1{\immediate\special{ps: #1}}%
-%\def\pstVerb#1{\immediate\special{PST: #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)
diff --git a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg.orig b/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg.orig
deleted file mode 100644
index 75a596ca353..00000000000
--- a/Master/texmf-dist/tex/generic/pstricks/config/xdvipdfmx.cfg.orig
+++ /dev/null
@@ -1,244 +0,0 @@
-% $Id: xdvipdfmx.cfg 4 2020-06-09 08:32:19Z herbert $
-%
-%% BEGIN: pstricks.con (for xdvipdfmx driver)
-%%
-%% Configuration file for PSTricks
-%%
-%% Version 0.05 (2015/09/11)
-%%
-%% For use with xdvipdfmx
-%% 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\pstunit{1bp}%
-\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)
-% \def\pstheader#1{\special{header=#1}}
-% We used to check for |\AtBeginDvi|, but that was broken in early release
-% so we now check for the existence of |\textsuperscript| (added 1995/05/16)
-\ifx\textsuperscript\@undefined
- \def\pstheader#1{\special{header=#1}}%
-\else
- \ifx\Gin@PS@file@header\@undefined
- \def\pstheader#1{\AtBeginDvi{\special{header=#1}}}%
- \else
- \let\pstheader\Gin@PS@file@header%
- \fi
-\fi
-% DG/SR modification end
-%
-%%
-%%
-%% In the following, CP is short for currentpoint.
-%% The neg is necessary because dvips scales the coordinates by 1 -1.
-%% \tx@NET means neg exch neg exch translate.
-\def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}%
-%%
-%% ****************** END xdvipdfmx *****************************
-
-
-%%%%%%%%%%%%%%%%%%% !! CUSTOMIZATION STUFF GOES HERE: !! %%%%%%%%%%%%%%%%%%
-%% If you want to include your own customizations to pstricks.tex, then
-%% uncomment the \pstcustomize command, and include your modifications
-%% after \pstcustomize. These will be read in after pstricks.tex.
-\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@}%
-\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end}%
-\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor}%
-\def\c@lor@ps@hsb#1\@@{#1 sethsbcolor}%
-\def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor}%
-\def\c@lor@ps@gray#1\@@{#1 setgray}%
-\pstcustomize
-\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}%
-\def\@@scalebox{%
- \leavevmode
- \hbox{%
-\ifdim\pst@tempd\p@<\z@
-\pst@dimg=\pst@tempd\ht\pst@hbox
-\pst@dimh=\pst@tempd\dp\pst@hbox
-\dp\pst@hbox=-\pst@dimg
-\ht\pst@hbox=-\pst@dimh
-\else
-\ht\pst@hbox=\pst@tempd\ht\pst@hbox
-\dp\pst@hbox=\pst@tempd\dp\pst@hbox
-\fi
-\pst@dima=\pst@tempc\wd\pst@hbox
-\ifdim\pst@dima<\z@\kern-\pst@dima\fi
-\special{x: bscale \pst@tempc \pst@tempd}%
-\hbox to \z@{\box\pst@hbox\hss}%
-\special{x: escale}%
-\ifdim\pst@dima>\z@\kern\pst@dima\fi}}%
-%
-\let\ps@@scalebox\@@scalebox
-\def\ps@rotateleft#1{%
-\leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
-\pst@Verb{90 \tx@RotBegin}%
-\vbox to \z@{\vss\hbox to \z@{\box#1\hss}\vskip\z@}%
-\pst@Verb{\tx@RotEnd}}}}%
-%
-\def\ps@rotateright#1{%
- \leavevmode\hbox{%
- \hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
- \pst@Verb{-90 \tx@RotBegin}%
- \vbox to \z@{\hbox to \z@{\hss\box#1}\vss}%
- \pst@Verb{\tx@RotEnd}}}}%
-%
-\def\ps@rotatedown#1{%
-\hbox{\hskip\wd#1\vbox{\vskip\ht#1\vskip\dp#1%
-\pst@Verb{180 \tx@RotBegin}%
-\vbox to \z@{\hbox to \z@{\box#1\hss}\vss}%
-\pst@Verb{\tx@RotEnd}}}}%
-%
-\def\begin@psclip{\special{x: gsave}}%
-\def\end@psclip{\special{x: grestore}}%
-\def\@newcolor#1#2#3{%
-\expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}%
-\expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17
-\expandafter\edef\csname\string\color@xetex@#1\endcsname{#3}%
-\ignorespaces}%
-%
-\def\newgray#1#2{%
- \pst@checknum{#2}\pst@tempg
- \@newcolor{#1}{\pst@tempg setgray}{gray \pst@tempg}%
-}
-\def\newrgbcolor#1#2{%
- \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
- \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}{rgb \pst@tempg \pst@temph \pst@tempi}%
-}%
-\def\newhsbcolor#1#2{%
- \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
- \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}{hsb \pst@tempg \pst@temph \pst@tempi}%
-}%
-\def\newcmykcolor#1#2{%
- \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil
- \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}%
- {cmyk \pst@tempg \pst@temph \pst@tempi \pst@tempj}%
-}%
-\newgray{black}{0}%
-\newgray{darkgray}{.25}%
-\newgray{gray}{.5}%
-\newgray{lightgray}{.75}%
-\newgray{white}{1}%
-\newrgbcolor{red}{1 0 0}%
-\newrgbcolor{green}{0 1 0}%
-\newrgbcolor{blue}{0 0 1}%
-\newrgbcolor{yellow}{1 1 0}%
-\newrgbcolor{cyan}{0 1 1}%
-\newrgbcolor{magenta}{1 0 1}%
-
-\@ifundefined{LaTeXe}%
- {\def\current@@@@color{\csname\string\color@xetex@\psfillcolor\endcsname}}{%
- \AtBeginDocument{\@ifpackageloaded{xcolor}{\def\current@@@@color{\psfillcolor}}%
- {\def\current@@@@color{\csname\string\color@\psfillcolor\endcsname}}}}%
-%
-\iffalse
-\def\pst@starbox{%
-\setbox\pst@hbox\hbox{{%
- \def\current@color{\current@@@@color}%
-\dimen@\wd\pst@hbox\advance\dimen@2\psframesep\wd\pst@hbox\dimen@%
-\dimen@\ht\pst@hbox\advance\dimen@\psframesep\ht\pst@hbox\dimen@%
-\dimen@\dp\pst@hbox\advance\dimen@\psframesep\dp\pst@hbox\dimen@%
-\@ifundefined{LaTeXe}{\special{color push \current@color}%
- \rlap{\vrule width\wd\pst@hbox height\ht\pst@hbox depth\dp\pst@hbox}%
- \special{color pop}}%
- {\color@block{\wd\pst@hbox}{\ht\pst@hbox}{\dp\pst@hbox}}}%
-\rlap{\hskip\psframesep\unhbox\pst@hbox}}}
-\fi
-%
-\def\AltClipMode{}%
-%
-\def\putoverlaybox#1{%
-\hbox{\special{x: gsave}\special{x: initoverlay #1}\copy\theoverlaybox\special{x: grestore}}}%
-%
-\def\pst@overlay#1{\edef\curr@overlay{#1}\special{x: clipoverlay #1}\aftergroup\pst@endoverlay}%
-\def\pst@endoverlay{\special{x: clipoverlay \curr@overlay}}%
-\def\AltOverlayMode{}%
-%The next line is not necessary, if pstricks.sty of [2007/02/18 v0.33] or newer is used.
-\@ifundefined{LaTeXe}{}{\AtBeginDocument{\psset{fillcolor=white}}}%
-%
-\endinput
-%
-%
-%%%%%%%%%%%%%%%% DESCRIPTION OF CONFIGURATION DEFINITIONS %%%%%%%%%%%%%%%
-
-Here are the commands that must be defined in this file:
-
- \pstverb{} - The argument is included as verbatim PostScript,
- grouped by save and restore. The coordinate system
- should be square, not rotated, and with the origin
- at TeX's currentpoint.
-
- \pstVerb{} - The argument is included as verbatim PostScript, not
- grouped by (g)save and (g)restore. The currentpoint
- should be TeX's currentpoint.
-
- \pstunit - The units used by driver for graphics included with
- \pstverb. Probably 1bp or 1sp.
-
- \pstverbscale - The PostScript code that scales the coordinate system
- from that in effect with \pstVerb to that in effect
- with \pstverb. Should not translate to the currentpoint.
-
- \pstrotate - The PostScript code that takes a number off the stack
- and rotates the axes properly. I.e.,
- \pstVerb{angle \pstrotate} is used to begin rotations.
-
- \pstheader{} - The argument is a header file (e.g., .pro file).
- If your driver does not support such a special, then
- the command might just remind you to include the header
- when printing. You can use PSTricks without a header,
- in which case it does not matter how you define
- \pstheader. See read-me.pst for details.
- If you cannot change the default directory where your
- driver looks for header files, and you cannot write to
- that directory, then you include the path for your
- PSTricks header files.
- E.g., \def\pstheader#1{\special{header=~/tex/#1}}.
-
- \pstdriver - The name of the driver.
-
-
-%%%%%%%%% !! HOW TO MAKE A TEX FORMAT WITH PSTRICKS PRELOADED !! %%%%%%%%
-
-See your local TeX documentation for instructions on creating a TeX format.
-
-Before making the format, be sure that this configuration file is correct.
-It will be read only when creating the format, and not with every job.
-
-If you are not using header files, there are no more special instructions.
-
-Special instructions when using header files:
-
- - If you want to include supplementary PSTricks files (e.g., pst-node.tex),
- add \input commands in the customization section above.
-
- - If your definition of \pstheader is, e.g.
-
- \def\pstheader#1{\special{\header=#1}}
-
- then change it to
-
- \def\pstheader#1{%
- \expandafter\everyjob\expandafter{\the\everyjob
- \special{header=#1}}}
-
- and put your original definition in the customization section, AFTER
- any \input commands. E.g., the customization section might look like:
-
- \pstcustomize
- \input pst-node.tex
- \input pst-coil.tex
- \def\pstheader#1{\special{header=#1}}
-
- - Input pstricks.tex at the appropriate time when creating the format.
- E.g., when initex stops running:
- *\input pstricks
- *\dump
-
-
-%%
-%% END: pstricks.con
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
index e00736bdeb6..34cfb16f9e7 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-fp.tex 68 2021-04-08 06:41:14Z herbert $
+%% $Id: pst-fp.tex 4 2020-06-09 08:32:19Z herbert $
%%
%%
%% This is file `pst-fp.tex',
@@ -18,16 +18,16 @@
%% `pst-fp' is a PSTricks related package for a division,
%% multiplication and addition
%%
-%
-\def\fileversion{0.06}
-\def\filedate{2020/11/20}
-\message{`pst-fp' v\fileversion, \filedate\space (hv)}
-
\csname PSTFPloaded\endcsname
\let\PSTFPloaded\endinput
+%
% Requires some packages
\ifx\PSTricksLoaded\endinput\else\input pstricks \fi
%
+\def\fileversion{0.05}
+\def\filedate{2010/01/17}
+\message{`pst-fp' v\fileversion, \filedate\space (hv)}
+%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
%fixed point arithmetic with values between (including)
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex
index 5684f3d7921..0d89aa6b985 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-arrows.tex 164 2021-08-25 19:26:42Z herbert $
+%% $Id: pstricks-arrows.tex 168 2021-08-28 08:43:24Z herbert $
%%
%% This is file `pstricks-arrows.tex',
%%
@@ -279,35 +279,18 @@
\psset[pstricks]{filledveearrowlength=3mm} % default projected length
\define@key[psset]{pstricks}{filledveearrowangle}[15]{\pst@getangle{#1}\psk@filledveearrowangle}
\psset[pstricks]{filledveearrowangle=15} % default angle
-\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.35mm]{\pst@getlength{#1}\psk@filledveearrowlinewidth}
-\psset[pstricks]{filledveearrowlinewidth=0.35mm} % default vee arrow line width
+\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.8pt]{\pst@getlength{#1}\psk@filledveearrowlinewidth}
+\psset[pstricks]{filledveearrowlinewidth=\pslinewidth} % default vee arrow line width
\define@key[psset]{pstricks}{arrowlinestyle}[solid]{%
\@ifundefined{psls@#1}%
{\@pstrickserr{Line style `#1' not defined}\@eha}%
{\def\psarrowlinestyle{#1}}}
\psset[pstricks]{arrowlinestyle=solid} % default
-\pst@def{VeeArrow}<%
- 1 setlinecap % round caps
- 1 setlinejoin % round join
- setlinewidth % vee arrow line width
- /y ED % projected length
- 2 div /a ED % angle (divide by 2)
- /t ED % false = inside, true = outside
- a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y
- t { 1 -1 scale } if % if outside : symmetry
- x neg y moveto % point #1
- 0 0 L % point #2
- x y L % point #3
- { closepath gsave fill grestore } if % if filled : close and fill
- \@nameuse{psls@\psarrowlinestyle}
- \ps@check@tipcolor
- stroke % draw line
- 0 t { y 2 mul } { 0 } ifelse moveto> % if outside : twice longer line
-
-% VeeArrow : filled? outside? (total) angle (projected) length (arrow) line width
\@namedef{psas@|}{\ps@check@tipcolor \psk@tbarsize \tx@Tbar}
+% VeeArrow : filled? outside? (total) angle (projected) length (arrow) line width
+
\@namedef{psas@v}{%
\ps@check@tipcolor
false false \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
@@ -315,12 +298,37 @@
\ps@check@tipcolor
false true \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow}
\@namedef{psas@f}{%
- \ps@check@tipcolor
+ \ps@check@tipcolor
true false \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
\@namedef{psas@F}{%
\ps@check@tipcolor
true true \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow}
+\pst@def{VeeArrow}<%
+ 5 dict begin
+ \pst@arrowscale\space div SLW % vee arrow line width
+ /y ED % projected length
+ 2 div /a ED % angle (divide by 2)
+ /t ED % false = inside, true = outside
+ a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y
+ /x2 x dup add def
+ t { 1 -1 scale } if % if outside : symmetry
+% newpath x2 neg y moveto 0 y neg rlineto x2 dup add 0 rlineto 0 y rlineto closepath clip % to get rid of linecap problem
+ newpath
+ x neg y moveto % lower left
+ 0 0 lineto % arrow tip
+ x y lineto % upper left
+ 0 setlinecap % round caps
+ 2 setlinejoin % round join
+ { closepath 0 setlinewidth gsave fill grestore } if % if filled : close and fill
+ \@nameuse{psls@\psarrowlinestyle}
+ \ps@check@tipcolor
+ stroke % draw line
+ 0 t { y 2 mul } { 0 } ifelse moveto
+ end
+> % if outside : twice longer line
+
+
% And An another arrowhead
% architectural tick / oblique arrow
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.con b/Master/texmf-dist/tex/generic/pstricks/pstricks.con
index 0c119d13a36..21134fb7817 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.con
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.con
@@ -1,4 +1,4 @@
-%% $Id: pstricks.con 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pstricks.con 170 2021-09-01 09:54:41Z herbert $
%% BEGIN: pstricks.con (for dvips driver)
%%
%% Configuration file for PSTricks
@@ -39,8 +39,11 @@
%% If you want to include your own customizations to pstricks.tex, then
%% uncomment the \pstcustomize command, and include your modifications
%% after \pstcustomize. These will be read in after pstricks.tex.
-%\pstcustomize
+\pstcustomize
+\ifPSTlualatex% luatex has another coordinate system
+ \def\pstrotate{CP CP translate 3 -1 roll rotate \tx@NET}
+\fi
\endinput
%%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 3bbf6a341ee..cd28900b39e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -81,8 +81,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{3.06}
-\def\filedate{2021/08/27}
+\def\fileversion{3.07}
+\def\filedate{2021/09/05}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -1396,7 +1396,8 @@
{ \pst@usecolor\ps@kitecolor }
{ \pst@usecolor\pshatchcolor }
\psk@psscale
- \tx@PenroseFillA }
+ \tx@PenroseFillA
+}
\def\psfs@penroseA{\pst@fill\pst@penroseFillA}
\@namedef{psfs@penroseA*}{\psfs@solid \psfs@penroseA}
%
@@ -2214,6 +2215,9 @@
}}
%
\pstheader{pst-dots.pro}
+
+\pstGSfontsfalse
+
\newpsfontdot{*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)}
\newpsfontdotH{o}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)}
\newpsfontdotH{Bo}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(C)}{(b)}
@@ -2226,53 +2230,11 @@
\newpsfontdotH{pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)}
\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
-
-\ifpstGSfonts
- %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{<E0>}
- %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{<A8>}
-\else
- %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>}
- %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
-\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
-
-\ifpstGSfonts
- \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{<C5>}
- \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{<C4>}
- \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{<B4>}
-\else
- \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{<C5>}
- \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{<C4>}
- \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{<B4>}
-\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>}
-\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>}
-\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)}
-% DG/SR modification begin - Oct. 27, 1997 - Patch 7
-%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{NimbusSanL-Regu}{(|)}
-% DG/SR modification end
-\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}%
-% DG/SR modification begin - Oct. 27, 1997 - Patch 7
-%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{NimbusSanL-Bold}{(|)}
-
-% DG/SR modification end
-\iffalse
-\ifpstGSfonts
- \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{<B7>}
- \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{<B0>}
-\else
- \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{<B7>}
- \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{<B0>}
-\fi
-\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{<CA>}
-\fi
% Etienne Riga
\newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)}
\newpsfontdot{BoldAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(K)}
@@ -2313,6 +2275,28 @@
\newpsfontdotH{Diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)}
\newpsfontdotH{BoldDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)}
\newpsfontdot{SolidDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)}
+
+\ifpstGSfonts
+ \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{<C5>}
+ \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{<C4>}
+ \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{<B4>}
+ \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>}
+ \newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>}
+ \newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)}
+ \newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}%
+\else
+ \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{<C5>}
+ \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{<C4>}
+ \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{<B4>}
+ \newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{Times-Roman}{<2B>}
+ \newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>}
+ \newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>}
+ \newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>}
+ \newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)}
+ \newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}%
+\fi
%
\newdimen\pslinearc
\define@key[psset]{pstricks}{linearc}[0pt]{\pssetlength\pslinearc{#1}}
@@ -4030,7 +4014,23 @@ pop
\def\getref@r{\def\psk@xref{1}}
\psset[pstricks]{ref=c}
%
-\def\pst@rotlist{ mark RAngle /ps@a ED cleartomark ps@a neg }
+%
+% U Up 0
+% L Left 90
+% D Down 180
+% R Right 270
+%
+% N North *0
+% W West *90
+% S South *180
+% E East *270
+%
+\ifPSTlualatex
+ \def\pst@rotlist{ mark RAngle /ps@a ED cleartomark ps@a }%
+\else
+ \def\pst@rotlist{ mark RAngle /ps@a ED cleartomark ps@a neg }%
+\fi
+
\def\pst@rottable{%
@0=%
@U=%
@@ -4068,11 +4068,21 @@ pop
%
\def\tx@RotBegin{RotBegin }
\def\tx@RotEnd{RotEnd }
-\def\pst@rotate#1#2{%
- \ifx#1\@empty\else
- \setbox#2=\hbox{\pst@Verb{#1 \tx@RotBegin}\box#2\pst@Verb{\tx@RotEnd}}%
- \fi%
-}
+\ifPSTlualatex
+ \def\pst@rotate#1#2{%
+ \ifx#1\@empty\else
+ \setbox#2=\hbox{\pst@Verb{#1 \ifPSTlualatex neg \fi\space \tx@RotBegin}\box#2\pst@Verb{\tx@RotEnd}}%
+ % luatex doesn't have the coordinate system of dvips, so we need negative angles
+ \fi
+ }%
+ \else
+ \def\pst@rotate#1#2{%
+ \ifx#1\@empty\else
+ \setbox#2=\hbox{\pst@Verb{#1 \ifPSTlualatex \fi\space \tx@RotBegin}\box#2\pst@Verb{\tx@RotEnd}}%
+ % luatex doesn't have the coordinate system of dvips, so we need negative angles
+ \fi
+ }%
+ \fi
\def\psput@cartesian#1{%
\hbox to \z@{\kern\pst@dimg{\vbox to \z@{\vss\box#1\vskip\pst@dimh}\hss}}%
}
@@ -4399,6 +4409,7 @@ pop
\ifshowgrid\ifnum\showgridp@s=0\psgrid[style=gridstyle]\fi\fi
% ----------- 1.10/12 end hv -------------------
\ignorespaces% % 2008-12-07
+ \pstVerb{\pst@number\pslinewidth setlinewidth 0 setgray}% default setting
\ifPst@pgffunctions\pstVerb{ pgffunctions }\fi% hv 2013-04-17
}
\def\pic@coor{(0,0)(0,0)(10,10)}