From: Joe Neeman <joeneeman@gmail.com>
Date: Sat, 20 Oct 2007 22:18:26 +0000 (+1000)
Subject: Fix 449.
X-Git-Tag: release/2.11.35-1~83^2~1^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ec8b80d1b75688aa875078a228fb0e6ec39d3ccb;p=lilypond.git

Fix 449.
Ensure that a TrillPitchGroup is included in the horizontal skylines.
---

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index a8d63c2e1a..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"
@@ -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));
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b11cc8a13e..ef27cbd1e3 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2252,6 +2252,7 @@
 
 (define pure-functions
   (list
+   parenthesize-elements
    ly:staff-symbol-referencer::callback
    ly:staff-symbol::height))