X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-ps.scm;h=c7214da3c597d25c5dcf49210a1f90efe829ab1c;hb=c6554467b0a9beddf0d7ef12746ae31a25fe36e7;hp=7c5669fdb32ecd11b80ded4d137994e30ddfb81c;hpb=c373de38a49dea998a0733658a48a0e62912fa11;p=lilypond.git

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 7c5669fdb3..c7214da3c5 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-ps))
 
@@ -246,14 +246,19 @@
 
 
 (define (write-preamble paper load-fonts? port)
-
-  (define (load-font-via-GS font-name-filename)
+  (define (internal-font? file-name)
+    (or (string-startswith file-name "Emmentaler")
+	(string-startswith file-name "emmentaler")
+	(string-startswith file-name "aybabtu")
+	(string-startswith file-name "Aybabtu")))
+  (define (load-font-via-GS font-name-filename)       
     (define (ps-load-file file-name)
       (if (string? file-name)
 	  (if (string-contains file-name (ly:get-option 'datadir))
 	      (begin
 		(set! file-name (ly:string-substitute (ly:get-option 'datadir) "" file-name))
 		(format "lilypond-datadir (~a) concatstrings (r) file .loadfont" file-name))
+	      
 	      (format "(~a) (r) file .loadfont\n" file-name))
 	  (format "% cannot find font file: ~a\n" file-name)))
 
@@ -268,10 +273,7 @@
        (if (mac-font? bare-file-name)
 	   (handle-mac-font name bare-file-name)
 	   (cond
-	    ((or (string-startswith file-name "Emmentaler")
-		 (string-startswith file-name "emmentaler")
-		 (string-startswith file-name "aybabtu")
-		 (string-startswith file-name "Aybabtu"))
+	    ((internal-font? file-name)
 	     (ps-load-file (ly:find-file
 			    (format "~a.otf"  file-name))))
 	    ((string? bare-file-name)
@@ -384,6 +386,8 @@
 
   (define (load-fonts paper)
     (let* ((fonts (ly:paper-fonts paper))
+
+	   ;; todo - doc format of list.
 	   (all-font-names
 	    (map
 	     (lambda (font)
@@ -410,9 +414,20 @@
 	     (sort (apply append all-font-names)
 		   (lambda (x y) (string<? (cadr x) (cadr y))))))
 
-	   (font-loader (if (ly:get-option 'gs-load-fonts)
-			    load-font-via-GS
-			    load-font))
+	   ;; slightly spaghetti-ish: deciding what to load where
+	   ;; is smeared out.
+	   (font-loader (lambda (name)
+			  (cond
+			   ((ly:get-option 'gs-load-fonts) 
+			    (load-font-via-GS name))
+			   ((ly:get-option 'gs-load-lily-fonts)
+			    (if (or
+				 (string-contains (caddr name) (ly:get-option 'datadir))
+				 (internal-font? (caddr name)))
+
+				(load-font-via-GS name)
+				(load-font name)))
+			   (else (load-font name)))))
 			 
 	   (pfas (map font-loader font-names)))
       pfas))
@@ -520,19 +535,22 @@
 (define-public (dump-stencil-as-EPS-with-bbox paper dump-me filename
 					      load-fonts
 					      bbox)
-  (define (to-bp-box mmbox)
+  "Create an EPS file from stencil DUMP-ME to FILENAME. BBOX has format
+   (left-x, lower-y, right x, up-y).  If LOAD-FONTS set, include fonts inline." 
+
+  (define (to-rounded-bp-box box)
+    "Convert box to 1/72 inch with rounding to enlarge the box."
     (let* ((scale (ly:output-def-lookup paper 'output-scale))
-	   (box (map
-		 (lambda (x)
-		   (if (or (nan? x) (inf? x))
-		       0
-		       (inexact->exact
-			(round (/ (* x scale) (ly:bp 1)))))) mmbox)))
-      
-    (list (car box)
-	  (cadr box)
-	  (max (1+ (car box)) (caddr box))
-	  (max (1+ (cadr box)) (cadddr box))
+	   (strip-non-number (lambda (x)
+			       (if (or (nan? x) (inf? x)) 0.0 x)))
+	   (directed-round (lambda (x rounder)
+			     (inexact->exact
+			      (rounder (/ (* (strip-non-number x) scale)
+					  (ly:bp 1)))))))
+      (list (directed-round (car box) floor)
+	    (directed-round (cadr box) floor)
+	    (directed-round (max (1+ (car box)) (caddr box)) ceiling)
+	    (directed-round (max (1+ (cadr box)) (cadddr box)) ceiling)
 	  )))
 
   (let* ((outputter (ly:make-paper-outputter
@@ -543,7 +561,7 @@
 		     'ps))
 
 	 (port (ly:outputter-port outputter))
-	 (rounded-bbox (to-bp-box bbox))
+	 (rounded-bbox (to-rounded-bp-box bbox))
 	 (port (ly:outputter-port outputter))
 	 (header (eps-header paper rounded-bbox load-fonts)))
 
@@ -582,7 +600,7 @@
 	   ((xext (car ext-system-pair))
 	    (paper-system (cdr ext-system-pair))
 	    (yext (paper-system-extent paper-system Y))
-	    (bbox (list (car  xext) (car yext)
+	    (bbox (list (car xext) (car yext)
 			(cdr xext) (cdr yext)))
 	    (filename (if (< 0 count)
 			  (format "~a-~a" basename count)