accidental-placement: add minimal padding; issue 2141

[lilypond.git] / lily / dot-column.cc

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 03f368d76b50703cd49055d54820417ec3248f63..6cba432639deb7f8fd899a53a577987253787762 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -109,16 +109,17 @@ Dot_column::calc_positioning_done (SCM smob)
 
           y.add_point (y1);
           y.add_point (y2);
+
+          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);
@@ -186,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);
     }