X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-bracket.hh;h=8c6ab14a3278774a7dac1a5fac738dbda204b30a;hb=26d40794616f7dc6d47af25bb373a5d2353633cf;hp=add0f47e6ff9cd8118e7eb2ceb054ebcb54e3239;hpb=889dc430ee110fc9f7b66d9f8768fb746bb2b12a;p=lilypond.git

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index add0f47e6f..8c6ab14a32 100644
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,33 +1,53 @@
 /*
-  tuplet-bracket.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2011 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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
 {
 public:
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_positions, (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));
 
-  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_script (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,
-			       Interval gap, Drul_array<Real> widen,
-			       Drul_array<Real> shorten);
+  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);
   static Direction get_default_dir (Grob *);
 };