summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/README.md8
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdfbin3879798 -> 3885597 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex2
-rw-r--r--Master/texmf-dist/tex/generic/pst-func/pst-func.tex38
-rw-r--r--Master/texmf-dist/tex/latex/pst-func/pst-func.sty12
6 files changed, 37 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes
index e8f600adba0..5f0cb2b0549 100644
--- a/Master/texmf-dist/doc/generic/pst-func/Changes
+++ b/Master/texmf-dist/doc/generic/pst-func/Changes
@@ -1,4 +1,7 @@
..... pst-func.tex
+0.88 2017-08-24 - use always URW fonts instead of PostScript,
+ eg Helvetica->NimbusSanL
+0.87a 2017-08-17 - added \RequirePackage for pst-func.sty
0.87 2017-08-03 - modified algorithm for the distributions
0.86 2017-06-21 - allow alternating colors for bars
0.85 2017-04-18 - allow framing of function values (ts)
diff --git a/Master/texmf-dist/doc/generic/pst-func/README.md b/Master/texmf-dist/doc/generic/pst-func/README.md
index 5913a33a6fe..ac18c266c9e 100644
--- a/Master/texmf-dist/doc/generic/pst-func/README.md
+++ b/Master/texmf-dist/doc/generic/pst-func/README.md
@@ -28,11 +28,14 @@
- psVolume (rotating f(x) around the x-axis)
- psPrintValue
+%% 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.
Save the files pst-func.sty|pro|tex in a directory, which is part of your
local TeX tree. The pro file should go into $TEXMF/dvips/pstricks/
Then do not forget to run texhash to update this tree.
-For more information see the documentation of your LATEX distribution
+For more information see the documentation of your TeX distribution
on installing packages into your local TeX system or read the
TeX Frequently Asked Questions:
(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
@@ -42,6 +45,7 @@ be part of your local TeX installation, otherwise get it from a
CTAN server, http://mirror.ctan.org
PSTricks is PostScript Tricks, the documentation cannot be run
-with pdftex, use the sequence latex->dvips->ps2pdf.
+with pdftex, use the sequence latex->dvips->ps2pdf or
+pdflatex with package auto-pst-pdf or xelatex.
%% $Id: README 897 2014-03-21 08:06:41Z herbert $
diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf
index 7057bb9fb7b..5917f210881 100644
--- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
index 39c151fd184..dd322755d9d 100644
--- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.tex
@@ -2264,7 +2264,7 @@ for polar plots are also possible (see next example).
The data of an implicit plot can be written into an external file for further purposes.
Use the optional argument \Lkeyword[pstricks-add]{saveData} to write the $x|y$ values
into the file \nxLcs{jobname.data}. The file name can be changed with
-the keyword {\Lkeyword[pstricks-add]{filename}. When running a \TeX\ file from within a GUI
+the keyword \Lkeyword[pstricks-add]{filename}. When running a \TeX\ file from within a GUI
it may be possible that you get a writeaccess error from GhostScript, because it prevents writing
into a file when called from another program. In this case run GhostScript on the \PS-output from
the command line.
diff --git a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
index c636a2b4b26..af5c8c4b35d 100644
--- a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
+++ b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
@@ -31,8 +31,8 @@
% interface to the `xkeyval' package
\pst@addfams{pst-func}
%
-\def\fileversion{0.87}
-\def\filedate{2017/08/03}
+\def\fileversion{0.88}
+\def\filedate{2017/08/24}
\message{`PST-func' v\fileversion, \filedate\space (hv)}
%
\pstheader{pst-func.pro}
@@ -387,18 +387,18 @@
\end@OpenObj%
}
%
-\define@key[psset]{pst-func}{PSfont}[Times-Roman]{\def\psk@PSfont{/#1 }}
+\define@key[psset]{pst-func}{PSfont}[NimbusRomNo9L-Regu]{\def\psk@PSfont{/#1 }}
\define@key[psset]{pst-func}{valuewidth}[10]{\pst@getint{#1}\psk@valuewidth }
\define@key[psset]{pst-func}{fontscale}[10]{\pst@checknum{#1}\psk@fontscale }
\define@key[psset]{pst-func}{decimals}[-1]{\pst@getint{#1}\psk@decimals }
-\psset[pst-func]{PSfont=Times-Roman,fontscale=10,valuewidth=10,decimals=-1}
+\psset[pst-func]{PSfont=NimbusRomNo9L-Regu,fontscale=10,valuewidth=10,decimals=-1}
%
\def\psPrintValue{\pst@object{psPrintValue}}
\def\psPrintValue@i#1{\expandafter\psPrintValue@ii#1,,\@nil}
\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@PSfont\space findfont \psk@fontscale scalefont setfont
\ifPst@algebraic
/x #1 def
/Func (#2) tx@AlgToPs begin AlgToPs end cvx def
@@ -422,9 +422,9 @@
\def\psPrintValueNew@ii#1,#2,#3\@nil{% #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
- /s1 { /Symbol findfont \psk@fontscale scalefont setfont } bind def
+ /mfont { \psk@PSfont\space findfont \psk@fontscale scalefont setfont } bind def
+ /mfontexp { \psk@PSfont\space findfont \psk@fontscale 1.2 div 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
@@ -636,7 +636,7 @@
/toggle toggle not def
\fi
\ifPst@printValue
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ gsave \psk@PSfont\space findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
Y \psFunc@PrintVLimit le { () } { Y \psk@valuewidth\space string cvs } ifelse
\ifPst@comma dot2comma \fi
k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
@@ -692,7 +692,7 @@
\ifPst@markZeros x scx 0 L \fi %
} ifelse
\ifPst@printValue
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ gsave \psk@PSfont\space findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
y \psk@valuewidth string cvs %/Output exch def
\ifPst@comma dot2comma \fi % do we have to change dot to comma
x dx sub scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
@@ -831,7 +831,7 @@
{ k scx F Y sub scy moveto k scx F scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse
\fi\fi\fi
\ifPst@printValue
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ gsave \psk@PSfont\space findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
Y \psFunc@PrintVLimit le { () } { F \psk@valuewidth\space string cvs } ifelse
\ifPst@comma dot2comma \fi
k scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
@@ -963,7 +963,7 @@
{ k scx FS Y add scy moveto k scx FS scy L \pst@usecolor\pslinecolor [3 2] 0 setdash stroke } ifelse
\fi\fi\fi
\ifPst@printValue
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
+ gsave \psk@PSfont\space findfont \psk@fontscale scalefont setfont \pst@usecolor\psk@LabelColor %
Y \psFunc@PrintVLimit le { () } { FS \psk@valuewidth\space string cvs } ifelse
\ifPst@comma dot2comma \fi
k 0.1 add scx \psk@fontscale 2 div add \psFunc@xlabelsep scx add
@@ -1105,7 +1105,7 @@
kOld scx Y scy L k dx add scx Y scy L
\ifPst@markZeros k dx add scx 0 L \fi
\ifPst@printValue
- gsave \psk@PSfont findfont \psk@fontscale scalefont setfont
+ gsave \psk@PSfont\space findfont \psk@fontscale scalefont setfont
Y \psk@valuewidth string cvs %/Output exch def
\ifPst@comma dot2comma \fi % do we have to change dot to comma
k scx \psk@fontscale 2 div add
@@ -1335,7 +1335,7 @@
add
} for
2 mul 1 sub neg % triangle area divided by the area under the polygon
- \psk@PSfont findfont \psk@fontscale scalefont setfont
+ \psk@PSfont\space findfont \psk@fontscale scalefont setfont
\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
\ifPst@comma dot2comma \fi % do we have to change dot to comma
@@ -1389,7 +1389,7 @@
add
} for
2 mul 1 sub neg % triangle area divided by the area under the polygon
- \psk@PSfont findfont \psk@fontscale scalefont setfont
+ \psk@PSfont\space findfont \psk@fontscale scalefont setfont
\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
\ifPst@comma dot2comma \fi % do we have to change dot to comma
@@ -1726,7 +1726,7 @@
% (#1,#2) Intervall f\"{u}r die Nullstelle, bzw #1 Startwert f\"{u}r Newton, #3 1. Funktion, #4 2. Funktion, #5 Knotenname
\begingroup
\pst@killglue
- \addbefore@par{framesep=1pt}%fontscale=40,PSfont=Times-Roman}%
+ \addbefore@par{framesep=1pt}%fontscale=40,PSfont=NimbusRomNo9L-Regu}%
\use@par
\pst@Verb{
/FunctionA
@@ -1770,9 +1770,9 @@
\ifPst@onlyNode\else
/dec \psk@decimals\space def % Anzahl der Dezimahlen f\"{u}r x
/ydec \psk@ydecimals\space def % Anzahl der Dezimalen f\"{u}r y
- /symb { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift f\"{u}r Klammer und senkrechten Strich
- /schrift { \psk@PSfont findfont \psk@fontscale scalefont setfont } bind def % Schrift f\"{u}r die Ergebnisse
- /TiefSchrift { /Symbol findfont \psk@fontscale 1.8 div scalefont setfont } bind def % Schrift f\"{u}r tiefergestellte Buchstaben
+ /symb { /StandardSymL findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift f\"{u}r Klammer und senkrechten Strich
+ /schrift { \psk@PSfont\space findfont \psk@fontscale scalefont setfont } bind def % Schrift f\"{u}r die Ergebnisse
+ /TiefSchrift { /StandardSymL findfont \psk@fontscale 1.8 div scalefont setfont } bind def % Schrift f\"{u}r tiefergestellte Buchstaben
/spdx \psk@fontscale 4 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist
/spdy \psk@fontscale 15 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist
/Wert { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq { cvi 15 string cvs } { 15 string cvs } ifelse % x-Wert runden und als string ablegen
diff --git a/Master/texmf-dist/tex/latex/pst-func/pst-func.sty b/Master/texmf-dist/tex/latex/pst-func/pst-func.sty
index 2f8d9173e66..2a8c0b4cb27 100644
--- a/Master/texmf-dist/tex/latex/pst-func/pst-func.sty
+++ b/Master/texmf-dist/tex/latex/pst-func/pst-func.sty
@@ -1,12 +1,16 @@
\RequirePackage{pstricks}
-\ProvidesPackage{pst-func}[2013/06/03 package wrapper for
- pst-func.tex (hv)]
+\ProvidesPackage{pst-func}[2017/08/17 package wrapper for pst-func.tex (hv)]
+\RequirePackage{pst-plot}
+\RequirePackage{pst-math}
+\RequirePackage{pst-tools}
+\RequirePackage{pstricks-add}
+\RequirePackage{pst-xkey}
+%
\input{pst-func.tex}
\ProvidesFile{pst-func.tex}
[\filedate\space v\fileversion\space `PST-func' (hv)]
\IfFileExists{pst-func.pro}{%
- \ProvidesFile{pst-func.pro}
- [2014/05/07 v. 0.16, PostScript prologue file (hv)]
+ \ProvidesFile{pst-func.pro}[2014/05/07 v. 0.16, PostScript prologue file (hv)]
\@addtofilelist{pst-func.pro}}{}%
\endinput
%% $Id: pst-func.sty 918 2014-05-19 12:32:37Z herbert $