X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-tex.scm;h=5a602e4e489ec4f2d914b5ba5282f4f01d1e7f90;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8b10bac42c8ab0cc8803660ce1cd3be6c1d11cdc;hpb=157d98c1870868bf59c1691577444e3c3d533bc4;p=lilypond.git

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 8b10bac42c..5a602e4e48 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;; source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-tex)
   #:export (output-framework-tex	
@@ -296,7 +296,7 @@
 	 (output-scale (ly:output-def-lookup defs 'output-scale)))
     (postscript->pdf (* paper-width output-scale (/ (ly:bp 1)))
 		     (* paper-height output-scale (/ (ly:bp 1)))
-		     (string-append (basename name ".tex") ".ps"))))
+		     (string-append (dir-basename name ".tex") ".ps"))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
@@ -312,14 +312,14 @@
      (* paper-width output-scale (/ (ly:bp 1)))
      (* paper-height output-scale (/ (ly:bp 1)))
 
-     (string-append (basename name ".tex") ".ps"))))
+     (string-append (dir-basename name ".tex") ".ps"))))
 
 (define-public (convert-to-ps book name)
   (let* ((paper (ly:paper-book-paper book))
 	 (preview? (string-contains name ".preview"))
 	 (papersizename (ly:output-def-lookup paper 'papersizename))
 	 (landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))
-	 (base (basename name ".tex"))
+	 (base (dir-basename name ".tex"))
 	 (ps-name (format "~a.ps"  base ".ps"))
 	 (cmd (string-append "dvips"
 			     (if preview?
@@ -352,7 +352,7 @@
 	    #f " *%.*\n?"
 	    (ly:kpathsea-expand-variable "extra_mem_top")
 	    'pre "" 'post)))
-	 (base (basename name ".tex"))
+	 (base (dir-basename name ".tex"))
 	 (cmd (format
 	       #f "latex \\\\nonstopmode \\\\input '~a'" name)))