pst2pdf (24sep14)

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

13 files changed, 78 insertions, 676 deletions

diff --git a/Master/texmf-dist/doc/latex/pst2pdf/Changes b/Master/texmf-dist/doc/latex/pst2pdf/Changes
index 00844724a41..3aaf4ab41ed 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/Changes
+++ b/Master/texmf-dist/doc/latex/pst2pdf/Changes
@@ -1,7 +1,11 @@
 pst2pdf.pl --------
+0.16  2014-09-14  - using gs for split pdf (no more pdftk)
+                  - support package pst-exa for examples
+		  - adding svg image support
+		  - ignore inline verbatim 
 0.15  2013-06-16  - adding short options for command line
                   - create png and jpg files in Linux and Windows
-				  - pass options to ps2pdf
+		  - pass options to ps2pdf
 0.14  2013-02-27  - suport xelatex and -help from command line
 0.13  2011-12-12  - some more improvements to the code
 0.12  2011-01-19  - new optional arguments for running
@@ -19,8 +23,8 @@ pst2pdf.pl --------
 0.06  2007-08-28  - fix bug with \begin{pspicture} and \pspicture
 0.05  2007-07-05  - allow different extensions for the source file
                     e.g. tex, ltx
-				  - ignore verbatim environment
-		          - better log file support
+		  - ignore verbatim environment
+		  - better log file support
 0.04  2007-07-04  - allow all \begin ..\end sequences anywhere 
                     in a line, see testcase 
 0.03  2007-06-21  - fix nested environments 
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/Makefile.doc b/Master/texmf-dist/doc/latex/pst2pdf/Makefile.doc
deleted file mode 100644
index 442e4f0040d..00000000000
--- a/Master/texmf-dist/doc/latex/pst2pdf/Makefile.doc
+++ /dev/null
@@ -1,62 +0,0 @@
-# `Makefile' for `pst2pdf.pdf', hv, 2006/08/11
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst2pdf
-
-MAIN = $(PACKAGE)-doc
-
-LATEX = latex
-
-ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
-
-ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
-
-TDS = ~/PSTricks/PSTricks-TDS
-
-all : doc clean
-
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
-	GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
-
-$(MAIN).ps : $(MAIN).dvi
-	dvips $<
-
-$(MAIN).dvi : $(MAIN).tex
-	$(LATEX) $<
-	$(LATEX) $<
-	if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
-	if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
-	makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
-	  $(basename $<).glo
-	makeindex -t $(basename $<).ilg -o $(basename $<).ind \
-	  $(basename $<).idx
-	bibtex $(basename $<)
-	$(LATEX) $<
-	$(LATEX) $<
-
-clean : 
-	$(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
-	$(RM) $(addprefix $(MAIN), .dvi .ps)
-
-veryclean : clean
-	$(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
-
-arch :
-	zip $(ARCHNAME).zip $(ARCHFILES)
-
-tds:
-	cp -u Changes     $(TDS)/scripts/$(PACKAGE)/
-	cp -u README      $(TDS)/scripts/$(PACKAGE)/
-	cp -u $(MAIN).pdf $(TDS)/scripts/$(PACKAGE)/
-	cp -u $(MAIN).tex $(TDS)/scripts/$(PACKAGE)/
-	cp -u $(MAIN).bib $(TDS)/scripts/$(PACKAGE)/
-	cp -u Makefile    $(TDS)/scripts/$(PACKAGE)/
-	cp -u test?.tex   $(TDS)/scripts/$(PACKAGE)/
-	cp -u test?-pdf.pdf   $(TDS)/scripts/$(PACKAGE)/
-	cp -u pst2pdf.pl  $(TDS)/scripts/$(PACKAGE)/
-
-
-# EOF
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/README b/Master/texmf-dist/doc/latex/pst2pdf/README
index 62bc39fa882..75ca92173dd 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/README
+++ b/Master/texmf-dist/doc/latex/pst2pdf/README
@@ -33,23 +33,28 @@ pdflatex, which then creates file-pdf.pdf. The created
 images are named file-fig-<No>.pdf
 
 Options:
-  -h,-help          - display this help and exit
-  -l,-license       - display license information and exit
-  -imageDir         - the dir for the created images (default images) 
-  -d,-DPI=<int>     - the dots per inch for a cretaed ppm files (default 75)
-  -j,-jpg           - create .jpg files (need pdftoppm and ImageMagick)
-  -p,-png           - create .png files (need pdftoppm and ImageMagick)
-  -e,-eps	        - create .eps files	(need pdftops)
-  -Iscale=<real>    - the value for [scale=] in \\includegraphics 
-  -noImages         - generate file-pdf.tex, but not images
-  -v,-verbose       - creates log file (.plog)
-  -c,-clear         - delete all tmp files
-  -runBibTeX        - run bibtex on the aux file, if exists
-  -runBiber         - run biber on the bcf file, if exists
-  -s,-single	    - create images whitout pdftk
-  -a,-all	        - create all image type and images.tex	
-  -x,-xetex         - using (Xe)LaTeX for compilation
-  -PS2=<opt>        - pass options to ps2pdf (default empty)
+Options:
+  -h,--help          - display this help and exit
+  -l,--license       - display license information and exit
+  -v,--version 	     - display version (current $nv) and exit
+  -d,--dpi=<int>     - the dots per inch for images (default 300)
+  -j,--jpg           - create .jpg files (need Ghostscript)
+  -p,--png           - create .png files (need Ghostscript)
+  -e,--eps	     - create .eps files (need pdftops)
+  -s,--svg	     - create .svg files (need pdf2svg)
+  -P,--ppm	     - create .ppm files (need pdftoppm)
+  -a,--all	     - create .(pdf,eps,jpg,png,ppm,svg) images
+  -c,--clear         - delete all temp and aux files
+  -x,--xetex         - using (Xe)LaTeX for create images
+  -m,--margins=<int> - margins for pdfcrop (in bp) (default 1)
+  -ni,--noimages     - generate file-pdf.tex, but not images
+  -np,--single       - create images files whitout preview and Ghostscript
+  -ns,--nosource     - delete all source(.tex) for images files
+  --imgdir=<string>  - the folder for the created images (default images)
+  --ignore=<string>  - skip other verbatim environment (default other)
+  --bibtex           - run bibtex on the aux file, if exists
+  --biber            - run biber on the bcf file, if exists
+  --Verbose          - creates a long log file (.plog)
 
 for more documentation => pst2pdf --help or read the documentation
 --
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib
deleted file mode 100644
index b51192400d3..00000000000
--- a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib
+++ /dev/null
@@ -1,149 +0,0 @@
-%% -*-bibtex-*-
-@STRING{tugboat	= {TUGboat} }
-@STRING{beiprogramm	= {{\TeX}-Beiprogramm} }
-@STRING{bretter	= {Bretter, die die Welt bedeuten} }
-@STRING{dtk		= {{D}ie {\TeX}nische {K}om{\"o}die} }
-@STRING{editorial	= {Editorial} }
-@STRING{fremdebuehne	= {Von fremden B{\"u}hnen} }
-@STRING{fundus		= {Aus dem Fundus} }
-@STRING{hinterbuehne	= {Hinter der B{\"u}hne} }
-@STRING{leserbrief	= {Leserbrief(e)} }
-@STRING{magazin	= {Magazin} }
-@STRING{rezension	= {Rezensionen} }
-@STRING{schonimmer	= {Was Sie schon immer {\"u}ber {\TeX} wissen wollten \dots} }
-@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. }
-}
-
-@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{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,
-  year		= {2007},
-  address	= {Reading, Mass.}
-}
-
-
-@Article{girou:01:,
-  author	= {Denis Girou},
-  title		= {Pr\'esentation de {PST}ricks},
-  journal	= {Cahier {GUT}enberg},
-  year		= 1994,
-  volume	= {16},
-  month		= apr,
-  pages		= {21-70}
-}
-
-@Article{girou:02:,
-  author	= {{Timothy van} Zandt and Denis Girou},
-  title		= {Inside {PST}ricks},
-  journal	= TUGboat,
-  year		= 1994,
-  volume	= {15},
-  month		= sep,
-  pages		= {239-246}
-}
-
-@Book{PostScript,
-  Author         = {Kollock, Nikolai G.},
-  Title          = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
-                   praktischen {E}insatz},
-  Publisher      = {IWT},
-  Address        = {Vaterstetten},
-  year           = 1989,
-}
-
-@Manual{pstricks,
-  Title          = {PSTricks - {\PS} macros for generic {\TeX}},
-  Author         = {{Timothy van} Zandt  and Herbert Vo{\ss}},
-  Organization   = {},
-  Address        = {\url{http://PSTricks.tug.org/}},
-  Note           = {},
-  year           = 2011
-}
-
-@Manual{pst-plot,
-  Title          = {\texttt{pst-plot}: Plotting two dimensional functions and data},
-  Author         = {{Timothy van} Zandt and Herbert Vo{\ss}},
-  Organization   = {},
-  Address        = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
-  Note           = {},
-  year           = 2011
-}
-
-@Manual{multido,
-  Title          = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
-  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		= {2011},
-  address	= {Heidelberg/Hamburg}
-}
-
-@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}
-}
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf
index 928f35f43b2..226845234cb 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf
+++ b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex
index a89995f74b8..7a59358ff9d 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex
+++ b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex
@@ -16,7 +16,7 @@
 \begin{document}
 
 \title{\texttt{pst2pdf}}
-\subtitle{Running a PSTricks document with pdflatex;\\  \small v. 0.15}
+\subtitle{Running a PSTricks document with pdflatex;\\  \small v. 0.16}
 \author{Herbert Vo\ss  \\ Pablo Gonz\'{a}lez Luengo}
 \docauthor{}
 \date{\today}
@@ -38,14 +38,15 @@ all \PST\ related code into single documents with the same preamble as the origi
 main document.
 
 The \nxLprog{pst2pdf} \emph{script} runs document, clips all whitespace around the
-image and creates a \Lext{pdf} (and \Lext{eps},\Lext{ppm}) image of the \PST\ 
-related code. In a last run which is the \Lprog{pdflatex} the \PST\ code in the
+image and creates a \Lext{pdf} images of the \PST\ related code. 
+
+In a last run which is the \Lprog{pdflatex} the \PST\ code in the
 main document is replaced by the created images.
 
 \section{Requirements}
 \subsection{Programs needed}
-\nxLprog{pst2pdf} needs \Lprog{pdftk}, \Lprog{ImageMagick}, \Lprog{pdftoppm}  and \Lprog{pdftops}
-(from \Lprog{poppler-utils} or \Lprog{xpdf-utils}) for the process file. If you need a create .pdf image files (whitout \Lprog{pdftk}) use single mode (see \ref{single}).
+\nxLprog{pst2pdf} needs a latest version \Lprog{Ghostscript} (9.14), \Lprog{perl} (>=5.18), \Lprog{pdf2svg}, \Lprog{pdftoppm} and \Lprog{pdftops}
+(from \Lprog{poppler-utils} or \Lprog{xpdf-utils}) for the process file. If you need a create .pdf images whitout \Lprog{Ghostscript}, use single mode (see \ref{single}).
 
 \subsection{Preparating file}
 The script scan the file for \Lenv{pspicture} and \Lenv{postscript} environments,
@@ -55,9 +56,16 @@ the \Lenv{postscript} one not! But it can contain an environment \Lenv{pspicture
 The \Lenv{postscript} environment should always be used, when there is some code before a \Lenv{pspicture}
 environment or for some code which is not inside of a \Lenv{pspicture} environment.
 
-Put all related \PST\ package in separate lines in your preamble, \nxLprog{pst2pdf} delete al lines contains \PST\ package before last run.
+\nxLprog{pst2pdf} delete al lines contains \PST\ package before last run, if you need delete other \PST\ code in preamble use:
+
+\begin{verbatim}
+%CleanPST
+pstricks code	
+%CleanPST
+\end{verbatim}
 
-This is an example of environments that support for \nxLprog{pst2pdf}:
+\section{Environments support}
+\nxLprog{pst2pdf} support fourth environments in default and single way:
 
 \vspace{10pt}
 \begin{minipage}[c]{0.25\textwidth}
@@ -93,6 +101,10 @@ pstricks code
 \end{verbatim}
 \end{minipage}
 
+\vspace{10pt}
+Note: When using the default mode, images are created using \Lprog{Ghostscript} and \LPack{preview} package, in this case, it is not necessary 
+to write \Lenv{psset} into \PST\ environment.
+\newpage
 \section{Running the script}
 \subsection{Default mode}
 The general syntax for the \Lprog{perl} \emph{script} is simple:
@@ -108,13 +120,13 @@ For \TeX Live users:
 \end{BDef}
 
 In this way \nxLprog{pst2pdf} creates a new file called \Larg{file-pst.tex} and copy all \Lenv{pspicture} 
-and \Lenv{postscript} environments, then processed and create file-pdf.pdf and file-fig-1.pdf, file-fig-2.pdf, file-fig-\dots.pdf and file-fig-1.tex, file-fig-2.tex, file-fig-\dots.tex for all \Lenv{pspicture} and \Lenv{postscript} using \nxLprog{pdftk}.
+and \Lenv{postscript} environments, then processed and create file-pdf.pdf and file-fig-1.pdf, file-fig-2.pdf, file-fig-\dots.pdf and file-fig-1.tex, file-fig-2.tex, file-fig-\dots.tex for all \Lenv{pspicture} and \Lenv{postscript} using \nxLprog{Ghostscript}.
 \subsection{Single mode}
 \label{single}
-If you do not have \nxLprog{pdftk} use the option \Loption{--single} in this mode the files are processed separately (take a more time to create images files) by default create PDF files. For example:
+If you do not have \nxLprog{Ghostscript} use the option \Loption{-np,---single} in this mode, the files are processed separately (take a more time to create images files). For example:
 
 \begin{BDef}
-\nxLprog{pst2pdf} \Larg{file.tex} \OptArg*{--single}
+\nxLprog{pst2pdf} \Larg{file.tex} \OptArg*{---single}
 \end{BDef}
 
 create file-pdf.pdf and file-fig-1.pdf, file-fig-2.pdf, file-fig-\dots.pdf and file-fig-1.tex, file-fig-2.tex, file-fig-\dots.tex for all \Lenv{pspicture} and \Lenv{postscript} environments (see \ref{options}).
@@ -127,24 +139,27 @@ The options listed in Table~\ref{perloptions} refer only to the \emph{script} an
 \caption{Optional arguments for \nxLprog{pst2pdf}}\label{perloptions}
 \begin{tabularx}{\linewidth}{@{} l l >{\ttfamily}l X @{}}\\\toprule
 \emph{name} & \emph{values} & \textrm{\emph{default}} & \emph{description}\\\midrule
-\Loption{--imageDir} & literal & images/  & the directory for the created images.\\
-\Loption{--Iext}     & literal & .pdf     & the extension for \Loption{PrependGraphicsExtensions}.\\  
-\Loption{--DPI}      & integer & 75       & the dots per inch for a created \Lext{ppm} file.\\
-\Loption{--Iscale}   & real    & 1        & the value for the option \Loption{scale} in \Lcs{includegraphics}.\\ 
-\Loption{--eps}      & boolean & 0        & creates \Lext{eps} images (need \Lprog{pdftops}).\\
-\Loption{--jpg}      & boolean & 0     & creates \Lext{jpg} images (need \Lprog{pdftoppm} and \Lprog{ImageMagick}).\\
-\Loption{--png}      & boolean & 0        & creates \Lext{png} images (need \Lprog{pdftoppm} and  \Lprog{ImageMagick}).\\
-\Loption{--verbose}  & boolean & 1        & for a long \nxLprog{pst2pdf} log.\\
-\Loption{--PS2}      & literal & empty    & pass options to \nxLprog{ps2pdf}.\\
-\Loption{--clear}    & boolean & 0        & delete all temporary files.\\
-\Loption{--help}     & boolean & 1        & print help and exit.\\
-\Loption{--single}   & boolean & 0        & create images type (whitout pdftk).\\
-\Loption{--all}      & boolean & 0        & generte all image (.pdf, .eps, .jpg, .png, .tex) and clear.\\
-\Loption{--license}  & boolean & 0        & print license and exit.\\
-\Loption{--xetex}    & boolean & 0        & using \Lprog{xelatex} instead of \Lprog{latex} for the process.\\
-\Loption{--noImages} & boolean & 0        & generate file-pdf.tex, but no images.\\
-\Loption{--runBibTeX}& boolean & 0        & runs \Lprog{bibtex} \\
-\Loption{--runBiber} & boolean & 0        & runs \Lprog{biber} if a file with extension \Lext{bcf} exists \\\bottomrule
+\Loption{-h,---help}     & boolean & 1        & print help and exit.\\
+\Loption{-l,---license}  & boolean & 0        & print license and exit.\\
+\Loption{-v,---version}  & boolean & 1     & print version and exit.\\
+\Loption{-m,---margins}  & literal & 1   & margins for pdfcrop (in bp).\\
+\Loption{-d,---dpi}      & integer & 300      & the dots per inch for a created \Lext{ppm} file.\\
+\Loption{-j,---jpg}      & boolean & 0        & creates \Lext{jpg} images (need \Lprog{Ghostscript}).\\
+\Loption{-p,---png}      & boolean & 0        & creates \Lext{png} images (need \Lprog{Ghostscript}).\\
+\Loption{-e,---eps}      & boolean & 0        & creates \Lext{eps} images (need \Lprog{pdftops}).\\
+\Loption{-s,---svg}      & boolean & 0        & creates \Lext{ppm} images (need \Lprog{pdf2svg}).\\
+\Loption{-P,---ppm}      & boolean & 0        & creates \Lext{ppm} images (need \Lprog{pdftoppm}).\\
+\Loption{-c,---clear}    & boolean & 0        & delete all temporary files.\\
+\Loption{-a,---all}      & boolean & 0        & generte all images type and clear.\\
+\Loption{-x,---xetex}    & boolean & 0        & using \Lprog{xelatex} instead of \Lprog{latex} for process.\\
+\Loption{-np,---single}   & boolean & 0        & create images type (whitout Ghostscript).\\
+\Loption{-ni,---noimages} & boolean & 0    		& generate file-pdf.tex, but no images.\\
+\Loption{-ns,---nosource} & boolean & 0    		& delte all source for images.\\
+\Loption{---imgdir} & literal & images/  & the directory for the created images.\\
+\Loption{---ignore} & literal & other   & skip other verbatim environment.\\
+\Loption{---Verbose}  & boolean & 1        & for a long \nxLprog{pst2pdf} log.\\
+\Loption{---bibtex}   & boolean & 0           & runs \Lprog{bibtex}.\\
+\Loption{---bibtex}   & boolean & 0          & runs \Lprog{biber} if a file with extension \Lext{bcf} exists. \\\bottomrule
 \end{tabularx}
 \end{table}
 
@@ -154,19 +169,16 @@ For Help in command line use:
 \nxLprog{pst2pdf} \OptArg*{--help}
 \end{BDef}
 
-\section{Image format}
-\nxLprog{pst2pdf} can create image files in the formats: \Lext{pdf}, \Lext{eps}, \Lext{jpg} and \Lext{png}. If you need to create other image formats use \nxLprog{pst2pdf} \Larg{file.tex} \OptArg*{-png} without the option
-\OptArg*{-clear} , than move to images dir and use \nxLprog{mogrify} command (from \Lprog{ImageMagick}), for examples:\\
+\section{Other image format}
+If you need to create other image formats use \nxLprog{pst2pdf}, move to images dir and use 
+\nxLprog{mogrify} command (from \Lprog{ImageMagick}), for examples:\\
 
 \begin{BDef} 
-\nxLprog{mogrify} -format gif \OptArg*{*.ppm} 
-\end{BDef}
-generate \Lext{gif} images files and \\
-\begin{BDef} 
 \nxLprog{mogrify} -format tiff \OptArg*{*.ppm} 
 \end{BDef} 
 generate \Lext{tiff} images files.
-\enlargethispage{1cm}
+\newpage
+%
 \bgroup
 \raggedright
 \nocite{*}
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test.pdf b/Master/texmf-dist/doc/latex/pst2pdf/test.pdf
deleted file mode 100644
index 8ffafa7a152..00000000000
--- a/Master/texmf-dist/doc/latex/pst2pdf/test.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test.tex b/Master/texmf-dist/doc/latex/pst2pdf/test.tex
deleted file mode 100644
index c664fb0a0d7..00000000000
--- a/Master/texmf-dist/doc/latex/pst2pdf/test.tex
+++ /dev/null
@@ -1,408 +0,0 @@
-\documentclass{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{lmodern}
-\usepackage[dvipsnames]{xcolor}
-\usepackage{pst-solides3d}
-\usepackage{psgo}
-\usepackage{pst-text}
-\usepackage{pst-blur}
-\usepackage[tiling]{pst-fill}
-\usepackage{pst-calendar}
-\usepackage{pst-eucl}
-\usepackage{pst-labo}
-\usepackage{pst-3d}
-\usepackage{psfrag}
-\usepackage{pst-bar}
-\usepackage{pst-barcode}
-\usepackage{pst-gr3d}
-\usepackage{pst-ob3d}
-\usepackage{pst-3dplot}
-\usepackage{pst-tree}
-\usepackage{pst-coil}
-\usepackage{pst-bezier}
-\usepackage{pst-coxeterp}
-\usepackage{pst-circ}
-\usepackage{pst-func}
-\usepackage{pstricks-add}
-\usepackage{pst-plot,pst-math}
-\usepackage{pst-slpe}
-\usepackage{pst-fr3d}
-\usepackage{vaucanson-g}
-\usepackage{blindtext}
-\usepackage{multido}
-\usepackage{pst-grad}
-\usepackage{pstricks-add}
-%\usepackage[pspdf={-dPDFSETTINGS=/prepress}]{auto-pst-pdf}
-\begin{document}
-A test for pst2pdf ...
-\texttt{blindtext,pst-node}
-\begin{postscript}
-\SpecialCoor
-\rnode{A}{The beginning of it all:}
-\blindtext 
-\rnode{E}{And this is the end my friend.}
-\nccurve[linewidth=5pt,strokeopacity=0 .4,ncurvB=0.9,arrowscale=1.5,arrows=->]{A}{E}
-\end{postscript}
-
-\texttt{pstricks-add}
-\begin{pspicture}(-0.04,-0.04)(1,1)
-\psset{unit=5}
-\psgrid[subgriddiv=5,subgridcolor=lightgray]
-\psplotDiffEqn[whichabs=0,whichord=1,linecolor=red,
-method=rk4,algebraic,plotpoints=400,
-showpoints=true]{0}{10}{0 0}%
-{cos(Pi*x^2/2)|sin(Pi*x^2/2)}
-\end{pspicture}
-
-\texttt{pst-solides3d}
-\begin{pspicture}[solidmemory](-4,-5)(7,4)
-\psset{viewpoint=50 -40 10 rtp2xyz,Decran=50,
-linecolor=darkgray,lightsrc=viewpoint}
-\psSolid[object=grille,action=draw,base=-3 5 -3 5,
-linecolor=Salmon!40](0,0,-3)
-\psSolid[object=cylindre,r=2,h=6,ngrid=6 24,
-plansepare={[0.707 0 0.707 0]},name=Zylinder,
-action=none](0,0,-3)
-\psSolid[object=load,load=Zylinder1,
-fillcolor=black!5,fcol=0 (Goldenrod)]
-\psSolid[object=load,load=Zylinder0,RotZ=90,
-fillcolor=black!5,rm=0,hollow,incolor=Goldenrod](0,4,0)
-\psSolid[object=plan,action=draw,definition=equation,
-args={[0.707 0 0.707 0] 90},base=-2 2 -3 3,planmarks]
-\psSolid[object=line,args=0 0 0 0 5.5 0,
-linecolor=blue]% first half of y axis
-\color{white}\axesIIID[showOrigin=false,
-linecolor=blue](0,6.8,0)(3.5,8,3.5)
-\end{pspicture}
-
-\texttt{pstricks}
-\begin{postscript}
-\psset{unit=0.05mm}% 1:20,or=0.1mm for 1:10
-\begin{pspicture}(-100,-100)(1000,650)
-\pspolygon[linewidth=2pt,fillcolor=gray!10,
-fillstyle=solid](0,0)(0,470)(860,625)(860,0)
-\psset{linewidth=0.2pt,arrowscale=2,tbarsize=10pt}
-\psline{|<->|}(0,-100)(860,-100)
-\rput*(430,-100){430mm}
-\psline{|<->|}(960,0)(960,625)
-\rput*{90}(960,312.5){625mm}
-\psline{|<->|}(-100,0)(-100,470)
-\rput*{90}(-100,235){470mm}
-\end{pspicture}
-\end{postscript}
-
-\texttt{pstricks, pst-node, and pst-plot}
-\begin{pspicture}(-1,-3)(4.75,3)
-\psscalebox{0.75}{
-\psaxes{->}(0,0)(-1,-3)(5,3)
-\psplot[polarplot,linewidth=2pt,algebraic,
-plotpoints=500]{0}{6.289}{2*(1+cos(x))}
-\multido{\r=0.000+0.314}{21}{ %
-\psplotTangent[polarplot,Derive=-2*sin(x),
-algebraic,arrows=<->]{\r}{1.5}{2*(1+cos(x))}}
-}
-\end{pspicture}
-
-\texttt{pst-plot}
-\begin{pspicture}[showgrid=true](-1.1,-1.1)(1.1,1.1)
-\psset{xunit=1.5cm,yunit=1.5cm}
-\psparametricplot[plotstyle=curve,linewidth=1.5pt,
-plotpoints=200]{-360}{360}%
-{t 1.5 mul sin t 2 mul 60 add sin}
-\end{pspicture}
-
-\texttt{pst-tree}
-\begin{postscript}
-\pstree[levelsep=1cm,radius=3pt]{\Toval{Wurzel}}{%
-\pstree{\TC}{%
-\TC
-\pstree{\TC*}{\TC\TC\TC\TC}%
-\TC\TC}}
-\end{postscript}
-
-\texttt{pst-bezier}
-\begin{pspicture}[showgrid=true](5,3)
-\psset{showpoints=true}
-\psbcurve[linecolor=blue,linewidth=0.01](1,1)%
-(2,2)(3,1)(4,2)
-\psbcurve(1,1)(2,2)l(2,1)(3,1)(4,2)
-\uput[-90](2,1){$\vec{l}_{2}$}
-\end{pspicture}
-
-\texttt{pst-text}
-\begin{pspicture}(0,0)(.25\linewidth,8)
-\DeclareFixedFont{\ps}{U}{psy}{m}{n}{8cm}
-\psboxfill{\footnotesize$\pi$}
-\pscharpath[fillstyle=solid,
-fillcolor=cyan!20,
-addfillstyle=boxfill,fillangle=30,
-fillsep=0.6mm]{%
-\rput[b](-0.5,0){\ps\char112}}
-\end{pspicture}
-
-\texttt{pst-fill}
-\begin{postscript}
-\psset{unit=1.5,dimen=middle}
-\begin{pspicture*}(3,3)
-\psboxfill{\begin{pspicture}(1,1)
-\psframe(1,1)\end{pspicture}}
-\psframe[fillstyle=boxfill](3,3)
-\psboxfill{\begin{pspicture}(1,1)
-\rput{-37}{\psframe[linecolor=red](0.8,0.8)}
-\end{pspicture}}
-\psframe[fillstyle=boxfill](3,4)
-\pspolygon[fillstyle=hlines,hatchangle=90](1,2)(1.64,1.53)(2,2)
-\end{pspicture*}
-\end{postscript}
-
-
-\texttt{pst-coils}
-\begin{pspicture}(4,3)
-\cnode*(0.5,0.5){0.5}{A}
-\cnode*(3.5,2.5){0.5}{B}
-\pccoil[coilwidth=0.4,coilaspect=35,coilheight=0.5,linecolor=white]{<->}(A)(B)
-\nccoil[coilwidth=0.4,coilaspect=35,coilheight=0.5]{A}{B}
-\end{pspicture}
-
-
-\texttt{pst-grad}
-\begin{pspicture}(5,3.5)
-\psframe[fillstyle=gradient,gradbegin=white](5,1.5)
-\newrgbcolor{gradbegin}{0 1 1}
-\psframe[fillstyle=gradient](0,2)(5,3.5)
-\end{pspicture}
-
-\texttt{pst-slpe}
-\begin{pspicture}(2.5,2.5)
-\def\st#1{\makebox[2.75cm]{$\vcenter to 55pt{}#1$}}
-\psset{fading,endfading=0.75,linecolor=black!40}
-\psframe*(-0.3,-0.25)(3.5,20pt)
-\psframebox[fillstyle=slope]{\LARGE\st{slope}}
-\end{pspicture}
-
-\texttt{pst-blur}
-\begin{postscript}
-\DeclareFixedFont{\RM}{T1}{ptm}{b}{n}{1.75cm}
-\psset{shadow=true,blur=true,shadowsize=10pt,blurradius=5pt}
-\pscharpath{\RM PSTricks}
-\end{postscript}
-
-\texttt{pst-3d}
-
-\begin{pspicture}(-4.5,-3)(3,4.75)
-\psset{viewpoint=1 1.5 0.8}
-{\psset{gridlabels=0pt,subgriddiv=0,gridcolor=black!50}
-\ThreeDput[normal=0 0 1]{\psgrid(5,5)}
-\ThreeDput[normal=0 -1 0] {\ psgrid(5,5)}
-\ThreeDput[normal=1 0 0]{\psgrid(5,5)}}
-\ThreeDput[normal=0 0 1] {%
-\psline[linewidth=3pt,linecolor=blue]{->}(4,4)(4,5.5)
-\uput[90](4,5.5){%
-\psrotateleft{\textcolor{blue}{$\vec{n}_A$}}}}%$%xy
-\ThreeDput[normal=0 -1 0]{%
-\psline[linewidth=3pt,linecolor=green]{->}(4,0)(5.5,0)
-\uput[90](5.5,0){ \ psscalebox{-1 1}{%
-\textcolor{green}{$\vec{n}_B$}}}}%$%xz
-\ThreeDput[normal=1 0 0]{%
-\psline[linewidth=3pt,linecolor=red]{->}(0,4)(0,5.5)
-\uput[0](0,5.5){$\vec{n}_{top}$}} %yz
-\ThreeDput[normal=0 0 1] (0,0,4){%
-\psframe*[linecolor=gray!25] (4,4)
-\rput(2,2){\Huge\textbf{TOP}}}
-\ThreeDput[normal=0 1 0](4,4,0){%
-\psframe*[linecolor=gray!5](4,4)
-\rput(2,2){\Huge\textbf{side A}}}
-\ThreeDput[normal=1 0 0] (4,0,0){%
-\psframe*[linecolor=gray!15](4,4)
-\rput(2,2){\Huge\textbf{side B}}}
-% Die kleinen Achsen
-\ThreeDput[normal=0 0 1](0,0,4){%
-\psline(4,0)\uput[90](3,0){X$_{top}$}
-\psline(0,4)\uput[0] (0,3){Y$_{top}$}}
-\ThreeDput[normal=0 1 0](4,4,0){%
-\psline(4,0)\uput[90](3,0){X$_{A}$}
-\psline(0,4)\uput[0] (0,3){Y$_{A}$}}
-\ThreeDput[normal=1 0 0] (4,0,0){%
-\psline(4,0)\uput[90](3,0){X$_{B}$}
-\psline(0,4)\uput[0](0,3){Y$_{B}$}}
-\end{pspicture}
-
-\texttt{pst-ob3d}
-\begin{pspicture}(-1,-0.5)(3,1.7)
-\psset{fillstyle=solid,fillcolor=yellow,RandomFaces=true}
-\PstDie[viewpoint=1 -3 1]
-\rput(1.5,0){\PstCube[Corners=true,CornersColor=blue,
-fillstyle=solid,fillcolor=cyan,viewpoint=1 2 1]
-{1}{1}{1}}
-\end{pspicture}
-
-\texttt{pst-gr3d}
-\begin{postscript}
-\psscalebox{0.5}{\footnotesize
-\PstGridThreeD[GridThreeDNodes,unit=2.5](2,3,2)
-\multido{\ix=0+1}{3}{%
-\multido{\iy=0+1}{4}{%
-\multido{\iz=0+1}{3}{%
-\rput*(Gr3dNode\ix\iy\iz){$\ix\iy\iz$}}}}
-\psset{linecolor=blue,linestyle=dashed,
-linewidth=0.3pt,arrowscale=2,nodesep=8pt}
-\pcline{->}(Gr3dNode000)(Gr3dNode202)
-\pccurve{->}(Gr3dNode000)(Gr3dNode232)}
-\end{postscript}
-
-\texttt{pst-fr3d}
-\begin{postscript}
-\PstFrameBoxThreeD[FrameBoxThreeDOn=false]
-{\Large Off}
-\quad
-\PstFrameBoxThreeD{\Large On}% default
-\end{postscript}
-
-\texttt{pst-3dplot}
-\begin{pspicture}(-4.8,-1.75)(4.8,3.75)
-\psset{unit=4cm,drawCoor,beginAngle=90,endAngle=180,linestyle=dotted}
-\def\oA{\pstThreeDLine[linecolor=blue,linewidth=3pt,
-arrows=c-> ](0,0,0)(1,60,70)}
-\def\oB{\pstThreeDLine[linecolor=red,linewidth=3pt,
-arrows=c->](0,0,0)(1,10,50)}
-\def\oAB{\pstThreeDEllipse[beginAngle=58,
-endAngle=90](0,0,0)(1,140,40)(1,10,50)}
-
-\pstThreeDCoor[drawing,linewidth=1pt,linecolor=black,
-linestyle=solid,xMin=0,xMax=1.1,yMin=0,yMax=1.1,
-zMin=0,zMax=1.1]
-\pstThreeDEllipse(0,0,0)(-1,0,0)(0,1,0)
-\pstThreeDEllipse(0,0,0)(-1,0,0)(0,0,1)
-\pstThreeDEllipse[beginAngle=0,
-endAngle=90](0,0,0)(0,0,1)(0,1,0)
-\psset{SphericalCoor,linestyle=solid}
-\pstThreeDDot[dotstyle=none](1,10,50)
-\pstThreeDDot[dotstyle=none](1,60,70)
-\pscustom[fillstyle=solid,fillcolor=black!20,
-linestyle=none]{\oB\oAB\oA} \oA\oB\oAB
-\pstThreeDPut[origin=lb](1.1,60,70){$\vec\Omega_1$}
-\pstThreeDPut[origin=rb](1.2,10,50){$\vec\Omega_2$}
-\pstThreeDPut[origin=lb](1,10,65){$\gamma_{12}$}
-\end{pspicture}
-
-\texttt{pst-solides3d}
-\begin{pspicture}(-2,-2)(2,2)
-\psset{viewpoint=100 50 20 rtp2xyz,
-Decran=60,lightsrc=10 15 10}
-\defFunction[algebraic]{corne}(u,v)%
-{(2 + u*cos(v))*sin(2*pi*u)}%
-{(2 + u*cos(v))*cos(2*pi*u)+2*u}%
-{u *sin(v)}
-\psSolid[object=surfaceparametree,base=0 1 0 2 pi mul,function=corne,ngrid=20]
-\end{pspicture}
-
-\texttt{pst-circ}
-\begin{pspicture}(4,3.5)
-\pnode(0,3){A}\pnode(0,0){B}
-\pnode(4,1.5){C}
-\OA[OAperfect=false,OAiplus,
-OAiminus,OAiout,
-OAipluslabel=$i_P$,
-OAiminuslabel=$i_M$,
-OAioutlabel=$i_A$,
-intensitycolor=red,
-intensitylabelcolor=red](A)(B)(C)
-\end{pspicture}
-
-
-
-\texttt{pst-barcode}
-\begin{postscript}
-\psframebox{\begin{pspicture}(2.5,1in)
-\psbarcode{12345678}{includetext}{ean8}
-\end{pspicture}}
-\end{postscript}
-
-\texttt{pst-bar}
-\begin{postscript}
-\psset{unit=0.5in}%
-\begin{pspicture}(0,-0.5)(3,4.5)%
-\psgrid[xunit=1.5in,gridlabels=0,%
-subgriddiv=0,griddots=30](0,0)(1,4)%
-\psaxes[axesstyle=frame,Ox=0,Dx=1,labels=y,%
-ticks=y](0,0)(3,4)%
-\readpsbardata{\data}{example2.csv}%
-\psbarchart[barstyle={red,blue}]{\data}%
-\end{pspicture}
-\end{postscript}
-
-\texttt{pst-math}
-\begin{pspicture*}(-0.75,-.75)(6,5)
-\psaxes{->}(6,5)
-\psset{linewidth=1.5pt,plotpoints=200}
-\psplot{.1}{6}{x GAMMA}
-\psplot{.1}{6}{x GAMMALN}
-\end{pspicture*}
-
-\texttt{pst-func}
-\begin{pspicture*}(-3,-2.2)(3.6,2.5)
-\psaxes{->}(0,0)(-3,-2)(3.2,2)[$x$,0][$y$,90]
-\psplotImp[linewidth=2pt,algebraic](-5,-2.2)(5,2.4){%
-(x^2+y^2)^2-8*(x^2-y^2)}
-\rput*(2,1.5){$\left(x^2+y^2\right)^2-8(x^2-y^2)=0$}
-\psplotImp[linewidth=1pt,linecolor=red,
-algebraic](-5,-2.2)(5,2.4){(x^2+y^2)^2-4*(x^2-y^2)}
-\end{pspicture*}
-
-\texttt{pst-eucl}
-\begin{postscript}
-\pstGeonode[PosAngle={0,90}](2,2){A_0}(-2,2){B_0}%
-\psset{RotAngle=90}
-\pstRotation[PosAngle=270]{A_0}{B_0}[D_0]
-\pstRotation[PosAngle=180]{D_0}{A_0}[C_0]
-\pspolygon(A_0)(B_0)(C_0)(D_0)%
-\psset{PointSymbol=none, PointName=none, HomCoef=.2}
-\multido{\n=1+1,\i=0+1}{20}{%
-\pstHomO[PosAngle=0]{B_\i}{A_\i}[A_\n]
-\pstHomO[PosAngle=90]{C_\i}{B_\i}[B_\n]
-\pstHomO[PosAngle=180]{D_\i}{C_\i}[C_\n]
-\pstHomO[PosAngle=270]{A_\i}{D_\i}[D_\n]
-\pspolygon(A_\n)(B_\n)(C_\n)(D_\n)}% fin multido
-\end{postscript}
-
-\texttt{pst-labo}
-\begin{postscript}
-\psset{unit=0.5cm,
-glassType=becher,
-burette=false}
-\pstDosage[phmetre]
-\end{postscript}
-
-\texttt{psgo}
-\begin{postscript}
-\psscalebox{0.7}{%
-\begin{psgopartialboard}[9]{(4,1)(9,6)}
-\stone{white}{c}{3} \stone{white}{e}{3}
-\stone{white}{d}{2} \stone{white}{d}{4}
-\stone{black}{f}{3} \stone{black}{e}{2}
-\stone{black}{e}{4}
-\end{psgopartialboard}}
-\end{postscript}
-
-\texttt{vaucanson-g}
-\begin{postscript}
-\begin{VCPicture}{(0,-2)(5.5,2)}
-\State[p]{(0,0)}{A} \State{(2.5,0)}{B}
-\State[r]{(5.5,0)}{C}\Initial{A} \Final{C}
-\EdgeL{A}{B}{a} \ArcL{B}{C}{b}
-\ArcL{C}{B}{b} \LoopN{A}{a} \LoopS{C}{d}
-\end{VCPicture}
-\end{postscript}
-
-Example for PSFRAG (from auto-pst-pdf)
-psfrag example with replacements defined in example-psfrag.tex:\par
-\begin{postscript}
-\psfragfig{example}
-\end{postscript}
-The same example with a psfrag override (bottom left):
-\begin{postscript}
-\psfragfig{example}[\psfrag{[Mp]}{$N_Q*$}]
-\end{postscript}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test1-pdf.pdf b/Master/texmf-dist/doc/latex/pst2pdf/test1-pdf.pdf
index bb3659ee69e..6a1e636665b 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/test1-pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pst2pdf/test1-pdf.pdf
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf b/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf
index 5b507dae2ee..292c5eef341 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test2.pdf b/Master/texmf-dist/doc/latex/pst2pdf/test2.pdf
deleted file mode 100644
index e92616a5433..00000000000
--- a/Master/texmf-dist/doc/latex/pst2pdf/test2.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test3-pdf.pdf b/Master/texmf-dist/doc/latex/pst2pdf/test3-pdf.pdf
index 39e83c9d5b7..73beb930dd7 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/test3-pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pst2pdf/test3-pdf.pdf
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test3.tex b/Master/texmf-dist/doc/latex/pst2pdf/test3.tex
index db581e1b374..7703cf05364 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/test3.tex
+++ b/Master/texmf-dist/doc/latex/pst2pdf/test3.tex
@@ -1,5 +1,5 @@
 \documentclass{article}
-\usepackage{graphicx,pst-calendar,pst-3dplot}% Pakete
+\usepackage{graphicx,pst-3dplot}
 \pagestyle{empty}
 \parindent=0pt
 \begin{document}