From cc565e6c4fe4dc99771584b80fb7b8a7965f6154 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 25 Apr 2005 16:47:47 +0000 Subject: [PATCH] (grob-cause): bugfix. --- ChangeLog | 4 ++++ scm/lily.scm | 3 ++- scm/output-ps.scm | 11 +++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa5b192d96..88fb1bfe3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-04-25 Han-Wen Nienhuys + + * scm/output-ps.scm (grob-cause): bugfix. + 2005-04-25 Jan Nieuwenhuizen * cygwin/*: Update. diff --git a/scm/lily.scm b/scm/lily.scm index 30e9951d3f..3d912310ff 100644 --- 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 6d7767687b..a02a20ce09 100644 --- 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)) -- 2.39.5