Imported Upstream version 2.16.0

[lilypond.git] / lily / slur-score-parameters.cc

diff --git a/lily/slur-score-parameters.cc b/lily/slur-score-parameters.cc
index 1683aeea2feace61a84496e7247cecb57fd81e6d..a8cbe4b7f90b7d610ad240633f6153de0e0cdc95 100644 (file)
--- a/lily/slur-score-parameters.cc
+++ b/lily/slur-score-parameters.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2006--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,19 +18,17 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include "slur-score-parameters.hh"
 #include "grob.hh"
 
-
 Real
 get_detail (SCM alist, SCM sym)
 {
   SCM entry = scm_assq (sym, alist);
   return robust_scm2double (scm_is_pair (entry)
-                           ? scm_cdr (entry)
-                           : SCM_EOL,
-                           0.0);
+                            ? scm_cdr (entry)
+                            : SCM_EOL,
+                            0.0);
 }
 
 void
@@ -44,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_
@@ -78,4 +74,12 @@ Slur_score_parameters::fill (Grob *me)
     = get_detail (details, ly_symbol2scm ("free-slur-distance"));
   edge_slope_exponent_
     = get_detail (details, ly_symbol2scm ("edge-slope-exponent"));
+  close_to_edge_length_
+    = get_detail (details, ly_symbol2scm ("close-to-edge-length"));
+  encompass_object_range_overshoot_
+    = get_detail (details, ly_symbol2scm ("encompass-object-range-overshoot"));
+  slur_tie_extrema_min_distance_
+    = get_detail (details, ly_symbol2scm ("slur-tie-extrema-min-distance"));
+  slur_tie_extrema_min_distance_penalty_
+    = get_detail (details, ly_symbol2scm ("slur-tie-extrema-min-distance-penalty"));
 }