* lily/include/tie.hh (struct Tie_details): add x_gap_

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

diff --git a/lily/include/tie.hh b/lily/include/tie.hh
index efaa3f2949b21c3628cf31afa28ae78e65e26e0f..7327dbd4c4733d9cdefaf2b07ce9b3a5358d5cea 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -11,20 +11,45 @@
 
 #include "lily-guile.hh"
 #include "lily-proto.hh"
+#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_;
+  
+  Tie_details ();
+  void init (Grob *);
+};
+  
 struct Tie_configuration
 {
+  int head_position_;
   int position_;
+  
   Direction dir_;
   Interval attachment_x_;
   Real delta_y_;
   
   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 Tie
@@ -35,15 +60,24 @@ public:
   static void set_direction (Grob *);
   static Grob *head (Grob *, Direction);
   static int get_column_rank (Grob *, Direction);
-  static Real get_position (Grob *);
+  static int get_position (Grob *);
   static Direction get_default_dir (Grob *);
-  static void get_configuration (Grob *, Grob **, Tie_configuration *);
-  static void set_control_points (Grob *, Grob **,Tie_configuration const&);
+  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 set_default_control_points (Grob *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (set_spacing_rods, (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);
   
 };