/*
threshold to combat rounding errors.
*/
-
const Real BEAM_EPS = 1e-3;
// possibly ridiculous, but too short stems just won't do
const int DAMPING_DIRECTION_PENALTY = 800;
const int MUSICAL_DIRECTION_FACTOR = 400;
const int IDEAL_SLOPE_FACTOR = 10;
-
-const Real ROUND_TO_ZERO_SLOPE = 0.05;
+const Real ROUND_TO_ZERO_SLOPE = 0.02;
const int ROUND_TO_ZERO_POINTS = 4;
extern bool debug_beam_quanting_flag;
{
Grob *me = unsmob_grob (smob);
- SCM s = me->get_grob_property ("positions");
+ SCM s = me->get_property ("positions");
Real yl = gh_scm2double (gh_car (s));
Real yr = gh_scm2double (gh_cdr (s));
Real thickness = Beam::get_thickness (me) / ss ;
Real slt = Staff_symbol_referencer::line_thickness (me) / ss;
- SCM sdy = me->get_grob_property ("least-squares-dy");
+ SCM sdy = me->get_property ("least-squares-dy");
Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0;
Real straddle = 0.0;
stem_infos.push (si);
dirs_found[stem_infos.top ().dir_] = true;
- bool f = to_boolean (s->get_grob_property ("french-beaming"))
+ bool f = to_boolean (s->get_property ("french-beaming"))
&& s != lvs && s != fvs;
base_lengths.push (calc_stem_y (me, s, common, xl, xr,
}
Real rad = Staff_symbol_referencer::staff_radius (me);
- int beam_count = get_beam_count (me);
+
+
+
+ Drul_array<int> edge_beam_counts
+ (Stem::beam_multiplicity (stems[0]).length () + 1,
+ Stem::beam_multiplicity (stems.top ()).length () + 1);
+
Real beam_translation = get_beam_translation (me) / ss;
Real reasonable_score = (is_knee) ? 200000 : 100;
{
Real d = score_forbidden_quants (qscores[i].yl, qscores[i].yr,
rad, slt, thickness, beam_translation,
- beam_count, ldir, rdir);
+ edge_beam_counts, ldir, rdir);
qscores[i].demerits += d;
#if DEBUG_QUANTING
#if DEBUG_QUANTING
- SCM inspect_quants = me->get_grob_property ("inspect-quants");
+ SCM inspect_quants = me->get_property ("inspect-quants");
if (debug_beam_quanting_flag
&& gh_pair_p (inspect_quants))
{
}
#endif
- me->set_grob_property ("positions",
+ me->set_property ("positions",
ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
qscores[best_idx].yr)));
#if DEBUG_QUANTING
qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
// debug quanting
- me->set_grob_property ("quant-score",
+ me->set_property ("quant-score",
scm_makfrom0str (qscores[best_idx].score_card_.to_str0 ()));
}
#endif
dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy), 1.5)
* slope_penalty;
+#if 0
/*
almost zero slopes look like errors in horizontal beams.
*/
+ /*
+ This causes too much problems, because horizontal depends on
+ horizontal spacing details. These errors should be dealt with
+ through concaveness. --hwn.
+ */
if (fabs (dy) > 1e-3
&& fabs (dy / dx) < ROUND_TO_ZERO_SLOPE)
dem += ROUND_TO_ZERO_POINTS;
+#endif
return dem;
}
Real radius,
Real slt,
Real thickness, Real beam_translation,
- int beam_count,
+ Drul_array<int> beam_counts,
Direction ldir, Direction rdir)
{
Real dy = yr - yl;
Drul_array<Real> y(yl,yr);
Drul_array<Direction> dirs(ldir,rdir);
- Real extra_demerit = SECONDARY_BEAM_DEMERIT / beam_count;
+ Real extra_demerit = SECONDARY_BEAM_DEMERIT / (beam_counts[LEFT] >? beam_counts[RIGHT]);
/*
Inside the staff, inter quants are forbidden.
while ((flip (&d))!= LEFT);
- for (int j = 1; j <= beam_count; j++)
+ do
{
- do
+ for (int j = 1; j <= beam_counts[d]; j++)
{
/*
see if the outer staffline falls in a beam-gap
if (gap.contains (k))
dem += extra_demerit;
}
- while ((flip (&d))!= LEFT);
}
+ while ((flip (&d))!= LEFT);
-
- // todo: use beam_count of outer stems.
- if (beam_count >= 2)
+ if ((beam_counts[LEFT] >? beam_counts[RIGHT]) >= 2)
{
Real straddle = 0.0;
Real sit = (thickness - slt) / 2;
Real inter = 0.5;
Real hang = 1.0 - (thickness - slt) / 2;
- // hmm, without Interval/Drul_array, you get ~ 4x same code...
- if (fabs (y[LEFT] - dirs[LEFT] * beam_translation) < radius + inter)
- {
- if (dirs[LEFT] == UP && dy <= BEAM_EPS
- && fabs (my_modf (y[LEFT]) - sit) < BEAM_EPS)
- dem += extra_demerit;
-
- if (dirs[LEFT] == DOWN && dy >= BEAM_EPS
- && fabs (my_modf (y[LEFT]) - hang) < BEAM_EPS)
- dem += extra_demerit;
- }
- if (fabs (y[RIGHT] - dirs[RIGHT] * beam_translation) < radius + inter)
- {
- if (dirs[RIGHT] == UP && dy >= BEAM_EPS
- && fabs (my_modf (y[RIGHT]) - sit) < BEAM_EPS)
- dem += extra_demerit;
-
- if (dirs[RIGHT] == DOWN && dy <= BEAM_EPS
- && fabs (my_modf (y[RIGHT]) - hang) < BEAM_EPS)
- dem += extra_demerit;
- }
-
- if (beam_count >= 3)
+ Direction d = LEFT;
+ do
{
- if (fabs (y[LEFT] - 2 * dirs[LEFT] * beam_translation) < radius + inter)
+ if (beam_counts[d] >= 2
+ && fabs (y[d] - dirs[d] * beam_translation) < radius + inter)
{
- if (dirs[LEFT] == UP && dy <= BEAM_EPS
- && fabs (my_modf (y[LEFT]) - straddle) < BEAM_EPS)
+ if (dirs[d] == UP && dy <= BEAM_EPS
+ && fabs (my_modf (y[d]) - sit) < BEAM_EPS)
dem += extra_demerit;
-
- if (dirs[LEFT] == DOWN && dy >= BEAM_EPS
- && fabs (my_modf (y[LEFT]) - straddle) < BEAM_EPS)
+
+ if (dirs[d] == DOWN && dy >= BEAM_EPS
+ && fabs (my_modf (y[d]) - hang) < BEAM_EPS)
dem += extra_demerit;
}
-
- if (fabs (y[RIGHT] - 2 * dirs[RIGHT] * beam_translation) < radius + inter)
+
+ if (beam_counts[d] >= 3
+ && fabs (y[d] - 2 * dirs[d] * beam_translation) < radius + inter)
{
- if (dirs[RIGHT] == UP && dy >= BEAM_EPS
- && fabs (my_modf (y[RIGHT]) - straddle) < BEAM_EPS)
+ if (dirs[d] == UP && dy <= BEAM_EPS
+ && fabs (my_modf (y[d]) - straddle) < BEAM_EPS)
dem += extra_demerit;
- if (dirs[RIGHT] == DOWN && dy <= BEAM_EPS
- && fabs (my_modf (y[RIGHT]) - straddle) < BEAM_EPS)
+ if (dirs[d] == DOWN && dy >= BEAM_EPS
+ && fabs (my_modf (y[d]) - straddle) < BEAM_EPS)
dem += extra_demerit;
}
}
+ while (flip (&d) != LEFT);
}
return dem;
projects / lilypond.git / blobdiff