X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=314f52ec8f578e3d44842774f3611bdb13139a3a;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c182d6aa6c6887fde16665b0804b4e8349a0e8e6;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh index c182d6aa6c..314f52ec8f 100644 --- 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--2006 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #ifndef PAPER_COLUMN_HH @@ -11,7 +11,6 @@ #include "item.hh" #include "rod.hh" -#include "lily-proto.hh" class Paper_column : public Item { @@ -23,10 +22,10 @@ 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; @@ -44,11 +43,13 @@ public: DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM)); DECLARE_GROB_INTERFACE(); - static int get_rank (Grob *); + 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 Real minimum_distance (Grob *l, Grob *r); + static Interval break_align_width (Grob *me); }; #endif // PAPER_COLUMN_HH