''

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

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