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

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index f44ea9ac15..0157eb6bb9 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -3,43 +3,52 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#ifndef P_COL_HH
-#define P_COL_HH
+#ifndef PAPER_COLUMN_HH
+#define PAPER_COLUMN_HH
 
 #include "item.hh"
 #include "rod.hh"
 
-
 class Paper_column : public Item
-{ 
+{
+  int rank_;
+  /// 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:
-  VIRTUAL_COPY_CONS (Grob);
+  Paper_column (SCM);
+  Paper_column (Paper_column const &);
 
-  static bool has_interface (Grob*);
-  int  rank_;
+  virtual Grob *clone () const;
   virtual void do_break_processing ();
   virtual Paper_column *get_column () const;
   virtual System *get_system () const;
-  
-  /// if lines are broken then this column is in #line#
-  System *system_;
-
-  static int get_rank (Grob*);
+  void set_system (System *);
 
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM));
-  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM));
-  
-  Paper_column (SCM);
-  static bool musical_b (Grob *);
-  static Moment when_mom (Grob*);
+  static int compare (Grob * const &a,
+		      Grob * const &b);
+  static bool less_than (Grob *const &a,
+			 Grob *const &b);
 
-  static bool used_b (Grob*) ;
+  int get_rank () const { return rank_; }
   void set_rank (int);
+
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
+
+  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 // P_COL_HH
+
+#endif // PAPER_COLUMN_HH