X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-number.cc;h=99e61b2ff55162d549bbf72b084029e071611df8;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=c8781ca14d0d2b7d9dcae542b4fa2c597a3b30b1;hpb=0c14539bc83d6bb405141b6f21430b33d1e8fcf0;p=lilypond.git diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc index c8781ca14d..99e61b2ff5 100644 --- a/lily/tuplet-number.cc +++ b/lily/tuplet-number.cc @@ -272,7 +272,7 @@ Tuplet_number::calc_x_offset (SCM smob) for (LEFT_and_RIGHT (d)) { - if (Note_column::has_interface (bounds[d]) + if (has_interface (bounds[d]) && Note_column::get_stem (bounds[d])) bounds[d] = Note_column::get_stem (bounds[d]); bound_poss[d] = Axis_group_interface::generic_bound_extent (bounds[d], commonx, X_AXIS)[-d]; @@ -336,7 +336,7 @@ count_beams_not_touching_stem (SCM beaming) for (SCM s = scm_car (beaming); scm_is_pair (s); s = scm_cdr (s)) { - if (scm_is_true (scm_c_memq (scm_car (s), scm_cdr (beaming)))) + if (scm_is_true (ly_memv (scm_car (s), scm_cdr (beaming)))) ++count; }