Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh
index 0157eb6bb9a64079af671078cca25d0f2102e3a1..719e7d5e4945dbe4e7eade5cd74ed8d9c884c2c4 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PAPER_COLUMN_HH
@@ -48,6 +48,9 @@ public:
   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