* ly/performer-init.ly: add CueVoice to MIDI too.

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 7694e0a3862acd566e9b03aa02106651cf0ab047..ceaf44306b2f31461e09af3496eb79dd55866177 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--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;; Note: currently misused as testbed for titles with markup, see
@@ -13,14 +13,13 @@
 ;;;;   * text setting, kerning.
 ;;;;   * document output-interface
 
-(debug-enable 'backtrace)
-
 (define-module (scm output-ps)
   #:re-export (quote)
 
   ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
   #:export (unknown
            blank
+           circle
            dot
            white-dot
            beam
@@ -68,10 +67,6 @@
 (define (escape-parentheses s)
   (regexp-substitute/global #f "(^|[^\\])([\\(\\)])" s 'pre 1 "\\" 2 'post))
 
-(define (offset-add a b)
-  (cons (+ (car a) (car b))
-       (+ (cdr a) (cdr b))))
-
 (define (ps-encoding text)
   (escape-parentheses text))
 
@@ -112,21 +107,15 @@
     (list arch_angle arch_width arch_height height arch_thick thick))
    " draw_bracket"))
 
+(define (circle radius thick)
+  (format
+   "~a ~a draw_circle" radius thick))
+
 (define (char font i)
   (string-append 
    (ps-font-command font) " setfont " 
    "(\\" (ly:inexact->string i 8) ") show"))
 
-;; save current color on stack and set new color
-(define (setcolor r g b)
-  (string-append "currentrgbcolor "
-  (ly:numbers->string (list r g b))
-  " setrgbcolor\n"))
-
-;; restore color from stack
-(define (resetcolor)
-  (string-append "setrgbcolor\n"))
-
 (define (dashed-line thick on off dx dy)
   (string-append 
    (ly:number->string dx) " "
@@ -181,10 +170,6 @@
   (string-append (ly:numbers->string (list breapth width depth height))
                 " draw_box"))
 
-
-(define (utf8-string pango-font-description string)
-  (ly:warn "utf8-string encountered in PS backend"))
-
 (define (glyph-string
         postscript-font-name
         size
@@ -201,8 +186,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))
   ))
@@ -215,17 +200,22 @@
                       (ly:input-file-line-column music-origin)
                       #f
                       ))
+        (file (if location (string-append (getcwd) "/" (car location))
+                  #f))
         (x-ext (ly:grob-extent grob grob X)) 
         (y-ext (ly:grob-extent grob grob Y)) 
         )
 
-    (if location
-       (format "~a ~a ~a ~a (lily-edit.sh ~a ~a ~a) mark_file_line\n"
+    (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))
-               (car location)
+               file
                (cadr location)
                (caddr location))
        "")))
@@ -266,19 +256,29 @@
    (ly:numbers->string (list wid slope thick))
    " draw_repeat_slash"))
 
+;; restore color from stack
+(define (resetcolor)
+  (string-append "setrgbcolor\n"))
+
 (define (round-filled-box x y width height blotdiam)
   (string-append
    (ly:numbers->string
     (list x y width height blotdiam)) " draw_round_box"))
 
+;; save current color on stack and set new color
+(define (setcolor r g b)
+  (string-append "currentrgbcolor "
+  (ly:numbers->string (list r g b))
+  " 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)
                                    " 0.0 rmoveto "))
-        (input-enc "latin1")
-        (out-vec (decode-byte-string input-enc s)))
+        (out-vec (decode-byte-string s)))
 
     (string-append
      (ps-font-command font) " setfont "
@@ -292,28 +292,34 @@
              (string-append "/" (symbol->string sym) " glyphshow")))
        out-vec))))))
 
-;; FIXME: BARF helvetica?
-(define (white-text scale s)
-  (let ((mystring (string-append
-                  "(" s  ") " (number->string scale)
-                  " /Helvetica-Bold "
-                  " draw_white_text")))
-    mystring
-
-
-    ;; FIXME: broken with user install of GS 8.x
-    ""
-    ))
-
 (define (unknown) 
   "\n unknown\n")
 
+(define (url-link url x y)
+  (format "~a ~a ~a ~a (~a) mark_URI"
+         (car x)
+         (car y)
+         (cdr x)
+         (cdr y)
+         url))
+
+(define (utf8-string pango-font-description string)
+  (ly:warning (_ "utf8-string encountered in PS backend")))
+
 (define (white-dot x y radius)
   (string-append
    " "
    (ly:numbers->string
     (list x y radius)) " draw_white_dot"))
 
+(define (white-text scale s)
+  (let ((mystring (string-append
+                  "(" s  ") " (number->string scale)
+                  " /Helvetica-Bold "
+                  " draw_white_text")))
+    mystring
+    ))
+
 (define (zigzag-line centre? zzw zzh thick dx dy)
   (string-append
    (if centre? "true" "false") " "