X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-alignment-interface.cc;h=a1d7606445353ece111cbf221a4bc9eda9257f53;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=58cb488d6b920efd83d21efbe841f9af8d7770fc;hpb=0c14539bc83d6bb405141b6f21430b33d1e8fcf0;p=lilypond.git diff --git a/lily/break-alignment-interface.cc b/lily/break-alignment-interface.cc index 58cb488d6b..a1d7606445 100644 --- a/lily/break-alignment-interface.cc +++ b/lily/break-alignment-interface.cc @@ -73,7 +73,7 @@ Break_alignment_interface::ordered_elements (Grob *grob) for (vsize i = writable_elts.size (); i--;) { Grob *g = writable_elts[i]; - if (g && sym == g->get_property ("break-align-symbol")) + if (g && scm_is_eq (sym, g->get_property ("break-align-symbol"))) { new_elts.push_back (g); writable_elts.erase (writable_elts.begin () + i); @@ -263,7 +263,7 @@ Break_alignable_interface::self_align_callback (SCM grob) { Grob *me = unsmob (grob); Item *alignment = dynamic_cast (me->get_parent (X_AXIS)); - if (!Break_alignment_interface::has_interface (alignment)) + if (!has_interface (alignment)) return scm_from_int (0); SCM symbol_list = me->get_property ("break-align-symbols"); @@ -277,9 +277,10 @@ Break_alignable_interface::self_align_callback (SCM grob) SCM sym = scm_car (symbol_list); for (vsize i = 0; i < elements.size (); i++) { - if (elements[i]->get_property ("break-align-symbol") == sym) + if (scm_is_eq (sym, elements[i]->get_property ("break-align-symbol"))) { if (Item::break_visible (elements[i]) + // TODO SCM: simplify syntax? && !elements[i]->extent (elements[i], X_AXIS).is_empty ()) { break_aligned_grob = i;