Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / break-align-interface.hh

diff --git a/lily/include/break-align-interface.hh b/lily/include/break-align-interface.hh
index 41972c83a5ee1e7f5b2c5d7708ab5de614e54b09..421043b24cc70dd05808a0e5768b19aaf5a6f925 100644 (file)
--- a/lily/include/break-align-interface.hh
+++ b/lily/include/break-align-interface.hh
@@ -1,5 +1,5 @@
 /*
-  break-align-interface.hh -- declare Break_align_interface
+  break-align-interface.hh -- declare Break_alignment_interface
 
   source file of the GNU LilyPond music typesetter
 
@@ -9,13 +9,14 @@
 #ifndef BREAK_ALIGN_INTERFACE_HH
 #define BREAK_ALIGN_INTERFACE_HH
 
-#include "item.hh"
+#include "grob-interface.hh"
+#include "lily-proto.hh"
 
-class Break_align_interface
+class Break_alignment_interface
 {
 public:
   static vector<Grob*> ordered_elements (Grob *me);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static void add_element (Grob *me, Grob *add);
   static SCM break_align_order (Item *me);
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM element));
@@ -24,13 +25,13 @@ public:
 
 struct Break_aligned_interface
 {
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 
-struct Break_alignment_align_interface
+struct Break_alignable_interface
 {
   DECLARE_SCHEME_CALLBACK (self_align_callback, (SCM element));
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif // BREAK_ALIGN_INTERFACE_HH