Run `make grand-replace'.

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

diff --git a/lily/include/spacing-interface.hh b/lily/include/spacing-interface.hh
index a0c77a8b6278d83565bda71ed91f32c11f796f15..0f62ac9b0fabecc933353f795c0d3a2fc079fe30 100644 (file)
--- a/lily/include/spacing-interface.hh
+++ b/lily/include/spacing-interface.hh
@@ -1,13 +1,27 @@
-/*   
+/*
   spacing-interface.hh -- declare Spacing_interface
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-struct Spacing_interface {
-  static bool has_interface (Grob*);
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+#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);
+  static Grob* extremal_break_aligned_grob (Grob *me, Direction, Direction, Interval*);
+
+  DECLARE_GROB_INTERFACE();
 };
 
+#endif /* SPACING_INTERFACE_HH */