release: 1.5.29

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 68f073e10f4d32f2ad4c48bc914002c335ef5474..04865f10bb1e212d45a0515f1f105b06319c011e 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,29 +1,38 @@
 /*
-  slur.hh -- part of LilyPond
+  slur.hh -- declare Slur
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "directional-spanner.hh"
+#include "lily-guile.hh"
 #include "lily-proto.hh"
-#include "varray.hh"
-#include "bow.hh"
+#include "rod.hh"
 
-class Slur : public Bow {
+class Slur
+{
 public:
-    Array<Note_column*> encompass_arr_;
-
-    void do_post_processing();
-    void do_pre_processing();
-    void add(Note_column*);
-    void set_default_dir();
-
-    Spanner* do_break_at( PCol*, PCol*) const; 
-private:
-    NAME_MEMBERS(Slur);
+  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