X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=fc4ff9810c9f59ec1949706fe128a05960f576fc;hb=978cbc12a1c129652e81d0d69eac52f39b59628b;hp=b78e435a49114b2af38ede20771f948e56f562e8;hpb=72b030aeed611d4a24ed6ade7fcc570cceac4c0d;p=lilypond.git diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index b78e435a49..fc4ff9810c 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -19,7 +19,7 @@ #include "staff-symbol-referencer.hh" #include "beam.hh" #include "stem.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "group-interface.hh" #include "align-interface.hh" @@ -30,7 +30,6 @@ const int STEM_LENGTH_DEMERIT_FACTOR = 5; /* threshold to combat rounding errors. */ - const Real BEAM_EPS = 1e-3; // possibly ridiculous, but too short stems just won't do @@ -38,8 +37,7 @@ const int STEM_LENGTH_LIMIT_PENALTY = 5000; 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; @@ -97,9 +95,9 @@ Beam::quanting (SCM smob) { Grob *me = unsmob_grob (smob); - SCM s = me->get_grob_property ("positions"); - Real yl = gh_scm2double (gh_car (s)); - Real yr = gh_scm2double (gh_cdr (s)); + SCM s = me->get_property ("positions"); + Real yl = ly_scm2double (ly_car (s)); + Real yr = ly_scm2double (ly_cdr (s)); /* @@ -111,8 +109,8 @@ Beam::quanting (SCM smob) 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"); - Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0; + SCM sdy = me->get_property ("least-squares-dy"); + Real dy_mus = ly_c_number_p (sdy) ? ly_scm2double (sdy) : 0.0; Real straddle = 0.0; Real sit = (thickness - slt) / 2; @@ -145,10 +143,10 @@ Beam::quanting (SCM smob) Array base_lengths; Array stem_xposns; - Drul_array dirs_found(0,0); + Drul_array dirs_found (0,0); Grob *common[2]; for (int a = 2; a--;) - common[a] = common_refpoint_of_array (stems, me, Axis(a)); + common[a] = common_refpoint_of_array (stems, me, Axis (a)); Grob * fvs = first_visible_stem (me); Grob *lvs = last_visible_stem (me); @@ -163,7 +161,7 @@ Beam::quanting (SCM smob) stem_y != 0.0, when we're cross staff. */ - for (int i= 0; i < stems.size(); i++) + for (int i= 0; i < stems.size (); i++) { Grob*s = stems[i]; @@ -172,7 +170,7 @@ Beam::quanting (SCM smob) 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, @@ -240,7 +238,13 @@ Beam::quanting (SCM smob) } Real rad = Staff_symbol_referencer::staff_radius (me); - int beam_count = get_beam_count (me); + + + + Drul_array 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; @@ -249,7 +253,7 @@ Beam::quanting (SCM smob) { 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 @@ -276,16 +280,16 @@ Beam::quanting (SCM smob) #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)) + && ly_c_pair_p (inspect_quants)) { Drul_array ins = ly_scm2interval (inspect_quants); int i = 0; Real mindist = 1e6; - for (; i < qscores.size(); i ++) + for (; i < qscores.size (); i ++) { Real d =fabs (qscores[i].yl- ins[LEFT]) + fabs (qscores[i].yr - ins[RIGHT]); if (d < mindist) @@ -299,7 +303,7 @@ Beam::quanting (SCM smob) } #endif - me->set_grob_property ("positions", + me->set_property ("positions", ly_interval2scm (Drul_array (qscores[best_idx].yl, qscores[best_idx].yr))); #if DEBUG_QUANTING @@ -308,7 +312,7 @@ Beam::quanting (SCM smob) 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 @@ -406,12 +410,19 @@ Beam::score_slopes_dy (Real yl, Real yr, 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; } @@ -433,14 +444,14 @@ Beam::score_forbidden_quants (Real yl, Real yr, Real radius, Real slt, Real thickness, Real beam_translation, - int beam_count, + Drul_array beam_counts, Direction ldir, Direction rdir) { Real dy = yr - yl; - Drul_array y(yl,yr); - Drul_array dirs(ldir,rdir); + Drul_array y (yl,yr); + Drul_array 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. @@ -455,9 +466,9 @@ Beam::score_forbidden_quants (Real yl, Real yr, 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 @@ -465,8 +476,15 @@ Beam::score_forbidden_quants (Real yl, Real yr, This test is too weak; we should really check all lines. */ Direction stem_dir = dirs[d]; - Real gap1 = y[d] - stem_dir * ((j-1) * beam_translation + thickness / 2 - slt/2 ); - Real gap2 = y[d] - stem_dir * (j * beam_translation - thickness / 2 + slt/2); + + /* + The 2.2 factor is to provide a little leniency for + borderline cases. If we do 2.0, then the upper outer line + will be in the gap of the (2,sit) quant, leading to a + false demerit. + */ + Real gap1 = y[d] - stem_dir * ((j-1) * beam_translation + thickness / 2 - slt/2.2 ); + Real gap2 = y[d] - stem_dir * (j * beam_translation - thickness / 2 + slt/2.2); Interval gap; gap.add_point (gap1); @@ -477,66 +495,46 @@ Beam::score_forbidden_quants (Real yl, Real yr, 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;