Fix a cyclic dependency.

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 3f57d3e63c888b09fb564849aa3809b4307366b3..d756a9121b86c4008c2b4b7235564ea20e14a5e1 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -1,9 +1,20 @@
 /*
-  note-column.cc -- implement Note_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--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 "note-column.hh"
@@ -126,28 +137,6 @@ Note_column::add_head (Grob *me, Grob *h)
     Axis_group_interface::add_element (me, h);
 }
 
-/**
-   translate the rest symbols vertically by amount DY, but only if
-   they have no staff-position set.
-*/
-void
-Note_column::translate_rests (Grob *me, int dy)
-{
-  Grob *r = unsmob_grob (me->get_object ("rest"));
-  if (r && !scm_is_number (r->get_property ("staff-position")))
-    {
-      r->translate_axis (dy * Staff_symbol_referencer::staff_space (r) / 2.0, Y_AXIS);
-      Grob *p = r->get_parent (Y_AXIS);
-      p->flush_extent_cache (Y_AXIS);
-    }
-}
-
-void
-Note_column::set_dotcol (Grob *me, Grob *d)
-{
-  Axis_group_interface::add_element (me, d);
-}
-
 Grob *
 Note_column::first_head (Grob *me)
 {
@@ -156,7 +145,7 @@ Note_column::first_head (Grob *me)
 }
 
 /*
-  Return the first Accidentals grob that we find in a note-head.
+  Return the first AccidentalPlacement grob that we find in a note-head.
 */
 Grob *
 Note_column::accidentals (Grob *me)
@@ -191,7 +180,7 @@ Note_column::dot_column (Grob *me)
       if (dots)
        return dots->get_parent (X_AXIS);
     }
-  
+
   return 0;
 }
 
@@ -201,13 +190,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 "