X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=3ea9ea5c4efb465b050db6154e5d81647474ee21;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=1e3f78cbc6a7cc77e2036e65a24feb5b4d89081d;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 1e3f78cbc6..3ea9ea5c4e 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,20 +1,25 @@ /* - head-grav.cc -- part of GNU LilyPond + tab-note-heads-engraver.cc -- part of GNU LilyPond - (c) 1997--2004 Han-Wen Nienhuys + based on note-heads-engraver.cc, by Jean-Baptiste Lamy , + + (c) 2002--2006 */ -#include -#include + +#include +#include +using namespace std; #include "rhythmic-head.hh" -#include "paper-def.hh" -#include "event.hh" +#include "output-def.hh" +#include "music.hh" #include "dots.hh" #include "dot-column.hh" #include "staff-symbol-referencer.hh" #include "item.hh" #include "score-engraver.hh" #include "warn.hh" +#include "duration.hh" /** make (guitar-like) tablature note @@ -22,27 +27,26 @@ class Tab_note_heads_engraver : public Engraver { Link_array notes_; - + 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 bool try_music (Music *event) ; - virtual void process_music (); + virtual bool try_music (Music *event); + 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) +Tab_note_heads_engraver::try_music (Music *m) { if (m->is_mus_type ("note-event")) { @@ -55,44 +59,39 @@ Tab_note_heads_engraver::try_music (Music *m) return true; } else if (m->is_mus_type ("busy-playing-event")) - { - return note_events_.size (); - } - + return note_events_.size (); + return false; } - void Tab_note_heads_engraver::process_music () { - int j = 0; - for (int i=0; i < note_events_.size (); i++) + int j = 0; + for (int 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")); + int number_of_strings = ((int) ly_length (stringTunings)); + bool high_string_one = to_boolean (get_property ("highStringOne")); - Item * note = make_item ("TabNoteHead"); - - Music * event = note_events_[i]; + Music *event = note_events_[i]; + Item *note = make_item ("TabNoteHead", event->self_scm ()); - - Music * tabstring_event=0; + Music *tabstring_event = 0; - for (SCM s =event->get_mus_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)); + 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 ()) + 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 +99,7 @@ Tab_note_heads_engraver::process_music () bool string_found; if (tabstring_event) { - tab_string = gh_scm2int(tabstring_event->get_mus_property ("string-number")); + tab_string = scm_to_int (tabstring_event->get_property ("string-number")); string_found = true; } else @@ -108,51 +107,49 @@ Tab_note_heads_engraver::process_music () tab_string = high_string_one ? 1 : number_of_strings; string_found = false; } - - Duration dur = *unsmob_duration (event->get_mus_property ("duration")); - note->set_grob_property ("duration-log", - gh_int2scm (dur.duration_log ())); + + Duration dur = *unsmob_duration (event->get_property ("duration")); + note->set_property ("duration-log", + scm_from_int (dur.duration_log ())); if (dur.dot_count ()) { - Item * d = make_item ("Dots"); + 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_from_int (dur.dot_count ())); d->set_parent (note, Y_AXIS); - announce_grob (d, SCM_EOL); + dots_.push (d); } - - - SCM scm_pitch = event->get_mus_property ("pitch"); - SCM proc = get_property ("tablatureFormat"); + + SCM scm_pitch = event->get_property ("pitch"); + 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(fretsemitone_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 text = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch); + 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"))) + if (to_boolean (get_property ("stringOneTopmost"))) pos = -pos; - - note->set_grob_property ("text", text); - - note->set_grob_property ("staff-position", gh_int2scm (pos)); - announce_grob (note, event->self_scm()); + + note->set_property ("text", text); + + note->set_property ("staff-position", scm_from_int (pos)); notes_.push (note); } } @@ -160,28 +157,18 @@ Tab_note_heads_engraver::process_music () 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 (); } +#include "translator.icc" -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 Music of type NoteEvent.", + /* create */ "TabNoteHead Dots", + /* accept */ "note-event string-number-event busy-playing-event", + /* read */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost", + /* write */ "");