From 76b7312019d63997d093e1f87e178d656b68a4fb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Sep 2021 20:24:50 +0000 Subject: pst-tools (14sep21) git-svn-id: svn://tug.org/texlive/trunk@60507 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pst-tools/pst-tools.tex | 41 ++++++++++++++++------ 1 file changed, 30 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pst-tools') diff --git a/Master/texmf-dist/tex/generic/pst-tools/pst-tools.tex b/Master/texmf-dist/tex/generic/pst-tools/pst-tools.tex index 3b25402ba8d..36b32ef8c07 100644 --- a/Master/texmf-dist/tex/generic/pst-tools/pst-tools.tex +++ b/Master/texmf-dist/tex/generic/pst-tools/pst-tools.tex @@ -1,4 +1,4 @@ -%% $Id: pst-tools.tex 1163 2020-03-24 09:47:58Z herbert $ +%% $Id: pst-tools.tex 245 2021-09-13 18:56:41Z herbert $ %% %% This is file `pst-tools.tex', %% @@ -26,8 +26,8 @@ % interface to the `xkeyval' package \pst@addfams{pst-tools} % -\def\fileversion{0.10} -\def\filedate{2020/03/24} +\def\fileversion{0.11} +\def\filedate{2021/09/13} \message{`PST-tools' v\fileversion, \filedate\space (hv)} % \define@key[psset]{pst-tools}{decimalSeparator}[.]{\def\psk@decimalSeparator{#1}}% @@ -38,11 +38,25 @@ \define@key[psset]{pst-tools}{yShift}[0]{\def\psk@yShift{#1}} \define@key[psset]{pst-tools}{postString}[{}]{\def\psk@postString{#1}} \define@key[psset]{pst-tools}{VarName}[]{\def\psk@VarName{#1 }} -\define@key[psset]{pst-tools}{PSfont}[NimbusRomNo9L-Regu]{\def\psk@PSfont{/#1 }} +\define@key[psset]{pst-tools}{PSfont}[NimbusRomNo9L-Regu]{% + \ifPSTlualatex + \ifx\relax#1\relax + \def\psk@printfont{ \fontid\font\space .findfontid }% + \else + \def\psk@printfont{ /#1 findfont }% + \fi + \else + \ifx\relax#1\relax + \def\psk@printfont{ /NimbusRomNo9L-Regu findfont }% + \else + \def\psk@printfont{ /#1 findfont }% + \fi + \fi +}% \define@key[psset]{pst-tools}{valuewidth}[10]{\pst@getint{#1}\psk@valuewidth } \define@key[psset]{pst-tools}{fontscale}[10]{\pst@checknum{#1}\psk@fontscale } \define@key[psset]{pst-tools}{decimals}[-1]{\pst@getint{#1}\psk@decimals } -\psset[pst-tools]{PSfont=NimbusRomNo9L-Regu,fontscale=10,valuewidth=10,decimals=-1, +\psset[pst-tools]{PSfont=Helvetica,fontscale=10,valuewidth=10,decimals=-1, xShift=0,yShift=0,trimSpaces=false,postString={},VarName={}, comma=false,decimalSeparator=.} % @@ -56,23 +70,26 @@ \def\psPrintValue@ii#1,#2,#3\@nil{% #1,#2 only for algebraic code \begin@SpecialObj \addto@pscode{ - gsave \psk@PSfont findfont \psk@fontscale scalefont setfont + gsave \psk@printfont + \psk@fontscale scalefont setfont \ifPst@algebraic /x #1 def /Func (#2) tx@AlgToPs begin AlgToPs end cvx def Func - \else #1 \fi + \else + #1 + \fi \ifx\relax\psk@VarName\relax\else dup \txG 10 string cvs /\psk@VarName\space exch def \etxG \fi \psk@decimals -1 gt { 10 \psk@decimals exp dup 3 1 roll mul cvi exch div } if \psk@valuewidth string cvs %/Output exch def % save output -%/concatstringarray{ % [(a) (b) ... (z)] --> (ab...z) 20100422 + %/concatstringarray % [(a) (b) ... (z)] --> (ab...z) 20100422 \ifx\relax\psk@postString\relax\else [ exch (\psk@postString) ] concatstringarray \fi \ifPst@trimSpaces rightTrim \fi \ifPst@comma dot2comma \fi % do we have to change dot to comma \psk@xShift\space \psk@yShift\space moveto %Output show grestore }% - \end@SpecialObj% + \end@SpecialObj } \define@boolkey[psset]{pst-tools}[Pst@]{round}[true]{}% @@ -85,8 +102,10 @@ \def\psPrintValueNew@ii#1,#2,#3!!{% #1,#2 only for algebraic code \begin@SpecialObj \addto@pscode{ % thanks to Buddy Ledger - /mfont { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def - /mfontexp { \psk@PSfont findfont \psk@fontscale 1.2 div scalefont setfont } bind def + /mfont { \psk@printfont + \psk@fontscale scalefont setfont } bind def + /mfontexp { \psk@printfont + \psk@fontscale 1.2 div scalefont setfont } bind def /s1 { /StandardSymL findfont \psk@fontscale scalefont setfont } bind def \ifPst@algebraic /x #1 def -- cgit v1.2.3