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

[lilypond.git] / lily / include / paper-column.hh

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index d21828c374ee5c5105b13ee98c97b99e3282f988..be6ab9378dbca9c3e4653160b974366c0564140d 100644 (file)
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -29,17 +29,21 @@ public:
   virtual void do_break_processing ();
   virtual Paper_column *get_column () const;
   virtual System *get_system () const;
+  void set_system (System *);
 
   static int compare (Grob * const &a,
                      Grob * const &b);
+  static bool less_than (Grob *const &a,
+                        Grob *const &b);
+
   int get_rank () const { return rank_; }
   void set_rank (int);
 
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
 
-  static bool has_interface (Grob *);
-  static int get_rank (Grob *);
+  DECLARE_GROB_INTERFACE();
+  static int get_rank (Grob const *);
   static bool is_musical (Grob *);
   static Moment when_mom (Grob *);
   static bool is_used (Grob *);