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) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl> |
5 | 5 |
6 LilyPond is free software: you can redistribute it and/or modify | 6 LilyPond is free software: you can redistribute it and/or modify |
7 it under the terms of the GNU General Public License as published by | 7 it under the terms of the GNU General Public License as published by |
8 the Free Software Foundation, either version 3 of the License, or | 8 the Free Software Foundation, either version 3 of the License, or |
9 (at your option) any later version. | 9 (at your option) any later version. |
10 | 10 |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 if (pure && beam) | 257 if (pure && beam) |
258 { | 258 { |
259 Interval ph = stem->pure_height (stem, 0, INT_MAX); | 259 Interval ph = stem->pure_height (stem, 0, INT_MAX); |
260 Stem_info si = Stem::get_stem_info (stem); | 260 Stem_info si = Stem::get_stem_info (stem); |
261 ph[-stemdir] = si.shortest_y_; | 261 ph[-stemdir] = si.shortest_y_; |
262 | 262 |
263 return (ph - stemdir * max (beam_count, 1) * beam_translation)[stemdir] -
stemdir * 0.5 * me->pure_height (me, 0, INT_MAX).length (); | 263 return (ph - stemdir * max (beam_count, 1) * beam_translation)[stemdir] -
stemdir * 0.5 * me->pure_height (me, 0, INT_MAX).length (); |
264 } | 264 } |
265 | 265 |
266 Real end_y | 266 Real end_y |
267 = stem->extent (stem, Y_AXIS)[stemdir] | 267 = (pure |
| 268 ? stem->pure_height (stem, 0, INT_MAX)[stemdir] |
| 269 : stem->extent (stem, Y_AXIS)[stemdir]) |
268 - stemdir * max (beam_count, 1) * beam_translation | 270 - stemdir * max (beam_count, 1) * beam_translation |
269 - Stem::beam_end_corrective (stem); | 271 - Stem::beam_end_corrective (stem); |
270 | 272 |
271 if (!beam && Stem::duration_log (stem) >= 3) | 273 if (!beam && Stem::duration_log (stem) >= 3) |
272 { | 274 { |
273 end_y -= stemdir * (Stem::duration_log (stem) - 2) * beam_translation; | 275 end_y -= stemdir * (Stem::duration_log (stem) - 2) * beam_translation; |
274 if (stemdir == UP) | 276 if (stemdir == UP) |
275 end_y -= stemdir * beam_translation * 0.5; | 277 end_y -= stemdir * beam_translation * 0.5; |
276 } | 278 } |
277 | 279 |
(...skipping 27 matching lines...) Expand all Loading... |
305 | 307 |
306 /* properties */ | 308 /* properties */ |
307 "beam-thickness " | 309 "beam-thickness " |
308 "beam-width " | 310 "beam-width " |
309 "flag-count " | 311 "flag-count " |
310 "length-fraction " | 312 "length-fraction " |
311 "stem " | 313 "stem " |
312 "style " | 314 "style " |
313 "slope " | 315 "slope " |
314 ); | 316 ); |
OLD | NEW |