X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie.hh;h=e92ca6194704db6fcc29c19ec73ea5f8b6d7e1a2;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c6fc1c89040d777981a41ca2e9cb89935b5c35b2;hpb=f5e5c04d731e93b1d8d4cf7e7697f71f6e7c2bdf;p=lilypond.git

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index c6fc1c8904..e92ca61947 100644
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -1,49 +1,45 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.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 "spanner.hh"
-#include "rod.hh"
+#include "lily-proto.hh"
+#include "skyline.hh"
+#include "grob-interface.hh"
 
-/**
-  Connect two noteheads.
-  */
-class Tie : public Spanner
+class Tie
 {
 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 scheme_molecule (SCM);
-  
-
-  virtual Direction get_default_dir() const;
-
-protected:
-  Molecule do_brew_molecule () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
-  Bezier get_curve () const;
-
-  Drul_array<Real> dy_f_drul_;
-  Drul_array<Real> dx_f_drul_;
-
-  virtual void do_add_processing ();
-  virtual void after_line_breaking ();
-
-  virtual Array<Rod> get_rods () const;
-
-  Array<Offset> get_controls () const;
+  static void set_head (Spanner *, Direction, Grob *head);
+  static Item *head (Spanner *, Direction);
+  static int get_column_rank (Spanner *, Direction);
+  static int get_position (Spanner *);
+  static Direction get_default_dir (Spanner *);
+  static SCM get_control_points (Grob *, Grob *,
+                                 Tie_configuration const &,
+                                 Tie_details const &);
+  static SCM get_default_control_points (Spanner *);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  static bool less (Grob *s1, Grob *s2);
 };
 
 #endif // TIE_HH