-/*
- spacing-spanner.cc -- implement Spacing_spanner
-
+/*
+ spacing-spanner.cc -- implement Spacing_spanner
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#include "spacing-spanner.hh"
+
+#include <math.h>
+#include <cstdio>
+
+#include "spacing-options.hh"
+#include "international.hh"
+#include "main.hh"
+#include "moment.hh"
+#include "note-spacing.hh"
+#include "output-def.hh"
#include "paper-column.hh"
-#include "dimensions.hh"
-#include "paper-def.hh"
-#include "warn.hh"
#include "paper-score.hh"
-#include "line-of-score.hh"
-#include "misc.hh"
+#include "pointer-group-interface.hh"
+#include "separation-item.hh"
+#include "skyline-pair.hh"
+#include "spaceable-grob.hh"
+#include "spacing-interface.hh"
+#include "staff-spacing.hh"
+#include "system.hh"
+#include "warn.hh"
-void
-Spacing_spanner::set_interface (Score_element*me)
+vector<Grob*>
+Spacing_spanner::get_columns (Grob *me_grob)
{
- me->set_extent_callback (SCM_EOL, X_AXIS);
- me->set_extent_callback (SCM_EOL, Y_AXIS) ;
+ Spanner *me = dynamic_cast<Spanner*> (me_grob);
+ vector<Grob*> all (get_root_system (me)->used_columns ());
+ vsize start = binary_search (all, (Grob*)me->get_bound (LEFT),
+ &Paper_column::less_than);
+ vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
+ &Paper_column::less_than);
+
+ all = vector<Grob*>::vector<Grob*> (all.begin () + start,
+ all.begin () + end + 1);
+ return all;
}
-/*
+MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs, 1);
+SCM
+Spacing_spanner::set_springs (SCM smob)
+{
+ Spanner *me = unsmob_spanner (smob);
- The algorithm is partly taken from :
+ /*
+ can't use get_system () ? --hwn.
+ */
+ Spacing_options options;
+ options.init_from_grob (me);
+ vector<Grob*> cols = Spacing_spanner::get_columns (me);
+ set_explicit_neighbor_columns (cols);
- John S. Gourlay. ``Spacing a Line of Music,'' Technical Report
- OSU-CISRC-10/87-TR35, Department of Computer and Information
- Science, The Ohio State University, 1987.
+ prune_loose_columns (me, &cols, &options);
+ set_implicit_neighbor_columns (cols);
+ generate_springs (me, cols, &options);
- TOO HAIRY.
+ return SCM_UNSPECIFIED;
+}
- TODO: write comments
-
- */
-void
-Spacing_spanner::do_measure (Score_element*me, Link_array<Score_element> cols)
+/*
+ We want the shortest note that is also "common" in the piece, so we
+ find the shortest in each measure, and take the most frequently
+ found duration.
+
+ This probably gives weird effects with modern music, where every
+ note has a different duration, but hey, don't write that kind of
+ stuff, then.
+*/
+
+MAKE_SCHEME_CALLBACK (Spacing_spanner, calc_common_shortest_duration, 1);
+SCM
+Spacing_spanner::calc_common_shortest_duration (SCM grob)
{
- Moment shortest;
- Moment mean_shortest;
+ Spanner *me = unsmob_spanner (grob);
+ vector<Grob*> cols (get_columns (me));
+
/*
- space as if this duration is present.
- */
- Moment base_shortest_duration = *unsmob_moment (me->get_elt_property ("maximum-duration-for-spacing"));
- shortest.set_infinite (1);
+ ascending in duration
+ */
+ vector<Rational> durations;
+ vector<int> counts;
+
+ Rational shortest_in_measure;
+ shortest_in_measure.set_infinite (1);
- int n = 0;
- for (int i =0 ; i < cols.size (); i++)
+ for (vsize i = 0; i < cols.size (); i++)
{
- if (dynamic_cast<Paper_column*> (cols[i])->musical_b ())
+ if (Paper_column::is_musical (cols[i]))
{
- SCM st = cols[i]->get_elt_property ("shortest-starter-duration");
- Moment this_shortest = *unsmob_moment(st);
- shortest = shortest <? this_shortest;
- if (!mean_shortest.infty_b ())
+ Moment *when = unsmob_moment (cols[i]->get_property ("when"));
+
+ /*
+ ignore grace notes for shortest notes.
+ */
+ if (when && when->grace_part_)
+ continue;
+
+ SCM st = cols[i]->get_property ("shortest-starter-duration");
+ Moment this_shortest = *unsmob_moment (st);
+ assert (this_shortest.to_bool ());
+ shortest_in_measure = min (shortest_in_measure, this_shortest.main_part_);
+ }
+ else if (!shortest_in_measure.is_infinity ()
+ && Paper_column::is_breakable (cols[i]))
+ {
+ vsize j = 0;
+ for (; j < durations.size (); j++)
+ {
+ if (durations[j] > shortest_in_measure)
+ {
+ counts.insert (counts.begin () + j, 1);
+ durations.insert (durations.begin () + j, shortest_in_measure);
+ break;
+ }
+ else if (durations[j] == shortest_in_measure)
+ {
+ counts[j]++;
+ break;
+ }
+ }
+
+ if (durations.size () == j)
{
- n++;
- mean_shortest += this_shortest;
+ durations.push_back (shortest_in_measure);
+ counts.push_back (1);
}
+
+ shortest_in_measure.set_infinite (1);
}
}
- mean_shortest /= n;
- Real non_musical_space_strength = me->paper_l ()->get_var ("breakable_column_space_strength");
- for (int i= 0; i < cols.size () - 1; i++)
+ vsize max_idx = VPOS;
+ int max_count = 0;
+ for (vsize i = durations.size (); i--;)
{
- Item * l = dynamic_cast<Item*> (cols[i]);
- Item * r = dynamic_cast<Item*> (cols[i+1]);
- Item * lb = dynamic_cast<Item*> ( l->find_prebroken_piece (RIGHT));
- Item * rb = dynamic_cast<Item*> ( r->find_prebroken_piece (LEFT));
+ if (counts[i] >= max_count)
+ {
+ max_idx = i;
+ max_count = counts[i];
+ }
+ }
+
+ SCM bsd = me->get_property ("base-shortest-duration");
+ Rational d = Rational (1, 8);
+ if (Moment *m = unsmob_moment (bsd))
+ d = m->main_part_;
- Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
+ if (max_idx != VPOS)
+ d = min (d, durations[max_idx]);
+
+ return Moment (d).smobbed_copy ();
+}
- for (int j=0; j < 4; j++)
+void
+Spacing_spanner::generate_pair_spacing (Grob *me,
+ Paper_column *left_col, Paper_column *right_col,
+ Paper_column *after_right_col,
+ Spacing_options const *options)
+{
+ if (Paper_column::is_musical (left_col))
+ {
+ if (!Paper_column::is_musical (right_col)
+ && options->float_nonmusical_columns_
+ && after_right_col
+ && Paper_column::is_musical (after_right_col))
{
- Paper_column * lc = dynamic_cast<Paper_column*> (combinations[j][0]);
- Paper_column *rc = dynamic_cast<Paper_column*> (combinations[j][1]);
- if (!lc || !rc)
- continue;
+ /*
+ TODO: should generate rods to prevent collisions.
+ */
+ musical_column_spacing (me, left_col, after_right_col, options);
+ right_col->set_object ("between-cols", scm_cons (left_col->self_scm (),
+ after_right_col->self_scm ()));
+ }
+ else
+ musical_column_spacing (me, left_col, right_col, options);
- Spring s;
- s.item_l_drul_[LEFT] = lc;
- s.item_l_drul_[RIGHT] = rc;
-
- SCM hint = lc->get_elt_property ("extra-space");
- SCM next_hint = rc->get_elt_property ("extra-space");
- SCM stretch_hint = lc->get_elt_property ("stretch-distance");
- SCM next_stretch_hint = rc->get_elt_property ("stretch-distance");
-
- Real left_distance;
- if (gh_pair_p (hint))
- {
- left_distance = gh_scm2double (gh_cdr (hint));
- }
- // 2nd condition should be (i+1 < col_count()), ie. not the last column in score. FIXME
- else if (!lc->musical_b() && i+1 < cols.size ())
- {
- left_distance= default_bar_spacing (me,lc,rc,shortest <? base_shortest_duration);
- }
- else if (lc->musical_b())
- {
- left_distance = note_spacing (me,lc, rc, shortest <? base_shortest_duration);
- }
+ if (Item *rb = right_col->find_prebroken_piece (LEFT))
+ musical_column_spacing (me, left_col, rb, options);
+ }
+ else
+ {
+ /*
+ The case that the right part is broken as well is rather
+ rare, but it is possible, eg. with a single empty measure,
+ or if one staff finishes a tad earlier than the rest.
+ */
+ Item *lb = left_col->find_prebroken_piece (RIGHT);
+ Item *rb = right_col->find_prebroken_piece (LEFT);
- s.distance_f_ = left_distance;
+ if (left_col && right_col)
+ breakable_column_spacing (me, left_col, right_col, options);
- /*
- Only do tight spaces *after* barlines (breakable columns),
- not before.
+ if (lb && right_col)
+ breakable_column_spacing (me, lb, right_col, options);
- We want the space before barline to be like the note
- spacing in the measure.
- */
- if (Item::breakable_b (lc) || lc->original_l_)
- s.strength_f_ = non_musical_space_strength;
- else if (!lc->musical_b ())
- left_distance *= me->paper_l ()->get_var ("decrease_nonmus_spacing_factor");
-
-
- Real right_dist = 0.0;
- if (gh_pair_p (next_hint))
- {
- right_dist += - gh_scm2double (gh_car (next_hint));
- }
- else
- {
- Interval ext (rc->extent (X_AXIS));
- right_dist = ext.empty_b() ? 0.0 : - ext [LEFT];
- }
+ if (left_col && rb)
+ breakable_column_spacing (me, left_col, rb, options);
- /*
- don't want to create too much extra space for accidentals
- */
- if (lc->musical_b () && rc->musical_b ())
- {
- if (!to_boolean (rc->get_elt_property ("contains-grace")))
- right_dist *= me->paper_l ()->get_var ("musical_to_musical_left_spacing_factor");
- }
+ if (lb && rb)
+ breakable_column_spacing (me, lb, rb, options);
+ }
+}
- if (rc->musical_b () && to_boolean (rc->get_elt_property ("contains-grace")))
- right_dist *= me->paper_l ()->get_var ("before_grace_spacing_factor");
-
- s.distance_f_ = left_distance + right_dist;
-
- Real stretch_dist = 0.;
- if (gh_number_p (stretch_hint))
- stretch_dist += gh_scm2double (stretch_hint);
- else
- stretch_dist += left_distance;
-
- if (gh_pair_p (next_stretch_hint))
- // see regtest spacing-tight
- stretch_dist += - gh_scm2double (gh_car (next_stretch_hint));
- else
- stretch_dist += right_dist;
+static void
+set_column_rods (vector<Grob*> const &cols, Real padding)
+{
+ /* distances[i] will be the minimum distance between column i and column i+1 */
+ vector<Real> distances;
- if (s.distance_f_ <0)
- {
- programming_error("Negative dist, setting to 1.0 PT");
- s.distance_f_ = 1.0;
- }
- if (stretch_dist == 0.0)
+ for (vsize i = 1; i < cols.size (); i++)
+ {
+ assert (distances.size () == i-1);
+
+ Item *r = dynamic_cast<Item*> (cols[i]);
+ Item *rb = r->find_prebroken_piece (LEFT);
+
+ if (Separation_item::is_empty (r) && (!rb || Separation_item::is_empty (rb)))
+ {
+ distances.push_back (0);
+ continue;
+ }
+
+ Skyline_pair *skys = Skyline_pair::unsmob (r->get_property ("horizontal-skylines"));
+ Real right_stickout = skys ? (*skys)[LEFT].max_height () : 0.0;
+
+ /* min rather than max because right-stickout will be negative if the right-hand column
+ sticks out a lot to the left */
+ right_stickout = min (right_stickout,
+ Separation_item::conditional_skyline (r, cols[i-1]).max_height ());
+
+ Drul_array<Item*> r_cols (r, rb);
+ Drul_array<Real> cur_dist (0.0, 0.0);
+
+ /* This is an inner loop and hence it is potentially quadratic. However, we only continue
+ as long as there is a rod to insert. Therefore, this loop will usually only execute
+ a constant number of times per iteration of the outer loop. */
+ for (vsize j = i; j--;)
+ {
+ Item *l = dynamic_cast<Item*> (cols[j]);
+ Item *lb = l->find_prebroken_piece (RIGHT);
+ Skyline_pair *skys = Skyline_pair::unsmob (l->get_property ("horizontal-skylines"));
+ Real left_stickout = skys ? (*skys)[RIGHT].max_height () : 0.0;
+ bool done = true;
+
+ Direction d = LEFT;
+ do
{
- /*
- \bar "". We give it 0 space, with high strength.
- */
- s.strength_f_ = 20.0;
+ if (j < i-1)
+ cur_dist[d] += distances[j];
+
+ Item *r_col = r_cols[d];
+ bool touches = right_stickout - left_stickout + cur_dist[d] < 0.0;
+ Real dist = 0.0;
+
+ /* we set a distance for the line-starter column even if it's non-broken counterpart
+ doesn't touch the right column. */
+ if (lb)
+ Separation_item::set_distance (lb, r_col, padding);
+
+ if (touches || j == i-1)
+ dist = Separation_item::set_distance (l, r_col, padding);
+
+ if (j == i-1 && d == LEFT)
+ distances.push_back (dist);
+
+ if (j == i-1)
+ cur_dist[d] = distances[j];
+
+ done = done && !touches;
}
- else
- s.strength_f_ /= stretch_dist;
-
- s.add_to_cols ();
+ while (flip (&d) != LEFT && rb);
+
+ /* we need the empty check for gregorian notation, where there are a lot of
+ extraneous paper-columns that we need to skip over */
+ if (done && !Separation_item::is_empty (l))
+ break;
}
}
-
}
-/**
- Do something if breakable column has no spacing hints set.
- */
-Real
-Spacing_spanner::default_bar_spacing (Score_element*me, Score_element *lc, Score_element *rc,
- Moment shortest)
-{
- Real symbol_distance = lc->extent (X_AXIS)[RIGHT] ;
- Real durational_distance = 0;
- Moment delta_t = Paper_column::when_mom (rc) - Paper_column::when_mom (lc);
- /*
- ugh should use shortest_playing distance
- */
- if (delta_t)
+void
+Spacing_spanner::generate_springs (Grob *me,
+ vector<Grob*> const &cols,
+ Spacing_options const *options)
+{
+ Paper_column *prev = dynamic_cast<Paper_column*> (cols[0]);
+ for (vsize i = 1; i < cols.size (); i++)
{
- durational_distance = get_duration_space (me, delta_t, shortest);
+ Paper_column *col = dynamic_cast<Paper_column *> (cols[i]);
+ Paper_column *next = (i + 1 < cols.size ()) ? dynamic_cast<Paper_column *> (cols[i+1]) : 0;
+
+ generate_pair_spacing (me, prev, col, next, options);
+
+ prev = col;
}
- return symbol_distance >? durational_distance;
+ Real padding = robust_scm2double (prev->get_property ("padding"), 0.1);
+ set_column_rods (cols, padding);
}
+/*
+ Generate the space between two musical columns LEFT_COL and RIGHT_COL.
+*/
+void
+Spacing_spanner::musical_column_spacing (Grob *me,
+ Item *left_col,
+ Item *right_col,
+ Spacing_options const *options)
+{
+ Real base_note_space = note_spacing (me, left_col, right_col, options);
+ Spring spring;
-/**
- Get the measure wide ant for arithmetic spacing.
+ if (options->stretch_uniformly_)
+ spring = Spring (base_note_space, 0.0);
+ else
+ {
+ vector<Spring> springs;
+ extract_grob_set (left_col, "right-neighbors", neighbors);
- @see
- John S. Gourlay. ``Spacing a Line of Music,'' Technical Report
- OSU-CISRC-10/87-TR35, Department of Computer and Information Science,
- The Ohio State University, 1987.
+ for (vsize i = 0; i < neighbors.size (); i++)
+ {
+ Grob *wish = neighbors[i];
- */
-Real
-Spacing_spanner::get_duration_space (Score_element*me, Moment d, Moment shortest)
-{
- Real log = log_2 (shortest);
- Real k= me->paper_l ()->get_var ("arithmetic_basicspace")
- - log;
-
- return (log_2 (d) + k) * me->paper_l ()->get_var ("arithmetic_multiplier");
-}
+ Item *wish_rcol = Spacing_interface::right_column (wish);
+ if (Spacing_interface::left_column (wish) != left_col
+ || (wish_rcol != right_col && wish_rcol != right_col->original ()))
+ continue;
+ /*
+ This is probably a waste of time in the case of polyphonic
+ music. */
+ if (Note_spacing::has_interface (wish))
+ {
+ Real inc = options->increment_;
+ Grob *gsp = unsmob_grob (left_col->get_object ("grace-spacing"));
+ if (gsp && Paper_column::when_mom (left_col).grace_part_)
+ {
+ Spacing_options grace_opts;
+ grace_opts.init_from_grob (gsp);
+ inc = grace_opts.increment_;
+ }
+ springs.push_back (Note_spacing::get_spacing (wish, right_col, base_note_space, inc));
+ }
+ }
-Real
-Spacing_spanner::note_spacing (Score_element*me, Score_element *lc, Score_element *rc,
- Moment shortest)
-{
- Moment shortest_playing_len = 0;
- SCM s = lc->get_elt_property ("shortest-playing-duration");
+ if (springs.empty ())
+ {
- // SCM s = lc->get_elt_property ("mean-playing-duration");
- if (unsmob_moment (s))
- shortest_playing_len = *unsmob_moment(s);
-
- if (! shortest_playing_len)
- {
- programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).str ());
- shortest_playing_len = 1;
+ if (!Paper_column::is_musical (right_col))
+ {
+ /*
+ There used to be code that examined left_col->extent
+ (X_AXIS), but this is resulted in unexpected wide
+ spacing, because the width of s^"text" output is also
+ taken into account here.
+ */
+ spring = Spring (max (base_note_space, options->increment_),
+ options->increment_);
+ }
+ else
+ {
+ /*
+ Min distance should be 0.0. If there are no spacing
+ wishes, we're probably dealing with polyphonic spacing
+ of hemiolas.
+ */
+ spring = Spring (base_note_space, 0.0);
+ }
+ }
+ else
+ spring = merge_springs (springs);
}
-
- if (! shortest)
+
+ if (Paper_column::when_mom (right_col).grace_part_
+ && !Paper_column::when_mom (left_col).grace_part_)
{
- programming_error ("no minimum in measure at " + Paper_column::when_mom (lc).str ());
- shortest = 1;
+ /*
+ Ugh. 0.8 is arbitrary.
+ */
+ spring *= 0.8;
}
- Moment delta_t = Paper_column::when_mom (rc) - Paper_column::when_mom (lc);
- Real dist = get_duration_space (me, shortest_playing_len, shortest);
- dist *= (double)(delta_t / shortest_playing_len);
/*
- UGH: KLUDGE!
+ TODO: make sure that the space doesn't exceed the right margin.
*/
-
- if (delta_t > Moment (1,32))
- dist += stem_dir_correction (me, lc,rc);
- return dist;
-}
-
+ if (options->packed_)
+ {
+ /*
+ In packed mode, pack notes as tight as possible. This makes
+ sense mostly in combination with ragged-right mode: the notes
+ are then printed at minimum distance. This is mostly useful
+ for ancient notation, but may also be useful for some flavours
+ of contemporary music. If not in ragged-right mode, lily will
+ pack as many bars of music as possible into a line, but the
+ line will then be stretched to fill the whole linewidth.
+
+ Note that we don't actually pack things as tightly as possible:
+ we don't allow the next column to begin before this one ends.
+ */
+ /* FIXME: the else clause below is the "right" thing to do,
+ but we can't do it because of all the empty columns that the
+ ligature-engravers leave lying around. In that case, the extent of
+ the column is incorrect because it includes note-heads that aren't
+ there. We get around this by only including the column extent if
+ the left-hand column is "genuine". This is a dirty hack and it
+ should be fixed in the ligature-engravers. --jneem
+ */
+ if (Paper_column::is_extraneous_column_from_ligature (left_col))
+ spring.set_distance (spring.min_distance ());
+ else
+ spring.set_distance (max (left_col->extent (left_col, X_AXIS)[RIGHT],
+ spring.min_distance ()));
+
+ spring.set_inverse_stretch_strength (1.0);
+ }
-/**
- Correct for optical illusions. See [Wanske] p. 138. The combination
- up-stem + down-stem should get extra space, the combination
- down-stem + up-stem less.
+ Spaceable_grob::add_spring (left_col, right_col, spring);
+}
- This should be more advanced, since relative heights of the note
- heads also influence required correction.
+/*
+ Check if COL fills the whole measure.
+ */
+bool
+Spacing_spanner::fills_measure (Grob *me, Item *left, Item *col)
+{
+ System *sys = get_root_system (me);
+ Item *next = sys->column (col->get_column ()->get_rank () + 1);
+ if (!next)
+ return false;
+
+ if (Paper_column::is_musical (next)
+ || Paper_column::is_musical (left)
+ || !Paper_column::is_musical (col)
+ || !Paper_column::is_used (next))
+ return false;
+
+ Moment dt =
+ Paper_column::when_mom (next) - Paper_column::when_mom (col);
+
+ Moment *len = unsmob_moment (left->get_property ("measure-length"));
+ if (!len)
+ return false;
+
+ /*
+ Don't check for exact measure length, since ending measures are
+ often shortened due to pickups.
+ */
+ if (dt.main_part_ > len->main_part_ / Rational (2)
+ && (next->is_broken ()
+ || next->break_status_dir ()))
+ return true;
- Also might not work correctly in case of multi voices or staff
- changing voices
+ return false;
+}
- TODO: lookup correction distances? More advanced correction?
- Possibly turn this off?
+/*
+ Read hints from L and generate springs.
+*/
+void
+Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
+ Spacing_options const *options)
+{
+ vector<Spring> springs;
+ Spring spring;
- TODO: have to check wether the stems are in the same staff.
+ Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l);
- This routine reads the DIR-LIST property of both its L and R arguments. */
-Real
-Spacing_spanner::stem_dir_correction (Score_element*me, Score_element*l, Score_element*r)
-{
- SCM dl = l->get_elt_property ("dir-list");
- SCM dr = r->get_elt_property ("dir-list");
-
- if (scm_ilength (dl) != 1 || scm_ilength (dr) != 1)
- return 0.;
+ if (dt == Moment (0, 0))
+ {
+ extract_grob_set (l, "spacing-wishes", wishes);
- dl = gh_car (dl);
- dr = gh_car (dr);
+ for (vsize i = 0; i < wishes.size (); i++)
+ {
+ Item *spacing_grob = dynamic_cast<Item *> (wishes[i]);
- assert (gh_number_p (dl) && gh_number_p(dr));
- int d1 = gh_scm2int (dl);
- int d2 = gh_scm2int (dr);
+ if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob))
+ continue;
- if (d1 == d2)
- return 0.0;
+ /*
+ column for the left one settings should be ok due automatic
+ pointer munging.
+ */
+ assert (spacing_grob->get_column () == l);
+ springs.push_back (Staff_spacing::get_spacing (spacing_grob, r));
+ }
+ }
- Real correction = 0.0;
- Real ssc = me->paper_l ()->get_var("stemSpacingCorrection");
+ if (springs.empty ())
+ spring = standard_breakable_column_spacing (me, l, r, options);
+ else
+ spring = merge_springs (springs);
+ if (Paper_column::when_mom (r).grace_part_)
+ {
+ /*
+ Correct for grace notes.
+
+ Ugh. The 0.8 is arbitrary.
+ */
+ spring *= 0.8;
+ }
- if (d1 && d2 && d1 * d2 == -1)
+ if (Paper_column::is_musical (r)
+ && l->break_status_dir () == CENTER
+ && fills_measure (me, l, r))
{
- correction = d1 * ssc;
+ Real full_measure_extra_space = robust_scm2double (l->get_property ("full-measure-extra-space"), 1.0);
+ spring.set_distance (spring.distance () + full_measure_extra_space);
+ spring.set_default_strength ();
}
- else
- programming_error ("Stem directions not set correctly for optical correction");
- return correction;
-}
-
-MAKE_SCHEME_CALLBACK(Spacing_spanner, set_springs,1);
-SCM
-Spacing_spanner::set_springs (SCM smob)
-{
- Score_element *me = unsmob_element (smob);
- Link_array<Score_element> all (me->pscore_l_->line_l_->column_l_arr ()) ;
-
- int j = 0;
-
- for (int i = 1; i < all.size (); i++)
+ if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT)
{
- Score_element *sc = all[i];
- if (Item::breakable_b (sc))
- {
- Link_array<Score_element> measure (all.slice (j, i+1));
- do_measure (me, measure);
- j = i;
- }
+ spring.set_min_distance (0.0);
+ spring.set_default_strength ();
}
- /*
- farewell, cruel world
- */
- me->suicide ();
- return SCM_UNSPECIFIED;
+ Spaceable_grob::add_spring (l, r, spring);
}
-
-
-
+ADD_INTERFACE (Spacing_spanner,
+ "The space taken by a note is dependent on its duration."
+ " Doubling a duration adds @code{spacing-increment} to the"
+ " space. The most common shortest note gets"
+ " @code{shortest-duration-space}. Notes that are even shorter"
+ " are spaced proportonial to their duration.\n"
+ "\n"
+ "Typically, the increment is the width of a black note head."
+ " In a piece with lots of 8th notes, and some 16th notes, the"
+ " eighth note gets a 2@tie{}note heads width (i.e., the space"
+ " following a note is a 1@tie{}note head width). A 16th note"
+ " is followed by 0.5 note head width. The quarter note is"
+ " followed by 3@tie{}NHW, the half by 4@tie{}NHW, etc.",
+
+ /* properties */
+ "average-spacing-wishes "
+ "base-shortest-duration "
+ "common-shortest-duration "
+ "packed-spacing "
+ "shortest-duration-space "
+ "spacing-increment "
+ "strict-grace-spacing "
+ "strict-note-spacing "
+ "uniform-stretching "
+ );
projects / lilypond.git / blobdiff