Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/note-column.cc b/lily/note-column.cc
index ba8ebd6fd8c700fbe4d1fd28160631ac478068c6..a53c06006943921f0f8b594e73f4025908003468 100644 (file)
--- 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 *
@@ -186,6 +187,16 @@ 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 */
+              "accidentals "
+              "arpeggio "
+              "force-hshift "
+              "horizontal-shift "
+              "note-heads "
+              "rest "
+              "rest-collision "
+              "stem "
+              );