(grob-cause): Bugfix.

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 51d6d968aad3aa1a911f904d3ca2025a3f504cec..6d7767687bb0f9de191cfcc17272154ef8ea5aca 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,9 +107,13 @@
     (list arch_angle arch_width arch_height height arch_thick thick))
    " draw_bracket"))
 
-(define (circle radius thick)
+(define (circle radius thick fill)
   (format
-   "~a ~a draw_circle" radius thick))
+   "~a ~a ~a draw_circle" radius thick
+   (if fill
+       "true "
+       "false ")
+   ))
 
 (define (char font i)
   (string-append 
@@ -188,8 +190,8 @@
 
            (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))
   ))
@@ -200,13 +202,15 @@
                           (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))
+        (file (if location
+                  (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))
@@ -274,7 +278,8 @@
   " 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)
@@ -305,7 +310,7 @@
          url))
 
 (define (utf8-string pango-font-description string)
-  (ly:warn "utf8-string encountered in PS backend"))
+  (ly:warning (_ "utf8-string encountered in PS backend")))
 
 (define (white-dot x y radius)
   (string-append