(triangle): add s to 0triangle.

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

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index cc4778ddddfcff7b5b4d75cf92927bfc3c169460..6a8a1d3d6f80fb3fc1ba3d5eef4744bef3969302 100644 (file)
--- 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--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
+#ifndef PAPER_COLUMN_HH
+#define PAPER_COLUMN_HH
 
 #include "item.hh"
 #include "rod.hh"
-#include "spring.hh"
+
 
 class Paper_column : public Item
 { 
 public:
-  VIRTUAL_COPY_CONS(Score_element);
-
-  /*
-    Not (yet) in scm, because of messy effects when a column commits suicide.
-   */
-  int  rank_i_;
-  virtual void do_break_processing ();
-  virtual Paper_column *column_l () const;
-  virtual Line_of_score *line_l () const;
-
+  int  rank_;
   /// if lines are broken then this column is in #line#
-  Line_of_score *line_l_;
-
-  /// which  one (left =0)
-  static int rank_i(Score_element*);
+  System *system_;
 
-  Paper_column (SCM);
-  bool musical_b () const;
-  static Moment when_mom (Score_element*);
+  Paper_column (SCM, Object_key const*);
+  Paper_column (Paper_column const&, int count);
+  
+  virtual Grob *clone (int count) const;
 
-  static bool used_b (Score_element*) ;
+  static bool has_interface (Grob*);
+  virtual void do_break_processing ();
+  virtual Paper_column *get_column () const;
+  virtual System *get_system () const;
+  
+  static int get_rank (Grob*);
+  
+  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);
 };
      
-#endif // P_COL_HH
+#endif // PAPER_COLUMN_HH