X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-bezier-bow.cc;h=8c1babb399cf1f9ac0419e6825bc9e78f8cba104;hb=refs%2Ftags%2Frelease%2F1.5.23;hp=d7395d2518248fe3745c49f6d5d147da2c04d912;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git diff --git a/lily/slur-bezier-bow.cc b/lily/slur-bezier-bow.cc index d7395d2518..8c1babb399 100644 --- a/lily/slur-bezier-bow.cc +++ b/lily/slur-bezier-bow.cc @@ -154,18 +154,15 @@ Slur_bezier_bow::minimise_enclosed_area (Real beauty, if (fit_factor () > 1.0) blow_fit (); - Real pct_c0 = gh_scm2double (gh_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-c0"), bezier_props))); - Real pct_c3 = gh_scm2double (gh_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-c3"), bezier_props))); - Real pct_in_max = gh_scm2double (gh_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-in-max"), bezier_props))); - Real pct_out_max = gh_scm2double (gh_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-out-max"), bezier_props))); - Real steps = gh_scm2double (gh_cdr (scm_assoc (ly_symbol2scm ("bezier-area-steps"),bezier_props))); + Real pct_c0 = gh_scm2double (ly_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-c0"), bezier_props))); + Real pct_c3 = gh_scm2double (ly_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-c3"), bezier_props))); + Real pct_in_max = gh_scm2double (ly_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-in-max"), bezier_props))); + Real pct_out_max = gh_scm2double (ly_cdr (scm_assoc (ly_symbol2scm ("bezier-pct-out-max"), bezier_props))); + Real steps = gh_scm2double (ly_cdr (scm_assoc (ly_symbol2scm ("bezier-area-steps"),bezier_props))); for (int i=0; i < steps; i++) { Real area = enclosed_area_f (); - if (!i) - DEBUG_OUT << to_str ("Init area: %f\n", area); - if (area <= beautiful) break; @@ -186,8 +183,6 @@ Slur_bezier_bow::minimise_enclosed_area (Real beauty, curve_.control_[1][X_AXIS] -= da[0] * u * pct; curve_.control_[2][X_AXIS] -= da[1] * u * pct; } - - // Real area = enclosed_area_f (); }