release: 1.3.109

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 5378672633ed823268ba4a3735ade126a9358508..4b009d608135e91e2acce23c4813766cc01b4d9e 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -5,15 +5,14 @@
 */
 
 #include "rhythmic-head.hh"
-#include "engraver.hh"
 #include "paper-def.hh"
 #include "musical-request.hh"
 #include "dots.hh"
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
-#include "engraver.hh"
-#include "pqueue.hh"
 #include "item.hh"
+#include "score-engraver.hh"
+#include "warn.hh"
 
 /**
   make balls and rests
@@ -29,9 +28,12 @@ public:
   Note_heads_engraver();
   
 protected:
-  virtual bool do_try_music (Music *req_l) ;
-  virtual void do_process_music();
-  virtual void do_pre_move_processing();
+  virtual void start_translation_timestep ();
+  virtual bool try_music (Music *req_l) ;
+  virtual void create_grobs ();
+  virtual void acknowledge_grob (Grob_info) ;
+  void deprecated_process_music();
+  virtual void stop_translation_timestep();
 };
 
 
@@ -43,7 +45,7 @@ Note_heads_engraver::Note_heads_engraver()
 }
 
 bool
-Note_heads_engraver::do_try_music (Music *m) 
+Note_heads_engraver::try_music (Music *m) 
 {
   if (Note_req * n =dynamic_cast <Note_req *> (m))
     {
@@ -52,93 +54,104 @@ Note_heads_engraver::do_try_music (Music *m)
       
       return true;
     }
-  else if (Tonic_req* t = dynamic_cast<Tonic_req*> (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))
+  else if (dynamic_cast<Busy_playing_req*> (m))
     {
       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_music()
+Note_heads_engraver::create_grobs ()
+{
+  deprecated_process_music ();
+}
+
+void
+Note_heads_engraver::acknowledge_grob (Grob_info)
+{
+  //deprecated_process_music ();
+}
+
+void
+Note_heads_engraver::deprecated_process_music()
 {
   if (note_p_arr_.size ())
     return ;
   
   for (int i=0; i < note_req_l_arr_.size (); i++)
     {
-      Item *note_p  = new Item (get_property ("basicNoteHeadProperties"));
+      Item *note_p  = new Item (get_property ("NoteHead"));
       
       Staff_symbol_referencer::set_interface (note_p);
 
 
       
-      Note_req * note_req_l = note_req_l_arr_[i];
+      Music * req = note_req_l_arr_[i];
       
-      note_p->set_elt_property ("duration-log",
-                               gh_int2scm (note_req_l->duration_.durlog_i_ <? 2));
+      Duration dur   = *unsmob_duration (req->get_mus_property ("duration"));
+      note_p->set_grob_property ("duration-log",
+                               gh_int2scm (dur.duration_log () <? 2));
 
-      if (note_req_l->duration_.dots_i_)
+      if (dur.dot_count ())
        {
-         Item * d = new Item (get_property ("basicDotsProperties"));
-
-         Staff_symbol_referencer::set_interface (d);
-         
+         Item * d = new Item (get_property ("Dots"));
          Rhythmic_head::set_dots (note_p, d);
          
-         if (note_req_l->duration_.dots_i_
-             != gh_scm2int (d->get_elt_property ("dot-count")))
-           d->set_elt_property ("dot-count", gh_int2scm (note_req_l->duration_.dots_i_));
+         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->add_offset_callback (Dots::quantised_position_callback, Y_AXIS);
-         announce_element (d,0);
+         announce_grob (d,0);
          dot_p_arr_.push (d);
        }
 
-      note_p->set_elt_property("staff-position",  gh_int2scm (note_req_l->pitch_.steps ()));
+      note_p->set_grob_property("staff-position",  gh_int2scm (unsmob_pitch (req->get_mus_property ("pitch"))->steps ()));
 
-      announce_element (note_p,note_req_l);
+      announce_grob (note_p,req);
       note_p_arr_.push (note_p);
     }
 }
  
 void
-Note_heads_engraver::do_pre_move_processing()
+Note_heads_engraver::stop_translation_timestep()
 {
   for (int i=0; i < note_p_arr_.size (); i++)
     {
-      typeset_element (note_p_arr_[i]);
+      typeset_grob (note_p_arr_[i]);
     }
   note_p_arr_.clear ();
   for (int i=0; i < dot_p_arr_.size (); i++)
     {
-      typeset_element (dot_p_arr_[i]);
+      typeset_grob (dot_p_arr_[i]);
     }
   dot_p_arr_.clear ();
   
   note_req_l_arr_.clear ();
 }
 
+void
+Note_heads_engraver::start_translation_timestep ()
+{
+  /* TODO:make this settable?
+   */
+  if (note_end_mom_ > now_mom())
+    {
+      Score_engraver * e = 0;
+      Translator * t  =  daddy_grav_l ();
+      for (; !e && t;  t = t->daddy_trans_l_)
+       {
+         e = dynamic_cast<Score_engraver*> (t);
+       }
+
+      if (!e)
+       programming_error ("No score engraver!");
+      else
+       e->forbid_breaks ();    // guh. Use properties!
+    }
+}