Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index a8e94b628bf2f6c4ff393a9790136719a432c335..bf794c3a74d67e81138ad6b8f1b3ea4d1c0097a0 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")
@@ -156,19 +155,22 @@
                 "%%EndComments\n"))
 
 (define (ps-document-media paper) 
+ (let* ((w (/ (*
+              (ly:output-def-lookup paper 'output-scale)
+              (ly:output-def-lookup paper 'paper-width)) (ly:bp 1)))
+       (h (/ (*
+              (ly:output-def-lookup paper 'paper-height)
+              (ly:output-def-lookup paper 'output-scale))
+           (ly:bp 1)))
+       (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t)))
   (format "%%DocumentMedia: ~a ~$ ~$ ~a ~a ~a\n"
-         (ly:output-def-lookup paper 'papersizename)
-         (/ (*
-             (ly:output-def-lookup paper 'output-scale)
-             (ly:output-def-lookup paper 'paper-width)) (ly:bp 1))
-         (/ (*
-             (ly:output-def-lookup paper 'paper-height)
-             (ly:output-def-lookup paper 'output-scale))
-            (ly:bp 1))
-         80  ;; weight
-         "()" ;; color
-         "()"  ;; type
-         ))
+   (ly:output-def-lookup paper 'papersizename)
+   (if landscape? h w)
+   (if landscape? w h)
+   80  ;; weight
+   "()" ;; color
+   "()"  ;; type
+  )))
 
 
 (define (file-header paper page-count load-fonts?)
@@ -188,21 +190,26 @@
                 "%%EndComments\n"))
 
 (define (procset file-name)
-  (string-append
-   (format
+  (format
     "%%BeginResource: procset (~a) 1 0
 ~a
 %%EndResource
 "
-    file-name (cached-file-contents file-name))))
+    file-name (cached-file-contents file-name)))
+
+(define (embed-document file-name)
+  (format "%%BeginDocument: ~a
+~a
+%%EndDocument
+" 
+    file-name (cached-file-contents file-name)))
 
-(define (setup paper)
+(define (setup-variables paper)
   (string-append
    "\n"
-   "%%BeginSetup\n"
    (define-fonts paper)
    (output-variables paper)
-   "%%EndSetup\n"))
+   ))
 
 (define (cff-font? font)
   (let*
@@ -232,7 +239,6 @@
           (string-length binary-data)))
         (footer "\n%%EndData
 %%EndResource
-%%EOF
 %%EndResource\n"))
 
     (string-append
@@ -258,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 "")
@@ -325,7 +336,7 @@
        
       (cond
        ((and file-name (string-match "\\.pfa" downcase-file-name))
-       (cached-file-contents file-name))
+       (embed-document file-name))
        ((and file-name (string-match "\\.pfb" downcase-file-name))
        (ly:pfb->pfa file-name))
        ((and file-name (string-match "\\.ttf" downcase-file-name))
@@ -335,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))
@@ -346,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))
@@ -412,12 +424,15 @@
         (display "\n%%EndFont\n" port))
        (load-fonts paper)))
 
-  (display (setup paper) port)
+  (display (setup-variables paper) port)
 
   ;; adobe note 5002: should initialize variables before loading routines.
   (display (procset "music-drawing-routines.ps") port)
   (display (procset "lilyponddefs.ps") port)
 
+  (if (not (ly:get-option 'point-and-click))
+      (display "/mark_URI { pop pop pop pop pop } bind def\n" port)) 
+
   (display "%%EndProlog\n" port)
   
   (display "%%BeginSetup\ninit-lilypond-parameters\n%%EndSetup\n\n" port))
@@ -431,6 +446,7 @@
                     (open-file filename "wb")
                     "ps"))
         (paper (ly:paper-book-paper book))
+        (systems (ly:paper-book-systems book))
         (page-stencils (map page-stencil (ly:paper-book-pages book)))
         
         (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
@@ -438,11 +454,16 @@
         (page-count (length page-stencils))
         (port (ly:outputter-port outputter)))
 
+    (if (ly:get-option 'dump-signatures)
+       (write-system-signatures basename (ly:paper-book-systems book) 0))
+  
     (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)
 
@@ -462,9 +483,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))