*** empty log message ***

[lilypond.git] / lily / modified-font-metric.cc

diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc
index 2b67671b2da2657a72e298c0573e3e39231cf147..c6afc583929827217eb0396a2ca4b431572fc137 100644 (file)
--- a/lily/modified-font-metric.cc
+++ b/lily/modified-font-metric.cc
@@ -34,10 +34,10 @@ Modified_font_metric::Modified_font_metric (String input_encoding,
   
   SCM desc = m->description_;
 
-  Real total_mag = magn * ly_scm2double (ly_cdr (desc));
+  Real total_mag = magn * scm_to_double (scm_cdr (desc));
   assert (total_mag);
   
-  description_ = scm_cons (ly_car (desc), scm_make_real (total_mag));
+  description_ = scm_cons (scm_car (desc), scm_make_real (total_mag));
   orig_ = m;
   
   if (coding_scheme_ != "" 
@@ -110,10 +110,10 @@ Modified_font_metric::make_scaled_font_metric (SCM coding,
   /*
     UGH.
    */
-  if (ly_c_symbol_p (coding))
+  if (scm_is_symbol (coding))
     coding = scm_symbol_to_string (coding);
   
-  String scheme = ly_c_string_p (coding) ? ly_scm2string (coding) : ""; 
+  String scheme = scm_is_string (coding) ? ly_scm2string (coding) : ""; 
   
   Modified_font_metric *sfm = new Modified_font_metric (scheme, m, s);
   
@@ -277,7 +277,7 @@ Modified_font_metric::text_dimension (String text)
 
          Box char_box;
 
-         if (!ly_c_symbol_p (sym))
+         if (!scm_is_symbol (sym))
            continue;
 
          char const * chars =  scm_i_string_chars (scm_symbol_to_string(sym));