X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftab-note-heads-engraver.cc;h=4e3f393a2df30766b0fc7cef612f15e1956703b8;hb=cf3642858a2340bb39ee56739f34c799946d4454;hp=3d426a0d0883204c5945f60f213358b43444e0eb;hpb=bd2e7580a591a24c2f9b11f556ea6c60005a6e0a;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 3d426a0d08..4e3f393a2d 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,158 +1,168 @@ /* - head-grav.cc -- part of GNU LilyPond + This file is part of LilyPond, the GNU music typesetter. - (c) 1997--2002 Han-Wen Nienhuys + Copyright (C) 2002--2011 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 "musical-request.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 - */ + make (guitar-like) tablature note +*/ class Tab_note_heads_engraver : public Engraver { - Link_array note_p_arr_; - - Link_array dot_p_arr_; - Link_array note_req_l_arr_; - - Link_array tabstring_req_arr_; + vector note_events_; + vector tabstring_events_; + vector fingering_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 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() +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_req_l_arr_.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_req_arr_.size () < note_req_l_arr_.size ()) { - tabstring_req_arr_.push (ts); - //} - return true; - } - else if (dynamic_cast (m)) - { - return note_req_l_arr_.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); +} +IMPLEMENT_TRANSLATOR_LISTENER (Tab_note_heads_engraver, fingering); void -Tab_note_heads_engraver::process_music () +Tab_note_heads_engraver::listen_fingering (Stream_event *ev) { - /* - 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++) - { - Item * note_p = new Item (get_property ("TabNoteHead")); - - Music * req = note_req_l_arr_[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); - int tab_string = atoi(tab_string_as_str); - - Duration dur = *unsmob_duration (req->get_mus_property ("duration")); - - note_p->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ())); - - if (dur.dot_count ()) - { - Item * d = new Item (get_property ("Dots")); - Rhythmic_head::set_dots (note_p, d); - - if (dur.dot_count () - != gh_scm2int (d->get_grob_property ("dot-count"))) - d->set_grob_property ("dot-count", gh_int2scm (dur.dot_count ())); - - d->set_parent (note_p, Y_AXIS); - announce_grob (d, SCM_EOL); - dot_p_arr_.push (d); - } - - int pos = 2 * tab_string - 2; // No tab-note between the string !!! - SCM c0 = get_property ("centralCPosition"); - if (gh_number_p (c0)) pos += gh_scm2int (c0); - - note_p->set_grob_property ("tab-string", gh_int2scm (tab_string)); - - note_p->set_grob_property ("staff-position", gh_int2scm (pos)); - announce_grob (note_p, req->self_scm()); - note_p_arr_.push (note_p); - } + fingering_events_.push_back (ev); } void -Tab_note_heads_engraver::stop_translation_timestep () +Tab_note_heads_engraver::process_music () { - for (int i=0; i < note_p_arr_.size (); i++) - { - typeset_grob (note_p_arr_[i]); - } - - note_p_arr_.clear (); - for (int i=0; i < dot_p_arr_.size (); i++) - { - typeset_grob (dot_p_arr_[i]); - } - dot_p_arr_.clear (); - - note_req_l_arr_.clear (); - - tabstring_req_arr_.clear (); + 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::start_translation_timestep () +Tab_note_heads_engraver::stop_translation_timestep () { + note_events_.clear (); + tabstring_events_.clear (); + fingering_events_.clear (); } +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 */ + "" + ); -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", -/* write */ "");