X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=390bde5c6f27975aa16250f49760c30fa6c78f96;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=d4f2e11c01eea1754bd8a501331b2a3803d3f50f;hpb=d8ddee6490dd1bb4965980d3e952a390493bfffd;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index d4f2e11c01..390bde5c6f 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,40 +1,29 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
-#include "rod.hh"
+#include "lily-guile.hh"
 
 class Slur
 {
 public:
-  static void add_column (Score_element *me, Score_element *col);
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
-  static void set_interface (Score_element*);
-  static bool  has_interface (Score_element*);
-  static Array<Offset> get_encompass_offset_arr (Score_element *me);
-  static Bezier get_curve (Score_element *me);
-  static Direction get_default_dir (Score_element *me);
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
-
-private:  
-  static Real get_first_notecolumn_y (Score_element *me, Direction dir);
-  static Offset broken_trend_offset (Score_element *me, Direction dir);
-  static Offset get_attachment (Score_element *me,Direction dir, Score_element **common);
-  static void de_uglyfy (Score_element *me,Slur_bezier_bow* bb, Real default_height);
-  static void set_extremities (Score_element *me);
-  static void set_control_points (Score_element *me);
-  static void check_slope (Score_element *me);
-  static Offset encompass_offset (Score_element *me, Score_element *col, Score_element **common);
+  static void add_column (Grob *me, Grob *col);
+  static void add_extra_encompass (Grob *me, Grob *col);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
+  static bool has_interface (Grob *);
+  static Bezier get_curve (Grob *me);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */