From 243d38ca86ef978f554b6384d5cfec96eb24a5b6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 24 Aug 2007 18:33:07 +0000 Subject: dottex update (21aug07) git-svn-id: svn://tug.org/texlive/trunk@4793 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/dottex/dottex.sty | 35 ++++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/dottex') 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}} -- cgit v1.2.3