resolve merge

[lilypond.git] / lily / include / slur-scoring.hh

diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh
index 6c4dd5da2f51f42e46794d496c439563548c13af..866b216942f5dc831995567de7484e1a7581d09d 100644 (file)
--- a/lily/include/slur-scoring.hh
+++ b/lily/include/slur-scoring.hh
@@ -1,9 +1,20 @@
 /*
-  slur-scoring.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) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2009 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_SCORING_HH
@@ -24,7 +35,6 @@ struct Extra_collision_info
   
   Extra_collision_info (Grob *g, Real idx, Interval x, Interval y, Real p);
   Extra_collision_info ();
-
 };
 
 struct Encompass_info
@@ -94,9 +104,10 @@ struct Slur_score_state
   Slur_score_state ();
   ~Slur_score_state ();
 
-  Bezier get_best_curve ();
+  Slur_configuration *get_forced_configuration (Interval ys) const;
+  Slur_configuration *get_best_curve () const;
   void fill (Grob *);
-  void set_next_direction ();
+  Direction slur_direction () const;
   
   vector<Offset> generate_avoid_offsets () const;
   Drul_array<Bound_info> get_bound_info () const;
@@ -107,7 +118,6 @@ struct Slur_score_state
   Encompass_info get_encompass_info (Grob *col) const;
   vector<Extra_collision_info> get_extra_encompass_infos () const;
   Real move_away_from_staffline (Real y, Grob *on_staff) const;
-  int get_closest_index (SCM inspect_quants) const;
 
   Grob *breakable_bound_item (Direction) const;  
 };