* flower/include/axis.hh: rename from axes.hh

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

diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh
index 8f4c6494dd96b47658a0d27f60bf852ce0c4bf30..9e85ee857dc58e927f2036b0b6df905781d9d187 100644 (file)
--- a/lily/include/slur-scoring.hh
+++ b/lily/include/slur-scoring.hh
@@ -1,10 +1,9 @@
-/* 
+/*
   slur-scoring.hh -- declare Slur_score_parameters
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_SCORING_HH
@@ -13,6 +12,7 @@
 #include "box.hh"
 #include "lily-proto.hh"
 #include "parray.hh"
+#include "lily-guile.hh"
 
 struct Slur_score_parameters
 {
@@ -39,14 +39,12 @@ struct Slur_score_parameters
   void fill (Grob *him);
 };
 
-
-
 struct Extra_collision_info
 {
   Real idx_;
   Box extents_;
   Real penalty_;
-  Grob * grob_;
+  Grob *grob_;
 
   Extra_collision_info (Grob *g, Real idx, Interval x, Interval y, Real p)
   {
@@ -64,7 +62,6 @@ struct Extra_collision_info
   }
 };
 
-
 struct Encompass_info
 {
   Real x_;
@@ -115,12 +112,12 @@ struct Slur_score_state
   bool edge_has_beams_;
   bool is_broken_;
   bool has_same_beam_;
-  
+
   Real musical_dy_;
   Link_array<Grob> columns_;
   Array<Encompass_info> encompass_infos_;
   Array<Extra_collision_info> extra_encompass_infos_;
-  
+
   Direction dir_;
   Slur_score_parameters parameters_;
   Drul_array<Bound_info> extremes_;
@@ -128,24 +125,26 @@ struct Slur_score_state
   Link_array<Slur_configuration> configurations_;
   Real staff_space_;
   Real thickness_;
-  
-  Slur_score_state();
-  ~Slur_score_state();
+
+  Slur_score_state ();
+  ~Slur_score_state ();
 
   Bezier get_best_curve ();
-  void fill (Grob*);
+  void fill (Grob *);
   void set_next_direction ();
-  
+
+  Array<Offset> Slur_score_state::generate_avoid_offsets () const;
   Drul_array<Bound_info> get_bound_info () const;
-  void generate_curves () const; 
+  void generate_curves () const;
   Link_array<Slur_configuration> enumerate_attachments (Drul_array<Real> end_ys) const;
-  Drul_array<Offset> get_base_attachments() const;
-  Drul_array<Real> get_y_attachment_range() const;
+  Drul_array<Offset> get_base_attachments () const;
+  Drul_array<Real> get_y_attachment_range () const;
   Encompass_info get_encompass_info (Grob *col) const;
   Array<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;
 };
 
-
 void set_slur_control_points (Grob *me);
 
 #endif /* SLUR_SCORING_HH */