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

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 4da6ff3ef9351419387914458f6f7cc879ca0296..2636b20fe4bccee354e4b9b915f060f8e6f082af 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -34,9 +34,9 @@ Paper_column::do_break_processing ()
 }
 
 int
-Paper_column::get_rank (Grob *me)
+Paper_column::get_rank (Grob const *me)
 {
-  return dynamic_cast<Paper_column *> (me)->rank_;
+  return dynamic_cast<Paper_column const *> (me)->rank_;
 }
 
 System *
@@ -45,6 +45,12 @@ Paper_column::get_system () const
   return system_;
 }
 
+void
+Paper_column::set_system (System *s)
+{
+  system_ = s;
+}
+
 Paper_column *
 Paper_column::get_column () const
 {
@@ -73,6 +79,16 @@ Paper_column::compare (Grob * const &a,
               - dynamic_cast<Paper_column*> (b)->rank_);
 }
 
+bool
+Paper_column::less_than (Grob *const &a,
+                        Grob *const &b)
+{
+  Paper_column *pa = dynamic_cast<Paper_column*> (a);
+  Paper_column *pb = dynamic_cast<Paper_column*> (b);
+  
+  return pa->rank_ < pb->rank_;
+}
+
 Moment
 Paper_column::when_mom (Grob *me)
 {
@@ -187,8 +203,6 @@ Paper_column::before_line_breaking (SCM grob)
 
 
 ADD_INTERFACE (Paper_column,
-
-              "paper-column-interface",
               "@code{Paper_column} objects form the top-most X-parents for items."
               "  The are two types of columns: musical columns, where are attached to, and "
               "  non-musical columns, where bar-lines, clefs etc. are attached to. "
@@ -214,8 +228,10 @@ ADD_INTERFACE (Paper_column,
               "page-break-permission "
               "page-turn-penalty "
               "page-turn-permission "
+              "rhythmic-location "
               "shortest-playing-duration "
               "shortest-starter-duration "
+              "spacing "
               "used "
               "when ");