``slikken kreng''

[lilypond.git] / lily / tab-note-heads-engraver.cc

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 07694ca84d844c69368c0238e69ce0f68673bba9..6c6e9e43d13ec67c0511371272890bb3503d7fd1 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -21,17 +21,17 @@
  */
 class Tab_note_heads_engraver : public Engraver
 {
-  Link_array<Item> note_p_arr_;
+  Link_array<Item> notes_;
   
-  Link_array<Item> dot_p_arr_;
-  Link_array<Note_req> note_req_l_arr_;
-  Link_array<Text_script_req> tabstring_req_arr_;
+  Link_array<Item> dots_;
+  Link_array<Note_req> note_reqs_;
+  Link_array<Text_script_req> tabstring_reqs_;
 public:
   TRANSLATOR_DECLARATIONS(Tab_note_heads_engraver);
 
 protected:
   virtual void start_translation_timestep ();
-  virtual bool try_music (Music *req_l) ;
+  virtual bool try_music (Music *req) ;
   virtual void process_music ();
 
   virtual void stop_translation_timestep ();
@@ -47,21 +47,21 @@ Tab_note_heads_engraver::try_music (Music *m)
 {
   if (Note_req * n =dynamic_cast <Note_req *> (m))
     {
-      note_req_l_arr_.push (n);
+      note_reqs_.push (n);
       return true;
     }
   else if (Text_script_req * ts = dynamic_cast<Text_script_req*> (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);
+      //if (tabstring_reqs_.size () < note_reqs_.size ()) {
+        tabstring_reqs_.push (ts);
       //}
       return true;
     }
   else if (dynamic_cast<Busy_playing_req*> (m))
     {
-      return note_req_l_arr_.size ();
+      return note_reqs_.size ();
     }
   
   return false;
@@ -72,42 +72,42 @@ void
 Tab_note_heads_engraver::process_music ()
 {
   /*
-  for (int i=0; i < tabstring_req_arr_.size (); i++) {
-      Music * tabstring_req = tabstring_req_arr_[i];
+  for (int i=0; i < tabstring_reqs_.size (); i++) {
+      Music * tabstring_req = tabstring_reqs_[i];
       
       size_t lenp;
-      char* tab_string_as_str = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp);
+      char* tab_string_as_string = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp);
   }
   */
   
-  for (int i=0; i < note_req_l_arr_.size (); i++)
+  for (int i=0; i < note_reqs_.size (); i++)
     {
-      Item * note_p  = new Item (get_property ("TabNoteHead"));
+      Item * note  = new Item (get_property ("TabNoteHead"));
       
-      Music * req = note_req_l_arr_[i];
+      Music * req = note_reqs_[i];
       
-      Music * tabstring_req = tabstring_req_arr_[i];
+      Music * tabstring_req = tabstring_reqs_[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);
+      char* tab_string_as_string = gh_scm2newstr(tabstring_req->get_mus_property ("text"), &lenp);
+      int tab_string = atoi(tab_string_as_string);
       
       Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
       
-      note_p->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
+      note->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);
+         Rhythmic_head::set_dots (note, 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);
+         d->set_parent (note, Y_AXIS);
          announce_grob (d, SCM_EOL);
-         dot_p_arr_.push (d);
+         dots_.push (d);
        }
       
       SCM stringTunings = get_property ("stringTunings");
@@ -125,32 +125,32 @@ Tab_note_heads_engraver::process_music ()
       SCM scm_pitch = req->get_mus_property ("pitch");
       SCM proc      = get_property ("tablatureFormat");
       SCM text      = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch);
-      note_p->set_grob_property ("text", text);
+      note->set_grob_property ("text", text);
       
-      note_p->set_grob_property ("staff-position", gh_int2scm (pos));
-      announce_grob (note_p, req->self_scm());
-      note_p_arr_.push (note_p);
+      note->set_grob_property ("staff-position", gh_int2scm (pos));
+      announce_grob (note, req->self_scm());
+      notes_.push (note);
     }
 }
 
 void
 Tab_note_heads_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < note_p_arr_.size (); i++)
+  for (int i=0; i < notes_.size (); i++)
     {
-      typeset_grob (note_p_arr_[i]);
+      typeset_grob (notes_[i]);
     }
 
-  note_p_arr_.clear ();
-  for (int i=0; i < dot_p_arr_.size (); i++)
+  notes_.clear ();
+  for (int i=0; i < dots_.size (); i++)
     {
-      typeset_grob (dot_p_arr_[i]);
+      typeset_grob (dots_[i]);
     }
-  dot_p_arr_.clear ();
+  dots_.clear ();
   
-  note_req_l_arr_.clear ();
+  note_reqs_.clear ();
   
-  tabstring_req_arr_.clear ();
+  tabstring_reqs_.clear ();
 }
 
 void