Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* | 1 /* |
2 This file is part of LilyPond, the GNU music typesetter. | 2 This file is part of LilyPond, the GNU music typesetter. |
3 | 3 |
4 Copyright (C) 1996--2020 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1996--2020 Han-Wen Nienhuys <hanwen@xs4all.nl> |
5 Jan Nieuwenhuizen <janneke@gnu.org> | 5 Jan Nieuwenhuizen <janneke@gnu.org> |
6 | 6 |
7 LilyPond is free software: you can redistribute it and/or modify | 7 LilyPond is free software: you can redistribute it and/or modify |
8 it under the terms of the GNU General Public License as published by | 8 it under the terms of the GNU General Public License as published by |
9 the Free Software Foundation, either version 3 of the License, or | 9 the Free Software Foundation, either version 3 of the License, or |
10 (at your option) any later version. | 10 (at your option) any later version. |
(...skipping 15 matching lines...) Expand all Loading... | |
26 #include "lily-proto.hh" | 26 #include "lily-proto.hh" |
27 #include "stem-info.hh" | 27 #include "stem-info.hh" |
28 | 28 |
29 struct Beam_segment | 29 struct Beam_segment |
30 { | 30 { |
31 int vertical_count_; | 31 int vertical_count_; |
32 Interval horizontal_; | 32 Interval horizontal_; |
33 Beam_segment (); | 33 Beam_segment (); |
34 }; | 34 }; |
35 | 35 |
36 struct Beam_stem_length | |
hanwenn
2020/02/24 06:44:39
Beam_stem_end ?
Be-3
2020/02/25 12:35:18
Agreed. Done.
| |
37 { | |
38 Real stem_y_; | |
39 Real french_correction_; | |
40 Beam_stem_length (); | |
41 }; | |
42 | |
36 bool beam_segment_less (Beam_segment const &a, Beam_segment const &b); | 43 bool beam_segment_less (Beam_segment const &a, Beam_segment const &b); |
37 | 44 |
38 struct Beam_stem_segment | 45 struct Beam_stem_segment |
39 { | 46 { |
40 Beam_stem_segment (); | 47 Beam_stem_segment (); |
41 | 48 |
42 Grob *stem_; | 49 Grob *stem_; |
43 Real width_; | 50 Real width_; |
44 Real stem_x_; | 51 Real stem_x_; |
45 vsize rank_; | 52 vsize rank_; |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
86 | 93 |
87 private: | 94 private: |
88 friend class Beam_scoring_problem; | 95 friend class Beam_scoring_problem; |
89 | 96 |
90 static Direction get_default_dir (Grob *); | 97 static Direction get_default_dir (Grob *); |
91 static std::vector<Beam_segment> get_beam_segments (Grob *); | 98 static std::vector<Beam_segment> get_beam_segments (Grob *); |
92 static void set_stem_directions (Grob *, Direction); | 99 static void set_stem_directions (Grob *, Direction); |
93 static void consider_auto_knees (Grob *); | 100 static void consider_auto_knees (Grob *); |
94 static void set_stem_shorten (Grob *); | 101 static void set_stem_shorten (Grob *); |
95 static vsize forced_stem_count (Grob *); | 102 static vsize forced_stem_count (Grob *); |
96 static Real calc_stem_y (Grob *, Grob *s, Grob **c, | 103 static Beam_stem_length calc_stem_y (Grob *, Grob *s, Grob **c, Real, Real, |
97 Real, Real, Direction, | 104 Direction, Drul_array<Real> pos, |
98 Drul_array<Real> pos, bool french); | 105 int french_count); |
99 }; | 106 }; |
100 | 107 |
101 #endif /* BEAM_HH */ | 108 #endif /* BEAM_HH */ |
102 | 109 |
OLD | NEW |