Run `make grand-replace'.

[lilypond.git] / lily / note-column.cc

diff --git a/lily/note-column.cc b/lily/note-column.cc
index b1c6b9f272204417ddf050f2ebd1a2a036068bb4..76bde1c3d60f632cae6a3c338f2009fef5504632 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-column.hh"
@@ -195,13 +195,28 @@ Note_column::arpeggio (Grob *me)
   return unsmob_grob (me->get_object ("arpeggio"));
 }
 
+/* If a note-column contains a cross-staff stem then
+   nc->extent (Y_AXIS, refp) will not consider the extent of the stem.
+   If you want the extent of the stem to be included (and you are safe
+   from any cross-staff issues) then call this function instead. */
+Interval
+Note_column::cross_staff_extent (Grob *me, Grob *refp)
+{
+  Interval iv = me->extent (refp, Y_AXIS);
+  if (Grob *s = get_stem (me))
+    iv.unite (s->extent (refp, Y_AXIS));
+
+  return iv;
+}
+
 ADD_INTERFACE (Note_column,
-              "Stem and noteheads combined",
+              "Stem and noteheads combined.",
 
               /* properties */
               "arpeggio "
               "force-hshift "
               "horizontal-shift "
+              "ignore-collision "
               "note-heads "
               "rest "
               "rest-collision "