X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=4d4c5ac588b95c8cb10c8f2eb37de2d9de3a88e0;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=f69ced71477729d69ae27225c5c1247eb75cde95;hpb=9e7d9faf831361e98ac94aa8be4aee439f595688;p=lilypond.git

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index f69ced7147..4d4c5ac588 100644
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -3,43 +3,45 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 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);
-  VIRTUAL_COPY_CONSTRUCTOR (Grob, Paper_column);
+  // 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);
 
-  static bool has_interface (Grob*);
+  virtual Grob *clone (int count) const;
   virtual void do_break_processing ();
   virtual Paper_column *get_column () const;
   virtual System *get_system () const;
-  
-  static int get_rank (Grob*);
-  
+
+  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);
+  static bool has_interface (Grob *);
+  static int get_rank (Grob *);
+  static bool is_musical (Grob *);
+  static Moment when_mom (Grob *);
+  static bool is_used (Grob *);
 };
-     
+
 #endif // PAPER_COLUMN_HH