Run grand-replace (issue 3765)

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

diff --git a/lily/include/dot-configuration.hh b/lily/include/dot-configuration.hh
index 1eed8f3c359a1b127a1bc3250bb2812c383d8e91..69627d02badd76087c99260bb6d4f64d9961e1e4 100644 (file)
--- a/lily/include/dot-configuration.hh
+++ b/lily/include/dot-configuration.hh
@@ -1,11 +1,20 @@
 /*
-  dot-configuration.hh -- declare Dot_configuration
+  This file is part of LilyPond, the GNU music typesetter.
 
-  Source file of the GNU LilyPond music typesetter.  Distributed under
-  terms of the GNU General Public License.  LilyPond comes with NO
-  WARRANTY.
+  Copyright (C) 2007--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2007 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 DOT_CONFIGURATION_HH
@@ -13,6 +22,7 @@
 
 #include "lily-proto.hh"
 #include "direction.hh"
+#include "box.hh"
 
 #include <map>
 
@@ -21,24 +31,27 @@ struct Dot_position
   int pos_;
   Direction dir_;
   Grob *dot_;
-  bool extremal_head_;
+  Box dot_extents_;
+  Interval x_extent_;
 
   Dot_position ()
   {
     dot_ = 0;
     pos_ = 0;
     dir_ = CENTER;
-    extremal_head_ = false;
   }
 };
 
 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