(process_music): idem.

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

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index c725690a4ac37a0a3ef69e3485ce476440a3f5c2..1c6bf4142d4e70efd749cde07a472a46b834212b 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -1,109 +1,112 @@
 /*
-  head-grav.cc -- part of GNU LilyPond
+  note-heads-engraver.cc -- part of GNU LilyPond
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "note-head.hh"
-#include "note-heads-engraver.hh"
-#include "paper-def.hh"
-#include "musical-request.hh"
+#include "engraver.hh"
+
+#include <cctype>
+using namespace std;
+
 #include "dots.hh"
 #include "dot-column.hh"
+#include "duration.hh"
+#include "item.hh"
+#include "output-def.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
+
+class Note_heads_engraver : public Engraver
+{
+  vector<Item*> notes_;
+  vector<Stream_event*> note_evs_;
+
+public:
+  TRANSLATOR_DECLARATIONS (Note_heads_engraver);
 
-Note_heads_engraver::Note_heads_engraver()
+protected:
+  DECLARE_TRANSLATOR_LISTENER (note);
+  void process_music ();
+  void stop_translation_timestep ();
+};
+
+Note_heads_engraver::Note_heads_engraver ()
 {
 }
 
-bool
-Note_heads_engraver::do_try_music (Music *m) 
+IMPLEMENT_TRANSLATOR_LISTENER (Note_heads_engraver, note);
+void
+Note_heads_engraver::listen_note (Stream_event *ev)
 {
-  if (Note_req * n =dynamic_cast <Note_req *> (m))
-    {
-      note_req_l_arr_.push (n);
-      notes_end_pq_.insert (now_mom () + m->length_mom ());
-      
-      return true;
-    }
-  else if (Tonic_req* t = dynamic_cast<Tonic_req*> (m))
-    {
-      return true;
-    }
-  else if (Busy_playing_req * p = dynamic_cast<Busy_playing_req*> (m))
-    {
-      return notes_end_pq_.size ();
-    }
-  return false;
-  
+  note_evs_.push_back (ev);
 }
 
 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++)
+  for (vsize i = 0; i < note_evs_.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_;
+      Stream_event *ev = note_evs_[i];
+      Item *note = make_item ("NoteHead", ev->self_scm ());
+
+      Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
+
+#if 0 /* TODO: should have a mechanism to switch off these warnings. */
 
-      if (note_req_l->duration_.dots_i_)
+      if (!pit)
+       ev->origin ()->warning (_ ("NoteEvent without pitch"));
+#endif
+
+      int pos = pit ? pit->steps () : 0;
+      SCM c0 = get_property ("middleCPosition");
+      if (scm_is_number (c0))
+       pos += scm_to_int (c0);
+
+      note->set_property ("staff-position", scm_from_int (pos));
+
+      /*
+       Shape note heads change on step of the scale.
+      */
+      SCM shape_vector = get_property ("shapeNoteStyles");
+      if (scm_is_vector (shape_vector))
        {
-         Dots * d = new Dots;
-         note_p->dots_l_ = d;
-
-         Scalar dir = get_property ("verticalDirection",0);
-         if (dir.isdir_b())
-           {
-             d->resolve_dir_ = (Direction)(int)dir;
-           }
-         
-         announce_element (Score_element_info (d,0));
-         dot_p_arr_.push (d);
+         SCM scm_tonic = get_property ("tonic");
+         Pitch tonic (0, 0, 0);
+         if (unsmob_pitch (scm_tonic))
+           tonic = *unsmob_pitch (scm_tonic);
+
+         unsigned int delta = (pit->get_notename () - tonic.get_notename () + 7) % 7;
+
+         SCM style = SCM_EOL;
+         if (scm_c_vector_length (shape_vector) > delta
+             && scm_is_symbol (scm_vector_ref (shape_vector, scm_from_int (delta))))
+           style = scm_vector_ref (shape_vector, scm_from_int (delta));
+         if (scm_is_symbol (style))
+           note->set_property ("style", style);
        }
-      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()));
-
-      
-      Score_element_info itinf (note_p,note_req_l);
-      announce_element (itinf);
-      note_p_arr_.push (note_p);
-    }
-}
- 
-void
-Note_heads_engraver::do_pre_move_processing()
-{
-  for (int i=0; i < note_p_arr_.size (); i++)
-    {
-      typeset_element (note_p_arr_[i]);
-    }
-  note_p_arr_.clear ();
-  for (int i=0; i < dot_p_arr_.size (); i++)
-    {
-      typeset_element (dot_p_arr_[i]);
+
+      notes_.push_back (note);
     }
-  dot_p_arr_.clear ();
-  
-  note_req_l_arr_.clear ();
 }
 
 void
-Note_heads_engraver::do_post_move_processing()
+Note_heads_engraver::stop_translation_timestep ()
 {
-  Moment n (now_mom ());
-  while (notes_end_pq_.size () && notes_end_pq_.front () <=n)
-    notes_end_pq_.get ();
+  notes_.clear ();
+  note_evs_.clear ();
 }
 
-
-
-ADD_THIS_TRANSLATOR(Note_heads_engraver);
+ADD_TRANSLATOR (Note_heads_engraver,
+               /* doc */ "Generate noteheads.",
+               /* create */
+               "NoteHead ",
+               /* accept */
+               "note-event",
+               /* read */ "middleCPosition",
+               /* write */ "");