X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=f8d1cb739ffc59c20a5da2c7f85cb4136bf2b6cd;hb=794a037c19a838dd56ceb59e2280059fb80d944a;hp=00103c31d4ee5839682d375084b6c568ad39815f;hpb=a93cdac09beaeb940a1776a5177fb823d1fa8337;p=lilypond.git

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 00103c31d4..f8d1cb739f 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -10,6 +10,7 @@
 
 #include "axis-group-interface.hh"
 #include "lookup.hh"
+#include "note-head.hh"
 #include "stencil.hh"
 #include "skyline.hh"
 #include "paper-column.hh"
@@ -30,13 +31,12 @@ Separation_item::add_conditional_item (Grob *me, Grob *e)
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e);
 }
 
-void
-Separation_item::set_distance (Drul_array<Item *> items,
-				       Real padding)
+Real
+Separation_item::set_distance (Item *l, Item *r, Real padding)
 {
-  Drul_array<Skyline_pair*> lines (Skyline_pair::unsmob (items[LEFT]->get_property ("horizontal-skylines")),
-				   Skyline_pair::unsmob (items[RIGHT]->get_property ("horizontal-skylines")));
-  Skyline right = conditional_skyline (items[RIGHT], items[LEFT]);
+  Drul_array<Skyline_pair*> lines (Skyline_pair::unsmob (l->get_property ("horizontal-skylines")),
+				   Skyline_pair::unsmob (r->get_property ("horizontal-skylines")));
+  Skyline right = conditional_skyline (r, l);
   right.merge ((*lines[RIGHT])[LEFT]);
   
   Real dist = padding + (*lines[LEFT])[RIGHT].distance (right);
@@ -44,11 +44,13 @@ Separation_item::set_distance (Drul_array<Item *> items,
     {
       Rod rod;
 
-      rod.item_drul_ = items;
+      rod.item_drul_ = Drul_array<Item*> (l, r);
 
       rod.distance_ = dist;
       rod.add_to_cols ();
-    }  
+    }
+
+  return max (dist, 0.0);
 }
 
 bool
@@ -108,7 +110,14 @@ Separation_item::boxes (Grob *me, Grob *left)
       Item *il = dynamic_cast<Item *> (elts[i]);
       if (pc != il->get_column ())
 	continue;
-      if (Axis_group_interface::has_interface (il))
+
+      /* ugh. We want to exclude groups of grobs (so that we insert each grob
+	 individually into the skyline instead of adding a single box that
+	 bounds all of them). However, we can't exclude an axis-group that
+	 adds to its childrens' stencil. Currently, this is just TrillPitchGroup;
+	 hence the check for note-head-interface. */
+      if (Axis_group_interface::has_interface (il)
+	  && !Note_head::has_interface (il))
 	continue;
 
       Interval y (il->pure_height (ycommon, 0, very_large));