X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=0157eb6bb9a64079af671078cca25d0f2102e3a1;hb=5ae46f750bfb3a947d4adc26044560da54c21e17;hp=ff6d642fba7cfd7a2ca885ab8b1cc57481a48f13;hpb=1b6937d111e6bddf65d00fd63a99f0d83cb41836;p=lilypond.git

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index ff6d642fba..0157eb6bb9 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_COLUMN_HH
@@ -18,30 +18,36 @@ class Paper_column : public Item
   /// if lines are broken then this column is in #line#
   System *system_;
 
-
   // ugh: friend declarations.
   friend void set_loose_columns (System *which, Column_x_positions const *posns);
   friend class System;
 public:
-  Paper_column (SCM, Object_key const *);
-  Paper_column (Paper_column const &, int count);
+  Paper_column (SCM);
+  Paper_column (Paper_column const &);
 
-  virtual Grob *clone (int count) const;
+  virtual Grob *clone () const;
   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 *);
+  static bool is_breakable (Grob *);
 };
 
 #endif // PAPER_COLUMN_HH