X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=dfd23f1724c4633efaae681f6e0efa187f7523ca;hb=8019ff784cd3aa6cc43b8eb8f29a621bc5800f5c;hp=d81f5cd7e7dc9a4b1d5a62fc97046474b1560b9e;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index d81f5cd7e7..dfd23f1724 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -1,29 +1,49 @@ /* - ambitus-engraver.cc -- implement Ambitus_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2002--2012 Juergen Reuter - (c) 2002--2004 Juergen Reuter - Han-Wen Nienhuys . */ #include "engraver.hh" + +#include "accidental-placement.hh" +#include "axis-group-interface.hh" +#include "item.hh" #include "note-head.hh" #include "pitch-interval.hh" +#include "pointer-group-interface.hh" #include "protected-scm.hh" -#include "staff-symbol-referencer.hh" -#include "axis-group-interface.hh" #include "side-position-interface.hh" +#include "separation-item.hh" +#include "staff-symbol-referencer.hh" +#include "stream-event.hh" + +#include "translator.icc" class Ambitus_engraver : public Engraver { public: -TRANSLATOR_DECLARATIONS (Ambitus_engraver); - virtual void process_music (); - virtual void acknowledge_grob (Grob_info); - virtual void stop_translation_timestep (); + TRANSLATOR_DECLARATIONS (Ambitus_engraver); +protected: + DECLARE_ACKNOWLEDGER (note_head); + + void process_music (); + void stop_translation_timestep (); virtual void finalize (); virtual void derived_mark () const; @@ -33,6 +53,7 @@ private: Item *group_; Drul_array heads_; Drul_array accidentals_; + Drul_array causes_; Pitch_interval pitch_interval_; bool is_typeset_; int start_c0_; @@ -48,32 +69,32 @@ Ambitus_engraver::derived_mark () const 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 () { ambitus_ = 0; - heads_[LEFT] = heads_[RIGHT] = 0; - accidentals_[LEFT] = accidentals_[RIGHT] = 0; + heads_.set (0, 0); + accidentals_.set (0, 0); group_ = 0; is_typeset_ = false; start_key_sig_ = SCM_EOL; @@ -83,15 +104,10 @@ 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 @@ -108,26 +124,29 @@ 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); - } - } + SCM p = nr->get_property ("pitch"); + /* + If the engraver is added to a percussion context, + filter out unpitched note heads. + */ + if (!unsmob_pitch (p)) + return; + Pitch pitch = *unsmob_pitch (p); + Drul_array expands = pitch_interval_.add_point (pitch); + if (expands[UP]) + causes_[UP] = nr; + if (expands[DOWN]) + causes_[DOWN] = nr; } } @@ -136,56 +155,84 @@ 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 ("staff-position", - 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 ())), - start_key_sig_); - - 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 (scm_cdr (handle)) : 0; - if (sig_alter == p.get_alteration ()) - { - accidentals_[d]->suicide(); - heads_[d]->set_property ("accidental-grob", SCM_EOL); - } - else - { - accidentals_[d]->set_property ("accidentals", - scm_list_1 (scm_from_int (p.get_alteration ()))); - } - } + { + 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 handle = scm_assoc (scm_cons (scm_from_int (p.get_octave ()), + scm_from_int (p.get_notename ())), + start_key_sig_); + + if (handle == SCM_BOOL_F) + handle = scm_assoc (scm_from_int (p.get_notename ()), + start_key_sig_); + + Rational sig_alter = (handle != SCM_BOOL_F) + ? robust_scm2rational (scm_cdr (handle), Rational (0)) + : Rational (0); + + const Pitch other = pitch_interval_[-d]; + + if (sig_alter == p.get_alteration () + && !((p.steps () == other.steps ()) + && (p.get_alteration () != other.get_alteration ()))) + { + accidentals_[d]->suicide (); + heads_[d]->set_object ("accidental-grob", SCM_EOL); + } + else + 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]); + Pointer_group_interface::add_grob (ambitus_, + ly_symbol2scm ("note-heads"), + heads_[d]); + } while (flip (&d) != DOWN); - ambitus_->set_property ("note-heads", scm_list_2 (heads_[DOWN]->self_scm (), - heads_[UP]->self_scm ())); + 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 (); } } +ADD_ACKNOWLEDGER (Ambitus_engraver, note_head); ADD_TRANSLATOR (Ambitus_engraver, -/* descr */ "", -/* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental", -/* accepts */ "", -/* acks */ "note-head-interface", -/* reads */ "", -/* write */ ""); + /* doc */ + "Create an ambitus.", + + /* create */ + "AccidentalPlacement " + "Ambitus " + "AmbitusAccidental " + "AmbitusLine " + "AmbitusNoteHead ", + + /* read */ + "keySignature " + "middleCPosition ", + + /* write */ + "" + );