X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-ps.scm;h=06b324b799c7abd07f10c1518ead850bd897724e;hb=5772b14978ff5573fee304fc8b13663f83fce6b5;hp=aef4802eb71d8b6e41391055a10640dcdf17fe48;hpb=e6cbbfc02ce33ad0b500a3af16e2351f21095f31;p=lilypond.git

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index aef4802eb7..06b324b799 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -1,9 +1,20 @@
-;;;; 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--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 1998--2010 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
@@ -14,33 +25,7 @@
 ;;;;   * 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
-            ellipse
-	    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)
@@ -135,8 +120,8 @@
 
   (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 
@@ -177,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))
@@ -198,10 +182,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"
@@ -235,7 +227,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)
@@ -247,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")
 
@@ -281,9 +250,6 @@
 	     (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 (convert-path-exps exps)
     (if (pair? exps)
@@ -294,6 +260,7 @@
 	      (cond
 	       ((memq head '(rmoveto rlineto lineto moveto)) 2)
 	       ((memq head '(rcurveto curveto)) 6)
+	       ((eq? head 'closepath) 0)
 	       (else 1)))
 	     (args (take rest arity))
 	     )
@@ -308,7 +275,7 @@
     
     
   (ly:format
-   "1 setlinecap ~a setlinewidth\n~l stroke"
+   "gsave currentpoint translate 1 setlinecap ~a setlinewidth\n~l stroke grestore"
    thickness
-   (convert-path-exps exps) ))
+   (convert-path-exps exps)))