X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=4fb33f7199b8ff4698d7d501b060c03baf0802f9;hb=d194ee9f637a200ac26b59e818acf5ca37985dc9;hp=b3f96b55ec5282b255e491af9ddcf1e6a86df5a7;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index b3f96b55ec..4fb33f7199 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,98 +1,93 @@ /* - head-grav.cc -- part of GNU LilyPond + tab-note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2004 Han-Wen Nienhuys + (c) 2002--2006 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); + 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() +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) gh_length(stringTunings)); - bool high_string_one = to_boolean(get_property ("highStringOne")); + SCM string_tunings = get_property ("stringTunings"); + int number_of_strings = scm_ilength (string_tunings); + bool high_string_one = to_boolean (get_property ("highStringOne")); - Item * note = make_item ("TabNoteHead"); - - Music * event = note_events_[i]; + 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"); - !tabstring_event && gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = event->get_property ("articulations"); + !tabstring_event && scm_is_pair (s); s = scm_cdr (s)) { - Music * art = unsmob_music (gh_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++; } @@ -100,7 +95,7 @@ Tab_note_heads_engraver::process_music () bool string_found; if (tabstring_event) { - tab_string = gh_scm2int(tabstring_event->get_property ("string-number")); + tab_string = scm_to_int (tabstring_event->get_property ("string-number")); string_found = true; } else @@ -108,80 +103,62 @@ 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", - gh_int2scm (dur.duration_log ())); - if (dur.dot_count ()) - { - Item * d = make_item ("Dots"); - Rhythmic_head::set_dots (note, d); - - if (dur.dot_count () - != gh_scm2int (d->get_property ("dot-count"))) - d->set_property ("dot-count", gh_int2scm (dur.dot_count ())); - - d->set_parent (note, Y_AXIS); - announce_grob (d, SCM_EOL); - dots_.push (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 = gh_number_p(min_fret_scm) ? gh_scm2int(min_fret_scm) : 0; + int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0; - while(!string_found) + while (!string_found) { - int fret = unsmob_pitch(scm_pitch)->semitone_pitch() - - gh_scm2int(gh_list_ref(stringTunings,gh_int2scm(tab_string-1))); - if(fretrounded_semitone_pitch () + - scm_to_int (scm_list_ref (string_tunings, scm_from_int (tab_string - 1))); + if (fret < min_fret) tab_string += high_string_one ? 1 : -1; else string_found = true; } - SCM text = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch); + SCM text = scm_call_3 (proc, scm_from_int (tab_string), + context ()->self_scm (), + event->self_scm ()); + note->set_property ("text", text); + int pos = 2 * tab_string - number_of_strings - 1; // No tab-note between the string !!! - if(to_boolean(get_property("stringOneTopmost"))) + if (to_boolean (get_property ("stringOneTopmost"))) pos = -pos; + + note->set_property ("staff-position", scm_from_int (pos)); + - note->set_property ("text", text); - - note->set_property ("staff-position", gh_int2scm (pos)); - announce_grob (note, event->self_scm()); - notes_.push (note); + notes_.push_back (note); } } 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 (); } - -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 */ "centralCPosition 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 " + , + + /* read */ + "middleCPosition " + "stringTunings " + "minimumFret " + "tablatureFormat " + "highStringOne " + "stringOneTopmost ", + + /* write */ "");