*** empty log message ***

[lilypond.git] / lily / chord-name-engraver.cc

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index ebe406f1f849d7533acc49c46b3c619c5d8aacf1..96377ba60bd8ea601a08c8b824bca3174a00c044 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
 #include "chord-name.hh"
 #include "chord.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"
 #include "paper-def.hh"
@@ -21,41 +21,37 @@
 
 class Chord_name_engraver : public Engraver 
 {
-public:
-  Chord_name_engraver ();
-  VIRTUAL_COPY_CONS (Translator);
-
+  TRANSLATOR_DECLARATIONS( Chord_name_engraver);
 protected:
   virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info i);
-  virtual void create_grobs ();
+  virtual void process_music ();
   virtual bool try_music (Music *);
 
 private:
-  void add_note (Note_req *);
+  void add_note (Music *);
   
-  Item* chord_name_p_;
+  Item* chord_name_;
 
   Protected_scm chord_;
   Protected_scm last_chord_;
 };
 
-ADD_THIS_TRANSLATOR (Chord_name_engraver);
+
 
 Chord_name_engraver::Chord_name_engraver ()
 {
-  chord_name_p_ = 0;
+  chord_name_ = 0;
   chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
-  last_chord_ = SCM_EOL;
+  last_chord_ = chord_;
 }
 
 void
-Chord_name_engraver::add_note (Note_req* n)
+Chord_name_engraver::add_note (Music * n)
 {
-  SCM pitches = gh_car (chord_);
-  SCM modifiers = gh_cdr (chord_);
-  SCM inversion = modifiers == SCM_EOL ? SCM_EOL : gh_car (modifiers);
-  SCM bass = modifiers == SCM_EOL ? SCM_EOL : gh_cdr (modifiers);
+  SCM pitches = ly_car (chord_);
+  SCM modifiers = ly_cdr (chord_);
+  SCM inversion = modifiers == SCM_EOL ? SCM_EOL : ly_car (modifiers);
+  SCM bass = modifiers == SCM_EOL ? SCM_EOL : ly_cdr (modifiers);
   
   if (n->get_mus_property ("inversion") == SCM_BOOL_T)
     inversion = n->get_mus_property ("pitch");
@@ -70,46 +66,51 @@ Chord_name_engraver::add_note (Note_req* n)
 bool
 Chord_name_engraver::try_music (Music* m)
 {
-  if (Note_req* n = dynamic_cast<Note_req*> (m))
+  /*
+    hmm. Should check? 
+   */
+  if (m->is_mus_type ("note-event"))
     {
-      add_note (n);
+      add_note (m);
       return true;
     }
   return false;
 }
 
 void
-Chord_name_engraver::acknowledge_grob (Grob_info i)
-{
-  if (Note_req* n = dynamic_cast<Note_req*> (i.req_l_))
-    add_note (n);
-}
-
-void
-Chord_name_engraver::create_grobs ()
+Chord_name_engraver::process_music ()
 {
-  if (!chord_name_p_ && gh_car (chord_) != SCM_EOL)
+  if (ly_car (chord_) != SCM_EOL)
     {
-      chord_name_p_ = new Item (get_property ("ChordName"));
-      chord_name_p_->set_grob_property ("chord", chord_);
-      announce_grob (chord_name_p_, 0);
+      chord_name_ = new Item (get_property ("ChordName"));
+      chord_name_->set_grob_property ("chord", chord_);
+      announce_grob(chord_name_, SCM_EOL);
       SCM s = get_property ("chordChanges");
-      if (to_boolean (s) && last_chord_ != SCM_EOL
+      if (to_boolean (s) && ly_car (last_chord_) != SCM_EOL
                  && gh_equal_p (chord_, last_chord_))
-       chord_name_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
+       chord_name_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
     }
 }
 
 void
 Chord_name_engraver::stop_translation_timestep ()
 {
-  if (chord_name_p_)
+  if (chord_name_)
     {
-      typeset_grob (chord_name_p_);
+      typeset_grob (chord_name_);
     }
-  chord_name_p_ = 0;
+  chord_name_ = 0;
 
-  last_chord_ = chord_;
+  if (ly_car (chord_) != SCM_EOL)
+    last_chord_ = chord_;
   chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
 }
 
+ENTER_DESCRIPTION(Chord_name_engraver,
+/* descr */       "Catch note-events, Tonic_reqs, Inversion_reqs, Bass_req "
+"and generate the appropriate chordname.",
+/* creats*/       "ChordName",
+/* accepts */     "note-event busy-playing-event",
+/* acks  */      "",
+/* reads */       "chordChanges",
+/* write */       "");