X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=55e20f8a6e3bd16597e86f5f5013d091fd857e87;hb=7a9aad3db6fe6ee35bbcda9d9096b5d0df7ef639;hp=9d19e641d52443343e62874ab0d98372dccad23b;hpb=a0a40c02de757661518577105dbb644a6ecdbc4d;p=lilypond.git diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 9d19e641d5..55e20f8a6e 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,7 +1,7 @@ /* head-grav.cc -- part of GNU LilyPond - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ #include @@ -18,6 +18,7 @@ /** make balls and rests */ + class Note_heads_engraver : public Engraver { Link_array notes_; @@ -34,14 +35,10 @@ protected: virtual void process_music (); virtual void stop_translation_timestep (); - -private: - bool in_ligature; }; Note_heads_engraver::Note_heads_engraver() { - in_ligature = 0; } bool @@ -54,19 +51,6 @@ Note_heads_engraver::try_music (Music *m) } else if (m->is_mus_type ("busy-playing-event")) return note_reqs_.size (); - else if (m->is_mus_type ("abort-event")) - { - in_ligature = 0; - } - else if (m->is_mus_type ("ligature-event")) - { - /* - Urg ; this is not protocol. We should accept and return - true, or ignore. - */ - in_ligature = (to_dir (m->get_mus_property("span-direction")) == START); - return false; - } return false; } @@ -77,8 +61,7 @@ Note_heads_engraver::process_music () { for (int i=0; i < note_reqs_.size (); i++) { - Item *note = - new Item (get_property ((in_ligature) ? "LigatureHead" : "NoteHead")); + Item *note = new Item (get_property ("NoteHead")); Music * req = note_reqs_[i]; @@ -137,8 +120,8 @@ Note_heads_engraver::start_translation_timestep () ENTER_DESCRIPTION(Note_heads_engraver, -/* descr */ "Generate noteheads (also serves a double functions: makes ligatures.", -/* creats*/ "NoteHead LigatureHead Dots", +/* descr */ "Generate noteheads.", +/* creats*/ "NoteHead Dots", /* accepts */ "note-event busy-playing-event ligature-event abort-event", /* acks */ "", /* reads */ "centralCPosition",