Removes closeness-factor from the Slur details list

diff --git a/lily/include/slur-score-parameters.hh b/lily/include/slur-score-parameters.hh
index cae53a4d8e70cd3742794a784af68860e07df073..866de050f4b63e363045d7f79098afb5f186eb4d 100644 (file)
--- 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 99577018129afd9dc8187864675e252e50fb6fcb..b9eaf918862a590f899b68d5a1be946df3a981d1 100644 (file)
--- 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 886799d9818dfd495044008710a901928b9fb942..fe0a7828e2a44fc68e8d86d7d3924ff9f4367162 100644 (file)
--- 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 7276df0e0107287968113fdf4f20a33193cfcda9..1f41607307f20ec403fa0ba084369294d561aeed 100644 (file)
--- 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 5614dd65c601b0db614ddc25c6a2b214c043d6fc..391582bdf6f25dadeac25c0dedb23f7ea40191ba 100644 (file)
--- 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)