From ab30505456ece933535297ab51495aaa6dbc5df1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Sep 2021 21:27:08 +0000 Subject: pst-tools (26sep21) git-svn-id: svn://tug.org/texlive/trunk@60621 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-tools/Changes | 1 + Master/texmf-dist/doc/generic/pst-tools/README | 2 +- .../doc/generic/pst-tools/pst-tools-doc.pdf | Bin 151064 -> 139102 bytes .../doc/generic/pst-tools/pst-tools-doc.tex | 53 +++++++++++---------- Master/texmf-dist/dvips/pst-tools/pst-tools.pro | 2 +- .../texmf-dist/tex/generic/pst-tools/pst-tools.tex | 15 +++--- 6 files changed, 37 insertions(+), 36 deletions(-) diff --git a/Master/texmf-dist/doc/generic/pst-tools/Changes b/Master/texmf-dist/doc/generic/pst-tools/Changes index f741afb493e..00059b5c777 100644 --- a/Master/texmf-dist/doc/generic/pst-tools/Changes +++ b/Master/texmf-dist/doc/generic/pst-tools/Changes @@ -1,4 +1,5 @@ ..... pst-tools.tex +0.12 2021-09-23 - rename PSfont to printfont 0.11 2021-09-13 - make it compatible to lualatex 0.10 2020-03-24 - added the random macros from random.tex which is no more on TeXLive diff --git a/Master/texmf-dist/doc/generic/pst-tools/README b/Master/texmf-dist/doc/generic/pst-tools/README index e9f6540214f..de528531e37 100644 --- a/Master/texmf-dist/doc/generic/pst-tools/README +++ b/Master/texmf-dist/doc/generic/pst-tools/README @@ -20,5 +20,5 @@ with pdftex, use the sequence latex->dvips->ps2pdf. %% in directory macros/latex/base/lppl.txt. -%% $Id: README 245 2021-09-13 18:56:41Z herbert $ +%% $Id: README 246 2021-09-13 20:06:21Z herbert $ hvoss@tug.org \ No newline at end of file diff --git a/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.pdf b/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.pdf index b37c59bca31..f968e5d4462 100644 Binary files a/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.pdf and b/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.tex b/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.tex index a4c1897f1a3..4ebc52e1e69 100644 --- a/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.tex @@ -1,6 +1,6 @@ \RequirePackage{pdfmanagement-testphase} \DeclareDocumentMetadata{} -%% $Id: pst-tools-doc.tex 245 2021-09-13 18:56:41Z herbert $ +%% $Id: pst-tools-doc.tex 256 2021-09-22 18:42:59Z herbert $ \documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,oneside]{pst-doc} \listfiles @@ -77,7 +77,8 @@ There are the following valid options for \Lcs{psPrintValue}: \begin{xltabular}{\linewidth}{@{}l|>{\ttfamily}l>{\ttfamily}lX@{}} \textrm{name} & \textrm{value} & \textrm{default}\\\hline \endhead -\Lkeyword{PSfont} & PS font name & Times & only valid \PS\ font names are possible, e.g. +\Lkeyword{printfont} & font name & Times & only the current font (\texttt{printfont={}}) +or valid \PS\ font names are possible, e.g. \Lps{Times-Roman}, \Lps{Helvetica}, \Lps{Courier}, \Lps{Helvetica}, \Lps{Bookman}. If you want to embed the fonts use always the URW names NimbusRomNo9L-Regu, NimbusSanL-Regu and NimbusMonL-Regu. However, the names may vary on different operating systems. If you leave the argument empty, it will choose the currently active font.\\ @@ -103,11 +104,11 @@ may vary on different operating systems. If you leave the argument empty, it wil \makebox[5em]{$\sqrt x$}\makebox[7em]{$\sin x+\cos x$}\makebox[6em]{$\sin^2 x+\cos^2 x$}\\[3pt] \multido{\iA=0+10}{18}{% \makebox[1em]{\iA} - \makebox[5em]{\psPrintValue[PSfont=NimbusRomNo9L-Regu,xShift=-10]{\iA\space sin}} - \makebox[4em][r]{\psPrintValue[PSfont={},fontscale=10,decimals=3,xShift=-20]{\iA\space cos}}\hspace{1em} - \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=NimbusSanL-Regu]{\iA\space sqrt}} - \makebox[7em]{\psPrintValue[comma,PSfont=NimbusRomNo9L-ReguItal]{\iA\space dup sin exch cos add}} - \makebox[6em]{\psPrintValue[PSfont=Palatino-Roman]{\iA\space dup sin dup mul exch cos dup mul add}}\\ + \makebox[5em]{\psPrintValue[printfont=NimbusRomNo9L-Regu,xShift=-10]{\iA\space sin}} + \makebox[4em][r]{\psPrintValue[printfont={},fontscale=10,decimals=3,xShift=-20]{\iA\space cos}}\hspace{1em} + \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,printfont=NimbusSanL-Regu]{\iA\space sqrt}} + \makebox[7em]{\psPrintValue[comma,printfont=NimbusRomNo9L-ReguItal]{\iA\space dup sin exch cos add}} + \makebox[6em]{\psPrintValue[printfont=Palatino-Roman]{\iA\space dup sin dup mul exch cos dup mul add}}\\ } \end{center} @@ -120,11 +121,11 @@ may vary on different operating systems. If you leave the argument empty, it wil \makebox[5em]{$\sqrt x$}\makebox[7em]{$\sin x+\cos x$}\makebox[6em]{$\sin^2 x+\cos^2 x$}\\[3pt] \multido{\iA=0+10}{18}{ \makebox[1em]{\iA} - \makebox[5em]{\psPrintValue[PSfont=NimbusRomNo9L-Regu,xShift=-10]{\iA\space sin}} - \makebox[4em][r]{\psPrintValue[PSfont={},fontscale=10,decimals=3,xShift=-20]{\iA\space cos}}\hspace{1em} - \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=NimbusSanL-Regu]{\iA\space sqrt}} - \makebox[7em]{\psPrintValue[comma,PSfont=NimbusRomNo9L-ReguItal]{\iA\space dup sin exch cos add}} - \makebox[6em]{\psPrintValue[PSfont=Palatino-Roman]{\iA\space dup sin dup mul exch cos dup mul add}}\\} + \makebox[5em]{\psPrintValue[printfont=NimbusRomNo9L-Regu,xShift=-10]{\iA\space sin}} + \makebox[4em][r]{\psPrintValue[printfont={},fontscale=10,decimals=3,xShift=-20]{\iA\space cos}}\hspace{1em} + \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,printfont=NimbusSanL-Regu]{\iA\space sqrt}} + \makebox[7em]{\psPrintValue[comma,printfont=NimbusRomNo9L-ReguItal]{\iA\space dup sin exch cos add}} + \makebox[6em]{\psPrintValue[printfont=Palatino-Roman]{\iA\space dup sin dup mul exch cos dup mul add}}\\} \end{lstlisting} @@ -144,11 +145,11 @@ Pay attention, in algebraic notation angles must be in radian and not degrees. \makebox[2em]{x(deg)} \makebox[5em]{$\sin x$} \makebox[4em]{$\cos x$}\hspace{1em} \makebox[5em]{$\sqrt x$}\makebox[7em]{$\sin x+\cos x$}\makebox[6em]{$\sin^2 x+\cos^2 x$}\\[3pt] \multido{\rA=0+0.1}{18}{\makebox[1em]{\rA} - \makebox[5em]{\psPrintValue[PSfont=NimbusSanL-Regu,xShift=-10]{\rA, sin(x)}} - \makebox[4em][r]{\psPrintValue[PSfont={},fontscale=10,decimals=3,xShift=-20]{\rA,cos(x)}}\hspace{1em} - \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=NimbusSanL-Regu]{\rA,sqrt(x)}} - \makebox[7em]{\psPrintValue[comma,PSfont=NimbusRomNo9L-ReguItal]{\rA,sin(x)+cos(x)}} - \makebox[6em]{\psPrintValue[PSfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\} + \makebox[5em]{\psPrintValue[printfont=NimbusSanL-Regu,xShift=-10]{\rA, sin(x)}} + \makebox[4em][r]{\psPrintValue[printfont={},fontscale=10,decimals=3,xShift=-20]{\rA,cos(x)}}\hspace{1em} + \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,printfont=NimbusSanL-Regu]{\rA,sqrt(x)}} + \makebox[7em]{\psPrintValue[comma,printfont=NimbusRomNo9L-ReguItal]{\rA,sin(x)+cos(x)}} + \makebox[6em]{\psPrintValue[printfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\} \end{center} \bigskip @@ -158,20 +159,20 @@ Pay attention, in algebraic notation angles must be in radian and not degrees. \makebox[2em]{x(deg)} \makebox[5em]{$\sin x$} \makebox[4em]{$\cos x$}\hspace{1em} \makebox[5em]{$\sqrt x$}\makebox[7em]{$\sin x+\cos x$}\makebox[6em]{$\sin^2 x+\cos^2 x$}\\[3pt] \multido{\rA=0+0.1}{18}{\makebox[1em]{\rA} - \makebox[5em]{\psPrintValue[PSfont=NimbusSanL-Regu,xShift=-10]{\rA, sin(x)}} - \makebox[4em][r]{\psPrintValue[PSfont={},fontscale=10,decimals=3,xShift=-20]{\rA,cos(x)}}\hspace{1em} - \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=NimbusSanL-Regu]{\rA,sqrt(x)}} - \makebox[7em]{\psPrintValue[comma,PSfont=NimbusRomNo9L-ReguItal]{\rA,sin(x)+cos(x)}} - \makebox[6em]{\psPrintValue[PSfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\} + \makebox[5em]{\psPrintValue[printfont=NimbusSanL-Regu,xShift=-10]{\rA, sin(x)}} + \makebox[4em][r]{\psPrintValue[printfont={},fontscale=10,decimals=3,xShift=-20]{\rA,cos(x)}}\hspace{1em} + \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,printfont=NimbusSanL-Regu]{\rA,sqrt(x)}} + \makebox[7em]{\psPrintValue[comma,printfont=NimbusRomNo9L-ReguItal]{\rA,sin(x)+cos(x)}} + \makebox[6em]{\psPrintValue[printfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\} \end{lstlisting} \begin{center} foo \makebox[2em][l]{\psPrintValue[comma]{3.14 10 mul round 10 div}}bar\\[3pt] -foo \makebox[2em][l]{\psPrintValue[comma,PSfont=StandardSymL, +foo \makebox[2em][l]{\psPrintValue[comma,printfont=StandardSymL, postString=\string\260]{3.14 10 mul round 10 div}}bar\\[3pt] -foo \makebox[3.5em][l]{\psPrintValue[PSfont=StandardSymL,decimals=6, +foo \makebox[3.5em][l]{\psPrintValue[printfont=StandardSymL,decimals=6, postString=\string\260]{3.14 dup mul}}bar \end{center} @@ -179,9 +180,9 @@ foo \makebox[3.5em][l]{\psPrintValue[PSfont=StandardSymL,decimals=6, \begin{lstlisting} foo \makebox[2em][l]{\psPrintValue[comma]{3.14 10 mul round 10 div}}bar\\[3pt] -foo \makebox[2em][l]{\psPrintValue[comma,PSfont=StandardSymL, +foo \makebox[2em][l]{\psPrintValue[comma,printfont=StandardSymL, postString=\string\260]{3.14 10 mul round 10 div}}bar\\[3pt] -foo \makebox[3.5em][l]{\psPrintValue[PSfont=StandardSymL,decimals=6, +foo \makebox[3.5em][l]{\psPrintValue[printfont=StandardSymL,decimals=6, postString=\string\260]{3.14 dup mul}}bar \end{lstlisting} diff --git a/Master/texmf-dist/dvips/pst-tools/pst-tools.pro b/Master/texmf-dist/dvips/pst-tools/pst-tools.pro index bc059faafad..6215b9e35a2 100644 --- a/Master/texmf-dist/dvips/pst-tools/pst-tools.pro +++ b/Master/texmf-dist/dvips/pst-tools/pst-tools.pro @@ -1,4 +1,4 @@ -% $Id: pst-tools.pro 842 2013-10-26 10:25:41Z herbert $ +% $Id: pst-tools.pro 249 2021-09-14 10:22:55Z herbert $ % %% PostScript tools prologue for pstricks.tex. %% Version 0.06, 2017/12/03 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 36b32ef8c07..8e9e08ec8ba 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 245 2021-09-13 18:56:41Z herbert $ +%% $Id: pst-tools.tex 265 2021-09-24 18:47:41Z herbert $ %% %% This is file `pst-tools.tex', %% @@ -26,8 +26,8 @@ % interface to the `xkeyval' package \pst@addfams{pst-tools} % -\def\fileversion{0.11} -\def\filedate{2021/09/13} +\def\fileversion{0.12} +\def\filedate{2021/09/23} \message{`PST-tools' v\fileversion, \filedate\space (hv)} % \define@key[psset]{pst-tools}{decimalSeparator}[.]{\def\psk@decimalSeparator{#1}}% @@ -38,9 +38,9 @@ \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]{% +\define@key[psset]{pst-tools}{printfont}[NimbusRomNo9L-Regu]{% \ifPSTlualatex - \ifx\relax#1\relax + \expandafter\ifx\expandafter\relax#1\relax \def\psk@printfont{ \fontid\font\space .findfontid }% \else \def\psk@printfont{ /#1 findfont }% @@ -56,7 +56,7 @@ \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=Helvetica,fontscale=10,valuewidth=10,decimals=-1, +\psset[pst-tools]{printfont=Helvetica,fontscale=10,valuewidth=10,decimals=-1, xShift=0,yShift=0,trimSpaces=false,postString={},VarName={}, comma=false,decimalSeparator=.} % @@ -70,8 +70,7 @@ \def\psPrintValue@ii#1,#2,#3\@nil{% #1,#2 only for algebraic code \begin@SpecialObj \addto@pscode{ - gsave \psk@printfont - \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 -- cgit v1.2.3