patch::: 1.3.44.jcn1

[lilypond.git] / lily / include / slur.hh

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 2fb4b5ede408b624dfc1a1564871347899ae8eed..cb202f1e93032f41214176105842a1f9da8af21d 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,39 +1,45 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "bow.hh"
+#include "spanner.hh"
 #include "rod.hh"
 
 /**
   A #Bow# which tries to drape itself around the stems too.
  */
-class Slur : public Bow
+class Slur : public Spanner
 {
-  int cross_staff_count () const;
-  Offset encompass_offset (Note_column const* )const;
 public:
   Slur ();
   VIRTUAL_COPY_CONS(Score_element);
 
   void add_column (Note_column*);
 
-  Link_array<Note_column> encompass_arr_;
 
 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 after_line_breaking ();
   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;
+
+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;
 };
 
 #endif // SLUR_HH