X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=b3f7e4aab9e350d22b64d3e536b69b50f8cd9f0b;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=f5b6f35e9045189b6ba5f88118cefc522b7100cf;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git diff --git a/lily/note-column.cc b/lily/note-column.cc index f5b6f35e90..b3f7e4aab9 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -98,7 +98,7 @@ Direction Note_column::dir (Grob *me) { Grob *stem = unsmob (me->get_object ("stem")); - if (stem && Stem::has_interface (stem)) + if (has_interface (stem)) return get_grob_direction (stem); else { @@ -107,7 +107,7 @@ Note_column::dir (Grob *me) return (Direction)sign (head_positions_interval (me).center ()); } - if (has_interface (me)) + if (has_interface (me)) programming_error ("Note_column without heads and stem"); else programming_error ("dir() given grob without Note_column interface"); @@ -131,7 +131,7 @@ void Note_column::add_head (Grob *me, Grob *h) { bool both = false; - if (Rest::has_interface (h)) + if (has_interface (h)) { extract_grob_set (me, "note-heads", heads); if (heads.size ()) @@ -139,7 +139,7 @@ Note_column::add_head (Grob *me, Grob *h) else me->set_object ("rest", h->self_scm ()); } - else if (Note_head::has_interface (h)) + else if (has_interface (h)) { if (unsmob (me->get_object ("rest"))) both = true; @@ -205,7 +205,7 @@ Note_column::accidentals (Grob *me) if (!acc) return 0; - if (Accidental_placement::has_interface (acc->get_parent (X_AXIS))) + if (has_interface (acc->get_parent (X_AXIS))) return acc->get_parent (X_AXIS); /* compatibility. */ @@ -251,4 +251,5 @@ ADD_INTERFACE (Note_column, "rest " "rest-collision " "stem " + "glissando-skip " );