X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspacing-basic.cc;h=947d00a216369091e81051a74f46a6407fd0f0de;hb=ba7dd825738031e7c1f9ec7787594ad78f2442ee;hp=2e81fdf416237d2569dcedd1f94960cb91e02bba;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc index 2e81fdf416..947d00a216 100644 --- a/lily/spacing-basic.cc +++ b/lily/spacing-basic.cc @@ -1,9 +1,20 @@ /* - spacing-basic.cc -- implement Spacing_spanner, simplistic spacing routines + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2009 Han-Wen Nienhuys - (c) 2005--2006 Han-Wen Nienhuys + 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 . */ #include "spacing-spanner.hh" @@ -14,6 +25,8 @@ #include "warn.hh" #include "pointer-group-interface.hh" #include "system.hh" +#include "spacing-interface.hh" +#include "spring.hh" /* LilyPond spaces by taking a simple-minded spacing algorithm, and @@ -24,29 +37,11 @@ The one-size-fits all spacing. It doesn't take into account different spacing wishes from one to the next column. */ -void -Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r, - Real *fixed, Real *space, - Spacing_options const *options) +Spring +Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Spacing_options const *options) { - *fixed = 0.0; - Direction d = LEFT; - Drul_array cols (l, r); - - do - { - if (!Paper_column::is_musical (cols[d])) - { - /* - Tied accidentals over barlines cause problems, so lets see - what happens if we do this for non musical columns only. - */ - Interval lext = cols[d]->extent (cols [d], X_AXIS); - if (!lext.is_empty ()) - *fixed += -d * lext[-d]; - } - } - while (flip (&d) != LEFT); + Real min_dist = max (0.0, Paper_column::minimum_distance (l, r)); + Real ideal; if (Paper_column::is_breakable (l) && Paper_column::is_breakable (r)) { @@ -57,7 +52,7 @@ Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r, Real incr = robust_scm2double (me->get_property ("spacing-increment"), 1); - *space = *fixed + incr * double (mlen.main_part_ / options->global_shortest_) * 0.8; + ideal = min_dist + incr * double (mlen.main_part_ / options->global_shortest_) * 0.8; } else { @@ -69,14 +64,12 @@ Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r, In this case, Staff_spacing should handle the job, using dt when it is 0 is silly. */ - *space = *fixed + 0.5; + ideal = min_dist + 0.5; } else - { - bool dummy; - *space = *fixed + options->get_duration_space (dt.main_part_, &dummy); - } + ideal = min_dist + options->get_duration_space (dt.main_part_); } + return Spring (ideal, min_dist); } Moment * @@ -86,14 +79,7 @@ get_measure_length (Grob *column) extract_grob_set (sys, "columns", cols); - vsize col_idx = binary_search (cols, column, - Paper_column::less_than); - - if (col_idx == VPOS) - { - programming_error ( __FUNCTION__ + string (": Unknown column")); - return 0; - } + vsize col_idx = Paper_column::get_rank (column); do { @@ -108,12 +94,11 @@ get_measure_length (Grob *column) } Real -Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc, - Spacing_options const *options, - bool *expand_only) +Spacing_spanner::note_spacing (Grob * /* me */, + Grob *lc, + Grob *rc, + Spacing_options const *options) { - (void) me; - Moment shortest_playing_len = 0; SCM s = lc->get_property ("shortest-playing-duration"); @@ -122,7 +107,7 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc, if (! shortest_playing_len.to_bool ()) { - programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).to_string ()); + programming_error ("cannot find a ruling note at: " + Paper_column::when_mom (lc).to_string ()); shortest_playing_len = 1; } @@ -130,32 +115,31 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc, Moment rwhen = Paper_column::when_mom (rc); Moment delta_t = rwhen - lwhen; - if (!Paper_column::is_musical (rc)) + + /* + when toying with mmrests, it is possible to have musical + column on the left and non-musical on the right, spanning + several measures. + + TODO: efficiency: measure length can be cached, or stored as + property in paper-column. + */ + + if (Moment *measure_len = get_measure_length (lc)) { + delta_t = min (delta_t, *measure_len); + /* - when toying with mmrests, it is possible to have musical - column on the left and non-musical on the right, spanning - several measures. + The following is an extra safety measure, such that + the length of a mmrest event doesn't cause havoc. */ - - Moment *dt = get_measure_length (lc); - if (dt) - { - delta_t = min (delta_t, *dt); - - /* - The following is an extra safety measure, such that - the length of a mmrest event doesn't cause havoc. - */ - shortest_playing_len = min (shortest_playing_len, *dt); - } + shortest_playing_len = min (shortest_playing_len, *measure_len); } Real dist = 0.0; if (delta_t.main_part_ && !lwhen.grace_part_) { - dist = options->get_duration_space (shortest_playing_len.main_part_, - expand_only); + dist = options->get_duration_space (shortest_playing_len.main_part_); dist *= double (delta_t.main_part_ / shortest_playing_len.main_part_); } else if (delta_t.grace_part_) @@ -165,15 +149,13 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc, available (namely the space for the global shortest note), and multiply that by grace-space-factor */ - dist = options->get_duration_space (options->global_shortest_, expand_only) / 2.0; + dist = options->get_duration_space (options->global_shortest_) / 2.0; Grob *grace_spacing = unsmob_grob (lc->get_object ("grace-spacing")); if (grace_spacing) { Spacing_options grace_opts; grace_opts.init_from_grob (grace_spacing); - - bool bla; - dist = grace_opts.get_duration_space (delta_t.grace_part_, &bla); + dist = grace_opts.get_duration_space (delta_t.grace_part_); } }