X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-column.cc;h=a12560bf8e19426eaec8f254b782a8e6108ccefb;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=3a288dac72fed44d4d617de36671398b357a2a40;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git diff --git a/lily/script-column.cc b/lily/script-column.cc index 3a288dac72..a12560bf8e 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -72,13 +72,13 @@ Script_column::row_before_line_breaking (SCM smob) /* Don't want to consider scripts horizontally next to notes. */ - if (Accidental_placement::has_interface (sc) - || Arpeggio::has_interface (sc)) + if (has_interface (sc) + || has_interface (sc)) { affect_all_grobs.push_back (sc); } - else if (sc->get_property_data ("Y-offset") - != Side_position_interface::y_aligned_side_proc) + else if (!scm_is_eq (sc->get_property_data ("Y-offset"), + Side_position_interface::y_aligned_side_proc)) { head_scripts_map[sc->get_parent (Y_AXIS)].push_back (sc); } @@ -112,8 +112,8 @@ Script_column::before_line_breaking (SCM smob) /* Don't want to consider scripts horizontally next to notes. */ - if (sc->get_property_data ("X-offset") - != Side_position_interface::x_aligned_side_proc) + if (!scm_is_eq (sc->get_property_data ("X-offset"), + Side_position_interface::x_aligned_side_proc)) staff_sided.push_back (sc); }