Merge commit '2799dfc'

[lilypond.git] / lily / include / arpeggio.hh

diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh
index aa2e36260e1d1b367a8c705d95e1d8dee5a9e483..7db201bb0004f5fba9b6e7373a2125a04036d82c 100644 (file)
--- a/lily/include/arpeggio.hh
+++ b/lily/include/arpeggio.hh
@@ -3,22 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef ARPEGGIO_HH
 #define ARPEGGIO_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
+
 
 class Arpeggio
 {
 public:
+  static Grob *get_common_y (Grob *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_positions, (SCM));
   DECLARE_SCHEME_CALLBACK (brew_chord_bracket, (SCM));
-  DECLARE_SCHEME_CALLBACK (width_callback, (SCM, SCM));
-  static bool has_interface (Grob *);
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+  DECLARE_GROB_INTERFACE();
 };
 
 #endif /* ARPEGGIO_HH */