resolve merge

[lilypond.git] / lily / dot-column.cc

diff --git a/lily/dot-column.cc b/lily/dot-column.cc
index 9536e97f308571e08da63943a0b997d6313ab8df..17d7effd7c947c6eb4178242e0bb0c465a08857a 100644 (file)
--- a/lily/dot-column.cc
+++ b/lily/dot-column.cc
@@ -1,9 +1,20 @@
 /*
-  dot-column.cc -- implement Dot_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 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/>.
 */
 
 #include "dot-column.hh"
@@ -99,12 +110,17 @@ Dot_column::calc_positioning_done (SCM smob)
          y.add_point (y1);
          y.add_point (y2);
        }
+      else if (Note_head::has_interface (s))
+       y = Interval (-1, 1);
       else
-       y = s->extent (s, Y_AXIS);
+       {
+         programming_error ("unknown grob in dot col support");
+         continue;
+       }
 
       y *= 2 / ss;
       y += Staff_symbol_referencer::get_position (s);
-         
+
       Box b (s->extent (commonx, X_AXIS), y);
       boxes.push_back (b);
 
@@ -112,7 +128,7 @@ Dot_column::calc_positioning_done (SCM smob)
        stems.insert (stem);
     }
 
-  for (set<Grob*>::const_iterator i(stems.begin());
+  for (set<Grob*>::const_iterator i (stems.begin());
        i != stems.end (); i++)
     {
       Grob *stem = (*i);
@@ -122,7 +138,7 @@ Dot_column::calc_positioning_done (SCM smob)
          Interval y = flag.extent (Y_AXIS)
            * (2 / ss)
            + Stem::stem_end_position (stem);
-                 
+
          Interval x = stem->relative_coordinate (commonx, X_AXIS)
            + flag.extent (X_AXIS);
 
@@ -132,8 +148,13 @@ Dot_column::calc_positioning_done (SCM smob)
              
   vector_sort (dots, position_less);
   for (vsize i = dots.size (); i--;)
-    if (!dots[i]->is_live ())
-      dots.erase (dots.begin () + i);
+    {
+      if (!dots[i]->is_live ())
+       dots.erase (dots.begin () + i);
+      else
+       // Undo any fake translations that were done in add_head.
+       dots[i]->translate_axis (-dots[i]->relative_coordinate (me, X_AXIS), X_AXIS);
+    }
 
   Dot_formatting_problem problem (boxes, base_x);
 
@@ -194,9 +215,14 @@ Dot_column::add_head (Grob *me, Grob *head)
 
       Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d);
       d->set_property ("Y-offset", Grob::x_parent_positioning_proc);
-      // Dot formatting requests the Y-offset, -which- for rests may
-      // trigger post-linebreak callbacks.
-      if (!Rest::has_interface (head))
+      // Dot formatting requests the Y-offset, which for rests may
+      // trigger post-linebreak callbacks.  On the other hand, we need the
+      // correct X-offset of the dots for horizontal collision avoidance.
+      // The translation here is undone in calc_positioning_done, where we
+      // do the X-offset properly.
+      if (Rest::has_interface (head))
+       d->translate_axis (head->extent (head, X_AXIS).length (), X_AXIS);
+      else
        d->set_property ("X-offset", Grob::x_parent_positioning_proc);
       Axis_group_interface::add_element (me, d);
     }