X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=0157eb6bb9a64079af671078cca25d0f2102e3a1;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=630d0acaf911a3b196a59929946e20c5e2183974;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 630d0acaf9..0157eb6bb9 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -3,45 +3,52 @@
 
   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
 #define PAPER_COLUMN_HH
 
 #include "item.hh"
 #include "rod.hh"
 
-
 class Paper_column : public Item
-{ 
-public:
-  int  rank_;
+{
+  int rank_;
   /// if lines are broken then this column is in #line#
   System *system_;
 
-  Paper_column (SCM, Object_key const*);
-  Paper_column (Paper_column const&, int count);
-  
-  virtual Grob *clone (int count) const;
+  // ugh: friend declarations.
+  friend void set_loose_columns (System *which, Column_x_positions const *posns);
+  friend class System;
+public:
+  Paper_column (SCM);
+  Paper_column (Paper_column const &);
 
-  static bool has_interface (Grob*);
+  virtual Grob *clone () const;
   virtual void do_break_processing ();
   virtual Paper_column *get_column () const;
   virtual System *get_system () const;
-  
-  static int get_rank (Grob*);
-  
+  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 is_musical (Grob *);
-  static Moment when_mom (Grob*);
 
-  static bool is_used (Grob*) ;
-  void set_rank (int);
+  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