X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-bracket.hh;fp=lily%2Finclude%2Ftuplet-bracket.hh;h=2f4bf38e1959681e88382fd9d3aca3c38f037200;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=17285a09178107cbde3c90cb74c0e61a7d1ca214;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index 17285a0917..2f4bf38e19 100644
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,24 +29,25 @@ class Tuplet_bracket
 public:
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_positions, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_x_positions, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_connect_to_neighbors, (SCM smob));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
-  
-  DECLARE_GROB_INTERFACE();
-  static Grob* get_common_x (Spanner *);
+
+  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_script (Grob *me, Item *);
   static void add_beam (Grob *me, Grob *);
-  static Grob *parallel_beam (Grob *me, vector<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 protrusion_axis,
-			       Offset dz, Drul_array<Real> height,
-			       Interval gap, Drul_array<Real> widen,
-			       Drul_array<Real> shorten);
+                               Offset dz, Drul_array<Real> height,
+                               Interval gap, Drul_array<Real> widen,
+                               Drul_array<Real> shorten);
   static Direction get_default_dir (Grob *);
 };