X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie.hh;h=bcce6c1265449b9529825197195ca35b3250ec95;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=bf6f386fc4f86293723845660f7197faca006c10;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index bf6f386fc4..bcce6c1265 100644
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -3,51 +3,39 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef TIE_HH
 #define TIE_HH
 
-#include "spanner.hh"
-#include "rod.hh"
+#include "lily-proto.hh"
+#include "skyline.hh"
+#include "grob-interface.hh"
 
-/**
-  Connect two noteheads.
-  */
-class Tie : public Spanner
-{
-public:
-  Tie (SCM);
-  void set_head (Direction, Item*head_l);
-  VIRTUAL_COPY_CONS(Score_element);
 
-  Note_head* head (Direction) const;
-  Real position_f () const;
-   static SCM brew_molecule (SCM);
   
 
-  virtual Direction get_default_dir() const;
-
-
-  SCM member_brew_molecule () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
-  Bezier get_curve () const;
-
-  /*
-    JUNKME
-   */
-  Drul_array<Real> dy_f_drul_;
-  Drul_array<Real> dx_f_drul_;
-
-  virtual void do_add_processing ();
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
-
-  virtual Array<Rod> get_rods () const;
-
-  Array<Offset> get_controls () const;
+class Tie
+{
+public:
+  static void set_head (Grob *, Direction, Grob *head);
+  DECLARE_GROB_INTERFACE();
+  static Grob *head (Grob *, Direction);
+  static int get_column_rank (Grob *, Direction);
+  static int get_position (Grob *);
+  static Direction get_default_dir (Grob *);  
+  static SCM get_control_points (Grob *, Grob *,
+				 Tie_configuration const&,
+				 Tie_details const&);
+  static SCM get_default_control_points (Grob *);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  static bool less (Grob *const &s1,
+		    Grob *const &s2);
 };
 
+
 #endif // TIE_HH