(print): robustify.

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

diff --git a/lily/font-select.cc b/lily/font-select.cc
index f04da901b3d63d2d2db02a4cbe3a60b82541b6b7..df6e008684e68c7339309bbdf937c16d3b1f9ca6 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -112,7 +112,7 @@ select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding)
 {
   SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
   
-  if (!ly_c_pair_p (name) || !ly_c_string_p (ly_cdr (name)))
+  if (!ly_c_pair_p (name) || !scm_is_string (ly_cdr (name)))
     {
       SCM fonts = paper->lookup_variable (ly_symbol2scm ("fonts"));
       name = properties_to_font_size_family (fonts, chain);
@@ -120,7 +120,7 @@ select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding)
   else
     name = ly_cdr (name);
 
-  if (ly_c_string_p (name))
+  if (scm_is_string (name))
     {
       SCM mag = ly_assoc_chain (ly_symbol2scm ("font-magnification"), chain);
       Real rmag = (ly_c_pair_p (mag)
@@ -138,9 +138,9 @@ select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding)
       SCM font_size = ly_assoc_chain (ly_symbol2scm ("font-size"), chain);
       Real req = 0;
       if (ly_c_pair_p (font_size))
-       req = ly_scm2double (ly_cdr (font_size));
+       req = scm_to_double (ly_cdr (font_size));
 
-      return get_font_by_mag_step (paper, req, vec, ly_scm2double (base_size),
+      return get_font_by_mag_step (paper, req, vec, scm_to_double (base_size),
                                   input_encoding);
     }