X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=ae012d65131d5d9c1e656dfb54b2379ff7caabfe;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b6f3f4ced9f2ff3d73009da13c41cf3d704cffe6;hpb=b6a8afbd0a9a0b36b07c114503d81a7c420e09e7;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index b6f3f4ced9..ae012d6513 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,25 +1,26 @@ /* tab-note-heads-engraver.cc -- part of GNU LilyPond - based on note-heads-engraver.cc, by Jean-Baptiste Lamy , - - (c) 2002--2006 + (c) 2002--2008 Han-Wen Nienhuys, Jean-Baptiste Lamy , */ #include #include + +#include "engraver.hh" + using namespace std; -#include "rhythmic-head.hh" -#include "output-def.hh" -#include "music.hh" -#include "dots.hh" -#include "dot-column.hh" -#include "staff-symbol-referencer.hh" +#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 "duration.hh" +#include "context.hh" + +#include "translator.icc" /** make (guitar-like) tablature note @@ -28,14 +29,14 @@ class Tab_note_heads_engraver : public Engraver { vector notes_; - vector dots_; - vector note_events_; - vector tabstring_events_; + vector note_events_; + vector tabstring_events_; public: TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver); protected: - virtual bool try_music (Music *event); + DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_TRANSLATOR_LISTENER (string_number); void process_music (); void stop_translation_timestep (); @@ -45,21 +46,18 @@ 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_back (m); - return true; - } - else if (m->is_mus_type ("string-number-event")) - { - tabstring_events_.push_back (m); - return true; - } + note_events_.push_back (ev); +} - return false; +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 @@ -68,21 +66,20 @@ Tab_note_heads_engraver::process_music () 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 && 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; } @@ -93,80 +90,79 @@ Tab_note_heads_engraver::process_music () j++; } - int tab_string; - bool string_found; + int string_number = 0; if (tabstring_event) - { - tab_string = scm_to_int (tabstring_event->get_property ("string-number")); - string_found = true; - } - else - { - tab_string = high_string_one ? 1 : number_of_strings; - string_found = false; - } + string_number = scm_to_int (tabstring_event->get_property ("string-number")); - Duration dur = *unsmob_duration (event->get_property ("duration")); - note->set_property ("duration-log", - scm_from_int (dur.duration_log ())); - - 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 () - != scm_to_int (d->get_property ("dot-count"))) - d->set_property ("dot-count", scm_from_int (dur.dot_count ())); - - d->set_parent (note, Y_AXIS); - - dots_.push_back (d); + 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)); + + 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 = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0; - - while (!string_found) + + if (string_number) { - int fret = unsmob_pitch (scm_pitch)->semitone_pitch () - - scm_to_int (scm_list_ref (stringTunings, scm_from_int (tab_string - 1))); - if (fret < min_fret) - tab_string += high_string_one ? 1 : -1; - else - string_found = true; - } + SCM proc = get_property ("tablatureFormat"); + SCM text = scm_call_3 (proc, scm_from_int (string_number), + context ()->self_scm (), + event->self_scm ()); + Item *note = make_item ("TabNoteHead", event->self_scm ()); + note->set_property ("text", text); - SCM text = scm_call_3 (proc, scm_from_int (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; + 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 ("text", text); - - note->set_property ("staff-position", scm_from_int (pos)); - notes_.push_back (note); + note->set_property ("staff-position", scm_from_int (pos)); + + notes_.push_back (note); + } + else + event->origin ()->warning ("could not calculate a string number."); } } - void Tab_note_heads_engraver::stop_translation_timestep () { notes_.clear (); - dots_.clear (); note_events_.clear (); tabstring_events_.clear (); } -#include "translator.icc" - ADD_TRANSLATOR (Tab_note_heads_engraver, - /* doc */ "Generate one or more tablature noteheads from Music of type NoteEvent.", - /* create */ "TabNoteHead Dots", - /* accept */ "note-event string-number-event", - /* read */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost", - /* write */ ""); + /* doc */ + "Generate one or more tablature noteheads from event of type" + " @code{NoteEvent}.", + + /* create */ + "TabNoteHead ", + + /* read */ + "middleCPosition " + "stringTunings " + "minimumFret " + "tablatureFormat " + "highStringOne " + "stringOneTopmost ", + + /* write */ "" + );