X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=49a760bec1400cd554b21c796378dab357e1213e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b1cb9dbcc07c70eda1ddf67f0aa7c6960a9b8328;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index b1cb9dbcc0..42dd7e4b1f 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,187 +1,168 @@ /* - head-grav.cc -- part of GNU LilyPond + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2004 Han-Wen Nienhuys + Copyright (C) 2002--2015 Han-Wen Nienhuys, Jean-Baptiste Lamy , + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#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 "articulations.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 "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 note_events_; + vector tabstring_events_; + vector fingering_events_; + public: 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); + DECLARE_TRANSLATOR_LISTENER (fingering); + void process_music (); - virtual void stop_translation_timestep (); + void stop_translation_timestep (); }; - 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) +{ + 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) { - 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; + tabstring_events_.push_back (ev); } +IMPLEMENT_TRANSLATOR_LISTENER (Tab_note_heads_engraver, fingering); +void +Tab_note_heads_engraver::listen_fingering (Stream_event *ev) +{ + fingering_events_.push_back (ev); +} void Tab_note_heads_engraver::process_music () { - int j = 0; - for (int i=0; i < note_events_.size (); i++) - { - SCM stringTunings = get_property ("stringTunings"); - 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 * tabstring_event=0; - - for (SCM s =event->get_property ("articulations"); - !tabstring_event && ly_pair_p (s); s = ly_cdr (s)) - { - Music * art = unsmob_music (ly_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 = ly_scm2int (tabstring_event->get_property ("string-number")); - string_found = true; - } - else - { - 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", - scm_int2num (dur.duration_log ())); - - if (dur.dot_count ()) - { - Item * d = make_item ("Dots"); - Rhythmic_head::set_dots (note, d); - - if (dur.dot_count () - != ly_scm2int (d->get_property ("dot-count"))) - d->set_property ("dot-count", scm_int2num (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 min_fret_scm = get_property ("minimumFret"); - int min_fret = ly_number_p (min_fret_scm) ? ly_scm2int (min_fret_scm) : 0; - - while (!string_found) - { - int fret = unsmob_pitch (scm_pitch)->semitone_pitch () - - ly_scm2int (scm_list_ref (stringTunings,scm_int2num (tab_string-1))); - if (fretset_property ("text", text); - - note->set_property ("staff-position", scm_int2num (pos)); - announce_grob (note, event->self_scm ()); - notes_.push (note); - } + SCM tab_strings = articulation_list (note_events_, + tabstring_events_, + "string-number-event"); + SCM defined_fingers = articulation_list (note_events_, + fingering_events_, + "fingering-event"); + SCM tab_notes = ly_cxx_vector_to_list (note_events_); + SCM proc = get_property ("noteToFretFunction"); + SCM string_fret_finger = SCM_EOL; + if (ly_is_procedure (proc)) + string_fret_finger = scm_call_3 (proc, + context ()->self_scm (), + tab_notes, + scm_list_2 (tab_strings, + defined_fingers)); + SCM note_entry = SCM_EOL; + SCM string_number = SCM_EOL; + SCM fret = SCM_EOL; + SCM fret_label = SCM_EOL; + SCM fret_procedure = get_property ("tablatureFormat"); + SCM staff_line_procedure = get_property ("tabStaffLineLayoutFunction"); + SCM staff_position = SCM_EOL; + vsize fret_count = (vsize) scm_ilength (string_fret_finger); + bool length_changed = (note_events_.size () != fret_count); + vsize index; + + if (string_fret_finger != SCM_EOL) + for (vsize i = 0; i < fret_count; i++) + { + note_entry = scm_list_ref (string_fret_finger, scm_from_int (i)); + string_number = scm_car (note_entry); + if (string_number != SCM_BOOL_F) + { + fret = scm_cadr (note_entry); + fret_label = scm_call_3 (fret_procedure, + context ()->self_scm (), + string_number, + fret); + index = length_changed ? 0 : i; + Item *note = make_item ("TabNoteHead", note_events_[index]->self_scm ()); + note->set_property ("text", fret_label); + staff_position = scm_call_2 (staff_line_procedure, + context ()->self_scm (), + string_number); + note->set_property ("staff-position", staff_position); + } + } } 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 (); + fingering_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 */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost", -/* write */ ""); +ADD_TRANSLATOR (Tab_note_heads_engraver, + /* doc */ + "Generate one or more tablature note heads from event of type" + " @code{NoteEvent}.", + + /* create */ + "TabNoteHead ", + + /* read */ + "defaultStrings " + "fretLabels " + "highStringOne " + "middleCPosition " + "minimumFret " + "noteToFretFunction " + "stringOneTopmost " + "stringTunings " + "tablatureFormat " + "tabStaffLineLayoutFunction ", + + /* write */ + "" + );