X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=a40cb2ac3f47bb58112fe8f6901f8c70c7916d12;hb=1402d6d957bee7d47e0bddf4c57dd89912182b26;hp=2c99cc724c1d0dbd40661883dec94429903ae6be;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 2c99cc724c..a40cb2ac3f 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -1,11 +1,10 @@ -/* +/* note-name-engraver.cc -- implement Note_name_engraver - + source file of the GNU LilyPond music typesetter - + (c) 1999--2005 Han-Wen Nienhuys - - */ +*/ #include "engraver.hh" #include "item.hh" @@ -17,9 +16,9 @@ public: Link_array events_; Link_array texts_; - virtual bool try_music (Music*m); - virtual void process_music (); - virtual void stop_translation_timestep (); + virtual bool try_music (Music *m); + PRECOMPUTED_VIRTUAL void process_music (); + PRECOMPUTED_VIRTUAL void stop_translation_timestep (); }; bool @@ -36,7 +35,7 @@ Note_name_engraver::try_music (Music *m) void Note_name_engraver::process_music () { - String s ; + String s; for (int i = 0; i < events_.size (); i++) { if (i) @@ -44,13 +43,13 @@ Note_name_engraver::process_music () Pitch p = *unsmob_pitch (events_[i]->get_property ("pitch")); if (!to_boolean (get_property ("printOctaveNames"))) - p = Pitch (-1, p.get_notename (), p.get_alteration ()); - + p = Pitch (-1, p.get_notename (), p.get_alteration ()); + s += p.to_string (); } if (s.length ()) { - Item * t = make_item ("NoteName", events_[0]->self_scm () ); + Item *t = make_item ("NoteName", events_[0]->self_scm ()); t->set_property ("text", scm_makfrom0str (s.to_str0 ())); texts_.push (t); } @@ -59,19 +58,20 @@ Note_name_engraver::process_music () void Note_name_engraver::stop_translation_timestep () { - texts_.clear () ; + texts_.clear (); events_.clear (); } - Note_name_engraver::Note_name_engraver () { } +#include "translator.icc" + ADD_TRANSLATOR (Note_name_engraver, -/* descr */ "", -/* creats*/ "NoteName", -/* accepts */ "note-event", -/* acks */ "", -/* reads */ "printOctaveNames", -/* write */ ""); + /* descr */ "", + /* creats*/ "NoteName", + /* accepts */ "note-event", + /* acks */ "", + /* reads */ "printOctaveNames", + /* write */ "");