(grob-cause): replace backslashes by /

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 67431321ff75d6958303da3e6f0c464560144ebb..91c4dc55d67c396603649464843bde2c8cf1c203 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
@@ -132,7 +132,6 @@
 (define (embedded-ps string)
   string)
 
-
 (define (glyph-string
         postscript-font-name
         size cid?
@@ -155,7 +154,7 @@
                       (g (cadddr item))
                       (prefix (if  (string? g) "/" "")))
 
-                   (format #f " gsave ~a~a glyphshow grestore ~a ~a rmoveto \n" prefix g (+ w x) y)
+                   (format #f " gsave ~a~a glyphshow grestore ~$ ~$ rmoveto \n" prefix g (+ w x) y)
                    ))
                w-x-y-named-glyphs))))
 
@@ -175,15 +174,18 @@
 
          (if (and (< 0 (interval-length x-ext))
                   (< 0 (interval-length y-ext)))
-             (format "~a ~a ~a ~a (textedit://~a:~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))
+             (format "~$ ~$ ~$ ~$ (textedit://~a:~a:~a:~a) mark_URI\n"
+                     (ly:number->string (+ (car offset) (car x-ext)))
+                     (ly:number->string (+ (cdr offset) (car y-ext)))
+                     (ly:number->string (+ (car offset) (cdr x-ext)))
+                     (ly:number->string (+ (cdr offset) (cdr y-ext)))
 
                      ;; TODO
-                     ;; full escaping.
-                     (string-regexp-substitute " " "%20" file)
+                     ;;full escaping.
+
+                     ;; backslash is interpreted by GS.
+                     (string-regexp-substitute "\\\\" "/" 
+                                     (string-regexp-substitute " " "%20" file))
                      (cadr location)
                      (caddr location)
                      (cadddr location))
@@ -206,14 +208,21 @@
   "")
 
 (define (placebox x y s) 
-  (string-append 
-   (ly:number->string x) " " (ly:number->string y) " { " s " } place-box\n"))
+  (format
+   "gsave ~a ~a translate
+0 0 moveto
+~a
+grestore\n"
+
+   (ly:number->string x)
+   (ly:number->string y)
+   s))
 
-(define (polygon points blotdiameter filled?)
+(define (polygon points blot-diameter filled?)
   (string-append
    (ly:numbers->string points) " "
    (ly:number->string (/ (length points) 2)) " "
-   (ly:number->string blotdiameter)
+   (ly:number->string blot-diameter)
    (if filled? " true " " false ")
    " draw_polygon"))