From 5f280a566ed2ec0f1b361d9c4ce08456e9eab9d0 Mon Sep 17 00:00:00 2001 From: Mike Solomon Date: Wed, 12 Oct 2011 07:58:36 +0200 Subject: [PATCH] Removes closeness-factor from the Slur details list --- lily/include/slur-score-parameters.hh | 1 - lily/slur-configuration.cc | 12 ------------ lily/slur-score-parameters.cc | 2 -- lily/slur.cc | 4 +--- scm/layout-slur.scm | 1 - 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lily/include/slur-score-parameters.hh b/lily/include/slur-score-parameters.hh index cae53a4d8e..866de050f4 100644 --- a/lily/include/slur-score-parameters.hh +++ b/lily/include/slur-score-parameters.hh @@ -28,7 +28,6 @@ struct Slur_score_parameters Real head_encompass_penalty_; Real stem_encompass_penalty_; - Real closeness_factor_; Real edge_attraction_factor_; Real same_slope_penalty_; Real steeper_slope_factor_; diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 9957701812..b9eaf91886 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -277,18 +277,6 @@ Slur_configuration::score_encompass (Slur_score_state const &state) demerit += stem_dem; } - else if (!edge) - { - Interval ext; - ext.add_point (state.encompass_infos_[j].stem_); - ext.add_point (state.encompass_infos_[j].head_); - - // ? - demerit += -state.parameters_.closeness_factor_ - * min (state.dir_ - * (y - (ext[state.dir_] + state.dir_ * state.parameters_.free_head_distance_)), 0.0) - / state.encompass_infos_.size (); - } } add_score (demerit, "encompass"); diff --git a/lily/slur-score-parameters.cc b/lily/slur-score-parameters.cc index 886799d981..fe0a7828e2 100644 --- a/lily/slur-score-parameters.cc +++ b/lily/slur-score-parameters.cc @@ -42,8 +42,6 @@ Slur_score_parameters::fill (Grob *me) = get_detail (details, ly_symbol2scm ("head-encompass-penalty")); stem_encompass_penalty_ = get_detail (details, ly_symbol2scm ("stem-encompass-penalty")); - closeness_factor_ - = get_detail (details, ly_symbol2scm ("closeness-factor")); edge_attraction_factor_ = get_detail (details, ly_symbol2scm ("edge-attraction-factor")); same_slope_penalty_ diff --git a/lily/slur.cc b/lily/slur.cc index 7276df0e01..1f41607307 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -439,8 +439,6 @@ ADD_INTERFACE (Slur, "Demerit to apply when note heads collide with a slur.\n" "@item stem-encompass-penalty\n" "Demerit to apply when stems collide with a slur.\n" - "@item closeness-factor\n" - "Additional demerit used when scoring encompasses.\n" "@item edge-attraction-factor\n" "Factor used to calculate the demerit for distances" " between slur endpoints and their corresponding base" @@ -496,7 +494,7 @@ ADD_INTERFACE (Slur, /* properties */ "annotation " - "avoid-slur " /* UGH. */ + "avoid-slur " /* UGH. */ "control-points " "dash-definition " "details " diff --git a/scm/layout-slur.scm b/scm/layout-slur.scm index 5614dd65c6..391582bdf6 100644 --- a/scm/layout-slur.scm +++ b/scm/layout-slur.scm @@ -20,7 +20,6 @@ '((region-size . 4) (head-encompass-penalty . 1000.0) (stem-encompass-penalty . 30.0) - (closeness-factor . 10) (edge-attraction-factor . 4) (same-slope-penalty . 20) (steeper-slope-factor . 50) -- 2.39.5