X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=d30c2265c7da959f81b32e5f1183252eae19d03e;hb=73d087a6589038ac21efe802fe6d51cafa411749;hp=68357bac1cbb431252a1024dba2287275b56bacb;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 68357bac1c..d30c2265c7 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,99 +1,96 @@ /* - head-grav.cc -- part of GNU LilyPond + tab-note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2004 Han-Wen Nienhuys + based on note-heads-engraver.cc, by Jean-Baptiste Lamy , + + (c) 2002--2006 */ #include #include +using namespace std; -#include "rhythmic-head.hh" -#include "output-def.hh" -#include "event.hh" -#include "dots.hh" #include "dot-column.hh" -#include "staff-symbol-referencer.hh" +#include "dots.hh" +#include "duration.hh" #include "item.hh" +#include "output-def.hh" +#include "pitch.hh" +#include "rhythmic-head.hh" #include "score-engraver.hh" +#include "staff-symbol-referencer.hh" +#include "stream-event.hh" #include "warn.hh" +#include "translator.icc" + /** make (guitar-like) tablature note */ class Tab_note_heads_engraver : public Engraver { - Link_array notes_; - - Link_array dots_; - Link_array note_events_; - Link_array tabstring_events_; + vector notes_; + + vector dots_; + vector note_events_; + vector tabstring_events_; public: TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver); protected: - virtual bool try_music (Music *event) ; - virtual void process_music (); + DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_TRANSLATOR_LISTENER (string_number); + void process_music (); - virtual void stop_translation_timestep (); + void stop_translation_timestep (); }; - Tab_note_heads_engraver::Tab_note_heads_engraver () { } -bool -Tab_note_heads_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Tab_note_heads_engraver, note); +void +Tab_note_heads_engraver::listen_note (Stream_event *ev) { - if (m->is_mus_type ("note-event")) - { - note_events_.push (m); - return true; - } - else if (m->is_mus_type ("string-number-event")) - { - tabstring_events_.push (m); - return true; - } - else if (m->is_mus_type ("busy-playing-event")) - { - return note_events_.size (); - } - - return false; + note_events_.push_back (ev); } +IMPLEMENT_TRANSLATOR_LISTENER (Tab_note_heads_engraver, string_number); +void +Tab_note_heads_engraver::listen_string_number (Stream_event *ev) +{ + tabstring_events_.push_back (ev); +} void Tab_note_heads_engraver::process_music () { - int j = 0; - for (int i= 0; i < note_events_.size (); i++) + vsize j = 0; + for (vsize i = 0; i < note_events_.size (); i++) { SCM stringTunings = get_property ("stringTunings"); int number_of_strings = ((int) ly_length (stringTunings)); bool high_string_one = to_boolean (get_property ("highStringOne")); - - Music * event = note_events_[i]; - Item * note = make_item ("TabNoteHead", event->self_scm ()); + Stream_event *event = note_events_[i]; + Item *note = make_item ("TabNoteHead", event->self_scm ()); - - Music * tabstring_event= 0; + Stream_event *tabstring_event = 0; - for (SCM s =event->get_property ("articulations"); + for (SCM s = event->get_property ("articulations"); !tabstring_event && scm_is_pair (s); s = scm_cdr (s)) { - Music * art = unsmob_music (scm_car (s)); + Stream_event *art = unsmob_stream_event (scm_car (s)); - if (art->is_mus_type ("string-number-event")) + if (art->in_event_class ("string-number-event")) tabstring_event = art; } - if (!tabstring_event && j < tabstring_events_.size ()) + if (!tabstring_event && j < tabstring_events_.size ()) { tabstring_event = tabstring_events_[j]; - if (j +1 < tabstring_events_.size ()) + if (j + 1 < tabstring_events_.size ()) j++; } @@ -109,51 +106,50 @@ Tab_note_heads_engraver::process_music () tab_string = high_string_one ? 1 : number_of_strings; string_found = false; } - + Duration dur = *unsmob_duration (event->get_property ("duration")); note->set_property ("duration-log", - scm_int2num (dur.duration_log ())); + scm_from_int (dur.duration_log ())); if (dur.dot_count ()) { - Item * d = make_item ("Dots", event->self_scm ()); + Item *d = make_item ("Dots", event->self_scm ()); Rhythmic_head::set_dots (note, d); - + if (dur.dot_count () != scm_to_int (d->get_property ("dot-count"))) - d->set_property ("dot-count", scm_int2num (dur.dot_count ())); + d->set_property ("dot-count", scm_from_int (dur.dot_count ())); d->set_parent (note, Y_AXIS); - - dots_.push (d); + + dots_.push_back (d); } - - + SCM scm_pitch = event->get_property ("pitch"); - SCM proc = get_property ("tablatureFormat"); + SCM proc = get_property ("tablatureFormat"); SCM min_fret_scm = get_property ("minimumFret"); int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0; while (!string_found) { int fret = unsmob_pitch (scm_pitch)->semitone_pitch () - - scm_to_int (scm_list_ref (stringTunings,scm_int2num (tab_string-1))); - if (fretset_property ("text", text); - - note->set_property ("staff-position", scm_int2num (pos)); - notes_.push (note); + + note->set_property ("text", text); + + note->set_property ("staff-position", scm_from_int (pos)); + notes_.push_back (note); } } @@ -166,12 +162,10 @@ Tab_note_heads_engraver::stop_translation_timestep () tabstring_events_.clear (); } - -ENTER_DESCRIPTION (Tab_note_heads_engraver, -/* descr */ "Generate one or more tablature noteheads from Music of type NoteEvent.", -/* creats*/ "TabNoteHead Dots", -/* accepts */ "note-event string-number-event busy-playing-event", -/* acks */ "", -/* reads */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost", -/* write */ ""); +ADD_TRANSLATOR (Tab_note_heads_engraver, + /* doc */ "Generate one or more tablature noteheads from event of type NoteEvent.", + /* create */ "TabNoteHead Dots", + /* accept */ "note-event string-number-event", + /* read */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost", + /* write */ "");