X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column.cc;h=6cba432639deb7f8fd899a53a577987253787762;hb=202d2afd0a4c6f199e063148d6e7368868db9390;hp=717b0bf19b55d9869dd5be6586ac9ec7945ad43f;hpb=47907c5dba308541a0f2fab3f164159212c1e40f;p=lilypond.git diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 717b0bf19b..6cba432639 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -113,14 +113,13 @@ Dot_column::calc_positioning_done (SCM smob) stems.insert (s); } else if (Note_head::has_interface (s)) - y = Interval (-1, 1); + y = Interval (-1.1, 1.1); else { programming_error ("unknown grob in dot col support"); continue; } - y *= 2 / ss; y += Staff_symbol_referencer::get_position (s); Box b (s->extent (commonx, X_AXIS), y); @@ -188,7 +187,8 @@ Dot_column::calc_positioning_done (SCM smob) cfg.remove_collision (p); cfg[p] = dp; - if (Staff_symbol_referencer::on_line (dp.dot_, p)) + if (Staff_symbol_referencer::on_line (dp.dot_, p) && + dp.dot_->get_property ("style") != ly_symbol2scm ("kievan")) cfg.remove_collision (p); }