X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=a77a3fe3c4ac3c4cfa5b67db91da3aa3398eb866;hb=725dc927cdbe2ab9c13636a4d5df881265ac1b87;hp=7694e0a3862acd566e9b03aa02106651cf0ab047;hpb=2a4d7df6e50f62cb03dc133fc9fb92b6806fa7c7;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 7694e0a386..a77a3fe3c4 100644
--- 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
@@ -63,15 +62,10 @@
 ;;(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))
 
-(define (offset-add a b)
-  (cons (+ (car a) (car b))
-	(+ (cdr a) (cdr b))))
-
 (define (ps-encoding text)
   (escape-parentheses text))
 
@@ -117,15 +111,12 @@
    (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 (circle radius thick fill)
+  (format
+   "~a ~a ~a draw_circle" radius thick
+   (if fill
+       "true "
+       "false ")))
 
 (define (dashed-line thick on off dx dy)
   (string-append 
@@ -181,54 +172,62 @@
   (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
+	 size cid?
 	 x-y-named-glyphs)
+
   (format #f "gsave 1 output-scale div 1 output-scale div scale
-  /~a findfont ~a scalefont setfont\n~a grestore" postscript-font-name size
-  (apply
-   string-append
-   (map (lambda  (item)
-	  (let
-	      ((x (car item))
-		(y (cadr item))
-		(g (caddr item)))
-
-	    (if (and (= 0.0 x)
-		     (= 0.0 y))
-		(format #f " /~a glyphshow " g)
-		(format #f " ~a ~a rmoveto /~a glyphshow "
-			x y g))))
-	x-y-named-glyphs))
-  ))
+  /~a ~a ~a scalefont setfont\n~a grestore"
+	  postscript-font-name
+	  (if cid?
+	      " /CIDFont findresource "
+	      " findfont") 
+	  
+	  size
+	  (apply
+	   string-append
+	   (map (lambda  (item)
+		  (let*
+		      ((x (car item))
+		       (y (cadr item))
+		       (g (caddr item))
+		       (prefix (if  (string? g) "/" "")))
+
+		    (if (and (= 0.0 x)
+			     (= 0.0 y))
+			(format #f " ~a~a glyphshow\n" prefix g)
+			(format #f " ~a ~a rmoveto ~a~a glyphshow\n"
+				x y
+				prefix
+				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
-		       ))
-	 (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"
-		(+ (car offset) (car x-ext))
-		(+ (cdr offset) (car y-ext))
-		(+ (car offset) (cdr x-ext))
-		(+ (cdr offset) (cdr y-ext))
-		(car location)
-		(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)
@@ -254,11 +253,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)
@@ -266,19 +266,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 +302,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") " "