Patch from Christopher Dutchyn, fixing lookup of executables on

Windows, and bumping slatex up to version 20050609.

svn: r578
This commit is contained in:
Eli Barzilay 2005-08-10 22:33:42 +00:00
parent 2e20fe2f94
commit 6fa56f33a4
3 changed files with 18 additions and 9 deletions

View File

@ -22,6 +22,12 @@
[else [else
(error 'filename->latex-filename "~e does not exist" input-file)]))) (error 'filename->latex-filename "~e does not exist" input-file)])))
(define (exec-latex exe file)
(let ([latex-path (find-executable-path exe #f)])
(unless latex-path
(error 'latex "could not find latex binary: ~e" exe))
(system* latex-path file)))
;; latex, pdf-latex : string -> boolean ;; latex, pdf-latex : string -> boolean
;; boolean result indicates success ;; boolean result indicates success
(define-values (latex pdf-latex) (define-values (latex pdf-latex)
@ -63,11 +69,9 @@
(send-event "MACS" "aevt" "odoc" (vector 'file oztex-location))))) (send-event "MACS" "aevt" "odoc" (vector 'file oztex-location)))))
(send-event "OTEX" "aevt" "odoc" (vector 'file file)) (send-event "OTEX" "aevt" "odoc" (vector 'file file))
#t] #t]
[(windows unix macosx) ;; is this also okay for beos? [(windows) (exec-latex (add-suffix command-name #".exe") file)]
(let ([latex-path (find-executable-path command-name #f)]) [(unix macosx) ;; is this also okay for beos?
(unless latex-path (exec-latex command-name file)]
(error 'latex "could not find latex binary"))
(system* latex-path file))]
[else [else
(error 'latex "do not know how to run ~s on ~s" command-name (system-type))]))))]) (error 'latex "do not know how to run ~s on ~s" command-name (system-type))]))))])
(values (values

View File

@ -25,7 +25,7 @@
;(c) Dorai Sitaram, ;(c) Dorai Sitaram,
;http://www.ccs.neu.edu/~dorai/scmxlate/scmxlate.html ;http://www.ccs.neu.edu/~dorai/scmxlate/scmxlate.html
(define slatex::*slatex-version* "2.4z2") (define slatex::*slatex-version* "20050609")
(define slatex::*operating-system* (if (getenv "COMSPEC") 'windows 'unix)) (define slatex::*operating-system* (if (getenv "COMSPEC") 'windows 'unix))
@ -317,7 +317,7 @@
(define slatex::*tex-calling-directory* "") (define slatex::*tex-calling-directory* "")
(define slatex::*max-line-length* 200) (define slatex::*max-line-length* 300)
(slatex::defenum (slatex::defenum
&void-space &void-space

View File

@ -3,7 +3,7 @@
% style file to be used in (La)TeX when using SLaTeX % style file to be used in (La)TeX when using SLaTeX
% (c) Dorai Sitaram, Rice U., 1991, 1999 % (c) Dorai Sitaram, Rice U., 1991, 1999
\def\slatexversion{2.4z2} \def\slatexversion{20050609} % last modified
% This file (or a soft link to it) should be in some % This file (or a soft link to it) should be in some
% directory in your TEXINPUTS path (i.e., the one % directory in your TEXINPUTS path (i.e., the one
@ -551,7 +551,12 @@
\catcode`\@12 \catcode`\@12
\global\let\atsign@% \global\let\atsign@%
\endgroup \endgroup
\chardef\dq=`\" %\chardef\dq=`\"
\ifusinglatex
\def\dq{\ttfamily\char`\"}%
\else
\def\dq{\tt\char`\"}%
\fi
% leading character of slatex filenames: . for unix to % leading character of slatex filenames: . for unix to
% keep them out of the way % keep them out of the way