X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie.hh;h=349f5b83e25aed2b40f397c5ca9fd502c027d8be;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=30be5796113207dfa0fcc11a93435ee0aea43263;hpb=94af2fb150edb6889a47bf5b4052a966f115e12a;p=lilypond.git

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index 30be579611..349f5b83e2 100644
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -1,78 +1,48 @@
 /*
-  tie.hh -- declare Tie
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef TIE_HH
 #define TIE_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
 #include "skyline.hh"
-
-
-  
-class Tie_configuration
-{
-public:
-  int position_;
-  Direction dir_;
-  Real delta_y_;
-
-
-  Interval attachment_x_;
-  Grob *tie_;
-  int head_position_;
-  
-  Tie_configuration ();
-  void center_tie_vertically (Tie_details const &);
-  Bezier get_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_;
-};
+#include "grob-interface.hh"
 
 class Tie
 {
 public:
   static void set_head (Grob *, Direction, Grob *head);
-  static bool has_interface (Grob *);
+  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 void get_configuration (Grob *, Tie_configuration *,
-				 Tie_formatting_problem const &);
-  static void set_control_points (Grob *, Grob *,
-				  Tie_configuration const&,
-				  Tie_details const&);
-  static void set_default_control_points (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 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);
 };
 
-
 #endif // TIE_HH