Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index d78e5e1b142724016e4d44090b18e25f62a3fa8d..7f96b826cffd20ab84e4902b197381ab47fbc694 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TIE_HH
@@ -15,38 +15,6 @@
 
 
   
-class Tie_configuration
-{
-public:
-  int position_;
-  Direction dir_;
-  Real delta_y_;
-
-
-  /* computed. */
-  Interval attachment_x_;
-  Grob *tie_;
-  int head_position_;
-  
-  Tie_configuration ();
-  void center_tie_vertically (Tie_details const &);
-  Bezier get_transformed_bezier (Tie_details const &) const;
-  Bezier get_untransformed_bezier (Tie_details const &) const;
-  Real height (Tie_details const&) const;
-  
-  static int compare (Tie_configuration const &a,
-                     Tie_configuration const &b);
-  static Real distance (Tie_configuration const &a,
-                      Tie_configuration const &b);
-};
-
-INSTANTIATE_COMPARE (Tie_configuration, Tie_configuration::compare);
-
-class Ties_configuration
-{
-public:
-  Array<Tie_configuration> ties_;
-};
 
 class Tie
 {
@@ -56,9 +24,7 @@ public:
   static Grob *head (Grob *, Direction);
   static int get_column_rank (Grob *, Direction);
   static int get_position (Grob *);
-  static Direction get_default_dir (Grob *);
-  static void get_configuration (Grob *, Tie_configuration *,
-                                Tie_formatting_problem const &);
+  static Direction get_default_dir (Grob *);  
   static void set_control_points (Grob *, Grob *,
                                  Tie_configuration const&,
                                  Tie_details const&);
@@ -67,13 +33,8 @@ public:
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
-  static int compare (Grob *const &s1,
-                     Grob *const &s2);
-
-  static Interval get_default_attachments (Spanner *me, Grob *common, Real gap,
-                                          int *staff_position, bool *in_between,
-                                          Tie_details const &);
-  
+  static bool less (Grob *const &s1,
+                   Grob *const &s2);
 };