* lily/tie-formatting-problem.cc (find_optimal_tie_configuration):

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

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index 6b4802ef58a3d1f974ae3d6eec2699e6f136ec39..30be5796113207dfa0fcc11a93435ee0aea43263 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@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef TIE_HH
@@ -14,31 +14,18 @@
 #include "skyline.hh"
 
 
-
-Interval
-get_skyline_attachment (Drul_array< Array < Skyline_entry > > const &skylines,
-                       Real y1);
-
-struct Tie_details
-{
-  Real height_limit_;
-  Real ratio_;
-  Real staff_space_;
-  Real x_gap_;
-  Real between_length_limit_;
-  
-  Tie_details ();
-  void init (Grob *);
-};
   
-struct Tie_configuration
+class Tie_configuration
 {
-  int head_position_;
+public:
   int position_;
-  
   Direction dir_;
-  Interval attachment_x_;
   Real delta_y_;
+
+
+  Interval attachment_x_;
+  Grob *tie_;
+  int head_position_;
   
   Tie_configuration ();
   void center_tie_vertically (Tie_details const &);
@@ -53,6 +40,12 @@ struct Tie_configuration
 
 INSTANTIATE_COMPARE (Tie_configuration, Tie_configuration::compare);
 
+class Ties_configuration
+{
+public:
+  Array<Tie_configuration> ties_;
+};
+
 class Tie
 {
 public:
@@ -62,13 +55,11 @@ public:
   static int get_column_rank (Grob *, Direction);
   static int get_position (Grob *);
   static Direction get_default_dir (Grob *);
-  static void get_configuration (Grob *, Grob *, Tie_configuration *,
-                                Drul_array< Array<Skyline_entry> > const *,
-                                Tie_details const & 
-                                );
-  static void set_control_points (Grob *, Grob *,Tie_configuration const&,
-                                 Tie_details const&
-                                 );
+  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 *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));