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

[lilypond.git] / lily / include / tie-formatting-problem.hh

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 5adda8bb6241e9ede3598dfaf912e1b907995823..c3cc58926f36474d1b0cf870cbfdd40fb8677ba7 100644 (file)
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -15,6 +15,8 @@
 #include "skyline.hh"
 #include "lily-proto.hh"
 
+#include <map>
+#include <set>
 
 struct Tie_details
 {
@@ -23,21 +25,37 @@ struct Tie_details
   Real staff_space_;
   Real x_gap_;
   Real between_length_limit_;
+  Grob *staff_symbol_referencer_;
   
   Tie_details ();
   void from_grob (Grob *);
 };
 
+
+typedef map< pair<int, int>, Tie_configuration *> Tie_configuration_map;
+
 class Tie_formatting_problem
 {
   Drul_array< Array<Skyline_entry> > chord_outlines_;
+  set<int> dot_positions_;
+  Tie_configuration_map possibilities_;
+
+  Tie_configuration *get_configuration (int position, Direction dir);
+  Tie_configuration *generate_configuration (int position, Direction dir);
+  Real score_configuration (Tie_configuration const&);
+  Real score_aptitude (Tie_configuration const&, int);
+  
   Grob *x_refpoint_;
+
+  
 public:
   Tie_details details_;
 
 public:
   Tie_formatting_problem ();
+  ~Tie_formatting_problem ();
 
+  Tie_configuration find_optimal_tie_configuration (int p, Direction d);
   void from_ties (Link_array<Grob> const &ties);
   void from_tie (Grob *tie);
   void from_lv_ties (Link_array<Grob> const &);