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 dc69e9c6a30e42b97124b1077fa43bcbdf33ffb6..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
@@ -24,13 +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 *);
-
-#if 0
-  static void get_configuration (Grob *, Tie_configuration *,
-                                Tie_formatting_problem const &);
-#endif
-  
+  static Direction get_default_dir (Grob *);  
   static void set_control_points (Grob *, Grob *,
                                  Tie_configuration const&,
                                  Tie_details const&);
@@ -39,12 +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);
 };