2003 -> 2004

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 7ec510afa2f10b5a8b4364df0071c2431a29fa1b..97abc42e18a2df28e7adff83790ed13346c25095 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,31 +1,38 @@
 /*
-  slur.hh -- part of GNU LilyPond
+  slur.hh -- declare Slur
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "directional-spanner.hh"
+#include "lily-guile.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
-#include "bow.hh"
+#include "rod.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_substitute_dependency(Score_elem*, Score_elem*);
-    virtual void do_pre_processing();
-    SCORE_ELEM_CLONE(Slur)
-    NAME_MEMBERS();
+  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_offsets (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_boundary_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 SCM 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