patch::: 1.3.121.jcn1

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 5b7e625a4eae0e2c1170be8a19b188ec27b3d1f8..a3541404a3c049e7a2cf2290b969fa83f6ac4344 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -26,10 +26,10 @@ public:
   VIRTUAL_COPY_CONS (Translator);
 
 protected:
-  virtual void do_pre_move_processing ();
-  virtual void acknowledge_element (Score_element_info i);
-  void deprecated_process_music ();
-  virtual bool do_try_music (Music *);
+  virtual void stop_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info i);
+  virtual void create_grobs ();
+  virtual bool try_music (Music *);
 
 private:
   void add_note (Note_req *);
@@ -45,7 +45,7 @@ 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_ = SCM_EOL;
 }
 
 void
@@ -67,7 +67,7 @@ Chord_name_engraver::add_note (Note_req* n)
 }
 
 bool
-Chord_name_engraver::do_try_music (Music* m)
+Chord_name_engraver::try_music (Music* m)
 {
   if (Note_req* n = dynamic_cast<Note_req*> (m))
     {
@@ -77,65 +77,44 @@ Chord_name_engraver::do_try_music (Music* m)
   return false;
 }
 
-/* Uh, if we do acknowledge_element, shouldn't we postpone
-  deprecated_process_music until do_process_acknowlegded?
-
-   Sigh, I can *never* remember how this works, can't we
-   possibly-please just number these functions:
-
-     do_creation0
-     
-     post_move1
-     do_try_music2
-  deprecated_process_music3 (or is it acknowledge_element3 ?)
-     acknowledge_element4
-  
-     do_pre_move9
-     
-     do_removal99
-
-  and what was the deal with this ``do'' prefix again? */
 void
-Chord_name_engraver::acknowledge_element (Score_element_info i)
+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::deprecated_process_music ()
+Chord_name_engraver::create_grobs ()
 {
   if (!chord_name_p_ && gh_car (chord_) != SCM_EOL)
     {
-#if 0
-      bool find_inversion_b = false;
-      SCM chord_inversion = get_property ("chordInversion");
-      if (gh_boolean_p (chord_inversion))
-       find_inversion_b = gh_scm2bool (chord_inversion);
-
-      chord_ = Chord::pitches_and_requests_to_chord (pitches_,
-                                                    inversion_,
-                                                    bass_,
-                                                    find_inversion_b);
-
-#endif
-      
       chord_name_p_ = new Item (get_property ("ChordName"));
-      chord_name_p_->set_elt_property ("chord", chord_);
-      announce_element (chord_name_p_, 0);
-      SCM s = get_property ("drarnChords"); //FIXME!
-      if (to_boolean (s) && last_chord_ != SCM_EOL &&
-         gh_equal_p (chord_, last_chord_))
-       chord_name_p_->set_elt_property ("begin-of-line-visible", SCM_BOOL_T);
+      chord_name_p_->set_grob_property ("chord", chord_);
+      announce_grob (chord_name_p_, 0);
+      SCM s = get_property ("chordChanges");
+#ifdef DEBUG
+      /*
+       gdb crashes upon printscm (chord_) etc...
+       ugh: why does gh_equal_p () not seem to work??
+       */
+      printf ("chord: %s\n",  ly_scm2string (ly_write2scm (chord_)).ch_C ());
+      printf ("last_chord: %s\n", ly_scm2string (ly_write2scm (last_chord_)).ch_C ());
+      int i = gh_equal_p (chord_, last_chord_);
+      printf ("i: %d\n", i);
+#endif
+      if (to_boolean (s) && last_chord_ != SCM_EOL
+         && gh_equal_p (chord_, last_chord_))
+       chord_name_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
     }
 }
 
 void
-Chord_name_engraver::do_pre_move_processing ()
+Chord_name_engraver::stop_translation_timestep ()
 {
   if (chord_name_p_)
     {
-      typeset_element (chord_name_p_);
+      typeset_grob (chord_name_p_);
     }
   chord_name_p_ = 0;