Merge branch 'master' of git://git.sv.gnu.org/lilypond.git into td-lily

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index a8d63c2e1a033d59834086068c4d45dd5611a391..5c9eb9ef10439826317203c17eee4547fc60988e 100644 (file)
--- 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"
@@ -109,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));
@@ -148,9 +156,9 @@ Separation_item::print (SCM smob)
 }
 
 ADD_INTERFACE (Separation_item,
-              "Item that computes widths to generate spacing rods. "
-              ,
+              "Item that computes widths to generate spacing rods.",
 
+              /* properties */
               "X-extent "
               "conditional-elements "
               "elements "