X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur-configuration.hh;h=b1b9f9a6e55033009f86c9f6b63a63252a2ce5d7;hb=459d4d5eaa90373349eb0461af7b6e3cdfd56981;hp=23e67bceda75bb3fdef8e8e116a4f388ed30e9b3;hpb=ba43faee242b37c23732aefb9fbce7eeb6d2eb25;p=lilypond.git

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index 23e67bceda..b1b9f9a6e5 100644
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -3,35 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_CONFIGURATION_HH
 #define SLUR_CONFIGURATION_HH
 
 #include "bezier.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "main.hh"
 
 class Slur_configuration
 {
+  Real score_;
+  string score_card_;
+
 public:
   Drul_array<Offset> attachment_;
-  Real score_;
   Bezier curve_;
   Real height_;
 
   int index_;
 
-#if DEBUG_SLUR_SCORING
-  String score_card_;
-#endif
-
   Slur_configuration ();
 
+  Real score () const { return score_; }
+  string card () const { return score_card_; } 
+  void add_score (Real, string);
+  
   void generate_curve (Slur_score_state const &state, Real r0, Real h_inf,
-		       Array<Offset> const&);
-  void score (Slur_score_state const &);
+		       vector<Offset> const &);
+  void calculate_score (Slur_score_state const &);
 protected:
   void score_extra_encompass (Slur_score_state const &);
   void score_slopes (Slur_score_state const &);