X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=f20c42f1e1012cea4bd2d7b6142f93d5b3aecbf8;hb=a4668131900363364bb2454700c40183cedf4c9b;hp=b82c185e02caa7638dc0acd9a6628e4dc179cd65;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index b82c185e02..f20c42f1e1 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -1,48 +1,35 @@
-;;;; output-ps.scm -- implement Scheme output interface for PostScript
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;;; Note: currently misused as testbed for titles with markup, see
 ;;;;       input/test/title-markup.ly
-;;;; 
+;;;;
 ;;;; TODO:
 ;;;;   * %% Papersize in (header ...)
 ;;;;   * text setting, kerning.
 ;;;;   * document output-interface
 
 (define-module (scm output-ps)
-  #:re-export (quote)
-
-  ;; JUNK this -- see lily.scm: ly:all-output-backend-commands
-  #:export (unknown
-	    bezier-sandwich
-	    char
-	    circle
-	    comment
-	    dashed-line
-	    dashed-slur
-	    dot
-	    draw-line
-	    embedded-ps
-	    named-glyph
-	    no-origin
-	    placebox
-	    polygon
-	    repeat-slash
-	    resetcolor
-	    resetrotation
-	    round-filled-box
-	    setcolor
-	    setrotation
-	    text
-	    ))
-
+  #:re-export (quote))
 
 (use-modules (guile)
 	     (ice-9 regex)
+	     (ice-9 optargs)
 	     (srfi srfi-1)
 	     (srfi srfi-13)
 	     (scm framework-ps)
@@ -58,17 +45,14 @@
 (define (str4 num)
   (if (or (nan? num) (inf? num))
       (begin
-	(ly:warning (_ "Found infinity or nan in output. Substituting 0.0"))
+	(ly:warning (_ "Found infinity or nan in output.  Substituting 0.0"))
 	(if (ly:get-option 'strict-infinity-checking)
 	    (exit 1))
 	"0.0")
       (ly:number->string num)))
 
 (define (number-pair->string4 numpair)
-  (ly:format "~4l" numpair)) 
-
-(define (numbers->string4 numlist)
-  (string-join (map str4 numlist) " "))
+  (ly:format "~4l" numpair))
 
 ;;;
 ;;; Lily output interface, PostScript implementation --- cleanup and docme
@@ -76,7 +60,7 @@
 
 ;; two beziers
 (define (bezier-sandwich lst thick)
-  (ly:format "~l ~4f draw_bezier_sandwich" 
+  (ly:format "~l ~4f draw_bezier_sandwich"
 	     (map number-pair->string4 lst)
 	  thick))
 
@@ -119,6 +103,24 @@
 	  (- x2 x1) (- y2 y1)
 	  x1 y1 thick))
 
+(define (partial-ellipse x-radius y-radius start-angle end-angle thick connect fill)
+  (ly:format "~a ~a ~4f ~4f ~4f ~4f ~4f draw_partial_ellipse"
+        (if fill "true" "false")
+	(if connect "true" "false")
+	x-radius
+	y-radius
+	start-angle
+	end-angle
+	thick))
+
+(define (ellipse x-radius y-radius thick fill)
+  (ly:format
+   "~a ~4f ~4f ~4f draw_ellipse"
+   (if fill
+     "true"
+     "false")
+   x-radius y-radius thick))
+
 (define (embedded-ps string)
   string)
 
@@ -129,11 +131,11 @@
 
   (define (glyph-spec w x y g)
     (let ((prefix (if (string? g) "/" "")))
-      (ly:format "~4f ~4f ~a~a"
-		 (+ w x)  y
+      (ly:format "~4f ~4f ~4f ~a~a"
+		 w x y
 		 prefix g)))
-  
-  (ly:format 
+
+  (ly:format
    (if cid?
 "/~a /CIDFont findresource ~a output-scale div scalefont setfont
 ~a
@@ -150,38 +152,38 @@
 
 
 (define (grob-cause offset grob)
-  (let* ((cause (ly:grob-property grob 'cause))
-	 (music-origin (if (ly:stream-event? cause)
-			   (ly:event-property cause 'origin))))
-    (if (not (ly:input-location? music-origin))
-	""
-	(let* ((location (ly:input-file-line-char-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)))
-	      (ly:format "~4f ~4f ~4f ~4f (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))
-
-			 ;; TODO
-			 ;;full escaping.
-
-			 ;; backslash is interpreted by GS.
-			 (ly:string-substitute "\\" "/" 
-					       (ly:string-substitute " " "%20" file))
-			 (cadr location)
-			 (caddr location)
-			 (cadddr location))
-	      "")))))
-
+  (if (ly:get-option 'point-and-click)
+      (let* ((cause (ly:grob-property grob 'cause))
+	     (music-origin (if (ly:stream-event? cause)
+			       (ly:event-property cause 'origin))))
+	(if (ly:input-location? music-origin)
+	    (let* ((location (ly:input-file-line-char-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)))
+		  (ly:format "~4f ~4f ~4f ~4f (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))
+
+			     ;; Backslashes are not valid
+			     ;; file URI path separators.
+			     (ly:string-percent-encode
+			       (ly:string-substitute "\\" "/" file))
+
+			     (cadr location)
+			     (caddr location)
+			     (cadddr location))
+		  ""))
+	    ""))
+      ""))
 
 (define (named-glyph font glyph)
   (ly:format "~a /~a glyphshow " ;;Why is there a space at the end?
@@ -191,10 +193,18 @@
 (define (no-origin)
   "")
 
-(define (placebox x y s) 
+(define (oval x-radius y-radius thick fill)
   (ly:format
-"~4f ~4f moveto
-~a\n" x y s))
+   "~a ~4f ~4f ~4f draw_oval"
+   (if fill
+     "true"
+     "false")
+   x-radius y-radius thick))
+
+(define (placebox x y s)
+  (if (not (string-null? s))
+      (ly:format "~4f ~4f moveto ~a\n" x y s)
+      ""))
 
 (define (polygon points blot-diameter filled?)
   (ly:format "~a ~4l ~a ~4f draw_polygon"
@@ -228,7 +238,7 @@
 	      (list r g b)))
 
 ;; restore color from stack
-(define (resetcolor) "grestore \n")
+(define (resetcolor) "grestore\n")
 
 ;; rotation around given point
 (define (setrotation ang x y)
@@ -240,53 +250,28 @@
 (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) 
+(define (unknown)
   "\n unknown\n")
 
 (define (url-link url x y)
-  (ly:format "~a ~a ~a ~a (~a) mark_URI"
+  (ly:format "~a ~a currentpoint vector_add  ~a ~a currentpoint vector_add (~a) mark_URI"
 	     (car x)
 	     (car y)
 	     (cdr x)
 	     (cdr y)
 	     url))
 
-(define (utf-8-string pango-font-description string)
-  (ly:warning (_ "utf-8-string encountered in PS backend")))
-
-(define (path thickness exps)
+(define* (path thickness exps #:optional (cap 'round) (join 'round) (fill? #f))
   (define (convert-path-exps exps)
     (if (pair? exps)
 	(let*
 	    ((head (car exps))
 	     (rest (cdr exps))
-	     (arity 
+	     (arity
 	      (cond
 	       ((memq head '(rmoveto rlineto lineto moveto)) 2)
 	       ((memq head '(rcurveto curveto)) 6)
+	       ((eq? head 'closepath) 0)
 	       (else 1)))
 	     (args (take rest arity))
 	     )
@@ -294,14 +279,34 @@
 	  ;; WARNING: this is a vulnerability: a user can output arbitrary PS code here.
 	  (cons (ly:format
 			"~l ~a "
-			args 
+			args
 			head)
 		(convert-path-exps (drop rest arity))))
 	'()))
-    
-    
-  (ly:format
-   "1 setlinecap ~a setlinewidth\n~l stroke"
-   thickness
-   (convert-path-exps exps) ))
-  
+
+  (let ((cap-numeric (case cap ((butt) 0) ((round) 1) ((square) 2)
+		       (else (begin
+			       (ly:warning (_ "unknown line-cap-style: ~S")
+					   (symbol->string cap))
+			       1))))
+	(join-numeric (case join ((miter) 0) ((round) 1) ((bevel) 2)
+			(else (begin
+				(ly:warning (_ "unknown line-join-style: ~S")
+					    (symbol->string join))
+				1)))))
+    (ly:format
+     "gsave currentpoint translate
+~a setlinecap ~a setlinejoin ~a setlinewidth
+~l gsave stroke grestore ~a grestore"
+     cap-numeric
+     join-numeric
+     thickness
+     (convert-path-exps exps)
+     (if fill? "fill" ""))))
+
+(define (setscale x y)
+  (ly:format "gsave ~4l scale\n"
+	      (list x y)))
+
+(define (resetscale)
+  "grestore\n")