X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=6dbdf4b23f626b1958655695e8001f9908a4b4e7;hb=9ead371f45f0a0c98e86e8e32eb86ef75c3af5a4;hp=c26d8d213785f770a29cff6a7072fe54d1a500fb;hpb=d8dfa746ead381a80901106b9c9b079dc9b5d004;p=lilypond.git diff --git a/lily/include/beam.hh b/lily/include/beam.hh index c26d8d2137..6dbdf4b23f 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2012 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -57,7 +57,6 @@ public: static int normal_stem_count (Grob *); static Grob *first_normal_stem (Grob *); static Grob *last_normal_stem (Grob *); - DECLARE_GROB_INTERFACE (); static void add_stem (Grob *, Grob *); static bool is_cross_staff (Grob *); static bool is_knee (Grob *); @@ -72,13 +71,9 @@ public: DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM prev_off)); DECLARE_SCHEME_CALLBACK (pure_rest_collision_callback, (SCM element, SCM, SCM, SCM prev_off)); DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_beam_gap, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_springs_and_rods, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_minimum_length, (SCM)); DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM)); DECLARE_SCHEME_CALLBACK (calc_stem_shorten, (SCM)); DECLARE_SCHEME_CALLBACK (calc_direction, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_positions, (SCM)); DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM)); DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM)); DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM)); @@ -92,7 +87,6 @@ public: private: friend class Beam_scoring_problem; - static bool whole_note_close_chord_tremolo (Grob *me); static Direction get_default_dir (Grob *); static vector get_beam_segments (Grob *); static void set_stem_directions (Grob *, Direction);