X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=a1b651a357c787fe98d466e1c02c0fa4145d0d8e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=71821f6629f796679c0d84fa53be0bf87c0464a5;hpb=7693db10b018da89a3123cb4c9e21e3956638c56;p=lilypond.git diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 71821f6629..a1b651a357 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -1,53 +1,41 @@ /* - beam.hh -- part of GNU LilyPond + This file is part of LilyPond, the GNU music typesetter. - source file of the LilyPond music typesetter - - (c) 1996--2006 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys 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 + 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 . */ #ifndef BEAM_HH #define BEAM_HH +#include "grob-interface.hh" #include "std-vector.hh" #include "lily-proto.hh" -#include "lily-guile.hh" #include "stem-info.hh" -/* - TODO: move quanting in separate file. -*/ -struct Beam_quant_parameters -{ - Real INTER_QUANT_PENALTY; - Real SECONDARY_BEAM_DEMERIT; - Real STEM_LENGTH_DEMERIT_FACTOR; - Real REGION_SIZE; - - /* - threshold to combat rounding errors. - */ - Real BEAM_EPS; - - // possibly ridiculous, but too short stems just won't do - Real STEM_LENGTH_LIMIT_PENALTY; - Real DAMPING_DIRECTION_PENALTY; - Real MUSICAL_DIRECTION_FACTOR; - Real IDEAL_SLOPE_FACTOR; - Real ROUND_TO_ZERO_SLOPE; - - void fill (Grob *him); -}; - struct Beam_segment { int vertical_count_; - Interval horizontal_; + Interval horizontal_; Beam_segment (); }; -struct Beam_stem_segment +bool beam_segment_less (Beam_segment const &a, Beam_segment const &b); + +struct Beam_stem_segment { Beam_stem_segment (); @@ -55,74 +43,62 @@ struct Beam_stem_segment Real width_; Real stem_x_; int rank_; - int stem_index_; + vsize stem_index_; bool gapped_; Direction dir_; int max_connect_; - }; - bool operator <(Beam_stem_segment const &a, Beam_stem_segment const &b); class Beam { public: - static int visible_stem_count (Grob *); - static Grob *first_visible_stem (Grob *); - static Grob *last_visible_stem (Grob *); - static bool has_interface (Grob *); + 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 *); static void set_beaming (Grob *, Beaming_pattern const *); static void set_stemlens (Grob *); static int get_beam_count (Grob *me); static Real get_beam_translation (Grob *me); - static Real get_thickness (Grob *me); + static Real get_beam_thickness (Grob *me); static void connect_beams (Grob *me); - static vector get_beam_segments (Grob *me_grob, Grob **common); - + static vector get_beam_segments (Grob *me_grob, Grob **common); + 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_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_least_squares_positions, (SCM, SCM)); - DECLARE_SCHEME_CALLBACK (calc_concaveness, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM)); DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM)); - + DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_beam_segments, (SCM)); /* position callbacks */ - DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM, SCM)); - DECLARE_SCHEME_CALLBACK (slope_damping, (SCM, SCM)); - DECLARE_SCHEME_CALLBACK (quanting, (SCM, SCM)); - -static Real score_slopes_dy (Real, Real, Real, Real, Real, bool, Beam_quant_parameters const *); - - static Real score_stem_lengths (vector const &stems, - vector const &stem_infos, - vector const &base_stem_ys, - vector const &stem_xs, - Real xl, Real xr, - bool knee, - Real yl, Real yr, Beam_quant_parameters const *); - static Real score_forbidden_quants (Real, Real, - Real, Real, Real, Real, - Drul_array, Direction, Direction, - Beam_quant_parameters const *); + DECLARE_SCHEME_CALLBACK (quanting, (SCM, SCM, SCM)); + DECLARE_SCHEME_CALLBACK (calc_x_positions, (SCM)); static int get_direction_beam_count (Grob *me, Direction d); + private: + friend class Beam_scoring_problem; + static Direction get_default_dir (Grob *); + static vector get_beam_segments (Grob *); static void set_stem_directions (Grob *, Direction); static void consider_auto_knees (Grob *); static void set_stem_shorten (Grob *); - static Real calc_stem_y (Grob *, Grob *s, Grob **c, - Real, Real, - Drul_array pos, bool french); static int forced_stem_count (Grob *); + static Real calc_stem_y (Grob *, Grob *s, Grob **c, + Real, Real, Direction, + Drul_array pos, bool french); }; - #endif /* BEAM_HH */