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 99477e09d74076452d0a4e83db6a3fa6d363d4db..c1bfea9317267b6349d6ed925e095b257fe1c8a6 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -29,6 +29,14 @@ 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 ();
@@ -54,31 +62,26 @@ Note_heads_engraver::do_process_requests()
     {
       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->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;
+         note_p->add_dots (d);
          d->dots_i_ = note_req_l->duration_.dots_i_;
-
-         SCM dir = get_property ("verticalDirection",0);
-         if (isdir_b (dir))
-           {
-             d->resolve_dir_ = to_dir (dir);
-           }
-         
          announce_element (Score_element_info (d,0));
          dot_p_arr_.push (d);
        }
-      note_p->position_i_  = note_req_l->pitch_.steps ();
+      note_p->set_position(note_req_l->pitch_.steps ());
 
+      /*
+       TODO: transparent note heads.
+       */
+        
       if (gh_string_p (noteheadstyle))
        {
-         if (ly_scm2string (noteheadstyle) == "transparent")
-           note_p->set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-         else 
-           note_p->set_elt_property (style_scm_sym, noteheadstyle);
+         note_p->set_elt_property ("style", noteheadstyle);
        }
       
       Score_element_info itinf (note_p,note_req_l);
@@ -115,3 +118,4 @@ Note_heads_engraver::do_post_move_processing()
 
 
 ADD_THIS_TRANSLATOR(Note_heads_engraver);
+