2006-08-04 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * lily/pitched-trill-engraver.cc (make_trill): do set_parent also
+ if no accidental.
+
* lily/accidental-engraver.cc (process_acknowledged): don't create
accidental for trill span event. This fixes spurious accidentals
on trills.
SCM handle = scm_assoc (key, keysig);
bool print_acc
- = (handle == SCM_BOOL_F)
- || p->get_alteration () == 0;
+ = (handle == SCM_BOOL_F) || p->get_alteration () == 0;
if (trill_head_)
{
+ c0));
trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ());
+ trill_group_->set_parent (trill_head_, Y_AXIS);
Axis_group_interface::add_element (trill_group_, trill_head_);
trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ())));
Side_position_interface::add_support (trill_accidental_, trill_head_);
trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ());
- trill_group_->set_parent (trill_head_, Y_AXIS);
- Axis_group_interface::add_element (trill_group_, trill_accidental_);
trill_accidental_->set_parent (trill_head_, Y_AXIS);
+ Axis_group_interface::add_element (trill_group_, trill_accidental_);
}
}
(define (parenthesize-elements grob . rest)
(let*
- (
- (refp (if (null? rest)
+ ((refp (if (null? rest)
grob
(car rest)))
(elts (ly:grob-object grob 'elements))
(lp (ly:font-get-glyph font "accidentals.leftparen"))
(rp (ly:font-get-glyph font "accidentals.rightparen"))
(padding (ly:grob-property grob 'padding 0.1)))
-
+
(ly:stencil-add
(ly:stencil-translate-axis lp (- (car x-ext) padding) X)
(ly:stencil-translate-axis rp (+ (cdr x-ext) padding) X))