dottex update (21aug07)

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

3 files changed, 51 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/latex/dottex/dottex.pdf b/Master/texmf-dist/doc/latex/dottex/dottex.pdf
index 98782364055..1177cd4e97d 100644
--- a/Master/texmf-dist/doc/latex/dottex/dottex.pdf
+++ b/Master/texmf-dist/doc/latex/dottex/dottex.pdf
diff --git a/Master/texmf-dist/source/latex/dottex/dottex.dtx b/Master/texmf-dist/source/latex/dottex/dottex.dtx
index d1877d5451e..de78ee85b86 100644
--- a/Master/texmf-dist/source/latex/dottex/dottex.dtx
+++ b/Master/texmf-dist/source/latex/dottex/dottex.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (c) 2005-2006, Lars Kotthoff <metalhead@metalhead.ws>
+% Copyright (c) 2005-2007, Lars Kotthoff <lars@larsko.org>
 %
 % Large portions copied from pdftex,
 % Copyright (c) 2001-3, Radhakrishnan CV <cvr@river-valley.com>
@@ -42,7 +42,7 @@
 %<package> \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package> \ProvidesPackage{dottex}
 %<*package>
-    [2006/04/02 v0.5 dot/neato graphs in LaTeX]
+    [2007/08/22 v0.6 dot/neato graphs in LaTeX]
 \RequirePackage{graphicx,moreverb,keyval}
 %</package>
 %
@@ -60,7 +60,7 @@
 %</driver>                                                       
 % \fi
 %
-% \CheckSum{387}                                                   
+% \CheckSum{397}                                                   
 %
 % \CharacterTable                                                
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -85,6 +85,7 @@
 %	\changes{v0.4}{2006/01/23}{Changed pdf support to ps -> eps -> pdf conversion.
 %	Fixed bugs.}
 %	\changes{v0.5}{2006/04/02}{Added keyval interface for picture dimensions.}
+%	\changes{v0.6}{2007/08/22}{Improved Miktex support.}
 %
 % \GetFileInfo{dottex.dtx}
 %
@@ -92,7 +93,7 @@
 %
 % \title{The \textsf{dottex} package\thanks{This document
 %   corresponds to \textsf{dottex}~\fileversion, dated \filedate.}}
-% \author{Lars Kotthoff\\ \texttt{metalhead@metalhead.ws}}
+% \author{Lars Kotthoff\\ \texttt{lars@larsko.org}}
 %
 % \maketitle
 %
@@ -118,8 +119,10 @@
 % \section{Requirements}
 %
 % To use dottex, you'll need the \texttt{graphicx}, \texttt{keyval} and
-% \texttt{moreverb} packages, ps2epsi and epstopdf if you want to use the pdf
-% option, and of course, dot / neato.
+% \texttt{moreverb} packages, ps2pdf if you want to use the pdf
+% option, and of course, dot / neato of the Graphviz package. All the binaries
+% need to be in your PATH, i.e.\ you should be able to call them without
+% specifying the absolute path to the binary.
 %
 % \section{Usage}
 %
@@ -127,7 +130,8 @@
 % preamble. Options that can be passed to the package are
 % \begin{description}
 %     \item[\oarg{shell}] Use shell escape to automatically generate the graphs
-%     from the dot source files. This is the default.
+%     from the dot source files. This is the default. Normally, you don't need
+%     to specify it.
 %     \item[\oarg{noshell}] Don't use shell escape, graphs must be generated
 %     manually.
 %     \item[\oarg{miktex}] We're using mikTeX.
@@ -152,6 +156,11 @@
 % For both environments, you may specify width or height of the picture using
 % [width=\meta{width}] or [height=\meta{height}] as in the \texttt{includegraphics} command.
 %
+% \section{Acknowledgements}
+%
+% Thanks to Klaus Storch for several suggestions to improve the Miktex
+% compatibility.
+%
 % \StopEventually{}
 %
 % \section{Implementation}
@@ -172,16 +181,19 @@
 %% test if shell escape really works
 \ifShellEscape
     \def\tmpfile{/tmp/w18-test-\the\year\the\month\the\day\the\time} 
-    \ifmiktex
-        \immediate\write18{rem >"\tmpfile"}
-    \else
-        \immediate\write18{touch \tmpfile}
-    \fi
-    \ifmiktex
-        \IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
-    \else
-        \IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
-    \fi
+		\ifmiktex
+				\def\tmpfile{w18-test-\the\year\the\month\the\day\the\time}
+				\immediate\write18{echo t > "\tmpfile"}
+		\else
+		\immediate\write18{touch \tmpfile}
+		\fi
+		\ifmiktex
+				\IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
+				\immediate\write18{del "\tmpfile"}
+		\else
+				\IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
+				\immediate\write18{rm -f \tmpfile}
+		\fi
 \fi
 
 \ifShellEscape
@@ -270,11 +282,10 @@
 \long\gdef\dotgraphicsprocess{%
     \ifShellEscape
 				\IfFileExists{\figname.dot}{%
-						\immediate\write18{dot -Tps -o \figname.ps \figname.dot}
+						\immediate\write18{dot -Tps2 -o \figname.ps \figname.dot}
 						\IfFileExists{\figname.ps}{%
 								\ifpdf
-										\immediate\write18{ps2epsi \figname.ps \figname.eps}
-										\immediate\write18{epstopdf \figname.eps}
+										\immediate\write18{ps2pdf \figname.ps \figname.pdf}
 										\IfFileExists{\figname.pdf}{%
 												\PackageInfo{dottex}
 												{\figname.dot converted}}
@@ -291,11 +302,10 @@
 \long\gdef\neatographicsprocess{%
     \ifShellEscape
         \IfFileExists{\figname.neato}{%
-            \immediate\write18{neato -Tps -o \figname.ps \figname.neato}
+            \immediate\write18{neato -Tps2 -o \figname.ps \figname.neato}
             \IfFileExists{\figname.ps}{%
 								\ifpdf
-										\immediate\write18{ps2epsi \figname.ps \figname.eps}
-										\immediate\write18{epstopdf \figname.eps}
+										\immediate\write18{ps2pdf \figname.ps \figname.pdf}
 										\IfFileExists{\figname.pdf}{%
 												\PackageInfo{dottex}
 												{\figname.dot converted}}
diff --git a/Master/texmf-dist/tex/latex/dottex/dottex.sty b/Master/texmf-dist/tex/latex/dottex/dottex.sty
index 2465f7e2c75..9e77960543a 100644
--- a/Master/texmf-dist/tex/latex/dottex/dottex.sty
+++ b/Master/texmf-dist/tex/latex/dottex/dottex.sty
@@ -41,7 +41,7 @@
 %% 
  \NeedsTeXFormat{LaTeX2e}[1999/12/01]
  \ProvidesPackage{dottex}
-    [2006/04/02 v0.5 dot/neato graphs in LaTeX]
+    [2007/08/22 v0.6 dot/neato graphs in LaTeX]
 \RequirePackage{graphicx,moreverb,keyval}
 \newif\ifShellEscape
 \newif\ifmiktex \miktexfalse
@@ -57,16 +57,19 @@
 %% test if shell escape really works
 \ifShellEscape
     \def\tmpfile{/tmp/w18-test-\the\year\the\month\the\day\the\time}
-    \ifmiktex
-        \immediate\write18{rem >"\tmpfile"}
-    \else
-        \immediate\write18{touch \tmpfile}
-    \fi
-    \ifmiktex
-        \IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
-    \else
-        \IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
-    \fi
+\ifmiktex
+\def\tmpfile{w18-test-\the\year\the\month\the\day\the\time}
+\immediate\write18{echo t > "\tmpfile"}
+\else
+\immediate\write18{touch \tmpfile}
+\fi
+\ifmiktex
+\IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
+\immediate\write18{del "\tmpfile"}
+\else
+\IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
+\immediate\write18{rm -f \tmpfile}
+\fi
 \fi
 
 \ifShellEscape
@@ -139,11 +142,10 @@
 \long\gdef\dotgraphicsprocess{%
     \ifShellEscape
 \IfFileExists{\figname.dot}{%
-\immediate\write18{dot -Tps -o \figname.ps \figname.dot}
+\immediate\write18{dot -Tps2 -o \figname.ps \figname.dot}
 \IfFileExists{\figname.ps}{%
 \ifpdf
-\immediate\write18{ps2epsi \figname.ps \figname.eps}
-\immediate\write18{epstopdf \figname.eps}
+\immediate\write18{ps2pdf \figname.ps \figname.pdf}
 \IfFileExists{\figname.pdf}{%
 \PackageInfo{dottex}
 {\figname.dot converted}}
@@ -160,11 +162,10 @@
 \long\gdef\neatographicsprocess{%
     \ifShellEscape
         \IfFileExists{\figname.neato}{%
-            \immediate\write18{neato -Tps -o \figname.ps \figname.neato}
+            \immediate\write18{neato -Tps2 -o \figname.ps \figname.neato}
             \IfFileExists{\figname.ps}{%
 \ifpdf
-\immediate\write18{ps2epsi \figname.ps \figname.eps}
-\immediate\write18{epstopdf \figname.eps}
+\immediate\write18{ps2pdf \figname.ps \figname.pdf}
 \IfFileExists{\figname.pdf}{%
 \PackageInfo{dottex}
 {\figname.dot converted}}