Merge commit 'ded1396' into jneeman

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

diff --git a/lily/include/spacing-interface.hh b/lily/include/spacing-interface.hh
index b558ede709aa46f9a69ad54f9fc910c564c79938..14b8c2bf03c468fa9bdab9365a33d371b683e080 100644 (file)
--- a/lily/include/spacing-interface.hh
+++ b/lily/include/spacing-interface.hh
@@ -8,8 +8,19 @@
 #include "grob-interface.hh"
 #include "lily-proto.hh"
 
+#ifndef SPACING_INTERFACE_HH
+#define SPACING_INTERFACE_HH
+
 struct Spacing_interface
 {
+  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);
+
   DECLARE_GROB_INTERFACE();
 };
 
+#endif /* SPACING_INTERFACE_HH */