Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

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

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 282b7c4c2638e0fb394ef7fa537576e538aff4f9..cc2e2b90f1f530fe7ae14e077077d1381380c145 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_COLUMN_HH
@@ -22,13 +22,19 @@ class Paper_column : public Item
   friend void set_loose_columns (System *which, Column_x_positions const *posns);
   friend class System;
 public:
-  Paper_column (SCM, Object_key const *);
-  Paper_column (Paper_column const &, int count);
+  Paper_column (SCM);
+  Paper_column (Paper_column const &);
 
-  virtual Grob *clone (int count) const;
+  virtual Grob *clone () const;
   virtual void do_break_processing ();
   virtual Paper_column *get_column () const;
   virtual System *get_system () const;
+  void set_system (System *);
+
+  static int compare (Grob * const &a,
+                     Grob * const &b);
+  static bool less_than (Grob *const &a,
+                        Grob *const &b);
 
   int get_rank () const { return rank_; }
   void set_rank (int);
@@ -36,11 +42,15 @@ public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
 
-  static bool has_interface (Grob *);
-  static int get_rank (Grob *);
+  DECLARE_GROB_INTERFACE();
+  static int get_rank (Grob const *);
   static bool is_musical (Grob *);
   static Moment when_mom (Grob *);
   static bool is_used (Grob *);
+  static bool is_breakable (Grob *);
+  static bool is_extraneous_column_from_ligature (Grob *);
+  static Real minimum_distance (Grob *l, Grob *r);
+  static Interval break_align_width (Grob *me);
 };
 
 #endif // PAPER_COLUMN_HH