X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-bracket.hh;h=ccc2c22bfc769a597e78f35ed873d0164690613d;hb=3f141d50d558df9fdfe08cc97b1bc910c0833e86;hp=b0095c6d23b28cd58dae4ff38cb1cf60247449e0;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index b0095c6d23..ccc2c22bfc 100644
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,42 +1,39 @@
 /*
   tuplet-bracket.hh -- part of GNU LilyPond
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 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"
 
-/*
-
-    TODO: quantise, we don't want to collide with staff lines.
- (or should we be above staff?)
-
-  todo: handle breaking elegantly.
-*/
 class Tuplet_bracket
 {
 public:
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
-  static bool has_interface (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 void calc_dy (Grob*,Real *) ;
-  static void calc_position_and_height (Grob*,Real*,Real *dy);
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_positions, (SCM));
+  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));
   
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM ));
-
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
-  static Molecule make_bracket (Axis protusion_axis,
-				Real dx, Real dy, Real thick, Drul_array<Real> height,
-				Real gap, Drul_array<Real> widen,
-				Drul_array<Real> shorten);
-  static Direction get_default_dir (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, 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,
+			       Interval gap, Drul_array<Real> widen,
+			       Drul_array<Real> shorten);
+  static Direction get_default_dir (Grob *);
 };
 
 #endif // Tuplet_bracket_HH