Merge branch 'master' into dev/texi2html

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

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 56507ce0e3ae15351d810373c5a1b1d1c4b01431..c7214da3c597d25c5dcf49210a1f90efe829ab1c 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -545,12 +545,13 @@
                               (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
                     ;; FIXME: better wrap open/open-file,