-/*
- spacing-spanner.cc -- implement Spacing_spanner
-
+/*
+ spacing-spanner.cc -- implement Spacing_spanner
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include <math.h>
+#include <cstdio>
#include "spacing-spanner.hh"
#include "paper-column.hh"
-#include "dimensions.hh"
-#include "paper-def.hh"
-#include "warn.hh"
+#include "output-def.hh"
#include "paper-score.hh"
-#include "line-of-score.hh"
-#include "misc.hh"
+#include "system.hh"
+#include "moment.hh"
+#include "note-spacing.hh"
+#include "main.hh"
+#include "warn.hh"
+#include "pointer-group-interface.hh"
+#include "spaceable-grob.hh"
+#include "staff-spacing.hh"
+#include "spacing-interface.hh"
-void
-Spacing_spanner::set_interface (Grob*me)
-{
- me->set_extent_callback (SCM_EOL, X_AXIS);
- me->set_extent_callback (SCM_EOL, Y_AXIS) ;
-}
-#if 0
-struct Note_run
-{
- Array<int> idxes;
- int start, end;
- Moment duration;
- int count;
-};
-
-int
-column_compare (Grob *const &t1, Grob *const &t2)
+
+void
+Spacing_options::init (Grob*me)
{
- return Moment::compare (Paper_column::when_mom (t1),
- Paper_column::when_mom (t2));
+ packed_ = to_boolean (me->get_layout ()->c_variable ("packed"));
+ uniform_ = to_boolean (me->get_property ("uniform-stretching"));
}
-Note_run
-run_length (Moment dt, int i, Array<Moment> const &moms,
- Link_array<Note_run> runs)
+Rational
+Spacing_spanner::effective_shortest_duration (Grob *me, Link_array<Grob> const &all)
{
- int k = 0;
- Array<int> idxes;
-
- idxes.push (i);
- while (1)
+ SCM preset_shortest = me->get_property ("common-shortest-duration");
+ Rational global_shortest;
+ if (unsmob_moment (preset_shortest))
{
- Moment next = moms[i] + dt;
- while (i < moms.size () && moms[i] < next)
- i++;
- if (i == moms.size () || moms[i] != next)
- break;
-
- idxes.push (i);
- k++;
+ global_shortest = unsmob_moment (preset_shortest)->main_part_;
+ }
+ else
+ {
+ global_shortest = Spacing_spanner::find_shortest (me, all);
+ if (be_verbose_global)
+ message (_f ("Global shortest duration is %s", global_shortest.to_string ()) + "\n");
}
- Moment dur = idxes.size ()
+ return global_shortest;
}
-void
-find_runs (Grob*me, Link_array<Grob> cols)
+
+MAKE_SCHEME_CALLBACK (Spacing_spanner, set_springs, 1);
+SCM
+Spacing_spanner::set_springs (SCM smob)
{
- Link_array<Grob> filter_cols;
- Array<Moment> col_moments;
- for (int i = 0; i < cols.size (); i++)
- {
- Moment w = Paper_column::when_mom (cols[i]);
-
- if (!w.grace_part_ && Paper_column::musical_b (cols[i]))
- {
- filter_cols.push (cols[i]);
- col_moments.push (w);
- }
- }
+ Grob *me = unsmob_grob (smob);
+
+ /*
+ can't use get_system() ? --hwn.
+ */
+ Link_array<Grob> all (me->pscore_->root_system ()->columns ());
+
+ set_explicit_neighbor_columns (all);
- Moment end_mom = col_moments.top ();
- for (int i = 0; i < col_moments.size () ; i++)
+ Spacing_options options;
+ options.init (me);
+ options.global_shortest_ = effective_shortest_duration (me, all);
+
+ prune_loose_columns (me, &all, &options);
+ set_implicit_neighbor_columns (all);
+
+ int j = 0;
+ for (int i = 1; i < all.size (); i++)
{
- for (int j = i+1; j < col_moments.size (); j++)
+ Grob *sc = all[i];
+ if (Item::is_breakable (sc))
{
- Moment dt = Paper_column::col_momentsfilter_cols
+ Link_array<Grob> measure (all.slice (j, i + 1));
+ do_measure (me, &measure, &options);
+ j = i;
}
}
+
+ return SCM_UNSPECIFIED;
}
-#endif
/*
+ 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.
- The algorithm is partly taken from :
-
- 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.
-
- TOO HAIRY.
-
- TODO: write comments
-
- */
-void
-Spacing_spanner::do_measure (Grob*me, Link_array<Grob> const & cols)
+ 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.
+*/
+Rational
+Spacing_spanner::find_shortest (Grob *me, Link_array<Grob> const &cols)
{
- Moment shortest;
- Moment mean_shortest;
-
/*
- space as if this duration is present.
- */
- Moment base_shortest_duration = *unsmob_moment (me->get_grob_property ("maximum-duration-for-spacing"));
- shortest.set_infinite (1);
+ ascending in duration
+ */
+ Array<Rational> durations;
+ Array<int> counts;
+
+ Rational shortest_in_measure;
+ shortest_in_measure.set_infinite (1);
- int n = 0;
- for (int i =0 ; i < cols.size (); i++)
+ for (int i = 0; i < cols.size (); i++)
{
- if (Paper_column::musical_b (cols[i]))
+ if (Paper_column::is_musical (cols[i]))
{
- Moment *when = unsmob_moment (cols[i]->get_grob_property ("when"));
+ 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_grob_property ("shortest-starter-duration");
+
+ SCM st = cols[i]->get_property ("shortest-starter-duration");
Moment this_shortest = *unsmob_moment (st);
- shortest = shortest <? this_shortest;
- if (!mean_shortest.main_part_.infty_b ())
- {
- n++;
- mean_shortest += this_shortest;
- }
+ assert (this_shortest.to_bool ());
+ shortest_in_measure = min (shortest_in_measure, this_shortest.main_part_);
}
- }
- mean_shortest /= n;
-
- Array<Spring> springs;
- for (int i= 0; i < cols.size () - 1; 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));
-
- Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
-
-
- /*
- left refers to the space that is associated with items of the left column, so you have
-
- LC <- left_space -><- right_space -> RC
- <- total space ->
-
-
- typically, right_space is non-zero when there are
- accidentals in RC
-
- */
- for (int j=0; j < 4; j++)
+ else if (!shortest_in_measure.is_infinity ()
+ && Item::is_breakable (cols[i]))
{
- Paper_column * lc = dynamic_cast<Paper_column*> (combinations[j][0]);
- Paper_column *rc = dynamic_cast<Paper_column*> (combinations[j][1]);
- if (!lc || !rc)
- continue;
-
- Spring s;
- s.item_l_drul_[LEFT] = lc;
- s.item_l_drul_[RIGHT] = rc;
-
- SCM hint = lc->get_grob_property ("extra-space");
- SCM next_hint = rc->get_grob_property ("extra-space");
- SCM stretch_hint = lc->get_grob_property ("stretch-distance");
- SCM next_stretch_hint = rc->get_grob_property ("stretch-distance");
-
- Real left_distance = 0;
- 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 (!Paper_column::musical_b (lc) && i+1 < cols.size ())
- {
- left_distance= default_bar_spacing (me,lc,rc,shortest <? base_shortest_duration);
- }
- else if (Paper_column::musical_b ( lc))
+ int j = 0;
+ for (; j < durations.size (); j++)
{
- left_distance = note_spacing (me,lc, rc, shortest <? base_shortest_duration);
+ if (durations[j] > shortest_in_measure)
+ {
+ counts.insert (1, j);
+ durations.insert (shortest_in_measure, j);
+ break;
+ }
+ else if (durations[j] == shortest_in_measure)
+ {
+ counts[j]++;
+ break;
+ }
}
- else
- programming_error ("uninitialised left_distance");
-
- s.distance_f_ = left_distance;
-
- /*
- Only do tight spaces *after* barlines (breakable columns),
- not before.
- We want the space before barline to be like the note
- spacing in the measure.
- */
- SCM sfac =lc->get_grob_property ("space-factor");
- if (gh_number_p (lc->get_grob_property ("column-space-strength"))
- && (Item::breakable_b (lc) || lc->original_l_))
+ if (durations.size () == j)
{
- s.strength_f_ =
- gh_scm2double (lc->get_grob_property ("column-space-strength"));
+ durations.push (shortest_in_measure);
+ counts.push (1);
}
- else if (gh_number_p (sfac))
- left_distance *= gh_scm2double (sfac);
-
- Real right_dist = 0.0;
- if (gh_pair_p (next_hint))
- {
- right_dist += - gh_scm2double (gh_car (next_hint));
- }
- else
- {
- Interval ext (rc->extent (rc, X_AXIS));
- right_dist = ext.empty_b () ? 0.0 : - ext [LEFT];
- }
-
- /*
- don't want to create too much extra space for accidentals
- */
- if (Paper_column::musical_b (rc))
- {
- if (to_boolean (rc->get_grob_property ("contains-grace")))
- right_dist *= gh_scm2double (rc->get_grob_property ("before-grace-spacing-factor")); // fixme.
- else
- right_dist *= gh_scm2double (lc->get_grob_property ("before-musical-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;
-
- if (s.distance_f_ <0)
- {
- programming_error ("Negative dist, setting to 1.0 PT");
- s.distance_f_ = 1.0;
- }
- if (stretch_dist == 0.0)
- {
- /*
- \bar "". We give it 0 space, with high strength.
- */
- s.strength_f_ = 20.0;
- }
- else
- s.strength_f_ /= stretch_dist;
-
- springs.push (s);
+ shortest_in_measure.set_infinite (1);
}
}
- Spacing_spanner::stretch_to_regularity (me, &springs, cols);
- for (int i=springs.size (); i --;)
- springs[i].add_to_cols ();
-}
-
-/*
- Look at COLS, searching for columns that have 'regular-distance-to
- set. A sequence of columns that have this property set should have
- an equal distance (an equispaced run). Extract the projected
- distance from SPRINGS, and scale SPRINGS for the equispaced run, to the
- widest space necessary.
-
-
- TODO:
-
- -- inefficient code; maybe it is easier to twiddle with the springs
- after they've become grob properties (ie. have their
- minimum-distances set)
-
- -- does not adjust strength field of the springs very well: result
- awkward spacing at the start of a line. (?)
-
- -- will be confused when there are multiple equispaced runs in a measure.
+ int max_idx = -1;
+ int max_count = 0;
+ for (int i = durations.size (); i--;)
+ {
+ if (counts[i] >= max_count)
+ {
+ max_idx = i;
+ max_count = counts[i];
+ }
- -- dealing with springs for line breaks is a little tricky; in any
- case, we will only space per measure.
+ // printf ("duration %d/%d, count %d\n", durations[i].num (), durations[i].den (), counts[i]);
+ }
- -- we scale to actual distances, not to optical effects. Eg. if the
- equispaced run contains optical corrections, then the scaling will
- cancel those.
+ SCM bsd = me->get_property ("base-shortest-duration");
+ Rational d = Rational (1, 8);
+ if (Moment *m = unsmob_moment (bsd))
+ d = m->main_part_;
- -- Regular_spacing_engraver doesn't mark the first column of the
- next bar, making the space before a barline too short, in this case
+ if (max_idx >= 0)
+ d = min (d, durations[max_idx]);
+ return d;
+}
- x<- 16ths--> x(8th)
- x(8th) x(8th) <- equispaced run.
-
+/*
+ Generate spacing for a single measure. We used to have code that did
+ per-measure spacing. Now we have piecewise spacing. We should fix
+ this to support "spacing-regions": some regions have different notes
+ (different time sigs) than others, and should be spaced differently.
*/
-
void
-Spacing_spanner::stretch_to_regularity (Grob *me,
- Array<Spring> * springs,
- Link_array<Grob> const & cols)
+Spacing_spanner::do_measure (Grob *me,
+ Link_array<Grob> *cols,
+ Spacing_options const *options
+ )
{
- /*
- Find the starting column of the run. REGULAR-DISTANCE-TO points
- back to a previous column, so we look ahead to find a column
- pointing back to the first one.
-
- */
- Grob * first_regular_spaced_col = 0;
- for (int i = 0 ; i < cols.size () && !first_regular_spaced_col; i++)
+ Real headwid = robust_scm2double (me->get_property ("spacing-increment"), 1);
+ for (int i = 0; i < cols->size () - 1; i++)
{
- SCM rdt = cols[i]->get_grob_property ("regular-distance-to");
- if (cols.find_l (unsmob_grob (rdt)))
- first_regular_spaced_col = unsmob_grob (rdt);
- }
- for (int i = springs->size (); i-- ;)
- springs->elem (i).set_to_cols ();
-
- int i;
- for (i = 0; i < springs->size ()
- && springs->elem (i).item_l_drul_[RIGHT] != first_regular_spaced_col;
- i++)
- ;
-
-
- if (i==springs->size ())
- return ;
-
- Real maxdist = 0.0;
- Real dist =0.0;
- Grob *last_col = first_regular_spaced_col;
- Grob *last_regular_spaced_col = first_regular_spaced_col;
-
+ Item *l = dynamic_cast<Item *> (cols->elem (i));
+ Item *r = dynamic_cast<Item *> (cols->elem (i + 1));
- /*
- find the max distance for this run.
- */
- for (int j = i; j < springs->size (); j++)
- {
- Spring *s = &(springs->elem_ref (j));
- if (s->item_l_drul_[LEFT] != last_col)
- continue;
-
- dist += s->distance_f_;
-
- last_col = s->item_l_drul_[RIGHT];
- SCM rdt = last_col->get_grob_property ("regular-distance-to");
- if (unsmob_grob (rdt) == last_regular_spaced_col)
+ Paper_column *lc = dynamic_cast<Paper_column *> (l);
+ Paper_column *rc = dynamic_cast<Paper_column *> (r);
+
+ if (Paper_column::is_musical (l))
{
- maxdist = maxdist >? dist;
- dist = 0.0;
- last_regular_spaced_col = last_col;
+ musical_column_spacing (me, lc, rc, headwid, options);
+ if (Item *rb = r->find_prebroken_piece (LEFT))
+ musical_column_spacing (me, lc, rb, headwid, 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 = l->find_prebroken_piece (RIGHT);
+ Item *rb = r->find_prebroken_piece (LEFT);
- }
+ if (i == 0 && Paper_column::get_rank (l) == 0)
+ l = 0;
- /*
- Scale the springs
- */
- dist =0.0;
- last_col = first_regular_spaced_col;
- last_regular_spaced_col = first_regular_spaced_col;
- for (int j = i; j < springs->size (); j++)
- {
- Spring *s = &springs->elem_ref (j);
- if (s->item_l_drul_[LEFT] != last_col)
- continue;
- dist += s->distance_f_;
-
- last_col = s->item_l_drul_[RIGHT];
- SCM rdt = last_col->get_grob_property ("regular-distance-to");
- if (unsmob_grob (rdt) == last_regular_spaced_col)
- {
- do {
- springs->elem_ref (i).distance_f_ *= maxdist / dist;
- springs->elem_ref (i).strength_f_ *= dist / maxdist;
- } while (i++ < j);
- last_regular_spaced_col = last_col;
- dist =0.0;
+ if (l && r)
+ breakable_column_spacing (me, l, r, options);
+
+ if (lb && r)
+ breakable_column_spacing (me, lb, r, options);
+
+ if (l && rb)
+ breakable_column_spacing (me, l, rb, options);
+
+ if (lb && rb)
+ breakable_column_spacing (me, lb, rb, options);
}
}
}
-/**
- Do something if breakable column has no spacing hints set.
- */
-Real
-Spacing_spanner::default_bar_spacing (Grob*me, Grob *lc, Grob *rc,
- Moment shortest)
+/*
+ Generate the space between two musical columns LC and RC, given
+ spacing parameters INCR and SHORTEST.
+*/
+void
+Spacing_spanner::musical_column_spacing (Grob *me, Item *lc, Item *rc,
+ Real increment,
+ Spacing_options const *options)
{
- Real symbol_distance = lc->extent (lc,X_AXIS)[RIGHT] ;
- Real durational_distance = 0;
- Moment delta_t = Paper_column::when_mom (rc) - Paper_column::when_mom (lc);
+ bool expand_only = false;
+ Real base_note_space = note_spacing (me, lc, rc, options, &expand_only);
+
+ Real compound_note_space = 0.0;
+ Real compound_fixed_note_space = 0.0;
- /*
- ugh should use shortest_playing distance
- */
- if (delta_t.to_bool ())
+ if (options->uniform_)
{
- durational_distance = get_duration_space (me, delta_t, shortest);
+ compound_note_space = base_note_space;
}
+ else
+ {
+ int wish_count = 0;
- return symbol_distance >? durational_distance;
-}
+ extract_grob_set (lc, "right-neighbors", neighbors);
+ /*
+ We adjust the space following a note only if the next note
+ happens after the current note (this is set in the grob
+ property SPACING-SEQUENCE.
+ */
+ for (int i = 0; i < neighbors.size (); i++)
+ {
+ Grob *wish = neighbors[i];
-/**
- Get the measure wide ant for arithmetic spacing.
+ Item *wish_rcol = Note_spacing::right_column (wish);
+ if (Note_spacing::left_column (wish) != lc
+ || (wish_rcol != rc && wish_rcol != rc->original_))
+ continue;
- @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.
+ /*
+ This is probably a waste of time in the case of polyphonic
+ music. */
+ if (Note_spacing::has_interface (wish))
+ {
+ Real space = 0.0;
+ Real fixed = 0.0;
- */
-Real
-Spacing_spanner::get_duration_space (Grob*me, Moment d, Moment shortest)
-{
- Real log = log_2 (shortest.main_part_);
- Real k = gh_scm2double (me->get_grob_property ("arithmetic-basicspace"))
- - log;
+ Note_spacing::get_spacing (wish, rc, base_note_space, increment, &space, &fixed);
- Rational compdur = d.main_part_ + d.grace_part_ / Rational (3);
- return (log_2 (compdur) + k) * gh_scm2double (me->get_grob_property ("arithmetic-multiplier"));
-}
+ compound_note_space = compound_note_space + space;
+ compound_fixed_note_space = compound_fixed_note_space + fixed;
+ wish_count++;
+ }
+ }
+ if (Paper_column::when_mom (rc).grace_part_
+ && !Paper_column::when_mom (lc).grace_part_)
+ {
+ /*
+ Ugh. 0.8 is arbitrary.
+ */
+ compound_note_space *= 0.8;
+ }
-Real
-Spacing_spanner::note_spacing (Grob*me, Grob *lc, Grob *rc,
- Moment shortest)
-{
- Moment shortest_playing_len = 0;
- SCM s = lc->get_grob_property ("shortest-playing-duration");
+ if (compound_note_space < 0 || wish_count == 0)
+ {
+ compound_note_space = base_note_space;
+ compound_fixed_note_space = increment;
+ }
+ else
+ {
+ compound_note_space /= wish_count;
+ compound_fixed_note_space /= wish_count;
+ }
- // SCM s = lc->get_grob_property ("mean-playing-duration");
- if (unsmob_moment (s))
- shortest_playing_len = *unsmob_moment (s);
-
- if (! shortest_playing_len.to_bool ())
- {
- programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).str ());
- shortest_playing_len = 1;
+ /*
+ Whatever we do, the fixed space is smaller than the real
+ space.
+
+ TODO: this criterion is discontinuous in the derivative.
+ Maybe it should be continuous?
+ */
+ compound_fixed_note_space = min (compound_fixed_note_space,
+ compound_note_space);
}
- if (! shortest.to_bool ())
- {
- programming_error ("no minimum in measure at " + Paper_column::when_mom (lc).str ());
- shortest = 1;
- }
- Moment delta_t = Paper_column::when_mom (rc) - Paper_column::when_mom (lc);
- Real dist = get_duration_space (me, shortest_playing_len, shortest);
-
+ Real inverse_strength = 1.0;
+ Real distance = 1.0;
/*
- ugh: 0.1 is an arbitrary distance.
- */
- dist *= (double) (delta_t.main_part_ / shortest_playing_len.main_part_)
- + 0.1 * (double) (delta_t.grace_part_ / shortest_playing_len.main_part_);
-
-
-
- /*
- 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);
-
-
- Moment *lm = unsmob_moment (lc->get_grob_property ("when"));
- Moment *rm = unsmob_moment (rc->get_grob_property ("when"));
-
- if (lm && rm)
+ if (options->packed_)
+ {
+ /*
+ In packed mode, pack notes as tight as possible. This makes
+ sense mostly in combination with raggedright 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 raggedright mode, lily will
+ pack as much bars of music as possible into a line, but the
+ line will then be stretched to fill the whole linewidth.
+ */
+ inverse_strength = 1.0;
+ distance = compound_fixed_note_space;
+ }
+ else
{
- if (lm->grace_part_ && rm->grace_part_)
- dist *= 0.5;
- else if (!rm->grace_part_ && lm->grace_part_)
- dist *= 0.7;
+ inverse_strength = (compound_note_space - compound_fixed_note_space);
+ distance = compound_note_space;
}
-
- return dist;
+ Spaceable_grob::add_spring (lc, rc, distance, inverse_strength);
}
+/*
+ Read hints from L and generate springs.
+*/
+void
+Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r,
+ Spacing_options const *options)
+{
+ Real compound_fixed = 0.0;
+ Real compound_space = 0.0;
+ int wish_count = 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.
+ Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l);
- This should be more advanced, since relative heights of the note
- heads also influence required correction.
+ if (dt == Moment (0, 0))
+ {
+ extract_grob_set (l, "spacing-wishes", wishes);
- Also might not work correctly in case of multi voices or staff
- changing voices
+ for (int i = 0; i < wishes.size (); i++)
+ {
+ Item *spacing_grob = dynamic_cast<Item *> (wishes[i]);
- TODO: lookup correction distances? More advanced correction?
- Possibly turn this off?
+ if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob))
+ continue;
- TODO: have to check wether the stems are in the same staff.
+ Real space;
+ Real fixed_space;
- This routine reads the DIR-LIST property of both its L and R arguments. */
-Real
-Spacing_spanner::stem_dir_correction (Grob*me, Grob*l, Grob*r)
-{
- SCM dl = l->get_grob_property ("dir-list");
- SCM dr = r->get_grob_property ("dir-list");
-
- if (scm_ilength (dl) != 1 || scm_ilength (dr) != 1)
- return 0.;
+ /*
+ column for the left one settings should be ok due automatic
+ pointer munging.
- dl = gh_car (dl);
- dr = gh_car (dr);
+ */
+ assert (spacing_grob->get_column () == l);
- assert (gh_number_p (dl) && gh_number_p (dr));
- int d1 = gh_scm2int (dl);
- int d2 = gh_scm2int (dr);
+ Staff_spacing::get_spacing_params (spacing_grob,
+ &space, &fixed_space);
- if (d1 == d2)
- return 0.0;
+ if (Paper_column::when_mom (r).grace_part_)
+ {
+ /*
+ Correct for grace notes.
+ Ugh. The 0.8 is arbitrary.
+ */
+ space *= 0.8;
+ }
- Real correction = 0.0;
- Real ssc = gh_scm2double (me->get_grob_property ("stem-spacing-correction"));
+ compound_space += space;
+ compound_fixed += fixed_space;
+ wish_count++;
+ }
+ }
- if (d1 && d2 && d1 * d2 == -1)
+ if (compound_space <= 0.0 || !wish_count)
{
- correction = d1 * ssc;
+ standard_breakable_column_spacing (me, l, r, &compound_fixed, &compound_space,
+ options);
+ wish_count = 1;
}
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)
-{
- Grob *me = unsmob_grob (smob);
- Link_array<Grob> all (me->pscore_l_->line_l_->column_l_arr ()) ;
-
- int j = 0;
+ {
+ compound_space /= wish_count;
+ compound_fixed /= wish_count;
+ }
- for (int i = 1; i < all.size (); i++)
+ if (options->uniform_ && l->break_status_dir () != RIGHT)
{
- Grob *sc = all[i];
- if (Item::breakable_b (sc))
- {
- Link_array<Grob> measure (all.slice (j, i+1));
- do_measure (me, measure);
- j = i;
- }
+ compound_fixed = 0.0;
}
+
+ assert (!isinf (compound_space));
+ compound_space = max (compound_space, compound_fixed);
/*
- farewell, cruel world
- */
- me->suicide ();
- return SCM_UNSPECIFIED;
-}
+ There used to be code that changed spacing depending on
+ raggedright setting. Ugh.
+
+ Do it more cleanly, or rename the property.
+ */
+ Real inverse_strength = (compound_space - compound_fixed);
+ Real distance = compound_space;
+ Spaceable_grob::add_spring (l, r, distance, inverse_strength);
+}
+ADD_INTERFACE (Spacing_spanner, "spacing-spanner-interface",
+ "The space taken by a note is dependent on its duration. Doubling a\n"
+ "duration adds spacing-increment to the space. The most common shortest\n"
+ "note gets @code{shortest-duration-space}. Notes that are even shorter are\n"
+ "spaced proportonial to their duration.\n"
+ "\n"
+ "Typically, the increment is the width of a black note head. In a\n"
+ "piece with lots of 8th notes, and some 16th notes, the eighth note\n"
+ "gets 2 note heads width (i.e. the space following a note is 1 note\n"
+ "head width) A 16th note is followed by 0.5 note head width. The\n"
+ "quarter note is followed by 3 NHW, the half by 4 NHW, etc.\n",
+
+ "grace-space-factor spacing-increment base-shortest-duration "
+ "shortest-duration-space common-shortest-duration uniform-stretching"
+
+ );
+
+ADD_INTERFACE (Spacing_interface, "spacing-interface",
+ "Something to do with line breaking and spacing. "
+ "Kill this one after determining line breaks.",
+ "");
-/*
- maximum-duration-for-spacing
-From: bf250@freenet.carleton.ca (John Sankey)
-To: gnu-music-discuss@gnu.org
-Subject: note spacing suggestion
-Date: Mon, 10 Jul 2000 11:28:03 -0400 (EDT)
-
-Currently, Lily spaces notes by starting with a basic distance,
-arithmetic_multiplier, which it applies to the minimum duration note
-of the bar. Then she adds a logarithmic increment, scaled from
-arithmetic_basicspace, for longer notes. (Then, columns are aligned
-and justified.) Fundamentally, this matches visual spacing to musical
-weight and works well.
-
-A lot of the time in music, I see a section basically in melodic
-notes that occasionally has a rapid ornamental run (scale). So, there
-will be a section in 1/4 notes, then a brief passage in 1/32nds, then
-a return to long notes. Currently, Lily gives the same horizontal
-space to the 1/32nd notes in their bar (even if set in small size as
-is commonly done for cadenzii) as she gives to 1/4 notes in bars
-where 1/4 note is the minimum duration. The resulting visual weight
-does not match the musical weight over the page.
-
-Looking at the music I am typesetting, I feel that Lily's spacing
-could be significantly improved if, with no change in the basic
-method used, arithmetic_multiplier could be applied referred to the
-same duration throughout a piece. Of course, the current method
-should be retained for those who have already set music in it, so I
-suggest a property called something like arithmetic_base=16 to fix
-1/16 duration as the reference for arithmetic_multiplier; the default
-would be a dynamic base is it is now.
-
-Does anyone else feel that this would be a useful improvement for
-their music? (Of course, if arithmetic_multiplier became a regular
-property, this could be used to achieve a similar result by
-tweaking.)
-
- */
projects / lilypond.git / blobdiff