From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 6 Nov 2004 17:13:48 +0000 (+0000)
Subject: * scm/lily.scm (postscript->pdf): Remove .pdf file if it
X-Git-Tag: release/2.4.2~3^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=425383ee84513318a85945f644e9fa2af41cd77d;p=lilypond.git

* scm/lily.scm (postscript->pdf): Remove .pdf file if it
exists before converting.

* scm/framework-tex.scm (convert-to-dvi): Remove .dvi file if it
exists before converting.
(convert-to-ps): Remove .ps file if it exists before converting.

* lily/lexer.ll: Remove extra progress newline, use present tense.

* scm/paper.scm (paper-alist): public.
* scm/framework-tex.scm (convert-to-ps):
* scm/lily.scm (postscript->pdf): Do not leak papersizename into
command line.  (backportme)
---

diff --git a/ChangeLog b/ChangeLog
index 57f7a0bc05..656afff154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-11-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* scm/lily.scm (postscript->pdf): Remove .pdf file if it
+	exists before converting.
+
+	* scm/framework-tex.scm (convert-to-dvi): Remove .dvi file if it
+	exists before converting.
+	(convert-to-ps): Remove .ps file if it exists before converting.
+
+	* lily/lexer.ll: Remove extra progress newline, use present tense.
+
 	* scm/paper.scm (paper-alist): public.
 	* scm/framework-tex.scm (convert-to-ps):
 	* scm/lily.scm (postscript->pdf): Do not leak papersizename into
diff --git a/lily/lexer.ll b/lily/lexer.ll
index dc55cdb1bb..9c734e87dd 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -188,17 +188,16 @@ HYPHEN		--
 		return INVALID;
 }
 <renameinput>\"[^"]*\"     {
-	String s (YYText ()+1);
+	String s (YYText () + 1);
 	s = s.left_string (s.index_last ('\"'));
 
 	yy_pop_state();
 	this->here_input().source_file_->name_ = s;
-	progress_indication ("\n");
-	progress_indication (_f ("input renamed to: `%s'", s.to_str0 ()));
+	progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ()));
 	progress_indication ("\n");
 	scm_module_define (scm_car (scopes_),
 		     ly_symbol2scm ("input-file-name"),
-		     scm_makfrom0str (s.to_str0()));
+		     scm_makfrom0str (s.to_str0 ()));
 
 }
 <encoding>. 	{
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 45c784096d..07bf07b8b2 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -293,7 +293,10 @@
 				 " ")
 			     "  -u+ec-mftrace.map -u+lilypond.map -Ppdf "
 			     base)))
-
+    
+    (let ((ps-name (string-append base ".ps")))
+      (if (access? ps-name W_OK)
+	  (delete-file ps-name)))
     (if (not (ly:get-option 'verbose))
 	(begin
 	  (format (current-error-port) (_ "Converting to `~a.ps'...") base)
@@ -309,9 +312,11 @@
 	    'pre "" 'post)))
 	 (base (basename name ".tex"))
 	 (cmd (string-append
-	       "latex \\\\nonstopmode \\\\input " name
-	       )))
+	       "latex \\\\nonstopmode \\\\input " name)))
     (setenv "extra_mem_top" (number->string (max curr-extra-mem 1024000)))
+    (let ((dvi-name (string-append base ".dvi")))
+      (if (access? dvi-name W_OK)
+	  (delete-file dvi-name)))
     (if (not (ly:get-option 'verbose))
 	(begin
 	  (format (current-error-port) (_ "Converting to `~a.dvi'...") base)
diff --git a/scm/lily.scm b/scm/lily.scm
index f870cb6254..1031f31bb4 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -576,8 +576,10 @@ possibly turned off."
     
     (set! status (system silenced))
     (if (> status 0)
-	(format (current-error-port) (_ "Error invoking `~a'. Return value ~a")
-		silenced status))))
+	(begin
+	  (format (current-error-port)
+		  (_ "Error invoking `~a'. Return value ~a") silenced status)
+	  (newline (current-error-port))))))
 
 ;;
 ;; ugh  -   double check this. We are leaking
@@ -589,7 +591,9 @@ possibly turned off."
 			    (string-append "-sPAPERSIZE=" papersizename " ")
 			    ""))
 	 (cmd (string-append "ps2pdf " set-papersize name))
-	 (pdf-name (string-append (basename name ".ps") ".pdf" )))
+	 (pdf-name (string-append (basename name ".ps") ".pdf")))
+    (if (access? pdf-name W_OK)
+	(delete-file pdf-name))
     (format (current-error-port) (_ "Converting to `~a'...") pdf-name)
     (ly:system cmd)))