X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=ae012d65131d5d9c1e656dfb54b2379ff7caabfe;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6c6e9e43d13ec67c0511371272890bb3503d7fd1;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 6c6e9e43d1..ae012d6513 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,168 +1,168 @@ /* - head-grav.cc -- part of GNU LilyPond + tab-note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2002 Han-Wen Nienhuys + (c) 2002--2008 Han-Wen Nienhuys, Jean-Baptiste Lamy , */ -#include -#include -#include "rhythmic-head.hh" -#include "paper-def.hh" -#include "musical-request.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 - */ + make (guitar-like) tablature note +*/ class Tab_note_heads_engraver : public Engraver { - Link_array notes_; - - Link_array dots_; - Link_array note_reqs_; - Link_array tabstring_reqs_; + vector notes_; + + vector note_events_; + vector 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) ; - 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() +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 (Note_req * n =dynamic_cast (m)) - { - note_reqs_.push (n); - return true; - } - else if (Text_script_req * ts = dynamic_cast (m)) - { - if (m->get_mus_property ("text-type") != ly_symbol2scm ("finger")) return false; - - //if (tabstring_reqs_.size () < note_reqs_.size ()) { - tabstring_reqs_.push (ts); - //} - return true; - } - else if (dynamic_cast (m)) - { - return note_reqs_.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 () { - /* - for (int i=0; i < tabstring_reqs_.size (); i++) { - Music * tabstring_req = tabstring_reqs_[i]; - - size_t lenp; - char* tab_string_as_string = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp); - } - */ - - for (int i=0; i < note_reqs_.size (); i++) + vsize j = 0; + for (vsize i = 0; i < note_events_.size (); i++) { - Item * note = new Item (get_property ("TabNoteHead")); - - Music * req = note_reqs_[i]; - - Music * tabstring_req = tabstring_reqs_[i]; - - size_t lenp; - char* tab_string_as_string = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp); - int tab_string = atoi(tab_string_as_string); - - Duration dur = *unsmob_duration (req->get_mus_property ("duration")); - - note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ())); + SCM string_tunings = get_property ("stringTunings"); + int string_count = scm_ilength (string_tunings); + bool high_string_one = to_boolean (get_property ("highStringOne")); + + Stream_event *event = note_events_[i]; + + Stream_event *tabstring_event = 0; - if (dur.dot_count ()) + for (SCM s = event->get_property ("articulations"); + !tabstring_event && scm_is_pair (s); s = scm_cdr (s)) { - Item * d = new Item (get_property ("Dots")); - 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 ())); + Stream_event *art = unsmob_stream_event (scm_car (s)); - d->set_parent (note, Y_AXIS); - announce_grob (d, SCM_EOL); - dots_.push (d); + if (art->in_event_class ("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 string_number = 0; + if (tabstring_event) + string_number = scm_to_int (tabstring_event->get_property ("string-number")); + + if (!string_number) + { + 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 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 proc = get_property ("tablatureFormat"); - SCM text = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch); - note->set_grob_property ("text", text); + if (string_number) + { + 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); + + + 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_grob_property ("staff-position", gh_int2scm (pos)); - announce_grob (note, req->self_scm()); - 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_reqs_.clear (); - - tabstring_reqs_.clear (); + note_events_.clear (); + tabstring_events_.clear (); } -void -Tab_note_heads_engraver::start_translation_timestep () -{ -} +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 Note_req.", -/* creats*/ "TabNoteHead Dots", -/* acks */ "", -/* reads */ "centralCPosition stringTunings", -/* write */ ""); + /* write */ "" + );