X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftab-note-heads-engraver.cc;h=18a1e122f6eee8318005c52ba642e292254dd01e;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=91a3ba3fc701cd7e2c754a9feb1206196627f496;hpb=35f7a594800d873f314f00f2c77951acab6dda41;p=lilypond.git

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 91a3ba3fc7..18a1e122f6 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 <jiba@tuxfamily.org>,
+  Copyright (C) 2002--2015 Han-Wen Nienhuys, Jean-Baptiste Lamy <jiba@tuxfamily.org>,
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -41,53 +41,63 @@ using namespace std;
 */
 class Tab_note_heads_engraver : public Engraver
 {
-  vector<Item *> notes_;
-
   vector<Stream_event *> note_events_;
   vector<Stream_event *> tabstring_events_;
+  vector<Stream_event *> fingering_events_;
+
 public:
   TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver);
 
 protected:
-  DECLARE_TRANSLATOR_LISTENER (note);
-  DECLARE_TRANSLATOR_LISTENER (string_number);
+  void listen_note (Stream_event *);
+  void listen_string_number (Stream_event *);
+  void listen_fingering (Stream_event *);
   void process_music ();
 
   void stop_translation_timestep ();
 };
 
-Tab_note_heads_engraver::Tab_note_heads_engraver ()
+Tab_note_heads_engraver::Tab_note_heads_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
-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)
 {
   tabstring_events_.push_back (ev);
 }
 
+void
+Tab_note_heads_engraver::listen_fingering (Stream_event *ev)
+{
+  fingering_events_.push_back (ev);
+}
+
 void
 Tab_note_heads_engraver::process_music ()
 {
   SCM tab_strings = articulation_list (note_events_,
-				       tabstring_events_,
-				       "string-number-event");
+                                       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,
-				     tab_strings);
+                                     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;
@@ -99,54 +109,66 @@ Tab_note_heads_engraver::process_music ()
   bool length_changed = (note_events_.size () != fret_count);
   vsize index;
 
-  if (string_fret_finger != SCM_EOL)
+  if (!scm_is_null (string_fret_finger))
     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 (scm_is_true (string_number))
+          {
+            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 ();
+}
+
+void
+Tab_note_heads_engraver::boot ()
+{
+  ADD_LISTENER (Tab_note_heads_engraver, note);
+  ADD_LISTENER (Tab_note_heads_engraver, string_number);
+  ADD_LISTENER (Tab_note_heads_engraver, fingering);
 }
 
 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 "
-		"noteToFretFunction "
-		"stringOneTopmost "
-		"stringTunings "
-		"tablatureFormat "
-		"tabStaffLineLayoutFunction ",
-
-		/* 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 */
+                ""
+               );