Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index a50f82d639da8dfd80e8e15be14d738e9d6a4643..9a65b0c5e56729714378bf9cefba074b1367abc4 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -65,10 +65,16 @@
   (/ (round (* 10000 num)) 10000))
 
 (define (str4 num)
-  (format #f "~f" (round4 num)))
+  (if (or (nan? num) (inf? num))
+      (begin
+       (ly:warning (_ "Found infinity or nan in output. Substituting 0.0"))
+       "0.0")
+      (format #f "~f" (round4 num))))
 
 (define (number-pair->string4 numpair)
-  (format #f "~f ~f" (round4 (car numpair)) (round4 (cdr numpair))))
+  (string-append (str4 (car numpair))
+                " "
+                (str4 (cdr numpair))))
 
 (define (numbers->string4 numlist)
   (string-join (map str4 numlist) " "))