source file of the GNU LilyPond music typesetter
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "dot-column.hh"
using namespace std;
-#include "dots.hh"
+#include "axis-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 "rhythmic-head.hh"
-#include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
#include "side-position-interface.hh"
-#include "axis-group-interface.hh"
+#include "staff-symbol-referencer.hh"
#include "stem.hh"
-#include "grob.hh"
-#include "pointer-group-interface.hh"
-#include "dot-configuration.hh"
-#include "note-head.hh"
-#include "skyline.hh"
-#include "dot-formatting-problem.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
= extract_grob_array (me, "dots");
vector<Grob*> main_heads;
+ 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;
for (vsize i = 0; i < support.size (); i++)
{
- if (Note_head::has_interface (support[i]))
+ Grob *s = support[i];
+ if (!ss)
+ ss = Staff_symbol_referencer::staff_space (s);
+
+ /* can't inspect Y extent of rest.
+
+ Rest collisions should wait after line breaking.
+ */
+ Interval y;
+ if (Rest::has_interface (s))
{
- Interval y(-1, 1);
- y += Staff_symbol_referencer::get_position (support[i]);
-
- Box b (support[i]->extent (commonx, X_AXIS), y);
- boxes.push_back (b);
+ base_x.unite (s->extent (commonx, X_AXIS));
+ continue;
+ }
+ else if (Stem::has_interface (s))
+ {
+ Real y1 = Stem::head_positions (s)[-get_grob_direction (s)];
+ Real y2 = y1 + get_grob_direction (s) * 7;
- if (Grob *s = unsmob_grob (support[i]->get_object ("stem")))
- stems.insert (s);
+ y.add_point (y1);
+ y.add_point (y2);
}
else
- programming_error ("unknown grob in dot col support");
- }
+ y = s->extent (s, Y_AXIS);
+
+ y *= 2 / ss;
+ y += Staff_symbol_referencer::get_position (s);
+
+ Box b (s->extent (commonx, X_AXIS), y);
+ boxes.push_back (b);
+ if (Grob *stem = unsmob_grob (s->get_object ("stem")))
+ stems.insert (stem);
+ }
for (set<Grob*>::const_iterator i(stems.begin());
i != stems.end (); i++)
if (!flag.is_empty ())
{
Interval y = flag.extent (Y_AXIS)
- * (2 / Staff_symbol_referencer::staff_space (stem))
+ * (2 / ss)
+ Stem::stem_end_position (stem);
Interval x = stem->relative_coordinate (commonx, X_AXIS)
{
Grob *stem = unsmob_grob (note->get_object ("stem"));
if (stem)
- {
- dp.extremal_head_ = Stem::first_head (stem) == note;
-
-
- }
+ dp.extremal_head_ = Stem::first_head (stem) == note;
dp.x_extent_ = note->extent (commonx, X_AXIS);
}
*/
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.
+ if (!Rest::has_interface (head))
+ 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 "
projects / lilypond.git / blobdiff