X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-heads-engraver.cc;h=87a5bff3f2d5a82fbe03c311aa907eef9b08a692;hb=0c1ce854cfb2b9ad594526e359ec206fdd9b21fe;hp=5243ff56cd77771a7e33626bde5e2eea255e9e1f;hpb=e4a2733b4c0ab484305dc19fc598d70a9631539b;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 5243ff56cd..87a5bff3f2 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,96 +1,123 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <ctype.h>
 
-#include "note-head.hh"
-#include "note-heads-engraver.hh"
+#include "rhythmic-head.hh"
 #include "paper-def.hh"
 #include "musical-request.hh"
 #include "dots.hh"
 #include "dot-column.hh"
+#include "staff-symbol-referencer.hh"
+#include "item.hh"
+#include "score-engraver.hh"
+#include "warn.hh"
 
-Note_heads_engraver::Note_heads_engraver()
+/**
+  make balls and rests
+ */
+class Note_heads_engraver : public Engraver
 {
-}
+  Link_array<Item> note_p_arr_;
+  Link_array<Item> dot_p_arr_;
+  Link_array<Note_req> note_req_l_arr_;
+  Moment note_end_mom_;
+public:
+  VIRTUAL_COPY_CONS (Translator);
+
+protected:
+  virtual void start_translation_timestep ();
+  virtual bool try_music (Music *req_l) ;
+  virtual void process_music ();
+
+  virtual void stop_translation_timestep ();
+};
 
 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))
     {
       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;
     }
-  else if (Tonic_req* t = dynamic_cast<Tonic_req*> (m))
+  else if (dynamic_cast<Busy_playing_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_;
     }
   return false;
   
 }
 
+
 void
-Note_heads_engraver::do_process_requests()
+Note_heads_engraver::process_music ()
 {
-  if (note_p_arr_.size ())
-    return ;
-  
-  String 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_;
+      Item *note_p  = new Item (get_property ("NoteHead"));
+      
+      Staff_symbol_referencer::set_interface (note_p);
+
+
+      
+      Music * req = note_req_l_arr_[i];
+      
+      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 ())
 	{
-	  Dots * d = new Dots;
-	  note_p->dots_l_ = d;
-	  d->dots_i_ = note_req_l->duration_.dots_i_;
-
-	  Scalar dir = get_property ("verticalDirection",0);
-	  if (dir.isdir_b())
-	    {
-	      d->resolve_dir_ = (Direction)(int)dir;
-	    }
+	  Item * d = new Item (get_property ("Dots"));
+	  Rhythmic_head::set_dots (note_p, d);
 	  
-	  announce_element (Score_element_info (d,0));
+	  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);
+	  announce_grob (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()));
+      Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch"));
+
+      int pos = pit->steps ();
+      SCM c0 = get_property ("centralCPosition");
+      if (gh_number_p (c0))
+	pos += gh_scm2int (c0);
+
+      note_p->set_grob_property ("staff-position",   gh_int2scm (pos));
+      if (to_boolean (get_property ("easyPlay")))
+	{
+	  char s[2] = "a";
+	  s[0] = (pit->notename_i_ + 2)%7 + 'a';
 
+	  s[0] = toupper (s[0]);
+	  note_p->set_grob_property ("note-character", ly_str02scm (s));
+	}
       
-      Score_element_info itinf (note_p,note_req_l);
-      announce_element (itinf);
+      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 ();
   
@@ -98,13 +125,28 @@ Note_heads_engraver::do_pre_move_processing()
 }
 
 void
-Note_heads_engraver::do_post_move_processing()
+Note_heads_engraver::start_translation_timestep ()
 {
-  Moment n (now_mom ());
-  while (notes_end_pq_.size () && notes_end_pq_.front () <=n)
-    notes_end_pq_.get ();
+  
+  /* 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!
+    }
 }
 
 
 
-ADD_THIS_TRANSLATOR(Note_heads_engraver);
+ADD_THIS_TRANSLATOR (Note_heads_engraver);
+