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"
bool
Note_column::rest_b (Grob*me)
}
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);
}
void
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;
}