Run `make grand-replace'.

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

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 5e26c1d4b7d916b261b11615d1cf3024ec9c4f77..d6bf44eff2bde58008ce6ad70a2a64501e3f576e 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 (define-module (scm framework-ps))
 
@@ -118,7 +118,7 @@
     "set-ps-scale-to-lily-scale "
     "\n"))
   (ly:outputter-dump-stencil outputter page)
-  (ly:outputter-dump-string outputter "stroke grestore \nshowpage\n"))
+  (ly:outputter-dump-string outputter "stroke grestore\nshowpage\n"))
 
 (define (supplies-or-needs paper load-fonts?)
   (define (extract-names font)
@@ -331,7 +331,7 @@
 
       (if (not embed)
          (begin
-           (set! embed "% failed \n")
+           (set! embed "% failed\n")
            (ly:warning (_ "cannot extract file matching ~a from ~a") name filename)))
       embed))
 
@@ -545,11 +545,12 @@
                               (if (or (nan? x) (inf? x)) 0.0 x)))
           (directed-round (lambda (x rounder)
                             (inexact->exact
-                             (rounder (/ (* x scale) (ly:bp 1)))))))
+                             (rounder (/ (* (strip-non-number x) scale)
+                                         (ly:bp 1)))))))
       (list (directed-round (car box) floor)
            (directed-round (cadr box) floor)
-           (max (1+ (car box)) (directed-round (caddr box) ceiling))
-           (max (1+ (cadr box)) (directed-round (cadddr box) ceiling))
+           (directed-round (max (1+ (car box)) (caddr box)) ceiling)
+           (directed-round (max (1+ (cadr box)) (cadddr box)) ceiling)
          )))
 
   (let* ((outputter (ly:make-paper-outputter
@@ -566,7 +567,7 @@
 
     (display header port)
     (write-preamble paper load-fonts port)
-    (display "gsave set-ps-scale-to-lily-scale \n" port)
+    (display "gsave set-ps-scale-to-lily-scale\n" port)
     (ly:outputter-dump-stencil outputter dump-me)
     (display "stroke grestore\n%%Trailer\n%%EOF\n" port)
     (ly:outputter-close outputter)))