summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-24 21:38:54 +0000
committerKarl Berry <karl@freefriends.org>2021-09-24 21:38:54 +0000
commit2a99f055fdb2f330eaf7da5766e19e5740c089be (patch)
treeb2514811af15f3daee20b7721a52c82d77a3f2f7 /Master/texmf-dist/tex/generic/pstricks
parente1d72a13a1129839d0d6bd981fe54217226aefc3 (diff)
pstricks (24sep21)
git-svn-id: svn://tug.org/texlive/trunk@60599 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
-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/pstricks-arrows.tex54
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-dots.tex228
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def3
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.con7
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex400
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks97.tex2
13 files changed, 361 insertions, 347 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/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-color.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex
index 708a4260a5f..7a7b5622d57 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-arrows.tex 168 2021-08-28 08:43:24Z herbert $
+%% $Id: pstricks-color.tex 260 2021-09-23 19:22:36Z herbert $
%%
%% This is file `pstricks-color.tex',
%%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-dots.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks-dots.tex
new file mode 100644
index 00000000000..67528a5853e
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-dots.tex
@@ -0,0 +1,228 @@
+%% $Id: pstricks-dots.tex 262 2021-09-24 09:02:54Z herbert $
+%%
+%% This is file `pstricks-dots.tex',
+%%
+%% IMPORTANT NOTICE:
+%%
+%% Herbert Voss <hvoss@tug.org>
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%%
+%% DESCRIPTION:
+%% `pstricks-dots' base code for dots
+%%
+%% fileversion and filedate see main file pstricks.tex
+%%
+\define@key[psset]{pstricks}{dotsize}[2pt 2]{%
+ \pst@expandafter\pst@getdimnum{#1} 0 {} {}\@nil%
+ \edef\psk@@dotsize{\pst@number\pst@dimg}%
+ \let\psk@@@dotsize\pst@tempg%
+ \edef\psk@dotsize{ /DS \psk@@dotsize \psk@@@dotsize CLW mul add 2 div def }}
+\psset[pstricks]{dotsize=2pt 2}
+%
+\define@key[psset]{pstricks}{dotscale}[1]{%
+ \pst@getscale{#1}\psk@dotscale
+ \ifx\psk@dotscale\@empty
+ \def\psk@xdotscale{1 }%
+ \def\psk@ydotscale{1 }%
+ \else
+ \let\psk@xdotscale\pst@tempg
+ \let\psk@ydotscale\pst@temph
+ \fi}
+%
+\def\pst@Getangle#1#2{%
+ \pst@getangle{#1}\pst@tempg
+ \def\pst@temph{0. }%
+ \ifx\pst@tempg\pst@temph\def#2{}\else\edef#2{\pst@tempg\space rotate }\fi}
+%
+\define@key[psset]{pstricks}{dotangle}[0]{%
+ \pst@getangle{#1}\psk@@dotangle
+ \ifdim\psk@@dotangle\p@=\z@
+ \let\psk@dotangle\@empty
+ \else
+ \edef\psk@dotangle{\psk@@dotangle rotate }%
+ \fi}
+\psset[pstricks]{dotangle=0}
+%
+\def\pst@getdotsize{%
+\pst@dimg=\psk@@@dotsize\pslinewidth
+\advance\pst@dimg\psk@@dotsize\p@
+\pst@dimh=\psk@ydotscale\pst@dimg
+\pst@dimg=\psk@xdotscale\pst@dimg
+\divide\pst@dimh 2
+\divide\pst@dimg 2\relax}
+%
+\psset[pstricks]{dotscale=1}
+%
+\def\psdot{\pst@object{psdot}}
+\def\psdot@i{\@ifnextchar({\psdot@ii}{\psdot@ii(\z@,\z@)}}
+\def\psdot@ii(#1){%
+ \begin@SpecialObj%
+% hv modification 1.13 2005-11-28
+ \solid@star%
+% hv modification end
+ \pst@@getcoor{#1}%
+ \addto@pscode{
+ \psk@dotsize
+ \@nameuse{psds@\psk@dotstyle}
+ \tx@setStrokeTransparency
+ \pst@coor Dot}%
+ \end@SpecialObj}
+%
+\def\psdots{\pst@object{psdots}}
+\def\psdots@i{%
+ \begin@SpecialObj%
+ \pst@getcoors[\psdots@ii}
+\def\psdots@ii{%
+ \addto@pscode{ false \tx@NArray \psdots@iii }%
+ \end@SpecialObj}
+\def\psdots@iii{%
+ \psk@dotsize
+ \@nameuse{psds@\psk@dotstyle}
+ \tx@setStrokeTransparency
+ newpath
+ n { transform floor .5 add exch floor .5 add exch itransform Dot } repeat }
+%
+% DG: dead code (to suppress until \psset[pstricks]{dotstyle) ? - Aug. 4, 1997
+\def\tx@SQ{SQ }
+\def\tx@ST{ST }
+\def\tx@SP{SP }
+%
+\def\pst@gdot#1{ /Dot { gsave T \psk@dotangle \psk@dotscale #1 grestore } def }
+%
+\@namedef{psds@*}{\pst@gdot{ 0 0 DS \tx@SD }}
+\@namedef{psds@o}{%
+ /r2 DS CLW sub def
+ \pst@gdot{ 0 0 DS \tx@SD \pst@usecolor\psfillcolor SLW 0 0 r2 \tx@SD }}
+\@namedef{psds@square*}{ /r1 DS .886 mul def \pst@gdot{r1 \tx@SQ }}
+\@namedef{psds@square}{%
+ /r1 DS .886 mul def /r2 r1 CLW sub def
+ \pst@gdot{r1 \tx@SQ \pst@usecolor\psfillcolor r2 \tx@SQ}}
+\@namedef{psds@triangle*}{%
+ /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def
+ \pst@gdot{x1 y1 \tx@ST}}
+\@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 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 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}}
+\@namedef{psds@|}{%
+ \psk@tbarsize CLW mul add 2 div /DS ED
+ \pst@gdot{0 DS moveto 0 DS neg L stroke}}
+% DG: end dead code?
+%
+\define@key[psset]{pstricks}{dotstyle}[*]{%
+ \@ifundefined{psds@#1}%
+ {\@pstrickserr{Dot style `#1' not defined}\@eha}%
+ {\edef\psk@dotstyle{#1}}}
+%
+\psset[pstricks]{dotstyle=*}
+%
+\def\tx@FontDot{FontDot }
+
+\def\newpsfontdot#1[#2]#3#4{%
+ \@namedef{psds@#1}{%
+ /#3 \psk@@dotangle [#2] \tx@FontDot
+ /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def
+}}
+\def\newpsfontdotH#1[#2]#3#4#5{% for filled objects
+ \@namedef{psds@#1}{%
+ /#3 \psk@@dotangle [#2] \tx@FontDot
+ /Dot {
+ moveto
+ gsave \psk@dotscale \pst@usecolor\psfillcolor #5 show grestore % fill first
+ gsave \psk@dotscale #4 show grestore % show the unfilled one
+ } bind def
+}}
+%
+\ifPSTlualatex\else\pstheader{pst-dots.pro}\fi % load the type 1 font
+%%40
+% /.notdef /BoldAdd /.notdef /BoldCircle /BoldDiamond /SolidOtimes /BoldOctogon /SolidHexagon
+% /BoldHexagon /BoldBar /SolidAsterisk /BoldAsterisk /.notdef /BOplus /BOtimes /.notdef
+%%50
+% /BoldPentagon /.notdef /.notdef /BoldSquare /BoldTriangle /.notdef /.notdef /.notdef
+% /BoldMul /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%%60
+% /.notdef /Add /Bullet /Circle /Diamond /SolidOplus /Octogon /SolidOctogon
+% /Hexagon /Bar /.notdef /Asterisk /SolidDiamond /Oplus /Otimes /.notdef
+%%70
+% /Pentagon /SolidPentagon /SolidSquare /Square /Triangle /SolidTriangle /.notdef /.notdef
+% /Mul /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ \newpsfontdot{B+}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<41>}
+ \newpsfontdot{BoldAdd}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<41>}
+ \newpsfontdot{Bo}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<43>}
+ \newpsfontdot{BoldCircle}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<43>}
+ \newpsfontdot{BoldDiamond}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<44>}
+ \newpsfontdot{Bdiamond}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<44>}
+ \newpsfontdot{SolidOtimes}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<45>}
+ \newpsfontdot{BoldOctogon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<46>}
+ \newpsfontdot{SolidHexagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<47>}
+ \newpsfontdot{BoldHexagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<48>}
+ \newpsfontdot{BoldBar}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<49>}
+ \newpsfontdot{B|}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<49>}
+ \newpsfontdot{Asterisk*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<4A>}
+ \newpsfontdot{SolidAsterisk}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<4A>}
+ \newpsfontdot{BoldAsterisk}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<4B>}
+ \newpsfontdot{Basterisk}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<4B>}
+ \newpsfontdot{BoldOplus}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<4D>}
+ \newpsfontdot{BoldOtimes}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<4E>}
+ \newpsfontdot{BoldPentagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<50>}
+ \newpsfontdot{Bpentagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<50>}
+ \newpsfontdot{BoldSquare}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<53>}
+ \newpsfontdot{Bsquare}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<53>}
+ \newpsfontdot{Btriangle}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<54>}
+ \newpsfontdot{BoldTriangle}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<54>}
+ \newpsfontdot{BoldMul}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<58>}
+%
+ \newpsfontdot{+}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<61>}
+ \newpsfontdot{Add}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<61>}
+ \newpsfontdot{bullet}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<62>}
+ \newpsfontdot{Bullet}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<62>}
+ \newpsfontdot{*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<62>}
+ \newpsfontdot{o}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<63>}
+ \newpsfontdot{Circle}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<63>}
+ \newpsfontdot{Diamond}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<64>}
+ \newpsfontdot{diamond}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<64>}
+ \newpsfontdot{Oplus*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<65>}
+ \newpsfontdot{SolidOplus}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<65>}
+ \newpsfontdot{Octogon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<66>}
+ \newpsfontdot{Octogon*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<67>}
+ \newpsfontdot{Hexagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<68>}
+ \newpsfontdot{Bar}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<69>}
+ \newpsfontdot{|}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<69>}
+ \newpsfontdot{asterisk}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6B>}
+ \newpsfontdot{Asterisk}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6B>}
+ \newpsfontdot{SolidDiamond}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6C>}
+ \newpsfontdot{diamond*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6C>}
+ \newpsfontdot{oplus}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6D>}
+ \newpsfontdot{Oplus}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6D>}
+ \newpsfontdot{otimes}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6E>}
+ \newpsfontdot{Otimes}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<6E>}
+%
+ \newpsfontdot{pentagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<70>}
+ \newpsfontdot{SolidPentagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<71>}
+ \newpsfontdot{Pentagon}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<70>}
+ \newpsfontdot{pentagon*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<71>}
+ \newpsfontdot{square*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<72>}
+ \newpsfontdot{SolidSquare}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<72>}
+ \newpsfontdot{square}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<73>}
+ \newpsfontdot{Square}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<73>}
+ \newpsfontdot{triangle}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<74>}
+ \newpsfontdot{Triangle}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<74>}
+ \newpsfontdot{triangle*}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<75>}
+ \newpsfontdot{SolidTriangle}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<75>}
+ \newpsfontdot{x}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<78>}
+ \newpsfontdot{Mul}[1.5 0.0 0.0 1.5 0 0]{PSTricksDotFont}{<78>}
+%
+%% END: pstricks-dots.tex
+\endinput
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
index d3039e8bf66..0e69a13917f 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
@@ -1,4 +1,4 @@
-%% $Id: pstricks-tex.def 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pstricks-tex.def 169 2021-08-31 17:46:12Z herbert $
%% pstricks-tex.def
%% Copyright 2017- Herbert Voss
%
@@ -45,6 +45,7 @@
%
\newif\ifpst@psfonts \pst@psfontsfalse % defined in pstricks.sty
\newif\ifpst@useCalc \pst@useCalcfalse % defined in pstricks.sty
+ \newif\ifpstGSfonts \pstGSfontsfalse % defined in pstricks.sty
%
\long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi}
\def\@namedef#1{\expandafter\def\csname #1\endcsname}
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 80005b22d00..36976bf0a67 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.08}
-\def\filedate{2021/09/10}
+\def\fileversion{3.10}
+\def\filedate{2021/09/23}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -764,7 +764,6 @@
\def\radians{\def\pst@angleunit{57.2956 mul }%
\pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}}%
\def\pst@angleunit{}%
-
%
\def\SpecialCoor{%
\def\pst@@getcoor##1{%
@@ -1356,78 +1355,56 @@
\define@boolkey[psset]{pstricks}[Pst@]{variableColor}[true]{}
\define@key[psset]{pstricks}{setflat}[0.1]{\pst@checknum{#1}\psk@setflat}%
\psset[pstricks]{startLW=\pslinewidth,endLW=\pslinewidth,variableColor=false,
- variableLW=false,startWL=380,endWL=780,setflat=0.1}
+ variableLW=false,startWL=380,endWL=770,setflat=0.1}
%
\def\pst@flattenpath{
- /Coors [] def % the array of all points
- 50 dict begin
- /lambda \psk@startWL\space def
- %
+ 20 dict begin
+ /Coors [] def
+ /Cmds [] def
+ /NoOfSteps 0 def
/add2Values { Coors aload length 2 add array astore /Coors exch def } def
/add6Values { Coors aload length 6 add array astore /Coors exch def } def
-%
- \psk@setflat\space setflat % the value for the line snippets
- flattenpath % flatten the existing path into line segments
-%
- { add2Values } % what to do with moveto
- { add2Values } % what to do with lineto
- { add6Values } % what to do with curveto (not needed here)
- { } % what to do with closepath
- pathforall % do it for the existing path
-%
+ /addmoveto { -1 Cmds aload length 1 add array astore /Cmds exch def } def
+ /addlineto { 0 Cmds aload length 1 add array astore /Cmds exch def } def
+ /addcurveto { 1 Cmds aload length 1 add array astore /Cmds exch def } def
+ \psk@setflat\space setflat % the value for the line snippets
+ flattenpath % flatten the existing path into line segments
+ { add2Values addmoveto} % what to do with moveto
+ { NoOfSteps 1 add /NoOfSteps ED add2Values addlineto} % what to do with lineto
+ { NoOfSteps 1 add /NoOfSteps ED add6Values addcurveto} % what to do with curveto (not needed here)
+ { } % nothing for closepath
+ pathforall
+%
+ /dLW \pst@number\psk@endLW \pst@number\psk@startLW sub NoOfSteps div def % the step for the linewidth
+ \ifPst@variableColor
+ /dColor \psk@endWL\space \psk@startWL\space sub NoOfSteps div def % same for color
+ \fi
+%%%
\pst@number\psk@startLW setlinewidth
\tx@setlinejoin
\psk@linecap\space setlinecap
- Coors aload length 2 sub 2 div cvi /N0 exch def % set number of points
- /NN 0 def
- /N N0 def
- { N 3 gt { N 3 sub /N ED }{ N 1 sub /N ED } ifelse
- NN 1 add /NN ED
- N 0 eq { exit } if
- } loop
- /dLW \pst@number\psk@endLW \pst@number\psk@startLW sub NN div def % the step for the linewidth
- \ifPst@variableColor
- /dColor \psk@endWL\space \psk@startWL\space sub NN div def
- lambda dColor add dup /lambda ED
- tx@addDict begin wavelengthToRGB Red Green Blue end setrgbcolor
- \else
- \pst@usecolor\pslinecolor
- \fi
- moveto % move to the first one
- /N N0 def
- {
- N 3 gt {
-% CP 6 2 roll
- \psk@curvature\space /c ED /b ED /a ED
- /ArrowA {} def
- /ArrowB {} def
- BOC NC EOC % curveto
- N 3 sub /N ED }{ lineto N 1 sub /N ED } ifelse
- currentlinewidth dLW add setlinewidth % increase line width
+ /lambda \psk@startWL def
+ Cmds length /Ncmds ED % number of the commands is the length of the array
+ /CoorIndex 0 def
+ Ncmds 1 sub -1 0 {
+ % on stack is the loop index
+ Cmds exch get /cmdNo ED % get command as nuber -1, 0, 1 | moveto, lineto, curveto
+ cmdNo 0 eq { Coors CoorIndex 2 getinterval aload pop lineto CoorIndex 2 add /CoorIndex ED }
+ { cmdNo 0 lt { Coors CoorIndex 2 getinterval aload pop moveto CoorIndex 2 add /CoorIndex ED }
+ { Coors CoorIndex 6 getinterval aload pop curveto CoorIndex 6 add /CoorIndex ED } ifelse } ifelse % else is curveto
\ifPst@variableColor
lambda dColor add dup /lambda ED
tx@addDict begin wavelengthToRGB Red Green Blue end setrgbcolor
\else
\pst@usecolor\pslinecolor
\fi
- CP /Y ED /X ED % put coors of current point on the stack
-% 0.4 .setopacityalpha
+ currentlinewidth dLW add setlinewidth
+ CP /yCurr ED /xCurr ED
stroke % draw the line segment
- N 0 eq { exit }{ X Y moveto } ifelse
- } loop
-% N { % repeat for the other N coords
-% lineto % line to next point
-% currentlinewidth dLW add setlinewidth % increase line width
-% lambda dColor add dup /lambda ED
-% tx@addDict begin wavelengthToRGB Red Green Blue end setrgbcolor
-% currentpoint % put coors of current point on the stack
-% 0.4 .setopacityalpha
-% stroke % draw the line segment
-% moveto
-% } repeat
+ xCurr yCurr moveto % go to the last point
+ } for
end
}
-
%
%--------------------------- A R R O W S ---------------------------
@@ -1993,227 +1970,9 @@
\end@OpenObj
}
%
-\define@key[psset]{pstricks}{dotsize}[2pt 2]{%
- \pst@expandafter\pst@getdimnum{#1} 0 {} {}\@nil%
- \edef\psk@@dotsize{\pst@number\pst@dimg}%
- \let\psk@@@dotsize\pst@tempg%
- \edef\psk@dotsize{ /DS \psk@@dotsize \psk@@@dotsize CLW mul add 2 div def }}
-\psset[pstricks]{dotsize=2pt 2}
-%
-\define@key[psset]{pstricks}{dotscale}[1]{%
- \pst@getscale{#1}\psk@dotscale
- \ifx\psk@dotscale\@empty
- \def\psk@xdotscale{1 }%
- \def\psk@ydotscale{1 }%
- \else
- \let\psk@xdotscale\pst@tempg
- \let\psk@ydotscale\pst@temph
- \fi}
-%
-\def\pst@Getangle#1#2{%
- \pst@getangle{#1}\pst@tempg
- \def\pst@temph{0. }%
- \ifx\pst@tempg\pst@temph\def#2{}\else\edef#2{\pst@tempg\space rotate }\fi}
-%
-\define@key[psset]{pstricks}{dotangle}[0]{%
- \pst@getangle{#1}\psk@@dotangle
- \ifdim\psk@@dotangle\p@=\z@
- \let\psk@dotangle\@empty
- \else
- \edef\psk@dotangle{\psk@@dotangle rotate }%
- \fi}
-\psset[pstricks]{dotangle=0}
-%
-\def\pst@getdotsize{%
-\pst@dimg=\psk@@@dotsize\pslinewidth
-\advance\pst@dimg\psk@@dotsize\p@
-\pst@dimh=\psk@ydotscale\pst@dimg
-\pst@dimg=\psk@xdotscale\pst@dimg
-\divide\pst@dimh 2
-\divide\pst@dimg 2\relax}
-%
-\psset[pstricks]{dotscale=1}
-%
-\def\psdot{\pst@object{psdot}}
-\def\psdot@i{\@ifnextchar({\psdot@ii}{\psdot@ii(\z@,\z@)}}
-\def\psdot@ii(#1){%
- \begin@SpecialObj%
-% hv modification 1.13 2005-11-28
- \solid@star%
-% hv modification end
- \pst@@getcoor{#1}%
- \addto@pscode{
- \psk@dotsize
- \@nameuse{psds@\psk@dotstyle}
- \tx@setStrokeTransparency
- \pst@coor Dot}%
- \end@SpecialObj}
-%
-\def\psdots{\pst@object{psdots}}
-\def\psdots@i{%
- \begin@SpecialObj%
- \pst@getcoors[\psdots@ii}
-\def\psdots@ii{%
- \addto@pscode{ false \tx@NArray \psdots@iii }%
- \end@SpecialObj}
-\def\psdots@iii{%
- \psk@dotsize
- \@nameuse{psds@\psk@dotstyle}
- \tx@setStrokeTransparency
- newpath
- n { transform floor .5 add exch floor .5 add exch itransform Dot } repeat }
-%
-% DG: dead code (to suppress until \psset[pstricks]{dotstyle) ? - Aug. 4, 1997
-\def\tx@SQ{SQ }
-\def\tx@ST{ST }
-\def\tx@SP{SP }
-%
-\def\pst@gdot#1{ /Dot { gsave T \psk@dotangle \psk@dotscale #1 grestore } def }
-%
-\@namedef{psds@*}{\pst@gdot{ 0 0 DS \tx@SD }}
-\@namedef{psds@o}{%
- /r2 DS CLW sub def
- \pst@gdot{ 0 0 DS \tx@SD \pst@usecolor\psfillcolor SLW 0 0 r2 \tx@SD }}
-\@namedef{psds@square*}{ /r1 DS .886 mul def \pst@gdot{r1 \tx@SQ }}
-\@namedef{psds@square}{%
- /r1 DS .886 mul def /r2 r1 CLW sub def
- \pst@gdot{r1 \tx@SQ \pst@usecolor\psfillcolor r2 \tx@SQ}}
-\@namedef{psds@triangle*}{%
- /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def
- \pst@gdot{x1 y1 \tx@ST}}
-\@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 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 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}}
-\@namedef{psds@|}{%
- \psk@tbarsize CLW mul add 2 div /DS ED
- \pst@gdot{0 DS moveto 0 DS neg L stroke}}
-% DG: end dead code?
-%
-\define@key[psset]{pstricks}{dotstyle}[*]{%
- \@ifundefined{psds@#1}%
- {\@pstrickserr{Dot style `#1' not defined}\@eha}%
- {\edef\psk@dotstyle{#1}}}
-\psset[pstricks]{dotstyle=*}
-%
-\def\tx@FontDot{FontDot }
-\def\newpsfontdot#1[#2]#3#4{%
- \@namedef{psds@#1}{%
- /#3 \psk@@dotangle [#2] \tx@FontDot
-% DG/SR modification begin - Dec. 12, 1999 - Patch 14
-%/Dot { moveto #4 show } bind def }}
- /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def
-}}
-% DG/SR modification end
-\def\newpsfontdotH#1[#2]#3#4#5{% for filled objects
- \@namedef{psds@#1}{%
- /#3 \psk@@dotangle [#2] \tx@FontDot
- /Dot {
- moveto
-% \iftrue
-% DG/SR modification begin - Dec. 23, 1999 - Patch 14
-%gsave \pst@usecolor\psfillcolor #5 show grestore
-%\fi
-%#4 show
- gsave \psk@dotscale \pst@usecolor\psfillcolor #5 show grestore % fill first
-% \fi
- gsave \psk@dotscale #4 show grestore % show the unfilled one
-% DG/SR modification end
- } bind def
-}}
-%
-\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)}
-\newpsfontdotH{triangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(t)}{(u)}
-\newpsfontdotH{Btriangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(T)}{(u)}
-\newpsfontdot{triangle*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(u)}
-\newpsfontdotH{square}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(s)}{(r)}
-\newpsfontdotH{Bsquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(S)}{(r)}
-\newpsfontdot{square*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(r)}
-\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)}
-% 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
-% 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)}
-\newpsfontdotH{SolidAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(J)}{(b)}
-%
-\newpsfontdotH{Pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)}
-\newpsfontdotH{BoldPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)}
-\newpsfontdot{SolidPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)}
-\newpsfontdotH{Hexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(h)}{(G)}
-\newpsfontdotH{BoldHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(H)}{(G)}
-\newpsfontdot{SolidHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(G)}
-\newpsfontdotH{Octogon}[1 0 0 1 0 0]{PSTricksDotFont}{(f)}{(g)}
-\newpsfontdotH{BoldOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(F)}{(g)}
-\newpsfontdot{SolidOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(g)}
-%
-\newpsfontdot{Bullet}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)}
-\newpsfontdotH{Circle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)}
-\newpsfontdotH{BoldCircle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(C)}{(b)}
-%\newpsfontdot{SolidCircle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(u)}
-\newpsfontdotH{Triangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(t)}{(u)}
-\newpsfontdotH{BoldTriangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(T)}{(u)}
-\newpsfontdot{SolidTriangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(u)}
-\newpsfontdotH{Square}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(s)}{(r)}
-\newpsfontdotH{BoldSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(S)}{(r)}
-\newpsfontdot{SolidSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(r)}
-\newpsfontdot{Add}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(a)}
-\newpsfontdot{BoldAdd}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(A)}
-\newpsfontdot{Mul}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(x)}
-\newpsfontdot{BoldMul}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(X)}
-\newpsfontdotH{Oplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(m)}{(b)}
-\newpsfontdotH{BoldOplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(M)}{(b)}
-\newpsfontdotH{SolidOplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(e)}{(b)}
-\newpsfontdotH{Otimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(n)}{(b)}
-\newpsfontdotH{BoldOtimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(N)}{(b)}
-\newpsfontdotH{SolidOtimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(E)}{(b)}
-\newpsfontdot{Bar}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(i)}
-\newpsfontdot{BoldBar}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(I)}
-\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
+%--------------------------- PSTricks dots -----------------------
+\input{pstricks-dots}
+%--------------------------- PSTricks dots end -------------------
%
\newdimen\pslinearc
\define@key[psset]{pstricks}{linearc}[0pt]{\pssetlength\pslinearc{#1}}
@@ -2599,17 +2358,13 @@
\psset[pstricks]{subgriddiv=5}
%
\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{%
- \typeout{Test lualatex}%
\ifPSTlualatex
- \typeout{Test true}%
\ifx\relax#1\relax
- \typeout{>>>>>>>>>>>>>>>> HIER <<<<<<<<<<<<<<}%
\def\psk@gridfont{\fontid\font\space .findfontid }%
\else
\def\psk@gridfont{/#1 findfont }% hv 2007-11-13
\fi
\else
- \typeout{Test false}%
\def\psk@gridfont{/#1 findfont }% hv 2007-11-13
\fi
}%
@@ -3864,22 +3619,39 @@ pop
\pslongbox{Scaleboxto}{\psscaleboxto}
%
\def\tx@Rot{Rot }
-\def\psrotateleft{\pst@makebox{\ps@rotateleft\pst@hbox}}
+\def\psrotateleft{%
+ \ifPSTlualatex
+ \def\pst@tempA{-90 }%
+ \def\pst@tempB{90 }%
+ \else
+ \def\pst@tempA{90 }%
+ \def\pst@tempB{-90 }%
+ \fi
+ \pst@makebox{\ps@rotateleft\pst@hbox}}
\def\ps@rotateleft#1{%
-\leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
-\pst@Verb{90 \tx@Rot}
-\vbox to \z@{\vss\hbox to \z@{\box#1\hss}\vskip\z@}%
-\pst@Verb{-90 \tx@Rot}}}}
-\def\psrotateright{\pst@makebox{\ps@rotateright\pst@hbox}}
+ \leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
+ \pst@Verb{\pst@tempA \tx@Rot}%
+ \vbox to \z@{\vss\hbox to \z@{\box#1\hss}\vskip\z@}%
+ \pst@Verb{\pst@tempB \tx@Rot}}}}
+%
+\def\psrotateright{%
+ \ifPSTlualatex
+ \def\pst@tempA{90 }%
+ \def\pst@tempB{-90 }%
+ \else
+ \def\pst@tempA{-90 }%
+ \def\pst@tempB{90 }%
+ \fi
+ \pst@makebox{\ps@rotateright\pst@hbox}}
\def\ps@rotateright#1{%
% ----------- hv begin 2004-05-07 ----------- patch 15
% \hbox{%
\leavevmode\hbox{%
% ----------- hv end 2004-05-07 ----------- patch 15
\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1%
- \pst@Verb{-90 \tx@Rot}
+ \pst@Verb{\pst@tempA \tx@Rot}
\vbox to \z@{\hbox to \z@{\hss\box#1}\vss}%
- \pst@Verb{90 \tx@Rot}}}}
+ \pst@Verb{\pst@tempB \tx@Rot}}}}
\def\psrotatedown{\pst@makebox{\ps@rotatedown\pst@hbox}}
\def\ps@rotatedown#1{%
\hbox{\hskip\wd#1\vbox{\vskip\ht#1\vskip\dp#1%
@@ -3983,23 +3755,16 @@ pop
%\edef\psk@rot{\pst@rotlist \ifx\psk@rot\@empty\else\psk@rot add \fi}}
\psset[pstricks]{rot=0}
%
-\def\tx@RotBegin{RotBegin }
-\def\tx@RotEnd{RotEnd }
-\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
+\def\tx@RotBegin{ RotBegin }
+\def\tx@RotEnd{ RotEnd }
+
+\def\pst@rotate#1#2{%
+ \setbox#2=\hbox{\pst@Verb{% check for empty #1
+ (#1) /strAngle ED strAngle length 0 eq { 0 }{ #1 } ifelse
+ %\ifPSTlualatex neg \fi
+ \tx@RotBegin}\box#2\pst@Verb{\tx@RotEnd}}%
}%
- \fi
+
\def\psput@cartesian#1{%
\hbox to \z@{\kern\pst@dimg{\vbox to \z@{\vss\box#1\vskip\pst@dimh}\hss}}%
}
@@ -4039,7 +3804,7 @@ pop
\use@par
\if@star\pst@starbox\fi
\pst@makesmall\pst@hbox
- \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% (MJS)
+ \ifx\psk@rot\@empty\else\pst@rotate{ ps@rot \ifPSTlualatex neg \fi }\pst@hbox\fi% (MJS)
% \pst@rotate\psk@rot\pst@hbox%
\psput@{#1}\pst@hbox%
\endgroup
@@ -4197,11 +3962,20 @@ pop
%\show\pst@coor
\setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
\setbox\pst@hbox=\psput@special\pst@hbox
- \ifnum\pst@C@@rType=7
- \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% CHANGED FROM \psk@rot (MJS)
+ \ifPSTlualatex
+ \ifnum\pst@C@@rType=7
+ \ifx\psk@rot\@empty\else\pst@rotate{ps@rot neg}\pst@hbox\fi% CHANGED FROM \psk@rot (MJS)
+ \else
+ \ifx\psk@rot\@empty\else\pst@rotate{\psk@rot\space neg}\pst@hbox\fi%
+ \fi
\else
- \ifx\psk@rot\@empty\else\pst@rotate{\psk@rot}\pst@hbox\fi%
- \fi}
+ \ifnum\pst@C@@rType=7
+ \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% CHANGED FROM \psk@rot (MJS)
+ \else
+ \ifx\psk@rot\@empty\else\pst@rotate{\psk@rot}\pst@hbox\fi%
+ \fi
+ \fi
+}
%
%
\def\uput@viii#1#2{%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex
index e4b0a5a2c9a..5c2b63edd9d 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks97.tex 446 2017-04-19 11:40:55Z herbert $
+%% $Id: pstricks97.tex 166 2021-08-26 19:52:16Z herbert $
%% BEGIN: pstricks.tex
%%
%% PostScript macros for Generic TeX: main input file for PSTricks 97.