X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=42dd7e4b1fdb7e9351c8d178f1145a37b23e3ed5;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e9c99d12a8860f8d0c4821b5f266a9964ec0460f;hpb=223ad8f5799657a5b628d862dd927f4197486b02;p=lilypond.git diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index e9c99d12a8..42dd7e4b1f 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2002--2010 Han-Wen Nienhuys, Jean-Baptiste Lamy , + 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 @@ -24,6 +24,7 @@ using namespace std; +#include "articulations.hh" #include "duration.hh" #include "item.hh" #include "output-def.hh" @@ -40,16 +41,17 @@ using namespace std; */ class Tab_note_heads_engraver : public Engraver { - vector notes_; + vector note_events_; + vector tabstring_events_; + vector fingering_events_; - 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 (); @@ -73,61 +75,31 @@ 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) { - vsize j = 0; - - vector string_events; - - for (vsize i = 0; i < note_events_.size (); i++) - { - - Stream_event *event = note_events_[i]; - - Stream_event *tabstring_event = 0; - - /* - For notes inside a chord construct, string indications are - stored as articulations on the note, so we check through - the notes - */ - for (SCM s = event->get_property ("articulations"); - !tabstring_event && scm_is_pair (s); s = scm_cdr (s)) - { - Stream_event *art = unsmob_stream_event (scm_car (s)); - - if (art->in_event_class ("string-number-event")) - tabstring_event = art; - } - - /* - For string indications listed outside a chord construct, - a string_number_event is generated, so if there was no string - in the articulations, we check for string events outside - the chord construct - */ - if (!tabstring_event && j < tabstring_events_.size ()) - { - tabstring_event = tabstring_events_[j]; - if (j + 1 < tabstring_events_.size ()) - j++; - } - if (tabstring_event) - string_events.push_back (tabstring_event); - } + fingering_events_.push_back (ev); +} +void +Tab_note_heads_engraver::process_music () +{ + 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 tab_strings = SCM_EOL; - if (string_events.size ()) - tab_strings = ly_cxx_vector_to_list (string_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, - tab_strings); + scm_list_2 (tab_strings, + defined_fingers)); SCM note_entry = SCM_EOL; SCM string_number = SCM_EOL; SCM fret = SCM_EOL; @@ -140,53 +112,57 @@ Tab_note_heads_engraver::process_music () vsize index; if (string_fret_finger != SCM_EOL) - for (vsize i=0; i < fret_count; i++) + 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); - 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); - notes_.push_back (note); + 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 (); note_events_.clear (); tabstring_events_.clear (); + fingering_events_.clear (); } ADD_TRANSLATOR (Tab_note_heads_engraver, - /* doc */ - "Generate one or more tablature noteheads from event of type" - " @code{NoteEvent}.", - - /* create */ - "TabNoteHead ", - - /* read */ - "fretLabels " - "highStringOne " - "middleCPosition " - "minimumFret " + /* 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 " + "stringOneTopmost " + "stringTunings " "tablatureFormat " "tabStaffLineLayoutFunction ", - /* write */ "" - ); + /* write */ + "" + );