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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 5f634e700c..7313ee7e6c 100644
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,41 +1,38 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2001 Han-Wen Nienhuys
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "bow.hh"
+#include "lily-guile.hh"
+#include "lily-proto.hh"
 #include "rod.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);
+  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 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