diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 91 |
1 files changed, 72 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 10cd89eba51..3bbf6a341ee 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.05} -\def\filedate{2021/08/25} +\def\fileversion{3.06} +\def\filedate{2021/08/27} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -429,20 +429,53 @@ \fi% } \fi -%-------------- end old vesrion --------------- +%-------------- end old version --------------- % \def\pst@configerr#1{\@pstrickserr{\string#1 not defined in pstricks.con}\@ehpc} -% -\def\pstVerb#1{\pst@configerr\pstVerb} -\def\pstverb#1{\pst@configerr\pstverb} -\def\pstverbscale{\pst@configerr\pstverbscale} -\def\pstrotate{\pst@configerr\pstrotate} -\def\pstheader#1{\pst@configerr\pstheader} -\def\pstdriver{\pst@configerr\pstdriver} -\@ifundefined{pstcustomize}% - {\def\pstcustomize{\endinput\let\pstcustomize\relax}}{} -% -\input pstricks.con % local config file + +\newif\ifPSTlualatex + +\ifdefined\directlua + \ifdefined\app@cmd@latex % do we have auto-pst-pdf-lua loaded? + \PSTlualatexfalse % + \typeout{--- We are running lualatex or dvilualatex with auto-pst-pdf-lua ---}% + \else + \ifnum\outputmode=1 + \PSTlualatextrue % + \typeout{--- We are running lualatex with luapstricks ---}% + \else + \PSTlualatexfalse % + \typeout{--- We are running dvilualatex without luapstricks ---}% + \fi + \fi +\else + \typeout{--- We are running latex or xelatex ---}% + \PSTlualatexfalse +\fi +\ifPSTlualatex + \directlua{require'luapstricks'}% + \def\pstdriver{LuaLaTeX}% + \def\pstverb{\luaPST}% + \def\pstVerb{\luaPST direct}% + \def\pstunit{1bp}% + \def\pstverbscale{}% + \def\pstnodescale{}% + \def\pstheader{\luaPSTheader}% + \def\c@lor@to@ps#1\@@{(#1) setpdfcolor} +% \AltClipMode % now done after the definition of \AltClipMode, see below + % Not sure if we need ``neg'' here or not + % \def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET} +\else + \def\pstVerb#1{\pst@configerr\pstVerb}% + \def\pstverb#1{\pst@configerr\pstverb}% + \def\pstverbscale{\pst@configerr\pstverbscale}% + \def\pstrotate{\pst@configerr\pstrotate}% + \def\pstheader#1{\pst@configerr\pstheader}% + \def\pstdriver{\pst@configerr\pstdriver}% + \@ifundefined{pstcustomize}% + {\def\pstcustomize{\endinput\let\pstcustomize\relax}}{}% + \input pstricks.con % local config file +\fi % \newif\ifPSTricks \PSTrickstrue @@ -2664,7 +2697,22 @@ \pst@cntg=#1\relax\edef\psk@subgriddiv{\the\pst@cntg}} \psset[pstricks]{subgriddiv=5} % -\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 +\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 +}% + \ifpst@psfonts \psset[pstricks]{gridfont=Helvetica}% \else @@ -2707,7 +2755,7 @@ \pst@number\psxunit abs \pst@number\psyunit abs % hv 1.11 \psk@subgriddiv\space \psk@subgriddots\space {} 0 - \psk@gridfont findfont 0 scalefont setfont % hv 1.16 + \psk@gridfont 0 scalefont setfont % hv 1.16 \tx@Grid grestore }% @@ -2726,8 +2774,8 @@ % \pst@number\psxunit \pst@number\psyunit % hv 1.11 1 \psk@griddots\space { \pst@usecolor\psgridlabelcolor } \psk@gridlabels - \psk@gridfont findfont \psk@gridlabels scalefont setfont % hv 1.16 - \tx@Grid + \psk@gridfont \psk@gridlabels scalefont setfont % hv 1.16 + \tx@Grid grestore }% \end@SpecialObj @@ -2892,7 +2940,12 @@ \def\AltClipMode{% \def\end@psclip{\pstVerb{\pst@grestore}}% \def\begin@psclip{\pstVerb{gsave}}} - \def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}} + +\ifPSTlualatex + \AltClipMode +\fi + +\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}} % DG modification begin - Apr. 3, 1997 % From paulus@immd5.informatik.uni-erlangen.de (Dietrich Paulus) %\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}} |