release: 1.3.10

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 55282d2334e225accbc2d2300006afc5f515d9cf..c1bfea9317267b6349d6ed925e095b257fe1c8a6 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -29,10 +29,24 @@ Note_heads_engraver::do_try_music (Music *m)
     {
       return true;
     }
+  else if (Inversion_req* i = dynamic_cast<Inversion_req*> (m))
+    {
+      return true;
+    }
+  else if (Bass_req* b = dynamic_cast<Bass_req*> (m))
+    {
+      return true;
+    }
   else if (Busy_playing_req * p = dynamic_cast<Busy_playing_req*> (m))
     {
       return notes_end_pq_.size ();
     }
+  else if (Pitch_interrogate_req *p = dynamic_cast<Pitch_interrogate_req*> (m))
+    {
+      for (int i= note_req_l_arr_.size (); i--;)
+       p->pitch_arr_.push (note_req_l_arr_[i]->pitch_); // GUH UGH UGHUGH.
+      return true;
+    }
   return false;
   
 }
@@ -43,35 +57,32 @@ Note_heads_engraver::do_process_requests()
   if (note_p_arr_.size ())
     return ;
   
-  String noteheadstyle = get_property ("noteHeadStyle", 0);
+  SCM noteheadstyle = get_property ("noteHeadStyle", 0);
   for (int i=0; i < note_req_l_arr_.size (); i++)
     {
       Note_head *note_p  = new Note_head;
       Note_req * note_req_l = note_req_l_arr_[i];
-      note_p->balltype_i_ = note_req_l->duration_.durlog_i_;
-      note_p->dots_i_ = note_req_l->duration_.dots_i_;
-      if (note_p->dots_i_)
+      
+      note_p->balltype_i_ = note_req_l->duration_.durlog_i_ <? 2;
+
+      if (note_req_l->duration_.dots_i_)
        {
          Dots * d = new Dots;
-         note_p->dots_l_ = d;
-
-         Scalar dir = get_property ("verticalDirection",0);
-         if (dir.isdir_b())
-           {
-             d->resolve_dir_ = int (dir);
-           }
-         
+         note_p->add_dots (d);
+         d->dots_i_ = note_req_l->duration_.dots_i_;
          announce_element (Score_element_info (d,0));
          dot_p_arr_.push (d);
        }
-      note_p->position_i_ = note_req_l->pitch_.steps ();
-
-      if (noteheadstyle == "transparent")
-       note_p->set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-      else 
-        note_p->set_elt_property (style_scm_sym,
-                                 gh_str02scm (noteheadstyle.ch_C()));
+      note_p->set_position(note_req_l->pitch_.steps ());
 
+      /*
+       TODO: transparent note heads.
+       */
+        
+      if (gh_string_p (noteheadstyle))
+       {
+         note_p->set_elt_property ("style", noteheadstyle);
+       }
       
       Score_element_info itinf (note_p,note_req_l);
       announce_element (itinf);
@@ -107,3 +118,4 @@ Note_heads_engraver::do_post_move_processing()
 
 
 ADD_THIS_TRANSLATOR(Note_heads_engraver);
+