summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pst-tools/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.bib2
-rw-r--r--Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.pdfbin70430 -> 80617 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.tex63
-rw-r--r--Master/texmf-dist/tex/generic/pst-tools/pst-tools.tex14
5 files changed, 43 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-tools/Changes b/Master/texmf-dist/doc/generic/pst-tools/Changes
index 95144dc9bfb..f6e774fbe38 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.07 2017-08-23 - use always URW fonts instead of PostScript, eg Helvetica-NimbusSanL
0.06 2017-05-12 - added style mmpaper
0.05 2014-05-12 - new optional arguments for printing values
on PS level
diff --git a/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.bib b/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.bib
index 23d783e72db..99ed68ae723 100644
--- a/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.bib
@@ -18,7 +18,7 @@ y%% -*-bibtex-*-
author = {Herbert Vo\ss},
title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
edition = {7},
- publisher = {DANTE -- Lehmanns},
+ publisher = {DANTE and Lehmanns},
year = {2016},
address = {Heidelberg/Berlin}
}
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 877354d3a39..2a2b9490ecc 100644
--- a/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-tools/pst-tools-doc.pdf
Binary files 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 09e85364574..7202cec324d 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,14 +1,16 @@
-%% $Id: pst-tools-doc.tex 456 2017-05-12 19:35:55Z herbert $
+%% $Id: pst-tools-doc.tex 527 2017-08-23 14:14:45Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
smallheadings, headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
\usepackage{pst-tools}
\let\pstToolsFV\fileversion
+\usepackage{ltablex}
\renewcommand\bgImage{}
\lstset{language=PSTricks,
morekeywords={psPrintValue},basicstyle=\footnotesize\ttfamily}
%
+\addbibresource{pst-tools-doc.bib}
\begin{document}
\title{\texttt{pst-tools}}
@@ -56,8 +58,11 @@ There are the following valid options for \Lcs{psPrintValue}:
\noindent\medskip
\begin{tabularx}{\linewidth}{@{}l|>{\ttfamily}l>{\ttfamily}lX@{}}
\textrm{name} & \textrm{value} & \textrm{default}\\\hline
-\Lkeyword{PSfont} & PS font name & Times & only valid \PS font names are possible, e.g.
- \Lps{Times-Roman}, \Lps{Helvetica}, \Lps{Courier}, \Lps{Helvetica}, \Lps{Bookman}\\
+\endhead
+\Lkeyword{PSfont} & PS font name & Times & only 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.\\
\Lkeyword{postString} & <string> & \{\} & will be appended to the number string\\
\Lkeyword{trimSpaces} & <boolean> & false & will strip spaces on the right\\
\Lkeyword{fontscale} & <number> & 10 & the font scale in pt\\
@@ -77,10 +82,10 @@ There are the following valid options for \Lcs{psPrintValue}:
\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=Helvetica,xShift=-10]{\iA\space sin}}
- \makebox[4em][r]{\psPrintValue[PSfont=Courier,fontscale=10,decimals=3,xShift=-20]{\iA\space cos}}\hspace{1em}
- \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=Helvetica]{\iA\space sqrt}}
- \makebox[7em]{\psPrintValue[comma,PSfont=Times-Italic]{\iA\space dup sin exch cos add}}
+ \makebox[5em]{\psPrintValue[PSfont=NimbusRomNo9L-Regu,xShift=-10]{\iA\space sin}}
+ \makebox[4em][r]{\psPrintValue[PSfont=NimbusMonL-Regu,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}}\\}
\end{center}
@@ -92,10 +97,10 @@ There are the following valid options for \Lcs{psPrintValue}:
\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=Helvetica,xShift=-10]{\iA\space sin}}
- \makebox[4em][r]{\psPrintValue[PSfont=Courier,fontscale=10,decimals=3,xShift=-20]{\iA\space cos}}\hspace{1em}
- \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=Helvetica]{\iA\space sqrt}}
- \makebox[7em]{\psPrintValue[comma,PSfont=Times-Italic]{\iA\space dup sin exch cos add}}
+ \makebox[5em]{\psPrintValue[PSfont=NimbusRomNo9L-Regu,xShift=-10]{\iA\space sin}}
+ \makebox[4em][r]{\psPrintValue[PSfont=NimbusMonL-Regu,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}}\\}
\end{lstlisting}
@@ -109,10 +114,10 @@ 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=Helvetica,xShift=-10]{\rA, sin(x)}}
- \makebox[4em][r]{\psPrintValue[PSfont=Courier,fontscale=10,decimals=3,xShift=-20]{\rA,cos(x)}}\hspace{1em}
- \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=Helvetica]{\rA,sqrt(x)}}
- \makebox[7em]{\psPrintValue[comma,PSfont=Times-Italic]{\rA,sin(x)+cos(x)}}
+ \makebox[5em]{\psPrintValue[PSfont=NimbusSanL-Regu,xShift=-10]{\rA, sin(x)}}
+ \makebox[4em][r]{\psPrintValue[PSfont=NimbusMonL-Regu,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}}\\}
\end{center}
@@ -123,30 +128,30 @@ 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=Helvetica,xShift=-10]{\rA, sin(x)}}
- \makebox[4em][r]{\psPrintValue[PSfont=Courier,fontscale=10,decimals=3,xShift=-20]{\rA,cos(x)}}\hspace{1em}
- \makebox[5em]{\psPrintValue[valuewidth=15,linecolor=blue,PSfont=Helvetica]{\rA,sqrt(x)}}
- \makebox[7em]{\psPrintValue[comma,PSfont=Times-Italic]{\rA,sin(x)+cos(x)}}
+ \makebox[5em]{\psPrintValue[PSfont=NimbusSanL-Regu,xShift=-10]{\rA, sin(x)}}
+ \makebox[4em][r]{\psPrintValue[PSfont=NimbusMonL-Regu,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}}\\}
\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=Symbol,
- postString=\string\260]{3.14 10 mul round 10 div}}bar\\3pt
-foo \makebox[3.5em][l]{\psPrintValue[PSfont=Symbol,decimals=6,
+foo \makebox[2em][l]{\psPrintValue[comma]{3.14 10 mul round 10 div}}bar\\[3pt]
+foo \makebox[2em][l]{\psPrintValue[comma,PSfont=StandardSymL,
+ postString=\string\260]{3.14 10 mul round 10 div}}bar\\[3pt]
+foo \makebox[3.5em][l]{\psPrintValue[PSfont=StandardSymL,decimals=6,
postString=\string\260]{3.14 dup mul}}bar
\end{center}
\bigskip
\begin{lstlisting}
-foo \makebox[2em][l]{\psPrintValue[comma]{3.14 10 mul round 10 div}}bar\\3pt
-foo \makebox[2em][l]{\psPrintValue[comma,PSfont=Symbol,
- postString=\string\260]{3.14 10 mul round 10 div}}bar\\3pt
-foo \makebox[3.5em][l]{\psPrintValue[PSfont=Symbol,decimals=6,
+foo \makebox[2em][l]{\psPrintValue[comma]{3.14 10 mul round 10 div}}bar\\[3pt]
+foo \makebox[2em][l]{\psPrintValue[comma,PSfont=StandardSymL,
+ postString=\string\260]{3.14 10 mul round 10 div}}bar\\[3pt]
+foo \makebox[3.5em][l]{\psPrintValue[PSfont=StandardSymL,decimals=6,
postString=\string\260]{3.14 dup mul}}bar
\end{lstlisting}
@@ -166,8 +171,8 @@ foo \makebox[3.5em][l]{\psPrintValue[PSfont=Symbol,decimals=6,
\bgroup
\raggedright
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-tools-doc}
+%\bibliographystyle{plain}
+\printbibliography
\egroup
\printindex
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 ef84306fd98..3c7ec247a90 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 456 2017-05-12 19:35:55Z herbert $
+%% $Id: pst-tools.tex 527 2017-08-23 14:14:45Z herbert $
%%
%% This is file `pst-tools.tex',
%%
@@ -26,8 +26,8 @@
% interface to the `xkeyval' package
\pst@addfams{pst-tools}
%
-\def\fileversion{0.06}
-\def\filedate{2017/05/12}
+\def\fileversion{0.07}
+\def\filedate{2017/08/23}
\message{`PST-tools' v\fileversion, \filedate\space (hv)}
%
\define@key[psset]{pst-tools}{decimalSeparator}[.]{\def\psk@decimalSeparator{#1}}%
@@ -36,13 +36,13 @@
\define@boolkey[psset]{pst-tools}[Pst@]{trimSpaces}[true]{}
\define@key[psset]{pst-tools}{xShift}[0]{\def\psk@xShift{#1}}
\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}{postString}[{}]{\def\psk@postString{#1}}
\define@key[psset]{pst-tools}{VarName}[]{\def\psk@VarName{#1 }}
-\define@key[psset]{pst-tools}{PSfont}[Times-Roman]{\def\psk@PSfont{/#1 }}
+\define@key[psset]{pst-tools}{PSfont}[NimbusRomNo9L-Regu]{\def\psk@PSfont{/#1 }}
\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=Times-Roman,fontscale=10,valuewidth=10,decimals=-1,
+\psset[pst-tools]{PSfont=NimbusRomNo9L-Regu,fontscale=10,valuewidth=10,decimals=-1,
xShift=0,yShift=0,trimSpaces=false,postString={},VarName={},
comma=false,decimalSeparator=.}
%
@@ -87,7 +87,7 @@
\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
- /s1 { /Symbol findfont \psk@fontscale scalefont setfont } bind def
+ /s1 { /StandardSymL findfont \psk@fontscale scalefont setfont } bind def
\ifPst@algebraic
/x #1 def
/Func (#2) tx@AlgToPs begin AlgToPs end cvx def