* 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 aa6581adf47d78a3cd1fe2c8feb5b1f23d1be3c5..cc021b84234809fdaaae12fb4e0666b5a0bd9e94 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -106,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 
@@ -204,10 +203,9 @@
        ""
        (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) #\/))
+              (file (if (is-absolute? raw-file)
                         raw-file
-                        (string-append (getcwd) "/" raw-file)))
+                        (string-append (ly-getcwd) "/" raw-file)))
               (x-ext (ly:grob-extent grob grob X))
               (y-ext (ly:grob-extent grob grob Y)))