release: 1.5.29

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index a8143f1845fd267b6d04a2411a05bbcf7179db7a..cfa35c26219c2682d79ae60155137f1a54c09b71 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -21,9 +21,8 @@
 
 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 ();
@@ -35,26 +34,27 @@ private:
   void add_note (Note_req *);
   
   Item* chord_name_p_;
+
   Protected_scm chord_;
   Protected_scm last_chord_;
 };
 
-ADD_THIS_TRANSLATOR (Chord_name_engraver);
+
 
 Chord_name_engraver::Chord_name_engraver ()
 {
   chord_name_p_ = 0;
   chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
-  last_chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
+  last_chord_ = chord_;
 }
 
 void
 Chord_name_engraver::add_note (Note_req* 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");
@@ -80,21 +80,21 @@ Chord_name_engraver::try_music (Music* m)
 void
 Chord_name_engraver::acknowledge_grob (Grob_info i)
 {
-  if (Note_req* n = dynamic_cast<Note_req*> (i.req_l_))
+  if (Note_req* n = dynamic_cast<Note_req*> (i.music_cause ()))
     add_note (n);
 }
 
 void
 Chord_name_engraver::create_grobs ()
 {
-  if (!chord_name_p_ && gh_car (chord_) != SCM_EOL)
+  if (!chord_name_p_ && 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);
-      SCM s = get_property ("drarnChords"); //FIXME!
-      if (to_boolean (s) && last_chord_ != SCM_EOL &&
-         gh_equal_p (chord_, last_chord_))
+      SCM s = get_property ("chordChanges");
+      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);
     }
 }
@@ -108,7 +108,15 @@ Chord_name_engraver::stop_translation_timestep ()
     }
   chord_name_p_ = 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_req's, Tonic_reqs, Inversion_reqs, Bass_req
+and generate the appropriate chordname.",
+/* creats*/       "ChordName",
+/* acks  */       "grob-interface",
+/* reads */       "chordChanges",
+/* write */       "");