Merge branch 'master' of ssh://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / dot-configuration.hh

diff --git a/lily/include/dot-configuration.hh b/lily/include/dot-configuration.hh
index 1eed8f3c359a1b127a1bc3250bb2812c383d8e91..a7ab09fab3fc0ea3b48402f4211a19e9dd2eef6f 100644 (file)
--- a/lily/include/dot-configuration.hh
+++ b/lily/include/dot-configuration.hh
@@ -13,6 +13,7 @@
 
 #include "lily-proto.hh"
 #include "direction.hh"
+#include "box.hh"
 
 #include <map>
 
@@ -21,8 +22,10 @@ struct Dot_position
   int pos_;
   Direction dir_;
   Grob *dot_;
+  Box dot_extents_;
   bool extremal_head_;
-
+  Interval x_extent_;
+  
   Dot_position ()
   {
     dot_ = 0;
@@ -34,11 +37,14 @@ struct Dot_position
 
 struct Dot_configuration : public map<int, Dot_position>
 {
+  Dot_formatting_problem const *problem_;
+  
+  Dot_configuration (Dot_formatting_problem const &);
+  Real x_offset () const;
   int badness () const;
   void print () const;
   Dot_configuration shifted (int k, Direction d) const;
-
-    void remove_collision (int p);
+  void remove_collision (int p);
 };
 
 #endif