CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/25 16:47:47
Modified files:
. : ChangeLog
scm : lily.scm output-ps.scm
Log message:
(grob-cause): bugfix.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3501&tr2=1.3502&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.327&tr2=1.328&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.132&tr2=1.133&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3501 lilypond/ChangeLog:1.3502
--- lilypond/ChangeLog:1.3501 Mon Apr 25 16:02:36 2005
+++ lilypond/ChangeLog Mon Apr 25 16:47:46 2005
@@ -1,3 +1,7 @@
+2005-04-25 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scm/output-ps.scm (grob-cause): bugfix.
+
2005-04-25 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
* cygwin/*: Update.
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.327 lilypond/scm/lily.scm:1.328
--- lilypond/scm/lily.scm:1.327 Mon Apr 25 11:15:30 2005
+++ lilypond/scm/lily.scm Mon Apr 25 16:47:47 2005
@@ -226,7 +226,8 @@
"paper.scm"
"backend-library.scm"
- ;; "x11-color.scm"
+ "x11-color.scm"
+
;; must be after everything has been defined
"safe-lily.scm"))
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.132 lilypond/scm/output-ps.scm:1.133
--- lilypond/scm/output-ps.scm:1.132 Mon Apr 25 11:23:43 2005
+++ lilypond/scm/output-ps.scm Mon Apr 25 16:47:47 2005
@@ -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))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
