X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=a3197932f69089bc663223039a5652f3b10f416e;hb=5c7d64ab0b4877bc8a659194034b7b74522f3d6c;hp=f358065b8d65331eb8d5bb6a108016b4fec962d3;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index f358065b8d..a3197932f6 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -138,12 +138,12 @@ Beam::quanting (SCM smob) precompute for every stem 2 factors. */ Link_array stems = - Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); + extract_grob_array (me, ly_symbol2scm ("stems")); Array stem_infos; 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)); @@ -174,7 +174,7 @@ Beam::quanting (SCM smob) && s != lvs && s != fvs; base_lengths.push (calc_stem_y (me, s, common, xl, xr, - Interval (0,0), f) / ss); + Interval (0, 0), f) / ss); stem_xposns.push (s->relative_coordinate (common[X_AXIS], X_AXIS)); } @@ -233,7 +233,7 @@ Beam::quanting (SCM smob) qscores[i].demerits += d; #if DEBUG_QUANTING - qscores[i].score_card_ += to_string ("S%.2f",d); + qscores[i].score_card_ += to_string ("S%.2f", d); #endif } @@ -431,8 +431,8 @@ Beam::score_forbidden_quants (Real yl, Real yr, 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_counts[LEFT] >? beam_counts[RIGHT]); @@ -449,7 +449,7 @@ Beam::score_forbidden_quants (Real yl, Real yr, /* 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 + 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 );