X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparation-item.cc;h=56ed817e170987566f4e31be1e70d22159260b86;hb=4a6773dd60ef6ef481e37b00049c9eedcb5b8193;hp=a567f3c6bd50c336e56773b14209efeb2d81eb45;hpb=524bd19f7f02c87ce421cb7776f1894c973b2f7f;p=lilypond.git

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index a567f3c6bd..56ed817e17 100644
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -1,9 +1,20 @@
 /*
-  separation-item.cc -- implement Separation_item
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "separation-item.hh"
@@ -11,6 +22,7 @@
 #include "accidental-placement.hh"
 #include "axis-group-interface.hh"
 #include "lookup.hh"
+#include "note-column.hh"
 #include "note-head.hh"
 #include "paper-column.hh"
 #include "pointer-group-interface.hh"
@@ -68,7 +80,7 @@ Skyline
 Separation_item::conditional_skyline (Grob *me, Grob *left)
 {
   vector<Box> bs = boxes (me, left);
-  return Skyline (bs, 0.1, Y_AXIS, LEFT);
+  return Skyline (bs, 0.0, Y_AXIS, LEFT);
 }
 
 
@@ -79,7 +91,7 @@ Separation_item::calc_skylines (SCM smob)
   Item *me = unsmob_item (smob);
   vector<Box> bs = boxes (me, 0);
   /* todo: the horizon_padding is somewhat arbitrary */
-  return Skyline_pair (bs, 0.1, Y_AXIS).smobbed_copy ();
+  return Skyline_pair (bs, 0.0, Y_AXIS).smobbed_copy ();
 }
 
 /* if left is non-NULL, get the boxes corresponding to the
@@ -101,7 +113,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);
   
@@ -123,15 +146,18 @@ Separation_item::boxes (Grob *me, Grob *left)
       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.0, 0.0));
+
+      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;