Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

[lilypond.git] / lily / include / spacing-interface.hh

diff --git a/lily/include/spacing-interface.hh b/lily/include/spacing-interface.hh
index 08e404e4e742ad9500fef7d1f8e6ca9c1d0ce250..135b31ae6e8f35219eb2ff1f15283e0732f433ee 100644 (file)
--- a/lily/include/spacing-interface.hh
+++ b/lily/include/spacing-interface.hh
@@ -13,10 +13,13 @@
 
 struct Spacing_interface
 {
-  static Real minimum_distance (Grob *me);
-  static Drul_array<Item*> note_columns (Grob *me);
+  static Real minimum_distance (Grob *me, Grob *right_col);
+  static vector<Item*> right_note_columns (Grob *me);
+  static vector<Item*> left_note_columns (Grob *me);
   static Item* right_column (Grob *me);
   static Item* left_column (Grob *me);
+  static Drul_array<Skyline> skylines (Grob *me, Grob *right_col);
+  static Grob* extremal_break_aligned_grob (Grob *me, Direction, Direction, Interval*);
 
   DECLARE_GROB_INTERFACE();
 };