Use queue for prioritizing slur scores.

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

diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh
index aeaac19c84a2e7aaddcee76b7317946e0f4cc91f..866b216942f5dc831995567de7484e1a7581d09d 100644 (file)
--- a/lily/include/slur-scoring.hh
+++ b/lily/include/slur-scoring.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2011 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
@@ -35,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
@@ -105,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;
@@ -118,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;  
 };