X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fslur.hh;h=003fa48083e56d89b9f104527547c2e17b71f5a1;hb=9ce63beb6e98dfda72259406ae5a19f48cd9b6af;hp=9a71f42d3f4bbe8267a5213e8b27a33a30b645e4;hpb=f5e5c04d731e93b1d8d4cf7e7697f71f6e7c2bdf;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 9a71f42d3f..003fa48083 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,49 +1,28 @@
 /*
   slur.hh -- declare Slur
-
-  (c) 1996--2000 Han-Wen Nienhuys
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "spanner.hh"
-#include "rod.hh"
+#include "lily-proto.hh"
+#include "lily-guile.hh"
 
-/**
-  A #Bow# which tries to drape itself around the stems too.
- */
-class Slur : public Spanner
+class Slur
 {
 public:
-  Slur (SCM);
-  VIRTUAL_COPY_CONS(Score_element);
-
-  void add_column (Note_column*);
- static SCM scheme_molecule (SCM);
-  
-
-
-protected:
-  Molecule do_brew_molecule () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
-  Bezier get_curve () const;
-  Drul_array<Real> dy_f_drul_;
-  Drul_array<Real> dx_f_drul_;
-
-  virtual Direction get_default_dir () const;
-  virtual void after_line_breaking ();
-  virtual void do_add_processing ();
-  Array<Rod> get_rods () const;
-
-private:  
-  void de_uglyfy (Slur_bezier_bow* bb, Real default_height);
-  void set_extremities ();
-  void set_control_points ();
-  int cross_staff_count () const;
-  Offset encompass_offset (Note_column const* )const;
+  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 (after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM,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 */