Remove unused object vectors in translators.

diff --git a/lily/control-track-performer.cc b/lily/control-track-performer.cc
index d1e677db63149a0cafca4b20c39483f444bc1a28..611bd6b48bcbf310361a6be6a2437c26b7c15446 100644 (file)
--- a/lily/control-track-performer.cc
+++ b/lily/control-track-performer.cc
@@ -12,7 +12,6 @@
 class Control_track_performer : public Performer
 {
   Audio_staff *control_track_;
-  vector<Audio_item*> texts_;
 
   void add_text (Audio_text::Type, string);
   TRANSLATOR_DECLARATIONS (Control_track_performer);
@@ -46,7 +45,6 @@ Control_track_performer::add_text (Audio_text::Type text_type, string str)
 {
   Audio_item *text = new Audio_text (text_type, str);
   control_track_->add_audio_item (text);
-  texts_.push_back (text);
 
   announce_element (Audio_element_info (text, 0));
   

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 3fc91edb7acc49d9276f8af6fda659280e0f7a35..c01736ea22593bd76949e6cdd56ced262d27476b 100644 (file)
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -35,9 +35,8 @@ using namespace std;
 
 class Drum_notes_engraver : public Engraver
 {
-  vector<Item*> notes_;
-  vector<Item*> scripts_;
-  vector<Stream_event*> events_;
+  vector<Item *> scripts_;
+  vector<Stream_event *> events_;
 
 public:
   TRANSLATOR_DECLARATIONS (Drum_notes_engraver);
@@ -102,8 +101,6 @@ Drum_notes_engraver::process_music ()
              scripts_.push_back (p);
            }
        }
-
-      notes_.push_back (note);
     }
 }
 
@@ -137,16 +134,13 @@ Drum_notes_engraver::acknowledge_note_column (Grob_info inf)
 void
 Drum_notes_engraver::stop_translation_timestep ()
 {
-  notes_.clear ();
   scripts_.clear ();
-
   events_.clear ();
 }
 
 ADD_ACKNOWLEDGER (Drum_notes_engraver, stem);
 ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column);
 
-
 ADD_TRANSLATOR (Drum_notes_engraver,
                /* doc */
                "Generate drum note heads.",
@@ -161,4 +155,3 @@ ADD_TRANSLATOR (Drum_notes_engraver,
                /* write */
                ""
                );
-

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index cda5f12d674d871d900a0d90e22106241f1a2b58..a395396441c137ad83486bc64793a84cbc845c5b 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -35,8 +35,7 @@ protected:
   void process_music ();
   DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  vector<Stream_event*> note_evs_;
-  vector<Audio_note*> notes_;
+  vector<Stream_event *> note_evs_;
 };
 
 Drum_note_performer::Drum_note_performer ()
@@ -81,7 +80,6 @@ Drum_note_performer::process_music ()
                                           tie_event, Pitch (0, 0, 0));
          Audio_element_info info (p, n);
          announce_element (info);
-         notes_.push_back (p);
        }
     }
 
@@ -91,7 +89,6 @@ Drum_note_performer::process_music ()
 void
 Drum_note_performer::stop_translation_timestep ()
 {
-  notes_.clear ();
   note_evs_.clear ();
 }
 

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 807e8cc121eeed752f438e0d4e04bf85f5cccb80..c972b2a1659c1f3840547d049f3c1fef746f3e16 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -35,8 +35,7 @@ using namespace std;
 
 class Note_heads_engraver : public Engraver
 {
-  vector<Item*> notes_;
-  vector<Stream_event*> note_evs_;
+  vector<Stream_event *> note_evs_;
 
 public:
   TRANSLATOR_DECLARATIONS (Note_heads_engraver);
@@ -62,7 +61,7 @@ void
 Note_heads_engraver::process_music ()
 {
   SCM c0 = get_property ("middleCPosition");
-  SCM layout_proc = get_property("staffLineLayoutFunction");
+  SCM layout_proc = get_property ("staffLineLayoutFunction");
 
   for (vsize i = 0; i < note_evs_.size (); i++)
     {
@@ -80,15 +79,16 @@ Note_heads_engraver::process_music ()
       int pos;
       if (pit == 0)
        pos = 0;
-      else if (ly_is_procedure (layout_proc)){
-       SCM pitch = ev->get_property("pitch");
-       pos = scm_to_int(scm_call_1 (layout_proc, pitch));
-      }
+      else if (ly_is_procedure (layout_proc))
+       {
+         SCM pitch = ev->get_property ("pitch");
+         pos = scm_to_int (scm_call_1 (layout_proc, pitch));
+       }
       else
        pos = pit->steps ();
 
       if (scm_is_number (c0))
-       pos += scm_to_int(c0);
+       pos += scm_to_int (c0);
 
       note->set_property ("staff-position", scm_from_int (pos));
 
@@ -112,15 +112,12 @@ Note_heads_engraver::process_music ()
          if (scm_is_symbol (style))
            note->set_property ("style", style);
        }
-
-      notes_.push_back (note);
     }
 }
 
 void
 Note_heads_engraver::stop_translation_timestep ()
 {
-  notes_.clear ();
   note_evs_.clear ();
 }
 

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 76bdd5677f101ff5c7a289d38a12f07c4b0897f1..11c09ab7c03eb365683bc065ca2fd1c2aa225aa5 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -29,8 +29,7 @@ class Note_name_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
-  vector<Stream_event*> events_;
-  vector<Item*> texts_;
+  vector<Stream_event *> events_;
   DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
@@ -62,14 +61,12 @@ Note_name_engraver::process_music ()
     {
       Item *t = make_item ("NoteName", events_[0]->self_scm ());
       t->set_property ("text", ly_string2scm (s));
-      texts_.push_back (t);
     }
 }
 
 void
 Note_name_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   events_.clear ();
 }
 

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 91a3ba3fc701cd7e2c754a9feb1206196627f496..dbd6fa85175ea2d23efaf9a638226cb982053afb 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -41,10 +41,9 @@ using namespace std;
 */
 class Tab_note_heads_engraver : public Engraver
 {
-  vector<Item *> notes_;
-
   vector<Stream_event *> note_events_;
   vector<Stream_event *> tabstring_events_;
+
 public:
   TRANSLATOR_DECLARATIONS (Tab_note_heads_engraver);
 
@@ -116,21 +115,19 @@ Tab_note_heads_engraver::process_music ()
                                     context ()->self_scm (),
                                     string_number);
        note->set_property ("staff-position", staff_position);
-       notes_.push_back (note);
       }
 }
 
 void
 Tab_note_heads_engraver::stop_translation_timestep ()
 {
-  notes_.clear ();
   note_events_.clear ();
   tabstring_events_.clear ();
 }
 
 ADD_TRANSLATOR (Tab_note_heads_engraver,
                /* doc */
-               "Generate one or more tablature noteheads from event of type"
+               "Generate one or more tablature note heads from event of type"
                " @code{NoteEvent}.",
 
                /* create */

diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 39a732cc01fe4d6c2c17068a77dd67a07414ac8c..f9b08f2e5e34089804ba332e2c15f700bebf6a17 100644 (file)
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -19,12 +19,10 @@
 
 #include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "rhythmic-head.hh"
+#include "item.hh"
 #include "side-position-interface.hh"
-#include "stem.hh"
 #include "stream-event.hh"
 #include "text-interface.hh"
-#include "item.hh"
 
 #include "translator.icc"
 
@@ -34,12 +32,11 @@
 class Text_engraver : public Engraver
 {
   vector<Stream_event *> evs_;
-  vector<Grob*> texts_;
 public:
   TRANSLATOR_DECLARATIONS (Text_engraver);
 protected:
   void stop_translation_timestep ();
-  void process_acknowledged ();
+  void process_music ();
 
   DECLARE_TRANSLATOR_LISTENER (text_script);
 };
@@ -52,10 +49,8 @@ Text_engraver::listen_text_script (Stream_event *ev)
 }
 
 void
-Text_engraver::process_acknowledged ()
+Text_engraver::process_music ()
 {
-  if (texts_.size ())
-    return;
   for (vsize i = 0; i < evs_.size (); i++)
     {
       Stream_event *r = evs_[i];
@@ -78,14 +73,12 @@ Text_engraver::process_acknowledged ()
       SCM mark = r->get_property ("text");
 
       text->set_property ("text", mark);
-      texts_.push_back (text);
     }
 }
 
 void
 Text_engraver::stop_translation_timestep ()
 {
-  texts_.clear ();
   evs_.clear ();
 }