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)
+{
+ return Moment::compare (Paper_column::when_mom (t1),
+ Paper_column::when_mom (t2));
+}
+
+
+Note_run
+run_length (Moment dt, int i, Array<Moment> const &moms,
+ Link_array<Note_run> runs)
+{
+ int k = 0;
+ Array<int> idxes;
+
+ idxes.push (i);
+ while (1)
+ {
+ 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++;
+ }
+
+ Moment dur = idxes.size ()
+}
+
+void
+find_runs (Grob*me, Link_array<Grob> cols)
+{
+ 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);
+ }
+ }
+
+ Moment end_mom = col_moments.top ();
+ for (int i = 0; i < col_moments.size () ; i++)
+ {
+ for (int j = i+1; j < col_moments.size (); j++)
+ {
+ Moment dt = Paper_column::col_momentsfilter_cols
+ }
+ }
+}
+#endif
+
/*
The algorithm is partly taken from :
*/
void
-Spacing_spanner::do_measure (Grob*me, Link_array<Grob> cols)
+Spacing_spanner::do_measure (Grob*me, Link_array<Item> const & cols)
{
Moment shortest;
Moment mean_shortest;
int n = 0;
for (int i =0 ; i < cols.size (); i++)
{
- if (dynamic_cast<Paper_column*> (cols[i])->musical_b ())
+ if (Paper_column::musical_b (cols[i]))
{
+ Moment *when = unsmob_moment (cols[i]->get_grob_property ("when"));
+
+ /*
+ ignore grace notes for shortest notes.
+ */
+ if (when && when->grace_part_)
+ continue;
+
SCM st = cols[i]->get_grob_property ("shortest-starter-duration");
Moment this_shortest = *unsmob_moment (st);
shortest = shortest <? this_shortest;
- if (!mean_shortest.infty_b ())
+ if (!mean_shortest.main_part_.infty_b ())
{
n++;
mean_shortest += this_shortest;
}
mean_shortest /= n;
-
+ Array<Spring> springs;
for (int i= 0; i < cols.size () - 1; i++)
{
Item * l = dynamic_cast<Item*> (cols[i]);
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 ())
+ 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 (lc->musical_b ())
+ else if (Paper_column::musical_b ( lc))
{
left_distance = note_spacing (me,lc, rc, shortest <? base_shortest_duration);
}
/*
don't want to create too much extra space for accidentals
*/
- if (rc->musical_b ())
+ 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
s.strength_f_ /= stretch_dist;
- s.add_to_cols ();
+ springs.push (s);
}
}
+
+ 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.
+
+ -- dealing with springs for line breaks is a little tricky; in any
+ case, we will only space per measure.
+
+ -- we scale to actual distances, not to optical effects. Eg. if the
+ equispaced run contains optical corrections, then the scaling will
+ cancel those.
+
+ -- Regular_spacing_engraver doesn't mark the first column of the
+ next bar, making the space before a barline too short, in this case
+
+
+ x<- 16ths--> x(8th)
+ x(8th) x(8th) <- equispaced run.
+
+*/
+
+void
+Spacing_spanner::stretch_to_regularity (Grob *me,
+ Array<Spring> * springs,
+ Link_array<Item> const & cols)
+{
+ /*
+ 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++)
+ {
+ SCM rdt = cols[i]->get_grob_property ("regular-distance-to");
+ if (cols.find_l (dynamic_cast<Item*> (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;
+
+
+ /*
+ 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)
+ {
+ maxdist = maxdist >? dist;
+ dist = 0.0;
+ last_regular_spaced_col = last_col;
+ }
+
+ }
+
+ /*
+ 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;
+ }
+ }
}
/**
/*
ugh should use shortest_playing distance
*/
- if (delta_t)
+ if (delta_t.to_bool ())
{
durational_distance = get_duration_space (me, delta_t, shortest);
}
Real
Spacing_spanner::get_duration_space (Grob*me, Moment d, Moment shortest)
{
- Real log = log_2 (shortest);
+ Real log = log_2 (shortest.main_part_);
Real k = gh_scm2double (me->get_grob_property ("arithmetic-basicspace"))
- log;
-
- return (log_2 (d) + k) * gh_scm2double (me->get_grob_property ("arithmetic-multiplier"));
+
+ Rational compdur = d.main_part_ + d.grace_part_ / Rational (3);
+ return (log_2 (compdur) + k) * gh_scm2double (me->get_grob_property ("arithmetic-multiplier"));
}
if (unsmob_moment (s))
shortest_playing_len = *unsmob_moment (s);
- if (! shortest_playing_len)
+ 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;
}
- if (! shortest)
+ 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);
- dist *= (double) (delta_t / shortest_playing_len);
+
+
+ /*
+ 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!
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 (lm->grace_part_ && rm->grace_part_)
+ dist *= 0.5;
+ else if (!rm->grace_part_ && lm->grace_part_)
+ dist *= 0.7;
+ }
+
+
return dist;
}
Spacing_spanner::set_springs (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Link_array<Grob> all (me->pscore_l_->line_l_->column_l_arr ()) ;
+ Link_array<Item> all (me->pscore_l_->line_l_->column_l_arr ()) ;
int j = 0;
for (int i = 1; i < all.size (); i++)
{
- Grob *sc = all[i];
+ Item *sc = all[i];
if (Item::breakable_b (sc))
{
- Link_array<Grob> measure (all.slice (j, i+1));
+ Link_array<Item> measure (all.slice (j, i+1));
do_measure (me, measure);
j = i;
}
projects / lilypond.git / blobdiff