X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fslur.hh;h=38bd195f9f796be3ed05bec82cb028cc26f315d3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5f634e700ca5644a723847c166d4274934b08c7b;hpb=8f58f4428d70961938e9151097886d861b3faeb3;p=lilypond.git

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 5f634e700c..38bd195f9f 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,43 +1,36 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "bow.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 Bow
+class Slur
 {
-  bool broken_edge_b ( Direction dir) const;
-  bool normal_edge_b ( Direction dir) const;
-  Drul_array<Note_column*> extrema () const; 
-
 public:
-  Slur ();
-  VIRTUAL_COPY_CONS(Score_element);
-
-  void add_column (Note_column*);
-  
-  Link_array<Note_column> encompass_arr_;
-
-protected:
-  virtual Array<Offset> get_encompass_offset_arr () const;
-
-  virtual Direction get_default_dir () const;
-  virtual void do_post_processing ();
-  virtual void do_add_processing ();
-  virtual void do_pre_processing ();
-  virtual void do_substitute_element_pointer (Score_element*, Score_element*);
-  Array<Rod> get_rods () 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 */