pst-tools (13may17)

git-svn-id: svn://tug.org/texlive/trunk@44320 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 73 insertions, 112 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-tools/Changes b/Master/texmf-dist/doc/generic/pst-tools/Changes
index f389a55b24a..95144dc9bfb 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.06  2017-05-12  - added style mmpaper
 0.05  2014-05-12  - new optional arguments for printing values
                     on PS level
 0.04  2013-07-08  - ???
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 96838e3a2db..23d783e72db 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
@@ -1,3 +1,4 @@
+y%% -*-bibtex-*-
 @STRING{tugboat	= {TUGboat} }
 @STRING{beiprogramm	= {{\TeX}-Beiprogramm} }
 @STRING{bretter	= {Bretter, die die Welt bedeuten} }
@@ -13,68 +14,49 @@
 @STRING{theaterkasse	= {Von der Theaterkasse} }
 @STRING{theatertage	= {{\TeX}-Theatertage} }
 
-@Article{	  dtk02.2:jackson.voss:plot-funktionen,
-  author	= {Laura E. Jackson and Herbert Vo{\ss}},
-  title		= {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
-  journal	= dtk,
-  year		= 2002,
-  volume	= {2/02},
-  altvolume	= 2,
-  altnumber	= 14,
-  month		= jun,
-  pages		= {27--34},
-  annote	= bretter,
-  keywords	= {},
-  abstract	= { Im letzten Heft wurden die mathematischen Funktionen von
-		  \PS~im Zusammenhang mit dem {\LaTeX}-Paket
-		  \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
-		  und durch Beispiele erl{\"a}utert. In diesem Teil werden
-		  die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r
-		  externe Daten behandelt. }
+@Book{PSTricks2,
+  author	= {Herbert Vo\ss},
+  title		= {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
+  edition	= {7},
+  publisher	= {DANTE -- Lehmanns},
+  year		= {2016},
+  address	= {Heidelberg/Berlin}
+}
+
+@Book{PSTricks-E,
+  author	= {Herbert Vo\ss},
+  title		= {{\PST} {G}raphics for \LaTeX},
+  edition	= {1},
+  publisher	= {UIT},
+  year		= {2011},
+  address	= {Cambridge}
 }
 
-@Article{	  dtk02.1:voss:mathematischen,
-  author	= {Herbert Vo{\ss}},
-  title		= {Die mathematischen {F}unktionen von {P}ost{S}cript},
-  journal	= dtk,
-  year		= 2002,
-  volume	= {1/02},
-  altvolume	= 1,
-  altnumber	= 14,
-  month		= mar,
-  pages		= {},
-  annote	= bretter,
-  keywords	= {},
-  abstract	= { \PS, faktisch genauso alt wie {\TeX}, ist im
-		  Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
-		  darum geht zu beurteilen, was es denn nun im eigentlichen
-		  Sinne ist. Au{\ss}erdem wird h{\"a}ufig vergessen, dass
-		  sich mit den \PS-Funktionen viele Dinge erledigen lassen,
-		  bei denen sonst auf externe Programme zur{\"u}ckgegriffen
-		  wird. Dies wird im Folgenden f{\"u}r die mathematischen
-		  Funktionen im Zusammenhang mit dem Paket \texttt{pst-plot}
-		  gezeigt. }
+@Book{companion04,
+  author	= {Frank Mittelbach and Michel Goosens et al},
+  title		= {The {\LaTeX} {C}ompanion},
+  edition	= {2},
+  publisher	= {Addison-Wesley Publishing Company},
+  year		= {2004},
+  address	= {Boston}
 }
 
+@Book{unbound,
+  author	= {Alan Hoenig},
+  title		= {\TeX{} {U}nbound: \LaTeX{} \& \TeX{} {S}trategies, {F}onts, {G}raphics, and {M}ore},
+  publisher	= {Oxford University Press},
+  year		= {1998},
+  address	= {London}
+}
 @Book{tlgc2,
   author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
   title		= {The {\LaTeX} {G}raphics {C}ompanion},
   publisher	= {{Addison-Wesley Publishing Company}},
-  edition	= second,
+  edition	= 2,
   year		= {2007},
   address	= {Reading, Mass.}
 }
 
-
-@Book{voss:chaos,
-  author	= {Herbert Vo{\ss}},
-  title		= {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen 
-    {\"u}ber {F}arbmanipulationen zur perfekten Darstellung},
-  publisher	= {{Franzis Verlag}},
-  year		= {1994},
-  address	= {Poing}
-}
-
 @Article{girou:01:,
   author	= {Denis Girou},
   title		= {Pr\'esentation de {PST}ricks},
@@ -86,7 +68,7 @@
 }
 
 @Article{girou:02:,
-  author	= {{Timothy van} Zandt and Denis Girou},
+  author	= {{Timothy Van} Zandt and Denis Girou},
   title		= {Inside {PST}ricks},
   journal	= TUGboat,
   year		= 1994,
@@ -97,7 +79,7 @@
 
 @Book{PostScript,
   Author         = {Kollock, Nikolai G.},
-  Title          = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
+  Title          = {PostScript richtig eingesetzt: vom {K}onzept zum
                    praktischen {E}insatz},
   Publisher      = {IWT},
   Address        = {Vaterstetten},
@@ -106,61 +88,19 @@
 
 @Manual{pstricks,
   Title          = {PSTricks - {\PS} macros for generic {\TeX}},
-  Author         = {{Timothy van} Zandt},
+  Author         = {{Timothy Van} Zandt},
   Organization   = {},
   Address        = {\url{http://www.tug.org/application/PSTricks}},
   Note           = {},
   year           = 1993
 }
 
-@Manual{pst-plot,
-  Title          = {\texttt{pst-plot}: Plotting two dimensional functions and data},
-  Author         = {{Timothy van} Zandt},
-  Organization   = {},
-  Address        = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
-  Note           = {},
-  year           = 1999
-}
-
 @Manual{multido,
   Title          = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
-  Author         = {{Timothy van} Zandt},
+  Author         = {{Timothy Van} Zandt},
   Organization   = {},
   Address        = {\url{CTAN:/graphics/pstricks/generic/multido.tex}},
   Note           = {},
   year           = 1997
 }
 
-@Book{PSTricks2,
-  author	= {Herbert Vo\ss},
-  title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {6.},
-  publisher	= {DANTE -- Lehmanns},
-  year		= {2010},
-  address	= {Heidelberg/Berlin}
-}
-
-@Book{voss:math,
-  author	= {Herbert Vo\ss},
-  title		= {Typesetting mathematics with \LaTeX},
-  publisher	= {UIT},
-  year		= {2010},
-  address	= {Cambridge}
-}
-
-@Book{PSTricks2-UIT,
-  author	= {Herbert Vo\ss},
-  title		= {PSTricks -- Graphics for \TeX\ and \LaTeX},
-  publisher	= {UIT},
-  year		= {2011},
-  address	= {Cambridge}
-}
-
-@Manual{wolfram,
-  author	= {Eric Weisstein},
-  title		= {Wolfram MathWorld},
-  publisher	= {{Wolfram}},
-  year		= {2007},
-  address	= {\url{http://mathworld.wolfram.com}}
-}
-
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 e3e25b7fded..877354d3a39 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
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 c825dbaa38d..09e85364574 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,4 +1,4 @@
-%% $Id: pst-func-doc.tex 599 2011-11-03 19:38:28Z herbert $
+%% $Id: pst-tools-doc.tex 456 2017-05-12 19:35:55Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
    smallheadings, headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
@@ -22,6 +22,23 @@
 \psset{unit=1cm}
 
 
+\section{Predefined styles}
+
+The style \Lkeyword{mmpaper} is defined for \Lcs{psgrid}:
+%\newpsstyle{mmpaper}{subgriddiv=5,gridlabels=0,gridwidth=1pt,gridcolor=orange,subgridwidth=0.1pt,subgridcolor=orange!90}
+
+\begin{LTXexample}[width=0.5\linewidth,frame=,pos=r]
+\begin{pspicture}(6,3)
+\psgrid[style=mmpaper](6,3)
+\end{pspicture}
+
+\begin{pspicture}(6,3)
+\psgrid[style=mmpaper,
+  gridcolor=blue,subgridcolor=blue!80](6,3)
+\end{pspicture}
+\end{LTXexample}
+
+
 \section{\Lcs{psPrintValue}}\label{sec:printValue}
 This macro allows to \Index{print} single values of a math function. It has the syntax
 
@@ -40,7 +57,7 @@ There are the following valid options for \Lcs{psPrintValue}:
 \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}\\
+    \Lps{Times-Roman}, \Lps{Helvetica}, \Lps{Courier}, \Lps{Helvetica}, \Lps{Bookman}\\
 \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\\
@@ -62,7 +79,7 @@ There are the following valid options for \Lcs{psPrintValue}:
   \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=AvantGarde]{\iA\space sqrt}}
+  \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[6em]{\psPrintValue[PSfont=Palatino-Roman]{\iA\space dup sin dup mul exch cos dup mul add}}\\}
 \end{center}
@@ -77,7 +94,7 @@ There are the following valid options for \Lcs{psPrintValue}:
   \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=AvantGarde]{\iA\space sqrt}}
+  \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[6em]{\psPrintValue[PSfont=Palatino-Roman]{\iA\space dup sin dup mul exch cos dup mul add}}\\}
 \end{lstlisting}
@@ -94,7 +111,7 @@ Pay attention, in algebraic notation angles must be in radian and not degrees.
 \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=AvantGarde]{\rA,sqrt(x)}}
+  \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[6em]{\psPrintValue[PSfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\}
 \end{center}
@@ -108,7 +125,7 @@ Pay attention, in algebraic notation angles must be in radian and not degrees.
 \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=AvantGarde]{\rA,sqrt(x)}}
+  \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[6em]{\psPrintValue[PSfont=Palatino-Roman]{\rA,sin(x)^2+cos(x)^2}}\\}
 \end{lstlisting}
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 7303d83c49d..ef84306fd98 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 599 2011-11-03 19:38:28Z herbert $
+%% $Id: pst-tools.tex 456 2017-05-12 19:35:55Z herbert $
 %%
 %% This is file `pst-tools.tex',
 %%
@@ -26,8 +26,8 @@
 % interface to the `xkeyval' package
 \pst@addfams{pst-tools}
 %
-\def\fileversion{0.05}
-\def\filedate{2014/05/12}
+\def\fileversion{0.06}
+\def\filedate{2017/05/12}
 \message{`PST-tools' v\fileversion, \filedate\space (hv)}
 %
 \define@key[psset]{pst-tools}{decimalSeparator}[.]{\def\psk@decimalSeparator{#1}}%
@@ -49,6 +49,8 @@
 \def\txG{ true setglobal globaldict begin }
 \def\etxG{ end false setglobal }
 %
+\newpsstyle{mmpaper}{subgriddiv=5,gridlabels=0,gridwidth=1pt,gridcolor=orange,subgridwidth=0.1pt,subgridcolor=orange!90}
+%
 \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
@@ -77,9 +79,10 @@
 \define@boolkey[psset]{pst-tools}[Pst@]{science}[true]{%
   \ifPst@science\def\psk@Scin{true }\else\def\psk@Scin{false }\fi}
 \psset[pst-tools]{science=false,round=false}
+%
 \def\psPrintValueNew{\pst@object{psPrintValueNew}}
-\def\psPrintValueNew@i#1{\expandafter\psPrintValueNew@ii#1,,\@nil}
-\def\psPrintValueNew@ii#1,#2,#3\@nil{%  #1,#2 only for algebraic code
+\def\psPrintValueNew@i#1{\expandafter\psPrintValueNew@ii#1,,!!}
+\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
@@ -90,13 +93,13 @@
         /Func (#2) tx@AlgToPs begin AlgToPs end cvx def 
         Func  
      \else #1 \fi
-     /value ED
+     /value exch def
      \psk@Scin {
-       value 0 ne { value log floor cvi /expon ED }{ /expon 0 def } ifelse
+       value 0 ne { value log floor cvi /expon exch def }{ /expon 0 def } ifelse
        value 10 expon exp div 
        \psk@decimals -1 gt { 10  \psk@decimals exp dup 3 1 roll mul 
          \ifPst@round round \else cvi \fi  exch div } if
-       \psk@decimals 0 eq { cvi } if /numb ED
+       \psk@decimals 0 eq { cvi } if /numb exch def
        expon \psk@valuewidth string cvs /expon exch def
        numb \psk@valuewidth string cvs 
        \ifPst@comma dot2comma \fi  % do we have to change dot to comma
@@ -116,7 +119,7 @@
        show
      } ifelse
   }%
-  \end@SpecialObj%
+  \end@SpecialObj
 }
 %
 \catcode`\@=\PstAtCode\relax
diff --git a/Master/texmf-dist/tex/latex/pst-tools/pst-tools.sty b/Master/texmf-dist/tex/latex/pst-tools/pst-tools.sty
index d4e98a67303..ec192f26741 100644
--- a/Master/texmf-dist/tex/latex/pst-tools/pst-tools.sty
+++ b/Master/texmf-dist/tex/latex/pst-tools/pst-tools.sty
@@ -5,4 +5,4 @@
 \ProvidesFile{pst-tools.tex}
   [\filedate\space v\fileversion\space `PST-tools' (hv)]
 \endinput
-%% $Id: pst-tools.sty 355 2010-06-21 10:02:44Z herbert $
+%% $Id: pst-tools.sty 456 2017-05-12 19:35:55Z herbert $