X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=42dd7e4b1fdb7e9351c8d178f1145a37b23e3ed5;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=1ddabdd6971a87d77f4647b7198b99076510d7ec;hpb=c4c0ba811cd526f047de3f4d3c77abcc32a3e076;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 1ddabdd697..42dd7e4b1f 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,26 +1,38 @@ /* - tab-note-heads-engraver.cc -- part of GNU LilyPond + This file is part of LilyPond, the GNU music typesetter. - based on note-heads-engraver.cc, by Jean-Baptiste Lamy , + Copyright (C) 2002--2015 Han-Wen Nienhuys, Jean-Baptiste Lamy , - (c) 2002--2006 + 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 "engraver.hh" + using namespace std; -#include "dot-column.hh" -#include "dots.hh" +#include "articulations.hh" #include "duration.hh" #include "item.hh" -#include "music.hh" #include "output-def.hh" +#include "pitch.hh" #include "rhythmic-head.hh" -#include "score-engraver.hh" -#include "staff-symbol-referencer.hh" #include "stream-event.hh" #include "warn.hh" +#include "context.hh" #include "translator.icc" @@ -29,17 +41,17 @@ using namespace std; */ class Tab_note_heads_engraver : public Engraver { - vector notes_; + vector note_events_; + vector tabstring_events_; + vector fingering_events_; - vector dots_; - vector note_events_; - vector tabstring_events_; public: TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver); protected: DECLARE_TRANSLATOR_LISTENER (note); DECLARE_TRANSLATOR_LISTENER (string_number); + DECLARE_TRANSLATOR_LISTENER (fingering); void process_music (); void stop_translation_timestep (); @@ -63,109 +75,94 @@ 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::listen_fingering (Stream_event *ev) +{ + fingering_events_.push_back (ev); +} + void Tab_note_heads_engraver::process_music () { - vsize j = 0; - for (vsize 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")); - - Stream_event *event = note_events_[i]; - Item *note = make_item ("TabNoteHead", event->self_scm ()); - - Stream_event *tabstring_event = 0; - - for (SCM s = event->get_property ("articulations"); - !tabstring_event && scm_is_pair (s); s = scm_cdr (s)) - { - Music *art = unsmob_music (scm_car (s)); - - if (art->is_mus_type ("string-number-event")) - tabstring_event = art->to_event (); - } - - 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 = scm_to_int (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_from_int (dur.duration_log ())); - - if (dur.dot_count ()) - { - Item *d = make_item ("Dots", event->self_scm ()); - Rhythmic_head::set_dots (note, d); - - if (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); - - dots_.push_back (d); - } - - SCM scm_pitch = event->get_property ("pitch"); - SCM proc = get_property ("tablatureFormat"); - SCM min_fret_scm = get_property ("minimumFret"); - int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0; - - while (!string_found) - { - int fret = unsmob_pitch (scm_pitch)->semitone_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 = 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"))) - pos = -pos; - - note->set_property ("text", text); - - note->set_property ("staff-position", scm_from_int (pos)); - notes_.push_back (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 () { - notes_.clear (); - dots_.clear (); note_events_.clear (); tabstring_events_.clear (); + fingering_events_.clear (); } 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", - /* read */ "middleCPosition stringTunings minimumFret tablatureFormat highStringOne stringOneTopmost", - /* write */ ""); + /* 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 */ + "" + );