X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie-formatting-problem.hh;h=5d46129fe592778753e15cd497a3179a5e73e19f;hb=24715a584c7ddb96a671942b3d24884b71265eaa;hp=946e3032355884e63f5ac8c75dd816fa30d7c210;hpb=ff95ccbbb814e6ccd108426afcbc9e14723ffb7f;p=lilypond.git

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 946e303235..5d46129fe5 100644
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -1,9 +1,9 @@
 /*
-  tie-formatting-problem.hh -- declare
+  tie-formatting-problem.hh -- declare Tie_formatting_problem
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -11,23 +11,99 @@
 #define TIE_FORMATTING_PROBLEM_HH
 
 #include "drul-array.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "skyline.hh"
 #include "lily-proto.hh"
+#include "tie-configuration.hh"
+#include "tie-details.hh"
+#include "tuple.hh"
 
+#include <map>
+#include <set>
+
+typedef map< Tuple<int,4>, Tie_configuration *> Tie_configuration_map;
+
+struct Tie_specification
+{
+  int position_;
+  Drul_array<Grob*> note_head_drul_;
+  Drul_array<int> column_ranks_;
+  
+  bool has_manual_position_;
+  bool has_manual_dir_;
+  
+  Real manual_position_;
+  Direction manual_dir_;
+  
+  Tie_specification ();
+  int column_span () const;
+  void get_tie_manual_settings (Grob *);
+};
+
+struct Tie_configuration_variation
+{
+  int index_;
+  Tie_configuration *suggestion_;
+  Tie_configuration_variation ();
+};
+
+typedef map < Tuple<int, 2>, vector<Skyline_entry> > Chord_outline_map;
+typedef map < Tuple<int, 2>, Box> Column_extent_map;
 class Tie_formatting_problem
 {
-  Drul_array< Array<Skyline_entry> > chord_outlines_;
+  Chord_outline_map chord_outlines_;
+  Column_extent_map stem_extents_;
+  Column_extent_map head_extents_;
+  
+  set<int> dot_positions_;
+  Interval dot_x_;
+  vector<Tie_specification> specifications_;
+  
+  Tie_configuration_map possibilities_;
+
   Grob *x_refpoint_;
+
+  
+  Tie_configuration *get_configuration (int position, Direction dir, Drul_array<int> cols) const;
+  Tie_configuration *generate_configuration (int position, Direction dir, Drul_array<int> cols) const;
+  vector<Tie_configuration_variation> generate_collision_variations (Ties_configuration const &ties) const;
+  vector<Tie_configuration_variation> generate_extremal_tie_variations (Ties_configuration const &ties) const;
+
+  void score_configuration (Tie_configuration *) const;
+  Real score_aptitude (Tie_configuration *, Tie_specification const &,
+		       Ties_configuration *, int) const;
+  void score_ties_aptitude (Ties_configuration *ties) const;
+  void score_ties_configuration (Ties_configuration *ties) const;
+  void set_ties_config_standard_directions (Ties_configuration *tie_configs_ptr);
+  void score_ties (Ties_configuration *) const;
+  
+  Ties_configuration generate_base_chord_configuration ();
+  Ties_configuration find_best_variation (Ties_configuration const &base,
+					  vector<Tie_configuration_variation> vars);
+
+public:
+  Tie_details details_;
+  void print_ties_configuration (Ties_configuration const *);
+
+  Interval get_stem_extent (int, Direction, Axis) const; 
+  Interval get_head_extent (int, Direction, Axis) const; 
+  
 public:
   Tie_formatting_problem ();
+  ~Tie_formatting_problem ();
 
-  void from_ties (Link_array<Grob> const &ties);
-  void from_tie (Grob *tie);
-  void from_lv_ties (Link_array<Grob> const &);
-  void set_chord_outline (Link_array<Item>, Direction);
+  Tie_specification get_tie_specification (int) const;
+  Ties_configuration generate_optimal_chord_configuration ();
+  Ties_configuration generate_ties_configuration (Ties_configuration const &);
+  Tie_configuration find_optimal_tie_configuration (Tie_specification const &) const;
 
-  Interval get_attachment (Real) const;
+  void from_ties (vector<Grob*> const &ties);
+  void from_tie (Grob *tie);
+  void from_semi_ties (vector<Grob*> const &, Direction head_dir);
+  void set_chord_outline (vector<Item*>, Direction);
+  void set_column_chord_outline (vector<Item*>, Direction, int rank);
+  void set_manual_tie_configuration (SCM);
+  Interval get_attachment (Real, Drul_array<int>) const;
   Grob *common_x_refpoint () const;
 };