X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fitem.cc;h=ff00630b5f8a739cc7719caf5ee87d84c29781f0;hb=920dccaf627f00ec2d5bbd49ffeb9ad01236da3b;hp=f4760eb2fd564bdb5d4555fa7592520a2e7fd679;hpb=baaf1af20fba2d871e14f0f94ee840d6bd4be5b8;p=lilypond.git diff --git a/lily/item.cc b/lily/item.cc index f4760eb2fd..ff00630b5f 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -8,6 +8,7 @@ #include "item.hh" +#include "axis-group-interface.hh" #include "paper-score.hh" #include "warn.hh" #include "paper-column.hh" @@ -149,13 +150,37 @@ Item::handle_prebroken_dependencies () SCM vis = get_property ("break-visibility"); if (scm_is_vector (vis)) { - bool visible = to_boolean (scm_vector_ref (vis, scm_from_int (break_status_dir () + 1))); + bool visible = to_boolean (scm_c_vector_ref (vis, break_status_dir () + 1)); if (!visible) suicide (); } } +bool +Item::pure_is_visible (int start, int end) const +{ + SCM vis = get_property ("break-visibility"); + if (scm_is_vector (vis)) + { + int pos = 1; + int pc_rank = Paper_column::get_rank (get_column ()); + if (pc_rank == start) + pos = 2; + else if (pc_rank == end) + pos = 0; + return to_boolean (scm_vector_ref (vis, scm_from_int (pos))); + } + return true; +} + +Interval_t +Item::spanned_rank_iv () +{ + int c = get_column ()->get_rank (); + return Interval_t (c, c); +} + void Item::derived_mark () const {