X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-bracket.hh;h=72daae4da9990aa7c942617ffc04b57008764e04;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=86a89262f79284295efd8f9cc3b2463c21ac7b34;hpb=da5ebcb20a260914bc71260f68c38559a344016c;p=lilypond.git

diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh
index 86a89262f7..72daae4da9 100644
--- a/lily/include/tuplet-bracket.hh
+++ b/lily/include/tuplet-bracket.hh
@@ -1,41 +1,54 @@
 /*
-  tuplet-bracket.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 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"
 
-/*
-
-    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> cols, bool *equally_long);
-  static void calc_dy (Grob*,Real *) ;
-  static void calc_position_and_height (Grob*,Real*,Real *dy);
-  
-  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, Real lprotrusion,
-				Real rprotrusion, Real gap, Real left_widen,
-				Real right_widen);
-  static Direction get_default_dir (Grob*);
+  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));
+
+  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 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);
+  static Direction get_default_dir (Grob *);
 };
 
 #endif // Tuplet_bracket_HH