X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=5f8471a600083fd199a75215e81ff1c2c3764abf;hb=840936be1b28526ef292b5dae8ae031b4fa587f9;hp=a8d63c2e1a033d59834086068c4d45dd5611a391;hpb=89f0e26fa758e6f2a05e64f9186fa5bc5c90d581;p=lilypond.git

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index a8d63c2e1a..5f8471a600 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -3,19 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "separation-item.hh"
 
+#include "accidental-placement.hh"
 #include "axis-group-interface.hh"
 #include "lookup.hh"
-#include "stencil.hh"
-#include "skyline.hh"
+#include "note-column.hh"
+#include "note-head.hh"
 #include "paper-column.hh"
-#include "warn.hh"
 #include "pointer-group-interface.hh"
-#include "accidental-placement.hh"
+#include "skyline-pair.hh"
+#include "stencil.hh"
+#include "warn.hh"
 
 void
 Separation_item::add_item (Grob *s, Item *i)
@@ -100,7 +102,18 @@ Separation_item::boxes (Grob *me, Grob *left)
   if (left)
     elts = Accidental_placement::get_relevant_accidentals (read_only_elts, left);
   else
-    elts = read_only_elts;
+    {
+      elts = read_only_elts;
+
+      /* This is a special-case for NoteColumn: we want to include arpeggio in its
+	 skyline (so spacing takes it into account) but we don't want to include it
+	 in the NoteColumn's extent because some spanners (eg. Hairpin) bound themselves
+	 on the NoteColumn and we don't want them to include arpeggios in their bounds.
+      */
+      if (Grob *a = Note_column::arpeggio (me)) {
+	elts.push_back (a);
+      }
+    }
 
   Grob *ycommon = common_refpoint_of_array (elts, me, Y_AXIS);
   
@@ -109,27 +122,36 @@ 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));
       Interval x (il->extent (pc, X_AXIS));
 
-      Interval extra = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"),
-					    Interval (-0.1, 0.1));
-      x[LEFT] += extra[LEFT];
-      x[RIGHT] += extra[RIGHT];
-      if (to_boolean (elts[i]->get_property ("infinite-spacing-height")))
-	y = Interval (-infinity_f, infinity_f);
+      Interval extra_width = robust_scm2interval (elts[i]->get_property ("extra-spacing-width"),
+						  Interval (-0.1, 0.1));
+      Interval extra_height = robust_scm2interval (elts[i]->get_property ("extra-spacing-height"),
+						   Interval (-0.1, 0.1));
+
+      x[LEFT] += extra_width[LEFT];
+      x[RIGHT] += extra_width[RIGHT];
+      y[DOWN] += extra_height[DOWN];
+      y[UP] += extra_height[UP];
  
       if (!x.is_empty () && !y.is_empty ())
-      out.push_back (Box (x, y));
+	out.push_back (Box (x, y));
     }
 
   return out;      
 }
 
-extern bool debug_skylines;
 MAKE_SCHEME_CALLBACK (Separation_item, print, 1)
 SCM
 Separation_item::print (SCM smob)
@@ -148,9 +170,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 "