Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

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

diff --git a/lily/slur-score-parameters.cc b/lily/slur-score-parameters.cc
index 84a3d1ce7a1768e0dcf2df7af8b26ecb50491a8b..5cd4b5858631475894482d6d37770e432c4ddb72 100644 (file)
--- a/lily/slur-score-parameters.cc
+++ b/lily/slur-score-parameters.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2006--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -57,6 +57,8 @@ Slur_score_parameters::fill (Grob *me)
     = get_detail (details, ly_symbol2scm ("accidental-collision"));
   extra_encompass_free_distance_
     = get_detail (details, ly_symbol2scm ("extra-encompass-free-distance"));
+  extra_encompass_collision_distance_
+    = get_detail (details, ly_symbol2scm ("extra-encompass-collision-distance"));
   head_slur_distance_factor_
     = get_detail (details, ly_symbol2scm ("head-slur-distance-factor"));
   head_slur_distance_max_ratio_