pst2pdf (20jan11)

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

7 files changed, 88 insertions, 39 deletions

diff --git a/Master/texmf-dist/doc/latex/pst2pdf/Changes b/Master/texmf-dist/doc/latex/pst2pdf/Changes
index d9b6cb98bc4..afe13167e70 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/Changes
+++ b/Master/texmf-dist/doc/latex/pst2pdf/Changes
@@ -1,4 +1,10 @@
 pst2pdf.pl --------
+0.12  2011-01-19  - new optional arguments for runninh 
+                    bibtex or biber
+0.11  2010-10-03  - use graphicspath instead of $imageDir to
+                    allow working with Windows
+                  - test for pst-exa to write \psset in the
+                    pdf file
 0.10  2010-01-04  allow using the package pst-exa
 0.09  2009-10-01  allow pspicture*
 0.08  2009-08-28  test for png files (only for Linux)
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/Makefile b/Master/texmf-dist/doc/latex/pst2pdf/Makefile
new file mode 100644
index 00000000000..442e4f0040d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pst2pdf/Makefile
@@ -0,0 +1,62 @@
+# `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 31e846d5d96..37db62ada72 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/README
+++ b/Master/texmf-dist/doc/latex/pst2pdf/README
@@ -41,6 +41,8 @@ Options:
 --verbose 
 --clear 
 --noImages 
+--runBibtex
+--runBiber
 
 for more documentation => perldoc pst2pdf 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
index 8894fa5f494..75da5a14ec5 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib
+++ b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.bib
@@ -67,15 +67,6 @@
 }
 
 
-@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},
@@ -107,20 +98,20 @@
 
 @Manual{pstricks,
   Title          = {PSTricks - {\PS} macros for generic {\TeX}},
-  Author         = {{Timothy van} Zandt},
+  Author         = {{Timothy van} Zandt  and Herbert Vo{\ss}},
   Organization   = {},
-  Address        = {\url{http://www.tug.org/application/PSTricks}},
+  Address        = {\url{http://PSTricks.tug.org/}},
   Note           = {},
-  year           = 1993
+  year           = 2011
 }
 
 @Manual{pst-plot,
   Title          = {\texttt{pst-plot}: Plotting two dimensional functions and data},
-  Author         = {{Timothy van} Zandt},
+  Author         = {{Timothy van} Zandt and Herbert Vo{\ss}},
   Organization   = {},
   Address        = {\url{CTAN:graphics/pstricks/generic/pst-plot.tex}},
   Note           = {},
-  year           = 1999
+  year           = 2011
 }
 
 @Manual{multido,
@@ -135,25 +126,9 @@
 @Book{PSTricks2,
   author	= {Herbert Vo\ss},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {5.},
+  edition	= {6.},
   publisher	= {DANTE -- Lehmanns},
-  year		= {2008},
+  year		= {2011},
   address	= {Heidelberg/Hamburg}
 }
 
-@Book{voss:math,
-  author	= {Herbert Vo\ss},
-  title		= {\LaTeX\ in {M}athematik und {N}aturwissenschaften},
-  publisher	= {{Franzis-Verlag}},
-  year		= {2006},
-  address	= {Poing}
-}
-
-@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/latex/pst2pdf/pst2pdf-doc.pdf b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.pdf
index 6636cce59f2..ff8111a0aeb 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 c201a359881..5d98d2d9088 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex
+++ b/Master/texmf-dist/doc/latex/pst2pdf/pst2pdf-doc.tex
@@ -2,7 +2,7 @@
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
    smallheadings, headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
-\usepackage{pst-exa,pst-text,pst-grad}
+\usepackage{pst-text,pst-grad,pst-exa}
 \let\pstFV\fileversion
 \DeclareFixedFont{\RM}{T1}{ptm}{b}{n}{4cm}
 \renewcommand\bgImage{\pscharpath[fillstyle=gradient,
@@ -16,7 +16,8 @@
 \begin{document}
 
 \title{\texttt{pst2pdf}}
-\subtitle{Running a PSTricks document with pdflatex and \nxLPack{pst-exa}; v.\pstFV}
+\subtitle{Running a PSTricks document with pdflatex and \nxLPack{pst-exa};\\
+\small v.\pstFV}
 \author{Herbert Vo\ss}
 \docauthor{}
 \date{\today}
@@ -34,7 +35,8 @@ code and output of PSTricks examples when running in pdf mode.
 
 \vfill\noindent
 Thanks to: \\
-Rolf Nirpraschk
+Pablo Gonzales Luengo;
+Rolf Niepraschk
 
 \end{abstract}
 
@@ -74,7 +76,9 @@ The options listed in Table~\ref{perloptions} refer only to the script and not t
 \Loption{--tempDir}  & literal & .        & the temporary directory for the temp files\\
 \Loption{--verbose}  & boolean & 1        & for a long \Lprog{pst2pdf} log\\
 \Loption{--clear}    & boolean & 0        & delete all temporary files\\
-\Loption{--noImages} & boolean & 0        & create no images, build only the pdf with the alread existing images\\\bottomrule
+\Loption{--noImages} & boolean & 0        & create no images, build only the pdf with the alread existing images\\
+\Loption{--runBibTeX} & boolean & 0        & runs \Lprog{bibtex} \\
+\Loption{--runBiber} & boolean & 0        & runs \Lprog{biber} if a file with extension \Lext{bcf} exists \\\bottomrule
 \end{tabularx}
 \end{table}
 
@@ -100,7 +104,7 @@ The package provides the environment \Lenv{PSTexample} with the optional
 arguments listed in Table~\ref{pst-exaoptions}.
 
 \begin{table}
-\caption{Possible optional arguments for the Perl script \nxLprog{pst2pdf}}\label{pst-exaoptions}
+\caption{Possible optional arguments for the package \LPack{pst-exa}}\label{pst-exaoptions}
 \begin{tabularx}{\linewidth}{@{} l l l X @{}}\\\toprule
 \emph{name} & \emph{values} & \textrm{\emph{default}} & \emph{description}\\\midrule
 \Lkeyword{pos}    & \Lkeyval{l},\Lkeyval{r},\Lkeyval{b},\Lkeyval{t} & \Lkeyval{l} & position of the image, maybe left, right, bottom ot top of the code.\\
@@ -108,7 +112,8 @@ arguments listed in Table~\ref{pst-exaoptions}.
 \Lkeyword{valign} & \Lkeyval{l},\Lkeyval{r},\Lkeyval{c}   & \Lkeyval{c} & the vertical alignment of the image.\\
 \Lkeyword{frame}  & see lst  &  & option is passed to \Lcs{lstinputlisting} from the package \LPack{listings}.\\ 
 \Lkeyword{width}  & length   &0.5\Ldim{linewidth}  & the width of the example box.\\
-\Lkeyword{sep}    & length   &1em        & separation between image and code.\\\bottomrule
+\Lkeyword{sep}    & length   &1em        & separation between image and code.\\
+\Lkeyword{imageDir} & literal   &images/    & directory for the created images and tex files.\\\bottomrule
 \end{tabularx}
 \end{table}
 
@@ -122,7 +127,6 @@ with the package \LPack{pst-exa}.
 \item[test3.tex] another example 
 \end{compactdesc}
 
-\clearpage
 \section{List of all optional arguments for \texttt{pst-exa}}
 
 \xkvview{family=pst-exa,columns={key,type,default}}
diff --git a/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf b/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf
index 5ea9adf0e73..5b507dae2ee 100644
--- a/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pst2pdf/test2-pdf.pdf