(write-preamble): new function.

[lilypond.git] / scm / framework-ps.scm

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 5e8581ecfe26425defa7c5bffd8b9597f41ab258..23b8d04ac8d76c7d7268cf65d21e61905a64d881 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -42,8 +42,7 @@
   (define font-list (ly:paper-fonts paper))
   (define (define-font command fontname scaling)
     (string-append
-     "/" command " { /" fontname " findfont "
-     (ly:number->string scaling) " output-scale div scalefont } bind def\n"))
+      "/" command " { /" fontname " " (ly:number->string scaling) " output-scale div selectfont } bind def\n"))
 
   (define (standard-tex-font? x)
     (or (equal? (substring x 0 2) "ms")
@@ -265,15 +264,20 @@
 
       (cons
        name
-       (cond
-       ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
-        (ps-load-file (ly:find-file
-                       (format "~a.otf"  file-name))))
-       ((string? bare-file-name)
-        (ps-load-file file-name))
-       (else
-        (ly:warning (_ "can't embed ~S=~S") name file-name)
-         "")))))
+       
+       (if (mac-font? bare-file-name)
+          (handle-mac-font name bare-file-name)
+          (cond
+           ((string-match "^([eE]mmentaler|[Aa]ybabtu)" file-name)
+            (ps-load-file (ly:find-file
+                           (format "~a.otf"  file-name))))
+           ((string? bare-file-name)
+            (ps-load-file file-name))
+           (else
+            (ly:warning (_ "can't embed ~S=~S") name file-name)
+            "")))
+
+         )))
 
   (define (dir-join a b)
     (if (equal? a "")
@@ -342,7 +346,15 @@
        (else
        (ly:warning (_ "don't know how to embed ~S=~S") name file-name)
        ""))))
-      
+
+    (define (mac-font? bare-file-name)
+      (and
+       (eq? PLATFORM 'darwin)
+       bare-file-name
+       (or
+       (string-match "\\.dfont" bare-file-name)
+       (= (stat:size (stat bare-file-name)) 0))))
+
   (define (load-font font-name-filename)
     (let* ((font (car font-name-filename))
           (name (cadr font-name-filename))
@@ -353,14 +365,7 @@
        name
        (cond
 
-       ((and
-         (eq? PLATFORM 'darwin)
-         bare-file-name (string-match "\\.dfont" bare-file-name))
-        (handle-mac-font name bare-file-name))
-       
-       ((and
-         (eq? PLATFORM 'darwin)
-         bare-file-name (= (stat:size (stat bare-file-name)) 0))
+       ((mac-font? bare-file-name)
         (handle-mac-font name bare-file-name))
 
        ((and font (cff-font? font))
@@ -447,9 +452,11 @@
 
     (output-scopes scopes fields basename)
     (display (file-header paper page-count #t) port)
-    (display "\n%%BeginDefaults
-%%PageMedia: a4
-%%EndDefaults\n" port)
+
+    
+    ;; don't do BeginDefaults PageMedia: A4 
+    ;; not necessary and wrong
+    
 
     (write-preamble paper #t port)
 
@@ -469,9 +476,11 @@
     (let* ((scale (ly:output-def-lookup paper 'output-scale))
           (box (map
                 (lambda (x)
-                  (inexact->exact
-                   (round (/ (* x scale) (ly:bp 1))))) mmbox)))
-
+                  (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))