* stepmake/stepmake/generic-vars.make (LOOP): Add PLUS to keep -j

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

diff --git a/lily/include/slur-configuration.hh b/lily/include/slur-configuration.hh
index 42680ad0ab8174692dab52735e3d313779bcdf92..285a8da7df6a9acccd4638caf596e6e3f8611cb8 100644 (file)
--- a/lily/include/slur-configuration.hh
+++ b/lily/include/slur-configuration.hh
@@ -1,19 +1,16 @@
-/* 
+/*
   slur-configuration.hh -- declare Slur_configuration
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_CONFIGURATION_HH
 #define SLUR_CONFIGURATION_HH
 
-#include "drul-array.hh"
 #include "bezier.hh"
-#include "lily-proto.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "main.hh"
 
 class Slur_configuration
@@ -23,22 +20,23 @@ public:
   Real score_;
   Bezier curve_;
   Real height_;
-  
+
   int index_;
-  
+
 #if DEBUG_SLUR_SCORING
-  String score_card_;
+  std::string score_card_;
 #endif
 
   Slur_configuration ();
 
-  void generate_curve (Slur_score_state const &state, Real r0, Real h_inf);
-  void score (Slur_score_state const&);
+  void generate_curve (Slur_score_state const &state, Real r0, Real h_inf,
+                      std::vector<Offset> const &);
+  void score (Slur_score_state const &);
 protected:
-  void score_extra_encompass (Slur_score_state const&);
-  void score_slopes  (Slur_score_state const&);
-  void score_edges (Slur_score_state const&);
-  void score_encompass (Slur_score_state const&);
+  void score_extra_encompass (Slur_score_state const &);
+  void score_slopes (Slur_score_state const &);
+  void score_edges (Slur_score_state const &);
+  void score_encompass (Slur_score_state const &);
 };
 
 #endif /* SLUR_CONFIGURATION_HH */