release: 1.5.13

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 2b3b9e082732853dc343439a189a34b680c65e25..8fc1e6f13a111838c6612adc94a7d6671cd896c6 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -21,21 +21,21 @@
 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);
-  
+  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 process_music ();
+
   virtual void stop_translation_timestep ();
 };
 
-
 bool
 Note_heads_engraver::try_music (Music *m) 
 {
@@ -54,18 +54,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"));
@@ -95,8 +87,13 @@ Note_heads_engraver::create_grobs ()
        }
 
       Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch"));
-      note_p->set_grob_property ("staff-position",  gh_int2scm (pit->steps ()));
 
+      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";
@@ -131,9 +128,14 @@ Note_heads_engraver::stop_translation_timestep ()
 void
 Note_heads_engraver::start_translation_timestep ()
 {
-  /* TODO:make this settable?
+  
+  /*
+    TODO: make this settable?
+
+    TODO: what if someone wants a line break in a grace note section??
    */
-  if (note_end_mom_ > now_mom ())
+  //  if (note_end_mom_ > now_mom ())  
+  if (note_end_mom_.main_part_ > now_mom ().main_part_)
     {
       Score_engraver * e = 0;
       Translator * t  =  daddy_grav_l ();
@@ -149,7 +151,12 @@ Note_heads_engraver::start_translation_timestep ()
     }
 }
 
+Note_heads_engraver::Note_heads_engraver()
+{}
 
-
-ADD_THIS_TRANSLATOR (Note_heads_engraver);
-
+ENTER_DESCRIPTION(Note_heads_engraver,
+/* descr */       "Generate one or more noteheads from Music of type Note_req.",
+/* creats*/       "NoteHead Dots",
+/* acks  */       "",
+/* reads */       "",
+/* write */       "");