patch::: 1.3.45.jcn1

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index f3c290916bb43b620edf040645ae977ebb42a628..9dcc8751922bf0383cfc889de9c1bc4533f24b56 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,7 +1,7 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "note-head.hh"
@@ -10,6 +10,7 @@
 #include "musical-request.hh"
 #include "dots.hh"
 #include "dot-column.hh"
+#include "staff-symbol-referencer.hh"
 
 Note_heads_engraver::Note_heads_engraver()
 {
@@ -21,7 +22,7 @@ Note_heads_engraver::do_try_music (Music *m)
   if (Note_req * n =dynamic_cast <Note_req *> (m))
     {
       note_req_l_arr_.push (n);
-      notes_end_pq_.insert (now_mom () + m->length_mom ());
+      note_end_mom_  = note_end_mom_ >? now_mom () + m->length_mom ();
       
       return true;
     }
@@ -29,49 +30,70 @@ 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 ();
+      return now_mom () < note_end_mom_;
+    }
+  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;
   
 }
 
 void
-Note_heads_engraver::do_process_requests()
+Note_heads_engraver::do_process_music()
 {
   if (note_p_arr_.size ())
     return ;
   
-  String noteheadstyle = get_property ("noteHeadStyle", 0);
+  SCM noteheadstyle = get_property ("noteHeadStyle");
   for (int i=0; i < note_req_l_arr_.size (); i++)
     {
       Note_head *note_p  = new Note_head;
+      
+      Staff_symbol_referencer_interface si (note_p);
+      si.set_interface ();
+
+      
       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->set_elt_property ("duration-log",
+                               gh_int2scm (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_ = (Direction)(int)dir;
-           }
+         Staff_symbol_referencer_interface sd (d);
+         sd.set_interface ();
          
+         note_p->add_dots (d);
+         d->set_elt_property ("dot-count", gh_int2scm (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,
-                                 ly_ch_C_to_scm (noteheadstyle.ch_C()));
+      si.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);
@@ -96,14 +118,8 @@ Note_heads_engraver::do_pre_move_processing()
   note_req_l_arr_.clear ();
 }
 
-void
-Note_heads_engraver::do_post_move_processing()
-{
-  Moment n (now_mom ());
-  while (notes_end_pq_.size () && notes_end_pq_.front () <=n)
-    notes_end_pq_.get ();
-}
 
 
 
 ADD_THIS_TRANSLATOR(Note_heads_engraver);
+