release commit

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index d79f96735a164eb93df06591320b4b472adc1358..4211d7d685075311de045ca46d8e7d378a8416dc 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 = ly_scm2int (ly_car (frac));
-      d = ly_scm2int (ly_cdr (frac));
+      n = scm_to_int (ly_car (frac));
+      d = scm_to_int (ly_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_paper ()->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_paper ()->self_scm (), chain,
                                        scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);
@@ -147,7 +147,7 @@ ADD_INTERFACE (Time_signature, "time-signature-interface",
 "        typeset with mensural style mensuration marks.  All other time\n"
 "        signatures are written with two digits.\n"
 "\n"
-"      @item @code{single-digit"
+"      @item @code{single-digit}\n"
 "        All time signatures are typeset with a single\n"
 "        digit, e.g. 3/2 is written as 3.\n"
 "    @end table\n"