Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index c8363075c4569bde2fe96e71f44b5fe628c84111..2c797239ce2876acf221f692dbe492ded0970657 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -1,36 +1,32 @@
 /*
-  slur.hh -- part of LilyPond
+  slur.hh -- declare Slur
 
-  (c) 1996,97 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SLUR_HH
 #define SLUR_HH
 
-#include "directional-spanner.hh"
-#include "fproto.hh"
-#include "varray.hh"
-
-struct Slur : Directional_spanner {
-
-    Array<Notehead*> encompass;
-
-    bool open_left, open_right;                        
-
-    /* *************** */
-    Offset center() const;
-    Slur();
-    void do_post_processing();
-    void do_pre_processing();
-    void add(Notehead*);
-    void set_default_dir();
-
-    Spanner* do_break_at( PCol*, PCol*) const; 
-private:
-    Molecule*brew_molecule_p()const;
-    NAME_MEMBERS(Slur);
+#include "grob-info.hh"
+#include "lily-proto.hh"
+#include "lily-guile.hh"
+#include "std-vector.hh"
+
+class Slur
+{
+public:
+  static void add_column (Grob *me, Grob *col);
+  static void add_extra_encompass (Grob *me, Grob *col);
+  static void auxiliary_acknowledge_extra_object (Grob_info, 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 (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM));
+  static bool has_interface (Grob *);
+  static Bezier get_curve (Grob *me);
 };
 
-#endif // SLUR_HH
-
-
+#endif /* SLUR_HH */