Run `make grand-replace'.

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 787773019ed7f7eadf5684989807f9dd6ccde98c..76bde1c3d60f632cae6a3c338f2009fef5504632 100644 (file)
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,21 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-column.hh"
 
-#include <math.h>              // ceil
+#include <cmath>               // ceil
+using namespace std;
 
+#include "accidental-placement.hh"
 #include "axis-group-interface.hh"
-#include "stem.hh"
-#include "warn.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "item.hh"
+#include "note-head.hh"
 #include "output-def.hh"
-#include "staff-symbol-referencer.hh"
+#include "pointer-group-interface.hh"
 #include "rest.hh"
-#include "note-head.hh"
-#include "accidental-placement.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "warn.hh"
 
 /*
   TODO: figure out if we can prune this class. This is just an
@@ -30,15 +35,15 @@ Note_column::has_rests (Grob *me)
   return unsmob_grob (me->get_object ("rest"));
 }
 
-int
-Note_column::shift_compare (Grob *const &p1, Grob *const &p2)
+bool
+Note_column::shift_less (Grob *const &p1, Grob *const &p2)
 {
   SCM s1 = p1->get_property ("horizontal-shift");
   SCM s2 = p2->get_property ("horizontal-shift");
 
   int h1 = (scm_is_number (s1)) ? scm_to_int (s1) : 0;
   int h2 = (scm_is_number (s2)) ? scm_to_int (s2) : 0;
-  return h1 - h2;
+  return h1 < h2;
 }
 
 Item *
@@ -56,7 +61,7 @@ Note_column::head_positions_interval (Grob *me)
   iv.set_empty ();
 
   extract_grob_set (me, "note-heads", heads);
-  for (int i = 0; i < heads.size(); i++) 
+  for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *se = heads[i];
 
@@ -71,9 +76,13 @@ Note_column::dir (Grob *me)
 {
   Grob *stem = unsmob_grob (me->get_object ("stem"));
   if (stem && Stem::has_interface (stem))
-    return Stem::get_direction (stem);
-  else if (scm_is_pair (me->get_object ("note-heads")))
-    return (Direction)sign (head_positions_interval (me).center ());
+    return get_grob_direction (stem);
+  else
+    {
+      extract_grob_set (me, "note-heads", heads);
+      if (heads.size ())
+       return (Direction)sign (head_positions_interval (me).center ());
+    }
 
   programming_error ("note column without heads and stem");
   return CENTER;
@@ -83,7 +92,6 @@ void
 Note_column::set_stem (Grob *me, Grob *stem)
 {
   me->set_object ("stem", stem->self_scm ());
-  me->add_dependency (stem);
   Axis_group_interface::add_element (me, stem);
 }
 
@@ -113,7 +121,7 @@ Note_column::add_head (Grob *me, Grob *h)
     }
 
   if (both)
-    me->warning (_ ("can't have note heads and rests together on a stem"));
+    me->warning (_ ("cannot have note heads and rests together on a stem"));
   else
     Axis_group_interface::add_element (me, h);
 }
@@ -134,12 +142,6 @@ Note_column::translate_rests (Grob *me, int dy)
     }
 }
 
-void
-Note_column::set_dotcol (Grob *me, Grob *d)
-{
-  Axis_group_interface::add_element (me, d);
-}
-
 Grob *
 Note_column::first_head (Grob *me)
 {
@@ -155,7 +157,7 @@ Note_column::accidentals (Grob *me)
 {
   extract_grob_set (me, "note-heads", heads);
   Grob *acc = 0;
-  for (int i = 0; i < heads.size(); i++) 
+  for (vsize i = 0; i < heads.size (); i++)
     {
       Grob *h = heads[i];
       acc = h ? unsmob_grob (h->get_object ("accidental-grob")) : 0;
@@ -173,7 +175,50 @@ Note_column::accidentals (Grob *me)
   return acc;
 }
 
-ADD_INTERFACE (Note_column, "note-column-interface",
-              "Stem and noteheads combined",
-              "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
+Grob *
+Note_column::dot_column (Grob *me)
+{
+  extract_grob_set (me, "note-heads", heads);
+  for (vsize i = 0; i < heads.size (); i++)
+    {
+      Grob *dots = unsmob_grob (heads[i]->get_object ("dot"));
+      if (dots)
+       return dots->get_parent (X_AXIS);
+    }
+  
+  return 0;
+}
+
+Grob *
+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.",
+
+              /* properties */
+              "arpeggio "
+              "force-hshift "
+              "horizontal-shift "
+              "ignore-collision "
+              "note-heads "
+              "rest "
+              "rest-collision "
+              "stem "
+              );