(grob-cause): Yet another fix, hope it's

alright this time round.

diff --git a/ChangeLog b/ChangeLog
index c4ac334add92d4c054839fcc1f394cb30049f4fb..f80f0d37633d9d3e5dd35db813fb59111e5e74d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-25  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/output-ps.scm (grob-cause): Yet another fix, hope it's
+       alright this time round.
+
 2005-04-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * Documentation/topdocs/INSTALL.texi (Top): idem.

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 919d1f446a3b99c44f7db0c5556e867af48a344a..5de8c1344337fabe45ebc3268b7f1c8c044eb6b2 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -109,6 +109,7 @@ EOF
 --define-variable prefix=$cygwin_root \
 --define-variable includedir=$cygwin_root/usr/include"
     fi
+    export CFLAGS="-DKPSE_DLL"
 }
 
 postconfig () {

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index a02a20ce093c24879cbe84ce5f9fe99739b91a93..b31ac807a49d98437f2fa0b5ce0fb06a5c1c8cac 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -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)