X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=4a4bfdd7eb086d2b6a3684c44149e8f34da2c3b1;hb=2a334fabd98bb8aaab153b83f2cd5f37faaf238a;hp=07694ca84d844c69368c0238e69ce0f68673bba9;hpb=6b89a99dbfb2e208c42ba1510be9e638d21be4a9;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 07694ca84d..4a4bfdd7eb 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,14 +1,15 @@ /* head-grav.cc -- part of GNU LilyPond - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include -#include + +#include +#include #include "rhythmic-head.hh" -#include "paper-def.hh" -#include "musical-request.hh" +#include "output-def.hh" +#include "event.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" @@ -17,51 +18,46 @@ #include "warn.hh" /** - make (guitar-like) tablature note - */ + make (guitar-like) tablature note +*/ class Tab_note_heads_engraver : public Engraver { - Link_array note_p_arr_; + Link_array notes_; - Link_array dot_p_arr_; - Link_array note_req_l_arr_; - Link_array tabstring_req_arr_; + Link_array dots_; + Link_array note_events_; + Link_array tabstring_events_; public: - TRANSLATOR_DECLARATIONS(Tab_note_heads_engraver); + TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver); protected: - virtual void start_translation_timestep (); - virtual bool try_music (Music *req_l) ; + virtual bool try_music (Music *event) ; virtual void process_music (); virtual void stop_translation_timestep (); }; -Tab_note_heads_engraver::Tab_note_heads_engraver() +Tab_note_heads_engraver::Tab_note_heads_engraver () { } bool Tab_note_heads_engraver::try_music (Music *m) { - if (Note_req * n =dynamic_cast (m)) + if (m->is_mus_type ("note-event")) { - note_req_l_arr_.push (n); + note_events_.push (m); return true; } - else if (Text_script_req * ts = dynamic_cast (m)) + else if (m->is_mus_type ("string-number-event")) { - if (m->get_mus_property ("text-type") != ly_symbol2scm ("finger")) return false; - - //if (tabstring_req_arr_.size () < note_req_l_arr_.size ()) { - tabstring_req_arr_.push (ts); - //} + tabstring_events_.push (m); return true; } - else if (dynamic_cast (m)) + else if (m->is_mus_type ("busy-playing-event")) { - return note_req_l_arr_.size (); + return note_events_.size (); } return false; @@ -71,98 +67,111 @@ Tab_note_heads_engraver::try_music (Music *m) void Tab_note_heads_engraver::process_music () { - /* - for (int i=0; i < tabstring_req_arr_.size (); i++) { - Music * tabstring_req = tabstring_req_arr_[i]; - - size_t lenp; - char* tab_string_as_str = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp); - } - */ - - for (int i=0; i < note_req_l_arr_.size (); i++) + int j = 0; + for (int i = 0; i < note_events_.size (); i++) { - Item * note_p = new Item (get_property ("TabNoteHead")); - - Music * req = note_req_l_arr_[i]; - - Music * tabstring_req = tabstring_req_arr_[i]; + SCM stringTunings = get_property ("stringTunings"); + int number_of_strings = ((int) ly_length (stringTunings)); + bool high_string_one = to_boolean (get_property ("highStringOne")); + - size_t lenp; - char* tab_string_as_str = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp); - int tab_string = atoi(tab_string_as_str); + Music * event = note_events_[i]; + Item * note = make_item ("TabNoteHead", event->self_scm ()); + - Duration dur = *unsmob_duration (req->get_mus_property ("duration")); + Music * 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)); + + if (art->is_mus_type ("string-number-event")) + tabstring_event = art; + } + + if (!tabstring_event && j < tabstring_events_.size ()) + { + tabstring_event = tabstring_events_[j]; + if (j +1 < tabstring_events_.size ()) + j++; + } + + int tab_string; + bool string_found; + 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; + } - note_p->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ())); + Duration dur = *unsmob_duration (event->get_property ("duration")); + note->set_property ("duration-log", + scm_int2num (dur.duration_log ())); if (dur.dot_count ()) { - Item * d = new Item (get_property ("Dots")); - Rhythmic_head::set_dots (note_p, d); + Item * d = make_item ("Dots", event->self_scm ()); + Rhythmic_head::set_dots (note, d); if (dur.dot_count () - != gh_scm2int (d->get_grob_property ("dot-count"))) - d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ())); + != scm_to_int (d->get_property ("dot-count"))) + d->set_property ("dot-count", scm_int2num (dur.dot_count ())); - d->set_parent (note_p, Y_AXIS); - announce_grob (d, SCM_EOL); - dot_p_arr_.push (d); + d->set_parent (note, Y_AXIS); + + dots_.push (d); } - SCM stringTunings = get_property ("stringTunings"); - int number_of_strings = ((int) gh_length(stringTunings)); - - int pos = 2 * tab_string - 2; // No tab-note between the string !!! - if (((float) (number_of_strings / 2)) != (((float) number_of_strings) / 2.0)) { // even number of string - pos = pos + 1; - } - - SCM c0 = get_property ("centralCPosition"); - if (gh_number_p (c0)) pos += gh_scm2int (c0); - - SCM scm_pitch = req->get_mus_property ("pitch"); + SCM scm_pitch = event->get_property ("pitch"); SCM proc = get_property ("tablatureFormat"); - SCM text = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch); - note_p->set_grob_property ("text", text); - - note_p->set_grob_property ("staff-position", gh_int2scm (pos)); - announce_grob (note_p, req->self_scm()); - note_p_arr_.push (note_p); - } -} + SCM min_fret_scm = get_property ("minimumFret"); + int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0; -void -Tab_note_heads_engraver::stop_translation_timestep () -{ - for (int i=0; i < note_p_arr_.size (); i++) - { - typeset_grob (note_p_arr_[i]); - } + 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); } - dot_p_arr_.clear (); - - note_req_l_arr_.clear (); - - tabstring_req_arr_.clear (); } void -Tab_note_heads_engraver::start_translation_timestep () +Tab_note_heads_engraver::stop_translation_timestep () { + notes_.clear (); + dots_.clear (); + note_events_.clear (); + tabstring_events_.clear (); } -ENTER_DESCRIPTION(Tab_note_heads_engraver, -/* descr */ "Generate one or more tablature noteheads from Music of type Note_req.", +ADD_TRANSLATOR (Tab_note_heads_engraver, +/* descr */ "Generate one or more tablature noteheads from Music of type NoteEvent.", /* creats*/ "TabNoteHead Dots", -/* acks */ "", -/* reads */ "centralCPosition stringTunings", +/* accepts */ "note-event string-number-event busy-playing-event", +/* acks */ "", +/* reads */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost", /* write */ "");