Doc: NR 2.1 Vocal: Placing dynamics above staff

[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 5ae14071da67ebf38eb3d4cbe3d532268f635f0c..2cd4950d841d0841241e35e419ca4303f873acd9 100644 (file)
--- 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2006 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
@@ -15,6 +25,7 @@
 struct Slur_score_parameters
 {
   int region_size_;
+
   Real head_encompass_penalty_;
   Real stem_encompass_penalty_;
   Real closeness_factor_;
@@ -28,6 +39,7 @@ struct Slur_score_parameters
   Real accidental_collision_;
   Real free_slur_distance_;
   Real free_head_distance_;
+  Real extra_encompass_collision_distance_;
   Real extra_encompass_free_distance_;
   Real absolute_closeness_measure_;
   Real edge_slope_exponent_;