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/source/latex/dottex/dottex.dtx | 56 ++++++++++++++---------- 1 file changed, 33 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/source/latex/dottex') 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 +% Copyright (c) 2005-2007, Lars Kotthoff % % Large portions copied from pdftex, % Copyright (c) 2001-3, Radhakrishnan CV @@ -42,7 +42,7 @@ % \NeedsTeXFormat{LaTeX2e}[1999/12/01] % \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} % % @@ -60,7 +60,7 @@ % % \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}} -- cgit v1.2.3