* lily/dots.cc (print): replace -

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 05f0dd75b50fa6bcf2d9f9c6bd413607aa57b5d5..44c1333d7a383a333261c813594a87ed03e12b8c 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -8,13 +8,11 @@
 
 #include "engraver.hh"
 #include "chord-name.hh"
-#include "event.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "dimensions.hh"
 #include "item.hh"
-#include "pitch.hh"
 #include "protected-scm.hh"
 #include "context.hh"
 #include "warn.hh"
@@ -27,19 +25,27 @@ protected:
   virtual void process_music ();
   virtual bool try_music (Music *);
   virtual void finalize ();
+  virtual void derived_mark () const;
 private:
   void add_note (Music *);
   
   Item* chord_name_;
   Link_array<Music> notes_;
   
-  Protected_scm last_chord_;
+  SCM last_chord_;
 };
 
+
+
 void
 Chord_name_engraver::finalize ()
 {
-  last_chord_ = SCM_EOL; 
+}
+
+void
+Chord_name_engraver::derived_mark() const
+{
+  scm_gc_mark (last_chord_);
 }
 
 Chord_name_engraver::Chord_name_engraver ()
@@ -65,7 +71,7 @@ Chord_name_engraver::process_music ()
   SCM pitches = SCM_EOL;
 
   Music* inversion_event = 0;
-  for (int i =0 ; i < notes_.size (); i++)
+  for (int i = 0 ; i < notes_.size (); i++)
     {
       Music *n = notes_[i];
       SCM p = n->get_property ("pitch");
@@ -86,13 +92,13 @@ Chord_name_engraver::process_music ()
   if (inversion_event)
     {
       SCM oct = inversion_event->get_property ("octavation");
-      if (is_number (oct))
+      if (scm_is_number (oct))
        {
          Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
-         int octavation =  ly_scm2int (oct);
+         int octavation =  scm_to_int (oct);
          Pitch orig = p->transposed (Pitch (-octavation, 0,0));
          
-         pitches= scm_cons (orig.smobbed_copy (), pitches);
+         pitches = scm_cons (orig.smobbed_copy (), pitches);
        }
       else
        programming_error ("Inversion does not have original pitch.");
@@ -102,19 +108,19 @@ Chord_name_engraver::process_music ()
 
   SCM name_proc = get_property ("chordNameFunction");
   SCM markup = scm_call_4 (name_proc, pitches, bass, inversion,
-                          get_parent_context ()->self_scm ());
+                          context ()->self_scm ());
 
   /*
     Ugh. 
    */
   SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
   
-  chord_name_ = make_item ("ChordName");
+  chord_name_ = make_item ("ChordName",notes_[0]->self_scm ());
   chord_name_->set_property ("text", markup);
-  announce_grob (chord_name_, notes_[0]->self_scm ());
+
   SCM s = get_property ("chordChanges");
-  if (to_boolean (s) && ly_c_pair_p (last_chord_) 
-      && is_equal (chord_as_scm, last_chord_))
+  if (to_boolean (s) && scm_is_pair (last_chord_) 
+      && ly_c_equal_p (chord_as_scm, last_chord_))
     chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
 
   last_chord_ = chord_as_scm;
@@ -137,10 +143,6 @@ Chord_name_engraver::try_music (Music* m)
 void
 Chord_name_engraver::stop_translation_timestep ()
 {
-  if (chord_name_)
-    {
-      typeset_grob (chord_name_);
-    }
   chord_name_ = 0;
   notes_.clear ();
 }
@@ -149,7 +151,7 @@ Chord_name_engraver::stop_translation_timestep ()
   The READs description is not strictly accurate:
   which properties are read depend on the chord naming function active.
 */
-ENTER_DESCRIPTION (Chord_name_engraver,
+ADD_TRANSLATOR (Chord_name_engraver,
 /* descr */       "Catch note-events "
 "and generate the appropriate chordname.",
 /* creats*/       "ChordName",