2003 -> 2004

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

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 6660379575badd8aec749e9d7d085247cdba1cec..f44ea9ac151661343fcc08c9925293a3783b2bf5 100644 (file)
--- 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,29 +12,29 @@
 
 #include "item.hh"
 #include "rod.hh"
-#include "spring.hh"
+
 
 class Paper_column : public Item
 { 
 public:
   VIRTUAL_COPY_CONS (Grob);
 
-  /*
-    Not (yet) in scm, because of messy effects when a column commits suicide.
-   */
-  int  rank_i_;
+  static bool has_interface (Grob*);
+  int  rank_;
   virtual void do_break_processing ();
-  virtual Paper_column *column_l () const;
-  virtual Line_of_score *line_l () const;
-
+  virtual Paper_column *get_column () const;
+  virtual System *get_system () const;
+  
   /// if lines are broken then this column is in #line#
-  Line_of_score *line_l_;
+  System *system_;
 
-  /// which  one (left =0)
-  static int rank_i (Grob*);
+  static int get_rank (Grob*);
 
+  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM));
+  
   Paper_column (SCM);
-  bool musical_b () const;
+  static bool musical_b (Grob *);
   static Moment when_mom (Grob*);
 
   static bool used_b (Grob*) ;