(grob-cause): bugfix.

diff --git a/ChangeLog b/ChangeLog
index aa5b192d96aec361f2d97591cfbddf8b52b38d08..88fb1bfe3b0e34128f1191f6cf781cc606369c9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/output-ps.scm (grob-cause): bugfix.
+
 2005-04-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/*: Update.

diff --git a/scm/lily.scm b/scm/lily.scm
index 30e9951d3f220a19375d743463a7db46b9412d69..3d912310ff1d31622f6ab9f850454030181bd139 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -226,7 +226,8 @@ The syntax is the same as `define*-public'."
            
            "paper.scm"
            "backend-library.scm"
-           ;; "x11-color.scm"
+           "x11-color.scm"
+
            ;; must be after everything has been defined
            "safe-lily.scm"))
 

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 6d7767687bb0f9de191cfcc17272154ef8ea5aca..a02a20ce093c24879cbe84ce5f9fe99739b91a93 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -202,10 +202,13 @@
                           (ly:music-property cause 'origin)))
         (location (if (ly:input-location? music-origin)
                       (ly:input-file-line-column music-origin)
-                      #f))
-        (file (if location
-                  (if (and (> 0 (string-length (car location)))
-                           (eq? (string-ref (car location) 0) #\/))
+                      #f
+                      ))
+        (file (if (string? location)
+                  (if (and
+                       (> (string-length location) 0)
+                       (eq? (string-ref (car location) 0 ) #\/))
+
                       location
                       (string-append (getcwd) "/" (car location)))
                   #f))