patch::: 1.3.151.jcn1

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 5fc28bbddb684c16dff65fa138ac490851f35201..87a5bff3f2d5a82fbe03c311aa907eef9b08a692 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -3,6 +3,7 @@
 
   (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <ctype.h>
 
 #include "rhythmic-head.hh"
 #include "paper-def.hh"
@@ -24,16 +25,15 @@ class Note_heads_engraver : public Engraver
   Link_array<Note_req> note_req_l_arr_;
   Moment note_end_mom_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
+  VIRTUAL_COPY_CONS (Translator);
+
 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 void process_music ();
 
+  virtual void stop_translation_timestep ();
+};
 
 bool
 Note_heads_engraver::try_music (Music *m) 
@@ -53,18 +53,10 @@ Note_heads_engraver::try_music (Music *m)
   
 }
 
-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++)
     {
       Item *note_p  = new Item (get_property ("NoteHead"));
@@ -93,15 +85,30 @@ Note_heads_engraver::create_grobs ()
          dot_p_arr_.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);
+
+      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));
+       }
+      
       announce_grob (note_p,req);
       note_p_arr_.push (note_p);
     }
 }
  
 void
-Note_heads_engraver::stop_translation_timestep()
+Note_heads_engraver::stop_translation_timestep ()
 {
   for (int i=0; i < note_p_arr_.size (); i++)
     {
@@ -120,9 +127,10 @@ Note_heads_engraver::stop_translation_timestep()
 void
 Note_heads_engraver::start_translation_timestep ()
 {
+  
   /* TODO:make this settable?
    */
-  if (note_end_mom_ > now_mom() )
+  if (note_end_mom_ > now_mom ())
     {
       Score_engraver * e = 0;
       Translator * t  =  daddy_grav_l ();
@@ -140,5 +148,5 @@ Note_heads_engraver::start_translation_timestep ()
 
 
 
-ADD_THIS_TRANSLATOR(Note_heads_engraver);
+ADD_THIS_TRANSLATOR (Note_heads_engraver);