X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=61bbf1f84d8991f5ba86b7abe0c5c5a983aa7aa8;hb=e2a4be3b72b1c473658436e4f82234b401dd7b60;hp=a7625e3c1964295495e292dd0932c6d304ab6db3;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index a7625e3c19..61bbf1f84d 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -102,7 +102,7 @@ Multi_measure_rest::print (SCM smob) int measures = 0; SCM m (me->get_property ("measure-count")); - if (ly_number_p (m)) + if (ly_c_number_p (m)) { measures = ly_scm2int (m); } @@ -118,7 +118,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) { int measures = 0; SCM m (me->get_property ("measure-count")); - if (ly_number_p (m)) + if (ly_c_number_p (m)) { measures = ly_scm2int (m); } @@ -282,7 +282,7 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, } Stencil mol; - for (SCM s = mols; ly_pair_p (s); s = ly_cdr (s)) + for (SCM s = mols; ly_c_pair_p (s); s = ly_cdr (s)) { mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (ly_car (s)), inner_padding, 0); }