X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=5059bdff9645cdf847ca3050c064c7042823d13f;hb=edf17353d89f4f6bd831466262402bb9151a26ca;hp=4f14512047e2d7bc7172ec1ca1b91c47ebc0cb71;hpb=ffe548cfbb3c3b37c8969f49b5aba04ef998d080;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 4f14512047..5059bdff96 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,47 +1,36 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "spanner.hh"
-#include "rod.hh"
+#include "lily-proto.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
-/**
-  A #Bow# which tries to drape itself around the stems too.
- */
-class Slur : public Spanner
+class Slur
 {
 public:
-  Slur ();
-  VIRTUAL_COPY_CONS(Score_element);
-
-  void add_column (Note_column*);
-
-
-protected:
-  virtual 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 do_post_processing ();
-  virtual void do_add_processing ();
-  Array<Rod> get_rods () const;
-
-private:  
-  void de_uglyfy (class 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);
+  static void replace_breakable_encompass_objects (Grob *me);
+  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob*>&, vector<Grob*>&);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (pure_outside_slur_callback, (SCM, SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_cross_staff, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_GROB_INTERFACE();
+  static Bezier get_curve (Grob *me);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */