release: 1.3.141

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 80b18fbfc7569a1100ad96951262969011140aec..7313ee7e6c32d02d46dac4162ff115ef6cc4c8c9 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,44 +1,38 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2001 Han-Wen Nienhuys
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "spanner.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 Spanner
+class Slur
 {
 public:
-  Slur (SCM);
-  VIRTUAL_COPY_CONS(Score_element);
-
-  void add_column (Note_column*);
- static SCM brew_molecule (SCM);
-  
-  SCM member_brew_molecule () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
-  Bezier get_curve () const;
-
-  virtual Direction get_default_dir () const;
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
-  virtual void do_add_processing ();
-  Array<Rod> get_rods () const;
-  Offset get_attachment (Direction dir) 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:  
-  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;
+  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