X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=becf51d275784d4d90436e59bf80e52bbd3aad0b;hb=a1fa0e63b1bf2c61a9c19a33b7034989fb3fac05;hp=8ccd3c04ed423797f0cb3e198f944ad975aca2df;hpb=4b3882304ff44852e6cf2c4bbd50f5d308001f6b;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 8ccd3c04ed..becf51d275 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-ps))
 
@@ -290,7 +290,7 @@
 	   (if (and (not embed)
 		    (equal? 'regular (stat:type (stat full-name)))
 		    (equal? name (ly:ttf-ps-name full-name)))
-	       (set! embed (font-file-as-ps-string name full-name)))
+	       (set! embed (font-file-as-ps-string name full-name 0)))
 	   (if (or (equal? "." f)
 		   (equal? ".." f))
 	       #t
@@ -345,7 +345,7 @@
 		  (else
 		   (ly:warning (_ "do not know how to embed font ~s ~s ~s")
 			       name file-name font))))))
-	
+
   (define (load-fonts paper)
     (let* ((fonts (ly:paper-fonts paper))
 
@@ -509,7 +509,7 @@ fonts inline."
     (display "stroke grestore\n%%Trailer\n%%EOF\n" port)
     (ly:outputter-close outputter)))
 
-(define (clip-systems-to-region basename paper systems region do-pdf)
+(define (clip-systems-to-region basename paper systems region do-pdf do-png)
   (let* ((extents-system-pairs
 	  (filtered-map (lambda (paper-system)
 			  (let* ((x-ext (system-clipped-x-extent
@@ -537,12 +537,17 @@ fonts inline."
 					(ly:get-option 'include-eps-fonts)
 					bbox)
 	 (if do-pdf
-	     (postscript->pdf 0 0 (format "~a.eps" filename)))))
+	     (postscript->pdf 0 0 (format "~a.eps" filename)))
+	 (if do-png
+	     (postscript->png (ly:get-option 'resolution) 0 0
+			      (format "~a.eps" filename)))))
      extents-system-pairs)))
 
 (define-public (clip-system-EPSes basename paper-book)
   (define do-pdf
     (member "pdf" (ly:output-formats)))
+  (define do-png
+    (member "png" (ly:output-formats)))
 
   (define (clip-score-systems basename systems)
     (let* ((layout (ly:grob-layout (paper-system-system-grob (car systems))))
@@ -555,7 +560,7 @@ fonts inline."
 		  (rhythmic-location->file-string (car region))
 		  (rhythmic-location->file-string (cdr region)))
 	  layout systems region
-	  do-pdf))
+	  do-pdf do-png))
        regions)))
 
   ;; partition in system lists sharing their layout blocks