(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 ed1d0edc495abbd4f3ca9e16679b38a888176334..6a8a1d3d6f80fb3fc1ba3d5eef4744bef3969302 100644 (file)
--- a/lily/include/paper-column.hh
+++ b/lily/include/paper-column.hh
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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"
@@ -17,29 +17,31 @@
 class Paper_column : public Item
 { 
 public:
-  VIRTUAL_COPY_CONS (Grob);
+  int  rank_;
+  /// if lines are broken then this column is in #line#
+  System *system_;
+
+  Paper_column (SCM, Object_key const*);
+  Paper_column (Paper_column const&, int count);
+  
+  virtual Grob *clone (int count) const;
 
   static bool has_interface (Grob*);
-  int  rank_i_;
   virtual void do_break_processing ();
-  virtual Paper_column *column_l () const;
+  virtual Paper_column *get_column () const;
   virtual System *get_system () const;
   
-  /// if lines are broken then this column is in #line#
-  System *system_;
-
-  static int rank_i (Grob*);
-
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM));
-  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM));
+  static int get_rank (Grob*);
+  
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
   
-  Paper_column (SCM);
-  static bool musical_b (Grob *);
+  static bool is_musical (Grob *);
   static Moment when_mom (Grob*);
 
-  static bool used_b (Grob*) ;
+  static bool is_used (Grob*) ;
   void set_rank (int);
 };
      
-#endif // P_COL_HH
+#endif // PAPER_COLUMN_HH