X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftuplet-bracket.hh;h=1e41154fbf32dfd03755ffd524cf1a6de81a8230;hb=0398fdb9df24ac2e22a8cbff1b3c18ca04e9f221;hp=ceeb7f3440c15c883bdb1b9f6c41db2e51807fea;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/include/tuplet-bracket.hh b/lily/include/tuplet-bracket.hh index ceeb7f3440..1e41154fbf 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 + Copyright (C) 1997--2015 Jan Nieuwenhuizen 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,16 +29,16 @@ 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 *); 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 const &cols, bool *equally_long);