* scripts/lilypond-invoke-editor.scm (dissect-uri): Handle URIs

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 500f65abb063d63243079164fe919e99797fde3e..cc021b84234809fdaaae12fb4e0666b5a0bd9e94 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -62,7 +62,6 @@
 ;;(write (ly:all-output-backend-commands))
 ;;(write (ly:all-stencil-expressions))
 
-
 ;;; helper functions, not part of output interface
 (define (escape-parentheses s)
   (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
@@ -107,18 +106,17 @@
     (list arch_angle arch_width arch_height height arch_thick thick))
    " draw_bracket"))
 
+(define (char font i)
+  (string-append 
+   (ps-font-command font) " setfont " 
+   "(\\" (ly:inexact->string i 8) ") show"))
+
 (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"))
+       "false ")))
 
 (define (dashed-line thick on off dx dy)
   (string-append 
@@ -191,41 +189,37 @@
            (if (and (= 0.0 x)
                     (= 0.0 y))
                (format #f " /~a glyphshow\n" g)
-               (format #f " ~a ~a rmoveto /~a glyphshow\n"
-                       x y g))))
-       x-y-named-glyphs))
-  ))
+               (format #f " ~a ~a rmoveto ~a~a glyphshow\n"
+                       x y
+                       (if  (string? g) "/" "")
+                       g))))
+       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
-                  (if (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 (is-absolute? raw-file)
+                        raw-file
+                        (string-append (ly-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)
@@ -251,11 +245,12 @@
   (string-append 
    (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
 
-(define (polygon points blotdiameter)
+(define (polygon points blotdiameter filled?)
   (string-append
    (ly:numbers->string points) " "
    (ly:number->string (/ (length points) 2)) " "
    (ly:number->string blotdiameter)
+   (if filled? " true " " false ")
    " draw_polygon"))
 
 (define (repeat-slash wid slope thick)