* lily/lily-guile.cc (robust_scm2double): new function. Use throughout.

[lilypond.git] / lily / font-select.cc

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 294ba8d3fcf0559c44d6de96a34abe08d236a57f..61ae2fa4fc3ed62a0483a4dd327d6f12838c3920 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -153,8 +153,7 @@ select_font (Paper_def *paper, SCM chain)
     {
       SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain);
   
-      Real rmag = gh_pair_p (mag) && gh_number_p (gh_cdr (mag))
-       ? gh_scm2double (gh_cdr (mag)) : 1.0;
+      Real rmag = gh_pair_p (mag) ? robust_scm2double (gh_cdr (mag), 1.0) : 1;
   
       return paper->find_font (name, rmag);
     }