/*
- 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--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/>.
*/
#include "dot-column.hh"
using namespace std;
-#include "dots.hh"
-#include "dot-column.hh"
-#include "rhythmic-head.hh"
-#include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
-#include "side-position-interface.hh"
#include "axis-group-interface.hh"
-#include "stem.hh"
-#include "grob.hh"
-#include "pointer-group-interface.hh"
+#include "directional-element-interface.hh"
+#include "dot-column.hh"
#include "dot-configuration.hh"
+#include "dot-formatting-problem.hh"
+#include "dots.hh"
+#include "grob.hh"
#include "note-head.hh"
+#include "pointer-group-interface.hh"
#include "rest.hh"
-#include "dot-formatting-problem.hh"
+#include "rhythmic-head.hh"
+#include "side-position-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
MAKE_SCHEME_CALLBACK (Dot_column, calc_positioning_done, 1);
SCM
{
Grob *me = unsmob_grob (smob);
+ /*
+ Trigger note collision resolution first, since that may kill off
+ dots when merging.
+ */
+ if (Grob *collision = unsmob_grob (me->get_object ("note-collision")))
+ (void) collision->get_property ("positioning-done");
+
me->set_property ("positioning-done", SCM_BOOL_T);
vector<Grob*> dots
Real ss = 0;
Grob *commonx = me;
- { /*
- Trigger note collision resolution first, since that may kill off
- dots when merging.
- */
- for (vsize i = 0; i < dots.size (); i++)
- {
- Grob *n = dots[i]->get_parent (Y_AXIS);
- commonx = n->common_refpoint (commonx, X_AXIS);
-
- if (Grob *stem = unsmob_grob (n->get_object("stem")))
- {
- commonx = stem->common_refpoint (commonx, X_AXIS);
-
- if (Stem::first_head (stem) == n)
- main_heads.push_back (n);
- }
- }
- }
+ for (vsize i = 0; i < dots.size (); i++)
+ {
+ Grob *n = dots[i]->get_parent (Y_AXIS);
+ commonx = n->common_refpoint (commonx, X_AXIS);
+
+ if (Grob *stem = unsmob_grob (n->get_object("stem")))
+ {
+ commonx = stem->common_refpoint (commonx, X_AXIS);
+
+ if (Stem::first_head (stem) == n)
+ main_heads.push_back (n);
+ }
+ }
vector<Box> boxes;
set<Grob*> stems;
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);
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);
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);
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);
*/
Staff_symbol_referencer::set_position (i->second.dot_, i->first);
}
-
me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS),
X_AXIS);
}
void
-Dot_column::add_head (Grob *me, Grob *rh)
+Dot_column::add_head (Grob *me, Grob *head)
{
- Grob *d = unsmob_grob (rh->get_object ("dot"));
+ Grob *d = unsmob_grob (head->get_object ("dot"));
if (d)
{
- Side_position_interface::add_support (me, rh);
+ Side_position_interface::add_support (me, head);
Pointer_group_interface::add_grob (me, ly_symbol2scm ("dots"), d);
d->set_property ("Y-offset", Grob::x_parent_positioning_proc);
- d->set_property ("X-offset", Grob::x_parent_positioning_proc);
+ // 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);
}
}
ADD_INTERFACE (Dot_column,
-
- "Groups dot objects so they form a column, and position dots so they do not "
- "clash with staff lines. ",
+ "Group dot objects so they form a column, and position"
+ " dots so they do not clash with staff lines.",
/* properties */
"dots "