6 files changed, 13 insertions, 92 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-func/Changes b/Master/texmf-dist/doc/generic/pst-func/Changes
index 9ee7327794e..b9395842e62 100644
--- a/Master/texmf-dist/doc/generic/pst-func/Changes
+++ b/Master/texmf-dist/doc/generic/pst-func/Changes
@@ -1,4 +1,5 @@
 ..... pst-func.tex
+0.75  2012-01-01  - moved \psPrintValue into pst-tools
 0.74  2011-11-02  - make \psLorenz work in a correct way
 0.73  2011-10-21  - add \psModBessel function
 0.72  2011-04-23  - allow option comma for all functions
diff --git a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib
index 96838e3a2db..8c5a13d2f5c 100644
--- a/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-func/pst-func-doc.bib
@@ -156,6 +156,14 @@
   address	= {Cambridge}
 }
 
+@Book{LaTeXRef-UIT,
+  author	= {Herbert Vo\ss},
+  title		= {{\LaTeX} quick reference},
+  publisher	= {UIT},
+  year		= {2012},
+  address	= {Cambridge}
+}
+
 @Manual{wolfram,
   author	= {Eric Weisstein},
   title		= {Wolfram MathWorld},
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 398502608b7..f67f3418bd2 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
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 bf5ff55929d..68dcabb7c05 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
@@ -1,4 +1,4 @@
-%% $Id: pst-func-doc.tex 599 2011-11-03 19:38:28Z herbert $
+%% $Id: pst-func-doc.tex 621 2012-01-01 15:26:33Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
    smallheadings, headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
@@ -1951,93 +1951,6 @@ $f(x)$ has to be described as usual for the macro \Lcs{psplot}.
 
 \clearpage
 
-\section{\Lcs{psPrintValue}}\label{sec:printValue}
-This new macro allows to \Index{print} single values of a math function. It has the syntax
-
-\begin{BDef}
-\Lcs{psPrintValue}\OptArgs\Largb{PostScript code}\\
-\Lcs{psPrintValue}\OptArg{algebraic,\ldots}\Largb{x value, algebraic code}
-\end{BDef}
-
-Important is the fact, that \Lcs{psPrintValue} works on \PS\ side. For \TeX\ it is only a box of
-zero dimension. This is the reason why you have to put it into a box, which reserves horizontal
-space.
-
-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{AvantGard}, \Lps{Bookman}\\
-\Lkeyword{fontscale} & <number>     & 10     & the font scale in pt\\
-\Lkeyword{valuewidth} & <number>     & 10     & the width of the string for the converted 
-    real number; if it is too small, no value is printed\\
-\Lkeyword{decimals}  & <number>     & -1     & the number of printed decimals, a negative value
-    prints all possible digits.\\ 
-\Lkeyword{xShift}  & <number>     & 0     & the x shift in pt for the output, relative to the current point.\\ 
-\Lkeyword{algebraic}  & <boolean>     & false     & function in algebraic notation.\\ 
-\end{tabularx}
-
-\begin{center}
-\psset{fontscale=12}
-\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{\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[comma,valuewidth=15,linecolor=blue,PSfont=AvantGarde]{\iA\space sqrt}}
-  \makebox[7em]{\psPrintValue[PSfont=Times-Italic]{\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}
-
-\bigskip
-
-\begin{lstlisting}
-\psset{fontscale=12}
-\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{\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[comma,valuewidth=15,linecolor=blue,PSfont=AvantGarde]{\iA\space sqrt}}
-  \makebox[7em]{\psPrintValue[PSfont=Times-Italic]{\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}
-
-With enabled \Lkeyword{algebraic} option there must be two arguments, separated by a comma.
-The first one is the x value as a number, which can also be PostScript code, which leaves a
-number on the stack. The second part is the function described in algebraic notation.
-Pay attention, in algebraic notation angles must be in radian and not degrees.
-
-\begin{center}
-\psset{algebraic, fontscale=12}% All functions now in algebraic notation
-\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[comma,valuewidth=15,linecolor=blue,PSfont=AvantGarde]{\rA,sqrt(x)}}
-  \makebox[7em]{\psPrintValue[PSfont=Times-Italic]{\rA,sin(x)+cos(x)}}
-  \makebox[6em]{\psPrintValue[PSfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\}
-\end{center}
-
-\bigskip
-
-\begin{lstlisting}
-\psset{algebraic, fontscale=12}% All functions now in algebraic notation
-\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[comma,valuewidth=15,linecolor=blue,PSfont=AvantGarde]{\rA,sqrt(x)}}
-  \makebox[7em]{\psPrintValue[PSfont=Times-Italic]{\rA,sin(x)+cos(x)}}
-  \makebox[6em]{\psPrintValue[PSfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\}
-\end{lstlisting}
-
 \section{Examples}
 
 \begin{LTXexample}[preset=\centering]
diff --git a/Master/texmf-dist/source/generic/pst-func/Makefile b/Master/texmf-dist/source/generic/pst-func/Makefile
index 71257283a2a..d24eb4d699f 100644
--- a/Master/texmf-dist/source/generic/pst-func/Makefile
+++ b/Master/texmf-dist/source/generic/pst-func/Makefile
@@ -39,7 +39,6 @@ $(MAIN).dvi : $(MAIN).tex
 clean : 
 	$(RM) $(addprefix $(MAIN), .log .aux .bbl .blg .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
 	$(RM) $(addprefix $(MAIN), .dvi .ps .xcp)
-	rm *.dat
 
 veryclean : clean
 	$(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
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 6f9032cff70..63763aab9fd 100644
--- a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
+++ b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-func.tex 599 2011-11-03 19:38:28Z herbert $
+%% $Id: pst-func.tex 621 2012-01-01 15:26:33Z herbert $
 %%
 %% This is file `pst-func.tex',
 %%
@@ -30,8 +30,8 @@
 % interface to the `xkeyval' package
 \pst@addfams{pst-func}
 %
-\def\fileversion{0.74}
-\def\filedate{2011/11/02}
+\def\fileversion{0.75}
+\def\filedate{2012/01/01}
 \message{`PST-func' v\fileversion, \filedate\space (hv)}
 %
 \pstheader{pst-func.pro}