Run `make grand-replace'.

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 096d96ab2ea7791d2827466b58d836842f294ed5..38bd195f9f796be3ed05bec82cb028cc26f315d3 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,37 +1,36 @@
 /*
   slur.hh -- declare Slur
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
-#include "rod.hh"
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
 class Slur
 {
 public:
-  static void add_column (Score_element*me,Score_element*col);
-  static SCM brew_molecule (SCM);
-  static void set_interface (Score_element*);
-  static bool  has_interface (Score_element*);
-  static Array<Offset> get_encompass_offset_arr (Score_element*me) ;
-  static Bezier get_curve (Score_element*me) ;
-  static Direction get_default_dir (Score_element*me) ;
-  static SCM before_line_breaking (SCM);
-  static SCM after_line_breaking (SCM);
-  static SCM set_spacing_rods (SCM);
-private:  
-  static Offset get_attachment (Score_element*me,Direction dir, Score_element**common) ;
-  static void de_uglyfy (Score_element*me,Slur_bezier_bow* bb, Real default_height);
-  static void set_extremities (Score_element*me);
-  static void set_control_points (Score_element*me);
-  static Offset encompass_offset (Score_element*me,Score_element *col,Score_element**common);
+  static void add_column (Grob *me, Grob *col);
+  static void add_extra_encompass (Grob *me, Grob *col);
+  static void replace_breakable_encompass_objects (Grob *me);
+  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob*>&, vector<Grob*>&);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (pure_outside_slur_callback, (SCM, SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_cross_staff, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_GROB_INTERFACE();
+  static Bezier get_curve (Grob *me);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */