2003 -> 2004

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

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 16b05850577f51cff1266e9c54a771ef24e8ee38..f44ea9ac151661343fcc08c9925293a3783b2bf5 100644 (file)
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -3,71 +3,43 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef P_COL_HH
 #define P_COL_HH
 
-#include "axis-group-item.hh"
+#include "item.hh"
 #include "rod.hh"
-#include "spring.hh"
 
-/**
-   stuff grouped vertically.
-    This is a class to address items vertically. It contains the data for:
-    \begin{itemize}
-    \item
-    unbroken score
-    \item
-    broken score
-    \item
-    the linespacing problem
-    \end{itemize}
-  */
 
-class Paper_column : public Axis_group_item { 
+class Paper_column : public Item
+{ 
 public:
-  VIRTUAL_COPY_CONS(Score_element);
-  Drul_array<Array<Column_rod> > minimal_dists_arr_drul_;
-  Drul_array<Array<Column_spring> > spring_arr_drul_;
-
-  /// set a minimum distance
-  void add_rod (Paper_column * to, Real distance);
-  void add_spring (Paper_column * to, Real dist, Real strength);
-
-  virtual Paper_column * column_l () const;
-  virtual Line_of_score *line_l () const;
-
-
+  VIRTUAL_COPY_CONS (Grob);
+
+  static bool has_interface (Grob*);
+  int  rank_;
+  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#
-  Line_of_score *line_l_;
-
+  System *system_;
 
-  /// which  one (left =0)
-  int rank_i() const;
+  static int get_rank (Grob*);
 
-  Paper_column (Moment when);
-  Moment when_mom ()const;
-
-  bool musical_b () const;
+  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 bool used_b (Grob*) ;
   void set_rank (int);
-  virtual void do_print() const;
-private:
-    
-  /**
-    The ranking: left is smaller than right 
-    -1 is uninitialised.
-    */
-  int rank_i_;
-
 };
-
-
-// #include "compare.hh"
-// INSTANTIATE_COMPARE(Paper_column &, Paper_column::compare);
      
 #endif // P_COL_HH