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

[lilypond.git] / scm / output-ps.scm

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 1d969d056d54ed2332d23078d843bf17b049a109..b31ac807a49d98437f2fa0b5ce0fb06a5c1c8cac 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -13,8 +13,6 @@
 ;;;;   * text setting, kerning.
 ;;;;   * document output-interface
 
-(debug-enable 'backtrace)
-
 (define-module (scm output-ps)
   #:re-export (quote)
 
@@ -109,21 +107,19 @@
     (list arch_angle arch_width arch_height height arch_thick thick))
    " draw_bracket"))
 
+(define (circle radius thick fill)
+  (format
+   "~a ~a ~a draw_circle" radius thick
+   (if fill
+       "true "
+       "false ")
+   ))
+
 (define (char font i)
   (string-append 
    (ps-font-command font) " setfont " 
    "(\\" (ly:inexact->string i 8) ") show"))
 
-;; save current color on stack and set new color
-(define (setcolor r g b)
-  (string-append "currentrgbcolor "
-  (ly:numbers->string (list r g b))
-  " setrgbcolor\n"))
-
-;; restore color from stack
-(define (resetcolor)
-  (string-append "setrgbcolor\n"))
-
 (define (dashed-line thick on off dx dy)
   (string-append 
    (ly:number->string dx) " "
@@ -146,11 +142,6 @@
    (ly:number->string off)
    " ] 0 draw_dashed_slur"))
 
-(define (circle radius thick)
-  (format
-   "~a ~a draw_circle" radius thick))
-
-
 (define (dot x y radius)
   (string-append
    " "
@@ -183,10 +174,6 @@
   (string-append (ly:numbers->string (list breapth width depth height))
                 " draw_box"))
 
-
-(define (utf8-string pango-font-description string)
-  (ly:warn "utf8-string encountered in PS backend"))
-
 (define (glyph-string
         postscript-font-name
         size
@@ -203,39 +190,37 @@
 
            (if (and (= 0.0 x)
                     (= 0.0 y))
-               (format #f " /~a glyphshow " g)
-               (format #f " ~a ~a rmoveto /~a glyphshow "
+               (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 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)
@@ -273,13 +258,24 @@
    (ly:numbers->string (list wid slope thick))
    " draw_repeat_slash"))
 
+;; restore color from stack
+(define (resetcolor)
+  (string-append "setrgbcolor\n"))
+
 (define (round-filled-box x y width height blotdiam)
   (string-append
    (ly:numbers->string
     (list x y width height blotdiam)) " draw_round_box"))
 
+;; save current color on stack and set new color
+(define (setcolor r g b)
+  (string-append "currentrgbcolor "
+  (ly:numbers->string (list r g b))
+  " setrgbcolor\n"))
+
 (define (text font s)
-;  (ly:warn "TEXT backend-command encountered in Pango backend\nargs: ~a ~a" font str)
+  ;; (ly:warning (_ "TEXT backend-command encountered in Pango backend"))
+  ;; (ly:warning (_ "Arguments: ~a ~a"" font str))
   
   (let* ((space-length (cdar (ly:text-dimension font " ")))
         (space-move (string-append (number->string space-length)
@@ -309,6 +305,9 @@
          (cdr y)
          url))
 
+(define (utf8-string pango-font-description string)
+  (ly:warning (_ "utf8-string encountered in PS backend")))
+
 (define (white-dot x y radius)
   (string-append
    " "