X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=ca85f08e123f47d180da89f445441c4c0ad86d26;hb=03ce3667568361ee7433032988a4089c64de2ec7;hp=458e60aad40b91cb0f4789f14dceac9303f19027;hpb=1402d6d957bee7d47e0bddf4c57dd89912182b26;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 458e60aad4..ca85f08e12 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -3,22 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 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 "output-def.hh"
-#include "staff-symbol-referencer.hh"
-#include "rest.hh"
+#include "directional-element-interface.hh"
+#include "international.hh"
+#include "item.hh"
 #include "note-head.hh"
-#include "accidental-placement.hh"
+#include "output-def.hh"
 #include "pointer-group-interface.hh"
+#include "rest.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
@@ -31,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 *
@@ -57,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];
 
@@ -72,14 +76,14 @@ Note_column::dir (Grob *me)
 {
   Grob *stem = unsmob_grob (me->get_object ("stem"));
   if (stem && Stem::has_interface (stem))
-    return Stem::get_direction (stem);
+    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;
 }
@@ -88,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);
 }
 
@@ -118,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);
 }
@@ -160,7 +163,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;
@@ -178,7 +181,22 @@ Note_column::accidentals (Grob *me)
   return acc;
 }
 
-ADD_INTERFACE (Note_column, "note-column-interface",
+Grob *
+Note_column::arpeggio (Grob *me)
+{
+  return unsmob_grob (me->get_object ("arpeggio"));
+}
+
+ADD_INTERFACE (Note_column,
 	       "Stem and noteheads combined",
-	       "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
 
+	       /* properties */
+	       "accidentals "
+	       "arpeggio "
+	       "force-hshift "
+	       "horizontal-shift "
+	       "note-heads "
+	       "rest "
+	       "rest-collision "
+	       "stem "
+	       );