X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=ae012d65131d5d9c1e656dfb54b2379ff7caabfe;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3a6285ec009d32103aa154243de5aeb53bc9e5de;hpb=e540311d3f5799216c91d203080f63b65cccde07;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 3a6285ec00..ae012d6513 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,186 +1,168 @@ /* - head-grav.cc -- part of GNU LilyPond + tab-note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2004 Han-Wen Nienhuys + (c) 2002--2008 Han-Wen Nienhuys, Jean-Baptiste Lamy , */ -#include -#include -#include "rhythmic-head.hh" -#include "paper-def.hh" -#include "event.hh" -#include "dots.hh" -#include "dot-column.hh" -#include "staff-symbol-referencer.hh" +#include +#include + +#include "engraver.hh" + +using namespace std; + +#include "duration.hh" #include "item.hh" -#include "score-engraver.hh" +#include "output-def.hh" +#include "pitch.hh" +#include "rhythmic-head.hh" +#include "stream-event.hh" #include "warn.hh" +#include "context.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 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)); + SCM string_tunings = get_property ("stringTunings"); + int string_count = scm_ilength (string_tunings); 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]; - - Music * tabstring_event=0; + Stream_event *tabstring_event = 0; - for (SCM s =event->get_property ("articulations"); - !tabstring_event && ly_c_pair_p (s); s = ly_cdr (s)) + for (SCM s = event->get_property ("articulations"); + !tabstring_event && scm_is_pair (s); s = scm_cdr (s)) { - Music * art = unsmob_music (ly_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++; } - int tab_string; - bool string_found; + int string_number = 0; if (tabstring_event) - { - tab_string = ly_scm2int (tabstring_event->get_property ("string-number")); - string_found = true; - } - else - { - 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 ())); + string_number = scm_to_int (tabstring_event->get_property ("string-number")); - if (dur.dot_count ()) + if (!string_number) { - Item * d = make_item ("Dots", event->self_scm ()); - Rhythmic_head::set_dots (note, d); - - if (dur.dot_count () - != ly_scm2int (d->get_property ("dot-count"))) - d->set_property ("dot-count", scm_int2num (dur.dot_count ())); - - d->set_parent (note, Y_AXIS); + SCM scm_pitch = event->get_property ("pitch"); + int min_fret = robust_scm2int (get_property ("minimumFret"), 0); + int start = (high_string_one) ? 1 : string_count; + int end = (high_string_one) ? string_count+1 : 0; + + int i = start; + do + { + int fret = unsmob_pitch (scm_pitch)->rounded_semitone_pitch () + - scm_to_int (robust_list_ref (i - 1, string_tunings)); - dots_.push (d); + if (fret >= min_fret) + { + string_number = i; + break; + } + i += high_string_one ? 1 : -1; + } + while (i != end); } - - SCM scm_pitch = event->get_property ("pitch"); - SCM proc = get_property ("tablatureFormat"); - SCM min_fret_scm = get_property ("minimumFret"); - int min_fret = ly_c_number_p (min_fret_scm) ? ly_scm2int (min_fret_scm) : 0; - - while (!string_found) + if (string_number) { - int fret = unsmob_pitch (scm_pitch)->semitone_pitch () - - ly_scm2int (scm_list_ref (stringTunings,scm_int2num (tab_string-1))); - if (fretself_scm (), + event->self_scm ()); + Item *note = make_item ("TabNoteHead", event->self_scm ()); + note->set_property ("text", text); - SCM text = scm_call_3 (proc, scm_int2num (tab_string), stringTunings, scm_pitch); - int pos = 2 * tab_string - number_of_strings - 1; // No tab-note between the string !!! - if (to_boolean (get_property ("stringOneTopmost"))) - pos = -pos; - - note->set_property ("text", text); + int pos = 2 * string_number - string_count - 1; // No tab-note between the string !!! + if (to_boolean (get_property ("stringOneTopmost"))) + pos = - pos; + + note->set_property ("staff-position", scm_from_int (pos)); - note->set_property ("staff-position", scm_int2num (pos)); - notes_.push (note); + notes_.push_back (note); + } + else + event->origin ()->warning ("could not calculate a string number."); } } - void Tab_note_heads_engraver::stop_translation_timestep () { - for (int i=0; i < notes_.size (); i++) - { - typeset_grob (notes_[i]); - } - notes_.clear (); - for (int i=0; i < dots_.size (); i++) - { - typeset_grob (dots_[i]); - } - - dots_.clear (); note_events_.clear (); tabstring_events_.clear (); } +ADD_TRANSLATOR (Tab_note_heads_engraver, + /* doc */ + "Generate one or more tablature noteheads from event of type" + " @code{NoteEvent}.", + + /* create */ + "TabNoteHead ", + + /* read */ + "middleCPosition " + "stringTunings " + "minimumFret " + "tablatureFormat " + "highStringOne " + "stringOneTopmost ", -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 */ ""); + /* write */ "" + );