X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-bracket.hh;h=d3209a5d3a9af9e5e7a789f7bbe464cb78083857;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3b0c0d735dcd1eb3d7fc6b6a5a4c5b591120ffc3;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index 3b0c0d735d..d3209a5d3a 100644
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,14 +1,15 @@
 /*
   tuplet-bracket.hh -- part of GNU LilyPond
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef Tuplet_bracket_HH
 #define Tuplet_bracket_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
 class Tuplet_bracket
 {
@@ -18,14 +19,15 @@ public:
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_connect_to_neighbors, (SCM smob));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static Grob* get_common_x (Spanner *);
   static void add_tuplet_bracket (Grob *me, Grob *smaller_bracket);
   static void get_bounds (Grob *, Grob **, Grob **);
   static void add_column (Grob *me, Item *);
   static void add_beam (Grob *me, Grob *);
-  static Grob *parallel_beam (Grob *me, Link_array__Grob_ const &cols, bool *equally_long);
+  static Grob *parallel_beam (Grob *me, vector<Grob*> const &cols, bool *equally_long);
   static void calc_position_and_height (Grob *, Real *, Real *dy);
   static Stencil make_bracket (Grob *me, Axis protusion_axis,
 			       Offset dz, Drul_array<Real> height,