X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-configuration.cc;h=3c39b457932072fc0636647061ec711e82aaf89f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8a1af612d5dae17961b19d4f8df726b636a84b58;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 8a1af612d5..3c39b45793 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -3,33 +3,32 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2005 Han-Wen Nienhuys + (c) 2004--2008 Han-Wen Nienhuys */ #include "slur-configuration.hh" -#include -#include "stem.hh" -#include "warn.hh" -#include "misc.hh" #include "item.hh" -#include "group-interface.hh" -#include "slur.hh" +#include "libc-extension.hh" +#include "misc.hh" +#include "pointer-group-interface.hh" #include "slur-scoring.hh" +#include "slur.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" -#include "libc-extension.hh" +#include "stem.hh" +#include "warn.hh" Bezier avoid_staff_line (Slur_score_state const &state, Bezier bez) { Offset horiz (1, 0); - Array ts = bez.solve_derivative (horiz); + vector ts = bez.solve_derivative (horiz); /* TODO: handle case of broken slur. */ - if (!ts.is_empty () + if (!ts.empty () && (state.extremes_[LEFT].staff_ == state.extremes_[RIGHT].staff_) && state.extremes_[LEFT].staff_ && state.extremes_[RIGHT].staff_) { @@ -65,7 +64,7 @@ avoid_staff_line (Slur_score_state const &state, Real fit_factor (Offset dz_unit, Offset dz_perp, - Bezier curve, Direction d, Array const &avoid) + Bezier curve, Direction d, vector const &avoid) { Real fit_factor = 0.0; Offset x0 = curve.control_[0]; @@ -77,58 +76,30 @@ fit_factor (Offset dz_unit, Offset dz_perp, curve_xext.add_point (curve.control_[0][X_AXIS]); curve_xext.add_point (curve.control_[3][X_AXIS]); - for (int i = 0; i < avoid.size (); i++) + for (vsize i = 0; i < avoid.size (); i++) { Offset z = (avoid[i] - x0); Offset p (dot_product (z, dz_unit), d * dot_product (z, dz_perp)); - if (!curve_xext.contains (p[X_AXIS])) + + Real eps = 0.01; + Interval pext = eps * Interval (-1,1) + p[X_AXIS]; + pext.intersect (curve_xext); + if (pext.is_empty () || pext.length () <= 1.999 * eps) continue; Real y = curve.get_other_coordinate (X_AXIS, p[X_AXIS]); if (y) - { - fit_factor = fit_factor >? (p[Y_AXIS] / y); - } + fit_factor = max (fit_factor, (p[Y_AXIS] / y)); } return fit_factor; } void Slur_configuration::generate_curve (Slur_score_state const &state, - Real r_0, Real h_inf) + Real r_0, Real h_inf, + vector const &avoid) { - Link_array encompasses = state.columns_; - - Array avoid; - for (int i = 0; i < encompasses.size (); i++) - { - if (state.extremes_[LEFT].note_column_ == encompasses[i] - || state.extremes_[RIGHT].note_column_ == encompasses[i]) - continue; - - Encompass_info inf (state.get_encompass_info (encompasses[i])); - Real y = state.dir_ * ((state.dir_ * inf.head_) >? (state.dir_ * inf.stem_)); - - avoid.push (Offset (inf.x_, y + state.dir_ * state.parameters_.free_head_distance_)); - } - - Link_array extra_encompasses - = extract_grob_array (state.slur_, ly_symbol2scm ("encompass-objects")); - for (int i = 0; i < extra_encompasses.size (); i++) - if (Slur::has_interface (extra_encompasses[i])) - { - Grob *small_slur = extra_encompasses[i]; - Bezier b = Slur::get_curve (small_slur); - - Offset z = b.curve_point (0.5); - z += Offset (small_slur->relative_coordinate (state.common_[X_AXIS], X_AXIS), - small_slur->relative_coordinate (state.common_[Y_AXIS], Y_AXIS)); - - z[Y_AXIS] += state.dir_ * state.parameters_.free_slur_distance_; - avoid.push (z); - } - Offset dz = attachment_[RIGHT]- attachment_[LEFT];; Offset dz_unit = dz; dz_unit *= 1 / dz.length (); @@ -151,7 +122,7 @@ Slur_configuration::generate_curve (Slur_score_state const &state, (control3 - control0). */ Real max_indent = len / 3.1; - indent = indent get_property ("excentricity"), 0); + Real eccentricity = robust_scm2double (state.slur_->get_property ("eccentricity"), 0); - Real x1 = (excentricity + indent); - Real x2 = (excentricity - indent); + Real x1 = (eccentricity + indent); + Real x2 = (eccentricity - indent); Bezier curve; curve.control_[0] = attachment_[LEFT]; @@ -182,7 +151,7 @@ Slur_configuration::generate_curve (Slur_score_state const &state, Real ff = fit_factor (dz_unit, dz_perp, curve, state.dir_, avoid); - height = height >? ((height * ff) 0) + score_card_ += ", "; + score_card_ += to_string ("%s=%.2f", desc.c_str (), s); + score_ += s; + } +} + void Slur_configuration::score_encompass (Slur_score_state const &state) { @@ -211,8 +200,8 @@ Slur_configuration::score_encompass (Slur_score_state const &state) Distances for heads that are between slur and line between attachment points. */ - Array convex_head_distances; - for (int j = 0; j < state.encompass_infos_.size (); j++) + vector convex_head_distances; + for (vsize j = 0; j < state.encompass_infos_.size (); j++) { Real x = state.encompass_infos_[j].x_; @@ -231,14 +220,14 @@ Slur_configuration::score_encompass (Slur_score_state const &state) if (state.dir_ * head_dy < 0) { demerit += state.parameters_.head_encompass_penalty_; - convex_head_distances.push (0.0); + convex_head_distances.push_back (0.0); } else { Real hd = (head_dy) ? (1 / fabs (head_dy) - 1 / state.parameters_.free_head_distance_) : state.parameters_.head_encompass_penalty_; - hd = (hd >? 0)? state.dir_ * line_y); + = state.dir_ * max (state.dir_ * state.encompass_infos_[j].get_point (state.dir_), state.dir_ * line_y); Real d = fabs (closest - y); - convex_head_distances.push (d); + convex_head_distances.push_back (d); } } @@ -278,22 +266,20 @@ Slur_configuration::score_encompass (Slur_score_state const &state) // ? demerit += -state.parameters_.closeness_factor_ - * (state.dir_ - * (y - (ext[state.dir_] + state.dir_ * state.parameters_.free_head_distance_)) - 0.0) variance_penalty - = (avg_distance / (min_dist + state.parameters_.absolute_closeness_measure_) - 1.0) - ? 0.0; + variance_penalty = max (variance_penalty, 0.0); variance_penalty *= state.parameters_.head_slur_distance_factor_; - } - -#if DEBUG_SLUR_SCORING - score_card_ += to_string ("C%.2f", demerit); - score_card_ += to_string ("D%.2f", variance_penalty); -#endif - score_ += demerit + variance_penalty; + add_score (variance_penalty, "variance"); + } } void Slur_configuration::score_extra_encompass (Slur_score_state const &state) { - Real demerit = 0.0; - for (int j = 0; j < state.extra_encompass_infos_.size (); j++) + for (vsize j = 0; j < state.extra_encompass_infos_.size (); j++) { Drul_array attachment = attachment_; + Extra_collision_info const &info (state.extra_encompass_infos_[j]); + Interval slur_wid (attachment[LEFT][X_AXIS], attachment[RIGHT][X_AXIS]); /* @@ -358,21 +339,23 @@ Slur_configuration::score_extra_encompass (Slur_score_state const &state) distance. */ Item *as_item = dynamic_cast (state.extra_encompass_infos_[j].grob_); - if ((as_item - && as_item->get_column () - == state.extremes_[d].bound_->get_column ()) - || state.extra_encompass_infos_[j].extents_[X_AXIS].contains (attachment[d][X_AXIS])) + if (!as_item) + continue; + + Interval item_x = as_item->extent (state.common_[X_AXIS], X_AXIS); + item_x.intersect (state.extremes_[d].slur_head_x_extent_); + if (!item_x.is_empty ()) { y = attachment[d][Y_AXIS]; found = true; } + } while (flip (&d) != LEFT); if (!found) { - Real x = state.extra_encompass_infos_[j].extents_[X_AXIS] - .linear_combination (state.extra_encompass_infos_[j].idx_); + Real x = info.extents_[X_AXIS].linear_combination (info.idx_); if (!slur_wid.contains (x)) continue; @@ -380,16 +363,27 @@ Slur_configuration::score_extra_encompass (Slur_score_state const &state) y = curve_.get_other_coordinate (X_AXIS, x); } - Real dist = state.extra_encompass_infos_[j].extents_[Y_AXIS].distance (y); - demerit - += fabs (0 >? (state.parameters_.extra_encompass_free_distance_ - dist)) - / state.parameters_.extra_encompass_free_distance_ - * state.extra_encompass_infos_[j].penalty_; + Real dist = 0.0; + if (info.type_ == ly_symbol2scm ("around")) + dist = info.extents_[Y_AXIS].distance (y); + + /* + Have to score too: the curve enumeration is limited in its + shape, and may produce curves which collide anyway. + */ + else if (info.type_ == ly_symbol2scm ("inside")) + dist = state.dir_ * (y - info.extents_[Y_AXIS][state.dir_]); + else + programming_error ("unknown avoidance type"); + + dist = max (dist, 0.0); + + Real penalty = info.penalty_ * peak_around (0.1 * state.parameters_.extra_encompass_free_distance_, + state.parameters_.extra_encompass_free_distance_, + dist); + + add_score (penalty, "extra"); } -#if DEBUG_SLUR_SCORING - score_card_ += to_string ("X%.2f", demerit); -#endif - score_ += demerit; } void @@ -414,10 +408,9 @@ Slur_configuration::score_edges (Slur_score_state const &state) demerit *= exp (state.dir_ * d * slope * state.parameters_.edge_slope_exponent_); - score_ += demerit; -#if DEBUG_SLUR_SCORING - score_card_ += to_string ("E%.2f", demerit); -#endif + + string dir_str = d == LEFT ? "L" : "R"; + add_score (demerit, dir_str + " edge"); } while (flip (&d) != LEFT); } @@ -430,8 +423,8 @@ Slur_configuration ::score_slopes (Slur_score_state const &state) Real slur_dy = slur_dz[Y_AXIS]; Real demerit = 0.0; - demerit += ((fabs (slur_dy / slur_dz[X_AXIS]) - - state.parameters_.max_slope_) >? 0) + demerit += max ((fabs (slur_dy / slur_dz[X_AXIS]) + - state.parameters_.max_slope_), 0.0) * state.parameters_.max_slope_factor_; /* 0.2: account for staffline offset. */ @@ -441,10 +434,10 @@ Slur_configuration ::score_slopes (Slur_score_state const &state) if (!state.is_broken_) demerit += state.parameters_.steeper_slope_factor_ - * ((fabs (slur_dy) -max_dy) >? 0); + * (max (fabs (slur_dy) -max_dy, 0.0)); - demerit += ((fabs (slur_dy / slur_dz[X_AXIS]) - - state.parameters_.max_slope_) >? 0) + demerit += max ((fabs (slur_dy / slur_dz[X_AXIS]) + - state.parameters_.max_slope_), 0.0) * state.parameters_.max_slope_factor_; if (sign (dy) == 0 @@ -460,14 +453,11 @@ Slur_configuration ::score_slopes (Slur_score_state const &state) ? state.parameters_.same_slope_penalty_ / 10 : state.parameters_.same_slope_penalty_; -#if DEBUG_SLUR_SCORING - score_card_ += to_string ("S%.2f", demerit); -#endif - score_ += demerit; + add_score (demerit, "slope"); } void -Slur_configuration::score (Slur_score_state const &state) +Slur_configuration::calculate_score (Slur_score_state const &state) { score_extra_encompass (state); score_slopes (state);