X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpaper-column.hh;h=f1cb01e740685bcf11f9463e82a42466501d01f0;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=90a3404416dbc71afbb7ffc77ac85647526c29e6;hpb=ba7dd825738031e7c1f9ec7787594ad78f2442ee;p=lilypond.git diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh index 90a3404416..f1cb01e740 100644 --- a/lily/include/paper-column.hh +++ b/lily/include/paper-column.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2009 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,10 +39,10 @@ public: virtual System *get_system () const; void set_system (System *); - static int compare (Grob * const &a, - Grob * const &b); + static int compare (Grob *const &a, + Grob *const &b); static bool less_than (Grob *const &a, - Grob *const &b); + Grob *const &b); int get_rank () const { return rank_; } void set_rank (int); @@ -50,7 +50,6 @@ public: DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM)); - DECLARE_GROB_INTERFACE(); static int get_rank (Grob const *); static bool is_musical (Grob *); static Moment when_mom (Grob *); @@ -58,8 +57,8 @@ public: 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); + static Interval break_align_width (Grob *me, SCM align_sym); + static Interval get_interface_extent (Grob *column, SCM iface, Axis a); }; #endif // PAPER_COLUMN_HH -