CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/25 19:35:00
Modified files:
scm : output-ps.scm
cygwin : mknetrel
. : ChangeLog
Log message:
(grob-cause): Yet another fix, hope it's
alright this time round.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-ps.scm.diff?tr1=1.133&tr2=1.134&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/mknetrel.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3504&tr2=1.3505&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3504 lilypond/ChangeLog:1.3505
--- lilypond/ChangeLog:1.3504 Mon Apr 25 18:19:54 2005
+++ lilypond/ChangeLog Mon Apr 25 19:35:00 2005
@@ -1,3 +1,8 @@
+2005-04-25 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * scm/output-ps.scm (grob-cause): Yet another fix, hope it's
+ alright this time round.
+
2005-04-25 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* Documentation/topdocs/INSTALL.texi (Top): idem.
Index: lilypond/cygwin/mknetrel
diff -u lilypond/cygwin/mknetrel:1.40 lilypond/cygwin/mknetrel:1.41
--- lilypond/cygwin/mknetrel:1.40 Mon Apr 25 11:15:30 2005
+++ lilypond/cygwin/mknetrel Mon Apr 25 19:35:00 2005
@@ -109,6 +109,7 @@
--define-variable prefix=$cygwin_root \
--define-variable includedir=$cygwin_root/usr/include"
fi
+ export CFLAGS="-DKPSE_DLL"
}
postconfig () {
Index: lilypond/scm/output-ps.scm
diff -u lilypond/scm/output-ps.scm:1.133 lilypond/scm/output-ps.scm:1.134
--- lilypond/scm/output-ps.scm:1.133 Mon Apr 25 16:47:47 2005
+++ lilypond/scm/output-ps.scm Mon Apr 25 19:34:59 2005
@@ -193,41 +193,34 @@
(format #f " /~a glyphshow\n" g)
(format #f " ~a ~a rmoveto /~a glyphshow\n"
x y g))))
- x-y-named-glyphs))
- ))
+ x-y-named-glyphs))))
(define (grob-cause offset grob)
(let* ((cause (ly:grob-property grob 'cause))
(music-origin (if (ly:music? cause)
- (ly:music-property cause 'origin)))
- (location (if (ly:input-location? music-origin)
- (ly:input-file-line-column music-origin)
- #f
- ))
- (file (if (string? location)
- (if (and
- (> (string-length location) 0)
- (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)))
-
- (if (and location
- (< 0 (interval-length x-ext))
- (< 0 (interval-length y-ext)))
-
- (format "~a ~a ~a ~a (textedit://~a:~a:~a) mark_URI\n"
- (+ (car offset) (car x-ext))
- (+ (cdr offset) (car y-ext))
- (+ (car offset) (cdr x-ext))
- (+ (cdr offset) (cdr y-ext))
- file
- (cadr location)
- (caddr location))
- "")))
+ (ly:music-property cause 'origin))))
+ (if (not (ly:input-location? music-origin))
+ ""
+ (let* ((location (ly:input-file-line-column music-origin))
+ (raw-file (car location))
+ (file (if (and (> (string-length raw-file) 0)
+ (eq? (string-ref raw-file 0) #\/))
+ raw-file
+ (string-append (getcwd) "/" raw-file)))
+ (x-ext (ly:grob-extent grob grob X))
+ (y-ext (ly:grob-extent grob grob Y)))
+
+ (if (and (< 0 (interval-length x-ext))
+ (< 0 (interval-length y-ext)))
+ (format "~a ~a ~a ~a (textedit://~a:~a:~a) mark_URI\n"
+ (+ (car offset) (car x-ext))
+ (+ (cdr offset) (car y-ext))
+ (+ (car offset) (cdr x-ext))
+ (+ (cdr offset) (cdr y-ext))
+ file
+ (cadr location)
+ (caddr location))
+ "")))))
;; WTF is this in every backend?
(define (horizontal-line x1 x2 th)
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
