* 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 5e07334424d9901e3b5c1e10ca68bfaf1e66aceb..30be5796113207dfa0fcc11a93435ee0aea43263 100644 (file)
--- a/lily/include/tie.hh
+++ b/lily/include/tie.hh
@@ -3,45 +3,76 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef TIE_HH
 #define TIE_HH
 
-#include "spanner.hh"
-#include "rod.hh"
+#include "lily-guile.hh"
+#include "lily-proto.hh"
+#include "skyline.hh"
+
 
-/**
-  Connect two noteheads.
-  */
-class Tie : public Spanner
+  
+class Tie_configuration
 {
 public:
-  Tie ();
-  void set_head (Direction, Item*head_l);
-  VIRTUAL_COPY_CONS(Score_element);
+  int position_;
+  Direction dir_;
+  Real delta_y_;
 
-  Note_head* head (Direction) const;
-  Real position_f () const;
-  
-  virtual Direction get_default_dir() const;
 
-protected:
-  virtual Molecule* do_brew_molecule_p () const;
-  virtual Array<Offset> get_encompass_offset_arr () const;
-  Bezier get_curve () const;
+  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);
+};
 
-  Drul_array<Real> dy_f_drul_;
-  Drul_array<Real> dx_f_drul_;
+INSTANTIATE_COMPARE (Tie_configuration, Tie_configuration::compare);
 
-  virtual void do_add_processing ();
-  virtual void do_post_processing ();
+class Ties_configuration
+{
+public:
+  Array<Tie_configuration> ties_;
+};
 
-  virtual Array<Rod> get_rods () const;
+class Tie
+{
+public:
+  static void set_head (Grob *, Direction, Grob *head);
+  static bool has_interface (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 *, 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));
+  DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
+  static int compare (Grob *const &s1,
+                     Grob *const &s2);
 
-  Array<Offset> get_controls () const;
+  static Interval get_default_attachments (Spanner *me, Grob *common, Real gap,
+                                          int *staff_position, bool *in_between,
+                                          Tie_details const &);
+  
 };
 
+
 #endif // TIE_HH