X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-bracket.hh;h=2097e98d58dd79934b7d326a0f866ba7e06d2329;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=b93de11d6adcce233ee4d028b8b050414c403b3f;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh index b93de11d6a..2097e98d58 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 + (c) 1997--2007 Jan Nieuwenhuizen */ #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 { @@ -19,13 +20,13 @@ public: DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (calc_connect_to_neighbors, (SCM smob)); - 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 const &cols, bool *equally_long); + static Grob *parallel_beam (Grob *me, vector 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 height,