* 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 81c356dd7fe7346a48e832c7e2e51114c26e20c9..7327dbd4c4733d9cdefaf2b07ce9b3a5358d5cea 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -3,32 +3,83 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef TIE_HH
 #define TIE_HH
 
-#include "bow.hh"
-
-/**
-  Connect two noteheads.
-  */
-class Tie : public Bow {
-    virtual void do_add_processing();
-    virtual void do_post_processing();
-    virtual void set_default_dir();
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    
+#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
+{
 public:
-    bool same_pitch_b_;
-    Note_head * left_head_l_;
-    Note_head * right_head_l_;
-    void set_head(int, Note_head*head_l);
-
-    Tie();
-    NAME_MEMBERS(Tie);
-    SPANNER_CLONE(Tie)
+  static void set_head (Grob *, Direction, Grob *head);
+  static bool has_interface (Grob *);
+  static void set_direction (Grob *);
+  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 *, 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);
+  
 };
+
+
 #endif // TIE_HH