X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=f244b2f725a4be5b44172922e2847c17b9205681;hb=ecde3b27ef910d586ba89dfedeb73278e48efed2;hp=7313ee7e6c32d02d46dac4162ff115ef6cc4c8c9;hpb=9cf00174c8273860064dc7ccb51beddcdd7105eb;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 7313ee7e6c..f244b2f725 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,40 +1,29 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2005 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 (Grob *me, Grob *col);
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
-  static void set_interface (Grob*);
-  static bool  has_interface (Grob*);
-  static Array<Offset> get_encompass_offset_arr (Grob *me);
+  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);
-  static Direction get_default_dir (Grob *me);
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-
-  DECLARE_SCHEME_CALLBACK (height, (SCM,SCM));
-private:  
-  static Real get_first_notecolumn_y (Grob *me, Direction dir);
-  static Offset broken_trend_offset (Grob *me, Direction dir);
-  static Offset get_attachment (Grob *me,Direction dir, Grob **common);
-  static void de_uglyfy (Grob *me,Slur_bezier_bow* bb, Real default_height);
-  static void set_extremities (Grob *me);
-  static void set_control_points (Grob *me);
-  static void check_slope (Grob *me);
-  static Offset encompass_offset (Grob *me, Grob *col, Grob **common);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */