X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie-formatting-problem.hh;h=2d3ce617b47d99f057a4ce0bf943de7c288c5ac9;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=36afc52ff615edb16359e7b8bdae6850589c4fd8;hpb=ecde3b27ef910d586ba89dfedeb73278e48efed2;p=lilypond.git

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 36afc52ff6..2d3ce617b4 100644
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -1,70 +1,111 @@
 /*
-  tie-formatting-problem.hh -- declare
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef TIE_FORMATTING_PROBLEM_HH
 #define TIE_FORMATTING_PROBLEM_HH
 
 #include "drul-array.hh"
-#include "parray.hh"
 #include "skyline.hh"
-#include "lily-proto.hh"
+#include "tie-configuration.hh"
+#include "tie-details.hh"
+#include "tie-specification.hh"
+#include "tuple.hh"
 
 #include <map>
 #include <set>
 
-struct Tie_details
+typedef map< Tuple<int, 4>, Tie_configuration *> Tie_configuration_map;
+
+struct Tie_configuration_variation
 {
-  Real height_limit_;
-  Real ratio_;
-  Real staff_space_;
-  Real x_gap_;
-  Real between_length_limit_;
-  Grob *staff_symbol_referencer_;
-  
-  Tie_details ();
-  void from_grob (Grob *);
+  vector<pair<int, Tie_configuration *> > index_suggestion_pairs_;
+  void add_suggestion (int index, Tie_configuration *suggestion)
+  {
+    index_suggestion_pairs_.push_back (make_pair (index, suggestion));
+  }
 };
 
-
-typedef map< pair<int, int>, Tie_configuration *> Tie_configuration_map;
+typedef map < Tuple<int, 2>, Skyline> Chord_outline_map;
+typedef map < Tuple<int, 2>, Box> Column_extent_map;
+typedef map <int, Slice> Position_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_;
+  Position_extent_map head_positions_;
+
   set<int> dot_positions_;
   Interval dot_x_;
-  
+  vector<Tie_specification> specifications_;
+  bool use_horizontal_spacing_;
+
   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_;
+  Grob *y_refpoint_;
+
+  Tie_configuration *get_configuration (int position, Direction dir, Drul_array<int> cols, bool tune_y) const;
+  Tie_configuration *generate_configuration (int position, Direction dir, Drul_array<int> cols, bool tune_y) 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;
+  vector<Tie_configuration_variation> generate_single_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;
+
+  Slice head_positions_slice (int) const;
+  Ties_configuration generate_base_chord_configuration ();
+  Ties_configuration find_best_variation (Ties_configuration const &base,
+                                          vector<Tie_configuration_variation> const &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 ();
 
-  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 &);
-  void set_chord_outline (Link_array<Item>, Direction);
+  Tie_specification get_tie_specification (int) const;
+  Ties_configuration generate_optimal_configuration ();
+  Ties_configuration generate_ties_configuration (Ties_configuration 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;
+  void set_debug_scoring (Ties_configuration const &);
 };
 
 #endif /* TIE_FORMATTING_PROBLEM_HH */