source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil
#include "axis-group-interface.hh"
#include "note-column.hh"
#include "stem.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "paper-def.hh"
#include "group-interface.hh"
#include "staff-symbol-referencer.hh"
#include "rest.hh"
#include "note-head.hh"
+#include "accidental-placement.hh"
+
+/*
+ TODO: figure out if we can prune this class. This is just an
+ annoying layer between (rest)collision & (note-head + stem)
+ */
bool
-Note_column::rest_b (Grob*me)
+Note_column::has_rests (Grob*me)
{
return unsmob_grob (me->get_grob_property ("rest"));
}
}
Item *
-Note_column::stem_l (Grob*me)
+Note_column::get_stem (Grob*me)
{
SCM s = me->get_grob_property ("stem");
return unsmob_item (s);
{
Grob *se = unsmob_grob (ly_car (h));
- int j = int (Staff_symbol_referencer::position_f (se));
+ int j = int (Staff_symbol_referencer::get_position (se));
iv.unite (Slice (j,j));
}
return iv;
void
-Note_column::set_stem (Grob*me,Grob * stem_l)
+Note_column::set_stem (Grob*me,Grob * stem)
{
- me->set_grob_property ("stem", stem_l->self_scm ());
- me->add_dependency (stem_l);
- Axis_group_interface::add_element (me, stem_l);
+ me->set_grob_property ("stem", stem->self_scm ());
+ me->add_dependency (stem);
+ Axis_group_interface::add_element (me, stem);
}
+
+Grob*
+Note_column::get_rest (Grob*me)
+{
+ return unsmob_grob (me->get_grob_property ("rest"));
+}
+
void
Note_column::add_head (Grob*me,Grob *h)
{
+ bool both = false;
if (Rest::has_interface (h))
{
- me->set_grob_property ("rest", h->self_scm ());
+ if (gh_pair_p (me->get_grob_property ("note-heads")))
+ both = true;
+ else
+ me->set_grob_property ("rest", h->self_scm ());
}
else if (Note_head::has_interface (h))
{
+ if (unsmob_grob (me->get_grob_property ("rest")))
+ both = true;
Pointer_group_interface::add_grob (me, ly_symbol2scm ("note-heads"),h);
}
- Axis_group_interface::add_element (me, h);
+
+ if (both)
+ me->warning ("Can't have rests and note heads together on a stem.");
+ else
+ Axis_group_interface::add_element (me, h);
}
/**
- translate the rest symbols vertically by amount DY_I, but only if
+ translate the rest symbols vertically by amount DY, but only if
they have no staff-position set.
*/
void
-Note_column::translate_rests (Grob*me,int dy_i)
+Note_column::translate_rests (Grob*me, int dy)
{
Grob * r = unsmob_grob (me->get_grob_property ("rest"));
if (r && !gh_number_p (r->get_grob_property ("staff-position")))
{
- r->translate_axis (dy_i * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
+ r->translate_axis (dy * Staff_symbol_referencer::staff_space (r)/2.0, Y_AXIS);
}
}
Grob*
Note_column::first_head (Grob*me)
{
- Grob * st = stem_l (me);
+ Grob * st = get_stem (me);
return st? Stem::first_head (st): 0;
}
Note_column::accidentals (Grob *me)
{
SCM heads = me->get_grob_property ("note-heads");
+ Grob * acc = 0;
for (;gh_pair_p (heads); heads =gh_cdr (heads))
{
Grob * h = unsmob_grob (gh_car (heads));
- Grob *a = h ? unsmob_grob(h->get_grob_property ("accidentals-grob")) : 0;
- if (a)
- return a;
+ acc = h ? unsmob_grob (h->get_grob_property ("accidental-grob")) : 0;
+ if (acc)
+ break;
}
- return 0;
+ if (!acc)
+ return 0;
+
+ if (Accidental_placement::has_interface (acc->get_parent (X_AXIS)))
+ return acc->get_parent (X_AXIS);
+
+ /* compatibility. */
+ return acc;
}