Run `make grand-replace'.

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index 82f5b9a1251c555925ce04252798e0a512473d45..38bd195f9f796be3ed05bec82cb028cc26f315d3 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,72 +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"
-
-/**
-
-   de-uglify-parameters -- list of 3 real constants. They define the
-     valid areas for the middle control points. Used in de_uglyfy.
-     They are a bit empirical.
-
-   details -- alist containing contaning a few magic constants.
-
-   note-columns -- list of elt pointers to note columns.
-
-   attachment -- cons of symbols, '(LEFT-TYPE . RIGHT-TYPE), where
-     both types may be alongside-stem, stem, head or loose-end
-   
-   direction -- up or down?
-
-   y-free -- ? 
-   
-   control-points --
+#include "std-vector.hh"
+#include "grob-interface.hh"
 
-   
-   
-   Read-only
-   =========
-   
-   extremity-rules --
-
-   extremity-offset-alist --
-
-   thickness --
-
-   dash -- number representing the length of the dashes.
-*/
 class Slur
 {
 public:
-  static void add_column (Score_element *me, Score_element *col);
-  DECLARE_SCHEME_CALLBACK (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);
-  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
-  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
-
-private:  
-  static Real get_first_notecolumn_y (Score_element *me, Direction dir);
-  static Offset broken_trend_offset (Score_element *me, Direction dir);
-  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 void check_slope (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 */