From: Jan Nieuwenhuizen Date: Mon, 25 Apr 2005 11:23:43 +0000 (+0000) Subject: (grob-cause): Bugfix. X-Git-Tag: release/2.5.21~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7de4eefd86a8413d032e64ebd6304bfb9aa2645d;hp=30975cdcf179eed25a19e8b97cfaa9c8b17d61df;p=lilypond.git (grob-cause): Bugfix. --- diff --git a/ChangeLog b/ChangeLog index 220b2971fc..a587b30b79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-04-25 Jan Nieuwenhuizen + * scm/output-ps.scm (grob-cause): Bugfix. + * scm/lily.scm (ly:load): Remove x11-color. * stepmake/aclocal.m4 (STEPMAKE_GET_EXECUTABLE): Bugfix: do not diff --git a/scm/output-ps.scm b/scm/output-ps.scm index 500f65abb0..6d7767687b 100644 --- a/scm/output-ps.scm +++ b/scm/output-ps.scm @@ -202,16 +202,15 @@ (ly:music-property cause 'origin))) (location (if (ly:input-location? music-origin) (ly:input-file-line-column music-origin) - #f - )) + #f)) (file (if location - (if (eq? (string-ref (car location) 0 ) #\/) + (if (and (> 0 (string-length (car location))) + (eq? (string-ref (car location) 0) #\/)) location (string-append (getcwd) "/" (car location))) #f)) (x-ext (ly:grob-extent grob grob X)) - (y-ext (ly:grob-extent grob grob Y)) - ) + (y-ext (ly:grob-extent grob grob Y))) (if (and location (< 0 (interval-length x-ext))