X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-heads-engraver.cc;h=7ce9a433de47286248f49960f748ff2b5243e96b;hb=0a8f98072c53d877cbb53dd490ba4394d03fa8d2;hp=b791c222ff2e269052ced29881b32c4dbf06e9a9;hpb=38fa6a3720e1187ec51514ab2a209c67ce19e14c;p=lilypond.git

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index b791c222ff..7ce9a433de 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,8 +1,9 @@
 /*
   head-grav.cc -- part of GNU LilyPond
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <ctype.h>
 
 #include "rhythmic-head.hh"
 #include "paper-def.hh"
@@ -11,7 +12,7 @@
 #include "dot-column.hh"
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
-#include "score-engraver.hh"
+#include "engraver.hh"
 #include "warn.hh"
 
 /**
@@ -19,126 +20,126 @@
  */
 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);
+  Link_array<Item> notes_;
   
+  Link_array<Item> dots_;
+  Link_array<Music> note_reqs_;
+
+public:
+  TRANSLATOR_DECLARATIONS(Note_heads_engraver);
+
 protected:
   virtual void start_translation_timestep ();
-  virtual bool try_music (Music *req_l) ;
-  virtual void create_grobs ();
-  virtual void acknowledge_grob (Grob_info) ;
-  virtual void stop_translation_timestep();
+  virtual bool try_music (Music *req) ;
+  virtual void process_music ();
+
+  virtual void stop_translation_timestep ();
+
+private:
+  bool in_ligature;
 };
 
+Note_heads_engraver::Note_heads_engraver()
+{
+  in_ligature = 0;
+}
 
 bool
 Note_heads_engraver::try_music (Music *m) 
 {
-  if (Note_req * n =dynamic_cast <Note_req *> (m))
+  if (m->is_mus_type ("note-event"))
     {
-      note_req_l_arr_.push (n);
-      note_end_mom_  = note_end_mom_ >? now_mom () + m->length_mom ();
-      
+      note_reqs_.push (m);
       return true;
     }
-  else if (dynamic_cast<Busy_playing_req*> (m))
+  else if (m->is_mus_type ("busy-playing-event"))
+    return note_reqs_.size ();
+  else if (m->is_mus_type ("abort-event"))
     {
-      return now_mom () < note_end_mom_;
+      in_ligature = 0;
+    }
+  else if (m->is_mus_type ("ligature-event"))
+    {
+      /*
+	Urg ; this is not protocol. We should accept and return
+	true, or ignore.
+      */
+      in_ligature = (m->get_mus_property("span-direction")
+		     == gh_int2scm (START));
     }
-  return false;
   
+  return false;
 }
 
-void
-Note_heads_engraver::acknowledge_grob (Grob_info)
-{
-  //create_grobs ();
-}
 
 void
-Note_heads_engraver::create_grobs ()
+Note_heads_engraver::process_music ()
 {
-  if (note_p_arr_.size ())
-    return ;
-  
-  for (int i=0; i < note_req_l_arr_.size (); i++)
+  for (int i=0; i < note_reqs_.size (); i++)
     {
-      Item *note_p  = new Item (get_property ("NoteHead"));
-      
-      Staff_symbol_referencer::set_interface (note_p);
+      Item *note =
+	new Item (get_property ((in_ligature) ? "LigatureHead" : "NoteHead"));
 
-
-      
-      Music * req = note_req_l_arr_[i];
+      Music * req = note_reqs_[i];
       
-      Duration dur   = *unsmob_duration (req->get_mus_property ("duration"));
-      note_p->set_grob_property ("duration-log",
-				gh_int2scm (dur.duration_log () <? 2));
+      Duration dur = *unsmob_duration (req->get_mus_property ("duration"));
+
+      note->set_grob_property ("duration-log", gh_int2scm (dur.duration_log ()));
 
       if (dur.dot_count ())
 	{
 	  Item * d = new Item (get_property ("Dots"));
-	  Rhythmic_head::set_dots (note_p, d);
+	  Rhythmic_head::set_dots (note, d);
 	  
 	  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);
+	  d->set_parent (note, Y_AXIS);
+	  announce_grob (d, SCM_EOL);
+	  dots_.push (d);
 	}
 
-      note_p->set_grob_property("staff-position",  gh_int2scm (unsmob_pitch (req->get_mus_property ("pitch"))->steps ()));
+      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);
 
-      announce_grob (note_p,req);
-      note_p_arr_.push (note_p);
+      note->set_grob_property ("staff-position",   gh_int2scm (pos));
+      announce_grob (note,req->self_scm());
+      notes_.push (note);
     }
 }
- 
+
 void
-Note_heads_engraver::stop_translation_timestep()
+Note_heads_engraver::stop_translation_timestep ()
 {
-  for (int i=0; i < note_p_arr_.size (); i++)
+  for (int i=0; i < notes_.size (); i++)
     {
-      typeset_grob (note_p_arr_[i]);
+      typeset_grob (notes_[i]);
     }
-  note_p_arr_.clear ();
-  for (int i=0; i < dot_p_arr_.size (); i++)
+
+  notes_.clear ();
+  for (int i=0; i < dots_.size (); i++)
     {
-      typeset_grob (dot_p_arr_[i]);
+      typeset_grob (dots_[i]);
     }
-  dot_p_arr_.clear ();
-  
-  note_req_l_arr_.clear ();
+  dots_.clear ();
+  note_reqs_.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!
-    }
 }
 
 
-
-ADD_THIS_TRANSLATOR(Note_heads_engraver);
-
+ENTER_DESCRIPTION(Note_heads_engraver,
+/* descr */       "Generate noteheads (also serves a double functions: makes ligatures.",
+/* creats*/       "NoteHead LigatureHead Dots",
+/* accepts */     "note-event busy-playing-event ligature-event abort-event",
+/* acks  */      "",
+/* reads */       "centralCPosition",
+/* write */       "");