X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=20667dd25cd20c59d38e7b115e23851ffca27fa1;hb=a113820bb91e69cc1ff86d61bad6778a5fd2ade9;hp=07b9093f9c439e2bb939a4fde1d966a98b429e67;hpb=38dcc7f0775e8332ebfadacb7b8fd931480a4cc9;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 07b9093f9c..20667dd25c 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,35 +1,34 @@
 /*
-  slur.hh -- part of GNU LilyPond
+  slur.hh -- declare Slur
 
-  (c) 1996,97 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 "directional-spanner.hh"
+#include "grob-info.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
-#include "bow.hh"
+#include "lily-guile.hh"
+#include "std-vector.hh"
 
-/**
-  A #Bow# which tries to drape itself around the stems too.
- */
-class Slur : public Bow {
+class Slur
+{
 public:
-  Link_array<Note_column> encompass_arr_;
-  void add (Note_column*);
-protected:
-  virtual void set_default_dir();
-  virtual void do_post_processing();
-  virtual void do_add_processing ();
-  virtual void do_pre_processing ();
-  virtual void do_substitute_dependency (Score_elem*, Score_elem*);
-
-  SCORE_ELEM_CLONE(Slur);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  static void add_column (Grob *me, Grob *col);
+  static void add_extra_encompass (Grob *me, Grob *col);
+  static void auxiliary_acknowledge_extra_object (Grob_info, 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));
+  static bool has_interface (Grob *);
+  static Bezier get_curve (Grob *me);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */