X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur-score-parameters.hh;h=2177d03bf7c124ef436f55a144988c1f944f9ef1;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=74a583ea01e3eb9ff972a17e6f765f5051f5da55;hpb=0387f04497978e37b335a8b99eec905499d6ad0f;p=lilypond.git

diff --git a/lily/include/slur-score-parameters.hh b/lily/include/slur-score-parameters.hh
index 74a583ea01..2177d03bf7 100644
--- a/lily/include/slur-score-parameters.hh
+++ b/lily/include/slur-score-parameters.hh
@@ -1,10 +1,20 @@
 /*
-  slur-score-paramaters.hh -- declare Slur_score_parameters
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2006--2008 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SLUR_SCORE_PARAMATERS_HH
@@ -18,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_;
@@ -31,10 +40,16 @@ struct Slur_score_parameters
   Real free_head_distance_;
   Real extra_encompass_collision_distance_;
   Real extra_encompass_free_distance_;
+  Real gap_to_staffline_inside_;
+  Real gap_to_staffline_outside_;
   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);
 };