* make/lilypond-vars.make: add scripts/out/ to PATH, to find ps2png.

* scm/lily.scm (ly:system): new function. Catches uninstalled
ps2png.

diff --git a/ChangeLog b/ChangeLog
index d49aebd3ecda1a404c53ab7a7e035eb77d2c3140..ba8de2235e429a48100869783c5fc3875124d3be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * make/lilypond-vars.make: add scripts/out/ to PATH, to find ps2png. 
+
+       * scm/lily.scm (ly:system): new function. Catches uninstalled
+       ps2png.
+
 2004-10-29  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * Documentation/user/notation.itely: remove

diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly
deleted file mode 100644 (file)
index cfa8383..0000000
--- a/input/regression/beam-postfix-notation.ly
+++ /dev/null
@@ -1,18 +0,0 @@
-
-\version "2.3.22"
-\header {
-
-texidoc = "Beams and ties may be entered in postfix notation, separating the
-    notes and the brackets with a dash."
-
-}
-    \layout { raggedright= ##t }
-
-
-\score
-{
- \relative c''
-   {
-       c8[~ c]
-   }
-}

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index b5ae24f1daac6ef016ca76005d127e68ec793edd..28a312bbd22b0996b80ade6b28cbce6f256fa988 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -2,7 +2,7 @@
 ## settings to run LilyPond
 
 
-export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(PATH)
+export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(builddir)/scripts/$(outconfbase):$(PATH):
 
 # LilyPond is often run from within $(outdir), making a relative
 # PREFIX incorrect.

diff --git a/scm/lily.scm b/scm/lily.scm
index 174ae3b0b8763cfd0ccd486931e84daa3a9bf6fd..01de0a300a5a149a9bb259fb5aef6dd7a3299f18 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -562,6 +562,21 @@ possibly turned off."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
 
+(define-public (ly:system command)
+  (let*
+      ((status 0))
+    
+    (if (ly:get-option 'verbose)
+       (display (format (_ "Invoking `~a'...\n") command) (current-error-port)))
+    
+    (set! status (system command))
+
+
+    (if (> status 0)
+       (display (format (_ "Error invoking `~a'. Return value ~a")
+                        command status)))
+    ))
+
 (define-public (postscript->pdf papersizename name)
   (let* ((cmd (string-append "ps2pdf -sPAPERSIZE=" papersizename " " name))
         (output-name
@@ -570,12 +585,8 @@ possibly turned off."
     (newline (current-error-port))
     (display (format (_ "Converting to `~a'...") output-name)
             (current-error-port))
-    (newline (current-error-port))
-    
-    (if (ly:get-option 'verbose)
-       (display (format (_"Invoking `~a'...") cmd) (current-error-port)))
 
-  (system cmd)))
+    (ly:system cmd)))
 
 (define-public (postscript->png resolution name)
   (let
@@ -588,11 +599,7 @@ possibly turned off."
               "--verbose "
               " ")
           name)))
-    (if (ly:get-option 'verbose)
-       (begin
-         (display (format (_ "Invoking `~a'...") cmd) (current-error-port))
-         (newline (current-error-port))))
-    (system cmd)))
+    (ly:system cmd)))
 
 (define-public (lilypond-main files)
   "Entry point for LilyPond."