* scm/define-context-properties.scm

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 4211d7d685075311de045ca46d8e7d378a8416dc..f8e7dcf1ab1b054528a1bcff91779ed124fc6134 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -36,8 +36,8 @@ Time_signature::print (SCM smob)
   int d = 4;
   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;
@@ -101,9 +101,9 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den)
                                         ly_symbol2scm ("fetaNumber"))),
                    chain);
                                
-  SCM sn = Text_interface::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_interface::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);