X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=79605c3b6d93094c227617e54a302fd35c17e82e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f50b651050756c7bc63ce61f6a4076a35854cbb9;hpb=e53b6ddc057f5419b4bc6219f0cf6132a487a305;p=lilypond.git diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index f50b651050..79605c3b6d 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -3,31 +3,36 @@ source file of the GNU LilyPond music typesetter - (c) 2002--2004 Juergen Reuter - + (c) 2002--2008 Juergen Reuter + Han-Wen Nienhuys heads_; Drul_array accidentals_; + Drul_array causes_; Pitch_interval pitch_interval_; bool is_typeset_; int start_c0_; - Protected_scm start_key_sig_; + SCM start_key_sig_; }; +void +Ambitus_engraver::derived_mark () const +{ + scm_gc_mark (start_key_sig_); +} + void Ambitus_engraver::create_ambitus () { - ambitus_ = make_item ("AmbitusLine",SCM_EOL); - group_ = make_item ("Ambitus",SCM_EOL); + ambitus_ = make_item ("AmbitusLine", SCM_EOL); + group_ = make_item ("Ambitus", SCM_EOL); Direction d = DOWN; do { heads_[d] = make_item ("AmbitusNoteHead", SCM_EOL); accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL); accidentals_[d]->set_parent (heads_[d], Y_AXIS); - heads_[d]->set_property ("accidental-grob", accidentals_[d]->self_scm ()); + heads_[d]->set_object ("accidental-grob", + accidentals_[d]->self_scm ()); Axis_group_interface::add_element (group_, heads_[d]); Axis_group_interface::add_element (group_, accidentals_[d]); - Side_position_interface::add_support (accidentals_[d], heads_[d]); } while (flip (&d) != DOWN); + ambitus_->set_parent (heads_[DOWN], X_AXIS); Axis_group_interface::add_element (group_, ambitus_); - - is_typeset_ = false; -} + is_typeset_ = false; +} Ambitus_engraver::Ambitus_engraver () { @@ -72,21 +84,17 @@ Ambitus_engraver::Ambitus_engraver () accidentals_[LEFT] = accidentals_[RIGHT] = 0; group_ = 0; is_typeset_ = false; + start_key_sig_ = SCM_EOL; } void Ambitus_engraver::process_music () { /* - * Ensure that ambitus is created in the very first timestep (on - * which lily does not call start_translation_timestep ()). - * Otherwise, if a voice begins with a rest, the ambitus grob will - * be placed after the rest. + * Ensure that ambitus is created in the very first timestep */ if (!ambitus_) - { - create_ambitus (); - } + create_ambitus (); } void @@ -103,26 +111,22 @@ Ambitus_engraver::stop_translation_timestep () start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0); start_key_sig_ = get_property ("keySignature"); - is_typeset_ = true; } } void -Ambitus_engraver::acknowledge_grob (Grob_info info) +Ambitus_engraver::acknowledge_note_head (Grob_info info) { - Item *item = dynamic_cast (info.grob_); - if (item) + Stream_event *nr = info.event_cause (); + if (nr && nr->in_event_class ("note-event")) { - if (Note_head::has_interface (info.grob_)) - { - Music *nr = info.music_cause (); - if (nr && nr->is_mus_type ("note-event")) - { - Pitch pitch = *unsmob_pitch (nr->get_property ("pitch")); - pitch_interval_.add_point (pitch); - } - } + Pitch pitch = *unsmob_pitch (nr->get_property ("pitch")); + Drul_array expands = pitch_interval_.add_point (pitch); + if (expands[UP]) + causes_[UP] = nr; + if (expands[DOWN]) + causes_[DOWN] = nr; } } @@ -131,13 +135,18 @@ Ambitus_engraver::finalize () { if (ambitus_ && !pitch_interval_.is_empty ()) { + Grob *accidental_placement = + make_item ("AccidentalPlacement", + accidentals_[DOWN]->self_scm ()); + Direction d = DOWN; do { Pitch p = pitch_interval_[d]; + heads_[d]->set_property ("cause", causes_[d]->self_scm()); heads_[d]->set_property ("staff-position", - scm_from_int (start_c0_ + - p.steps ())); + scm_from_int (start_c0_ + + p.steps ())); SCM handle = scm_assoc (scm_cons (scm_from_int (p.get_octave ()), scm_from_int (p.get_notename ())), @@ -146,41 +155,58 @@ Ambitus_engraver::finalize () if (handle == SCM_BOOL_F) handle = scm_assoc (scm_from_int (p.get_notename ()), start_key_sig_); - - int sig_alter = (handle != SCM_BOOL_F) ? scm_to_int (ly_cdr (handle)) : 0; + + Rational sig_alter = (handle != SCM_BOOL_F) + ? robust_scm2rational (scm_cdr (handle), Rational (0)) : Rational (0); + if (sig_alter == p.get_alteration ()) { - accidentals_[d]->suicide(); - heads_[d]->set_property ("accidental-grob", SCM_EOL); + accidentals_[d]->suicide (); + heads_[d]->set_object ("accidental-grob", SCM_EOL); } else { - accidentals_[d]->set_property ("accidentals", - scm_list_1 (scm_from_int (p.get_alteration ()))); + accidentals_[d]->set_property ("alteration", ly_rational2scm (p.get_alteration ())); } + Separation_item::add_conditional_item (heads_[d], accidental_placement); + Accidental_placement::add_accidental (accidental_placement, accidentals_[d]); } while (flip (&d) != DOWN); - ambitus_->set_property ("note-heads", scm_list_2 (heads_[DOWN]->self_scm (), - heads_[UP]->self_scm ())); + + Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[DOWN]); + Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[UP]); + Axis_group_interface::add_element (group_, accidental_placement); } else { Direction d = DOWN; do { - accidentals_[d]->suicide(); - heads_[d]->suicide(); - } + accidentals_[d]->suicide (); + heads_[d]->suicide (); + } while (flip (&d) != DOWN); - ambitus_->suicide(); + + ambitus_->suicide (); } } -ENTER_DESCRIPTION (Ambitus_engraver, -/* descr */ "", -/* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental", -/* accepts */ "", -/* acks */ "note-head-interface", -/* reads */ "", -/* write */ ""); +ADD_ACKNOWLEDGER (Ambitus_engraver, note_head); +ADD_TRANSLATOR (Ambitus_engraver, + /* doc */ + "", + + /* create */ + "AccidentalPlacement " + "Ambitus " + "AmbitusAccidental " + "AmbitusLine " + "AmbitusNoteHead ", + + /* read */ + "", + + /* write */ + "" + );