Fix 1130.

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index bb34b1f3a625bca4cbb2c4bcfbba157dc1981cd4..06b324b799c7abd07f10c1518ead850bd897724e 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -162,12 +162,11 @@
                             (+ (car offset) (cdr x-ext))
                             (+ (cdr offset) (cdr y-ext))
 
-                            ;; TODO
-                            ;;full escaping.
+                            ;; Backslashes are not valid
+                            ;; file URI path separators.
+                            (ly:string-percent-encode
+                              (ly:string-substitute "\\" "/" file))
 
-                            ;; backslash is interpreted by GS.
-                            (ly:string-substitute "\\" "/" 
-                                                  (ly:string-substitute " " "%20" file))
                             (cadr location)
                             (caddr location)
                             (cadddr location))
@@ -240,29 +239,6 @@
 (define (resetrotation ang x y)
   "grestore  ")
 
-
-(define (text font s)
-  ;; (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)
-                                   ;; how much precision do we need here?
-                                   " 0.0 rmoveto "))
-        (out-vec (decode-byte-string s)))
-
-    (string-append
-     (ps-font-command font) " "
-     (string-join
-      (vector->list
-       (vector-for-each
-       
-       (lambda (sym)
-         (if (eq? sym 'space)
-             space-move
-             (string-append "/" (symbol->string sym) " glyphshow")))
-       out-vec))))))
-
 (define (unknown) 
   "\n unknown\n")