Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[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 fd7a373b5254712b7cd2e3886e7a6cf4efe0378e..2b1e2b6230533cc8e8f99b6855a5eb3b09ee0c2a 100644 (file)
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -11,43 +11,14 @@
 #define TIE_FORMATTING_PROBLEM_HH
 
 #include "drul-array.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>
 
-template<class T, int N>
-struct Tuple
-{
-  T t_array[N];
-  Tuple (T const *src)
-  {
-    for (int i = 0; i < N; i++)
-      t_array[i] = src[i];
-  }
-};
-
-template<class T, int N>
-inline bool
-operator<(Tuple<T, N> const &t1,
-         Tuple<T, N> const &t2)
-{
-  for (int i = 0; i < N ; i++)
-    {
-      if (t1.t_array[i] > t2.t_array[i])
-       return false;
-      if (t1.t_array[i] < t2.t_array[i])
-       return true;
-    }
-
-  return false;
-}
-
-
 typedef map< Tuple<int,4>, Tie_configuration *> Tie_configuration_map;
 
 struct Tie_specification
@@ -64,6 +35,7 @@ struct Tie_specification
   
   Tie_specification ();
   int column_span () const;
+  void get_tie_manual_settings (Grob *);
 };
 
 struct Tie_configuration_variation
@@ -73,11 +45,14 @@ struct Tie_configuration_variation
   Tie_configuration_variation ();
 };
 
+typedef map < Tuple<int, 2>, Skyline> Chord_outline_map;
+typedef map < Tuple<int, 2>, Box> Column_extent_map;
 class Tie_formatting_problem
 {
-  Drul_array< vector<Skyline_entry> > chord_outlines_;
-  Drul_array< Box > stem_extents_;
-  Drul_array< Box > head_extents_;
+  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_;
@@ -108,6 +83,9 @@ 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 ();
@@ -121,8 +99,9 @@ public:
   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) const;
+  Interval get_attachment (Real, Drul_array<int>) const;
   Grob *common_x_refpoint () const;
 };