X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-column.cc;h=fbb838523eeb9beab87c8a8606844a11882806e1;hb=c5bf34be054141c1b2ebd354630ada56db1dfc76;hp=8d4204b674a7a941e2b64df18b797207a7ef8237;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/note-column.cc b/lily/note-column.cc
index 8d4204b674..fbb838523e 100644
--- a/lily/note-column.cc
+++ b/lily/note-column.cc
@@ -15,6 +15,7 @@ using namespace std;
 #include "axis-group-interface.hh"
 #include "directional-element-interface.hh"
 #include "international.hh"
+#include "item.hh"
 #include "note-head.hh"
 #include "output-def.hh"
 #include "pointer-group-interface.hh"
@@ -34,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 *
@@ -60,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];
 
@@ -120,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);
 }
@@ -162,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;
@@ -186,6 +187,15 @@ Note_column::arpeggio (Grob *me)
   return unsmob_grob (me->get_object ("arpeggio"));
 }
 
-ADD_INTERFACE (Note_column, "note-column-interface",
+ADD_INTERFACE (Note_column,
 	       "Stem and noteheads combined",
-	       "arpeggio note-heads rest-collision rest horizontal-shift stem accidentals force-hshift");
+
+	       /* properties */
+	       "arpeggio "
+	       "force-hshift "
+	       "horizontal-shift "
+	       "note-heads "
+	       "rest "
+	       "rest-collision "
+	       "stem "
+	       );