X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-engraver.cc;h=8c16d4804160623723026f00cf6dbab7d00f4ad0;hb=c53d0cabdf9361e448cdd02a338aa5d696f4f466;hp=6d4160ea66036dc7df5904197c7b4714e328f126;hpb=5320f6d196dd67186178adcb6e5debdbbec8aee8;p=lilypond.git diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index 6d4160ea66..8c16d48041 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2003 Han-Wen Nienhuys + (c) 2000--2004 Han-Wen Nienhuys */ @@ -82,7 +82,7 @@ Chord_tremolo_engraver::try_music (Music * m) { Repeated_music * rp = dynamic_cast (m); if (rp - && rp->get_mus_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc + && rp->get_property ("iterator-ctor") == Chord_tremolo_iterator::constructor_proc && !repeat_) { Moment l = rp->get_length (); @@ -95,7 +95,7 @@ Chord_tremolo_engraver::try_music (Music * m) int elt_count = seq ? scm_ilength (seq-> music_list ()) : 1; - if (elt_count != 2) + if (seq && elt_count != 2) { rp->origin ()->warning (_f ("Chord tremolo with %d elements. Must have two elements.", elt_count)); } @@ -123,8 +123,8 @@ Chord_tremolo_engraver::process_music () { if (sequential_body_b_ && !beam_) { - beam_ = new Spanner (get_property ("Beam")); - beam_->set_grob_property ("chord-tremolo", SCM_BOOL_T); + beam_ = make_spanner ("Beam"); + beam_->set_property ("chord-tremolo", SCM_BOOL_T); SCM smp = get_property ("measurePosition"); Moment mp @@ -136,9 +136,9 @@ Chord_tremolo_engraver::process_music () { if (flags_) { - stem_tremolo_ = new Item (get_property ("StemTremolo")); + stem_tremolo_ = make_item ("StemTremolo"); announce_grob(stem_tremolo_, repeat_->self_scm()); - stem_tremolo_->set_grob_property ("flag-count", + stem_tremolo_->set_property ("flag-count", scm_int2num (flags_)); } } @@ -179,7 +179,7 @@ Chord_tremolo_engraver::acknowledge_grob (Grob_info info) if (Stem::duration_log (s) != 1) { - beam_->set_grob_property ("gap-count", gh_int2scm (flags_ - total_duration_flags_)); + beam_->set_property ("gap-count", gh_int2scm (flags_ - total_duration_flags_)); } if (info.music_cause ()->is_mus_type ("rhythmic-event"))