X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=494326f47ffd1871cca000c7ca3ca80c01c3ee76;hb=36f6cd546770e38c6e2314404e21f1c89504eb7d;hp=d6667e098d83f098cce82130faedf36ca3b177d1;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index d6667e098d..494326f47f 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -1,10 +1,10 @@ -/* +/* arpeggio-engraver.cc -- implement Arpeggio_engraver - + source file of the GNU LilyPond music typesetter - + (c) 2000--2005 Jan Nieuwenhuizen - */ +*/ #include "engraver.hh" #include "group-interface.hh" @@ -18,29 +18,29 @@ class Arpeggio_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Arpeggio_engraver); - + protected: virtual void acknowledge_grob (Grob_info); virtual void process_music (); virtual void stop_translation_timestep (); virtual bool try_music (Music *); private: - Item *arpeggio_; - Music *arpeggio_req_; + Item *arpeggio_; + Music *arpeggio_event_; }; Arpeggio_engraver::Arpeggio_engraver () { arpeggio_ = 0; - arpeggio_req_ = 0; + arpeggio_event_ = 0; } bool Arpeggio_engraver::try_music (Music *m) { - if (!arpeggio_req_) + if (!arpeggio_event_) { - arpeggio_req_ = m; + arpeggio_event_ = m; } return true; } @@ -50,27 +50,27 @@ Arpeggio_engraver::acknowledge_grob (Grob_info info) { if (arpeggio_) { - if (Stem::has_interface (info.grob_)) + if (Stem::has_interface (info.grob ())) { - if (!arpeggio_->get_parent (Y_AXIS)) - arpeggio_->set_parent (info.grob_, Y_AXIS); - + if (!arpeggio_->get_parent (Y_AXIS)) + arpeggio_->set_parent (info.grob (), Y_AXIS); + Pointer_group_interface::add_grob (arpeggio_, ly_symbol2scm ("stems"), - info.grob_); + info.grob ()); } - + /* We can't catch local key items (accidentals) from Voice context, see Local_key_engraver */ - else if (Rhythmic_head::has_interface (info.grob_)) + else if (Rhythmic_head::has_interface (info.grob ())) { - Side_position_interface::add_support (arpeggio_, info.grob_); + Side_position_interface::add_support (arpeggio_, info.grob ()); } - else if (Note_column::has_interface (info.grob_ )) + else if (Note_column::has_interface (info.grob ())) { - info.grob_->set_property ("arpeggio", arpeggio_->self_scm ()); + info.grob ()->set_property ("arpeggio", arpeggio_->self_scm ()); } } } @@ -78,9 +78,9 @@ Arpeggio_engraver::acknowledge_grob (Grob_info info) void Arpeggio_engraver::process_music () { - if (arpeggio_req_) + if (arpeggio_event_) { - arpeggio_ = make_item ("Arpeggio", arpeggio_req_->self_scm ()); + arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ()); } } @@ -88,13 +88,13 @@ void Arpeggio_engraver::stop_translation_timestep () { arpeggio_ = 0; - arpeggio_req_ = 0; + arpeggio_event_ = 0; } ADD_TRANSLATOR (Arpeggio_engraver, -/* descr */ "Generate an Arpeggio from a Arpeggio_req", -/* creats*/ "Arpeggio", -/* accepts */ "arpeggio-event", -/* acks */ "stem-interface rhythmic-head-interface note-column-interface", -/* reads */ "", -/* write */ ""); + /* descr */ "Generate an Arpeggio symbol", + /* creats*/ "Arpeggio", + /* accepts */ "arpeggio-event", + /* acks */ "stem-interface rhythmic-head-interface note-column-interface", + /* reads */ "", + /* write */ "");