X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbeam.hh;h=a9b30b678668e1020b9b9e2f1a0aea2d8b552656;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1bfe58ae84f8e07babace6bd239b81cb9b2a69b7;hpb=40e1749088af2d15d50901862fc500ceee57aa41;p=lilypond.git diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 1bfe58ae84..a9b30b6786 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -3,78 +3,131 @@ source file of the LilyPond music typesetter - (c) 1996--2003 Han-Wen Nienhuys + (c) 1996--2008 Han-Wen Nienhuys Jan Nieuwenhuizen */ #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 HINT_DIRECTION_PENALTY; + Real IDEAL_SLOPE_FACTOR; + Real ROUND_TO_ZERO_SLOPE; + + void fill (Grob *him); +}; + +struct Beam_segment +{ + int vertical_count_; + Interval horizontal_; + Beam_segment (); +}; + +struct Beam_stem_segment +{ + Beam_stem_segment (); + + Grob *stem_; + Real width_; + Real stem_x_; + int rank_; + 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*); - DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis)); - Beam (SCM); - static void add_stem (Grob*,Grob*); - static bool knee_b (Grob*); - static void set_beaming (Grob*,Beaming_info_list *); - 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 void connect_beams (Grob*me); - DECLARE_SCHEME_CALLBACK (space_function, (SCM, SCM)); - DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM)); - DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM)); - DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); + 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 void connect_beams (Grob *me); + static vector get_beam_segments (Grob *me_grob, Grob **common); + static Interval no_visible_stem_positions (Grob *me, Interval default_value); + DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, 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_normal_stems, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_concaveness, (SCM)); + DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM)); + /* position callbacks */ - DECLARE_SCHEME_CALLBACK (least_squares, (SCM)); - DECLARE_SCHEME_CALLBACK (check_concave, (SCM)); - DECLARE_SCHEME_CALLBACK (slope_damping, (SCM)); - DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM)); - DECLARE_SCHEME_CALLBACK (quanting, (SCM)); - static Real score_slopes_dy (Real, Real, Real, Real, bool); - - static Real score_stem_lengths (Link_array const &stems, - Array const &stem_infos, - Array const &base_stem_ys, - Array const &stem_xs, - Real xl, Real xr, - bool knee, - Real yl, Real yr); + 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, - int, Direction, Direction); - + Drul_array, Direction, Direction, + Beam_quant_parameters const *); static int get_direction_beam_count (Grob *me, Direction d); private: - static Direction get_default_dir (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, - Interval pos, bool french); - static void set_stem_lengths (Grob*); - static int forced_stem_count (Grob*); + static Direction get_default_dir (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, Direction, + Drul_array pos, bool french); + static int forced_stem_count (Grob *); }; -const int REGION_SIZE = 2; - -#define DEBUG_QUANTING 1 #endif /* BEAM_HH */