Imported Upstream version 2.16.0

[lilypond.git] / lily / include / slur-score-parameters.hh

diff --git a/lily/include/slur-score-parameters.hh b/lily/include/slur-score-parameters.hh
index 49d159b9390da0a2aebb9589e62d1947b1ea1bd2..75b1ae8e4623cd75c45917e968a5a24f472cae30 100644 (file)
--- a/lily/include/slur-score-parameters.hh
+++ b/lily/include/slur-score-parameters.hh
@@ -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
   it under the terms of the GNU General Public License as published by
@@ -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_;
@@ -43,8 +42,12 @@ struct Slur_score_parameters
   Real extra_encompass_free_distance_;
   Real absolute_closeness_measure_;
   Real edge_slope_exponent_;
+  Real close_to_edge_length_;
   Real head_slur_distance_max_ratio_;
   Real head_slur_distance_factor_;
+  Real encompass_object_range_overshoot_;
+  Real slur_tie_extrema_min_distance_;
+  Real slur_tie_extrema_min_distance_penalty_;
 
   void fill (Grob *him);
 };