(move_away_from_staffline): new function.

[lilypond.git] / lily / time-signature.cc

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index f4324653fe67f008415e017775dff01ab883010d..f8e7dcf1ab1b054528a1bcff91779ed124fc6134 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -34,10 +34,10 @@ Time_signature::print (SCM smob)
   SCM frac = me->get_property ("fraction");
   int n = 4;
   int d = 4;
-  if (ly_c_pair_p (frac))
+  if (scm_is_pair (frac))
     {
-      n = scm_to_int (ly_car (frac));
-      d = scm_to_int (ly_cdr (frac));
+      n = scm_to_int (scm_car (frac));
+      d = scm_to_int (scm_cdr (frac));
     }
 
   Stencil m;
@@ -45,7 +45,7 @@ Time_signature::print (SCM smob)
     {
       m = numbered_time_signature (me, n, 0);
     }
-  else if (ly_c_symbol_p (st))
+  else if (scm_is_symbol (st))
     {
       m = special_time_signature (me, st, n, d);
     }
@@ -101,9 +101,9 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den)
                                         ly_symbol2scm ("fetaNumber"))),
                    chain);
                                
-  SCM sn = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
+  SCM sn = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
                                        scm_makfrom0str (to_string (num).to_str0 ()));
-  SCM sd = Text_item::interpret_markup (me->get_paper ()->self_scm (), chain,
+  SCM sd = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
                                        scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);