* lily/paper-outputter.cc (output_stencil): dump font definitions

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 05f0dd75b50fa6bcf2d9f9c6bd413607aa57b5d5..252dfb8743c840a6669dd1e9ba930097759478dd 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -86,7 +86,7 @@ Chord_name_engraver::process_music ()
   if (inversion_event)
     {
       SCM oct = inversion_event->get_property ("octavation");
-      if (is_number (oct))
+      if (ly_c_number_p (oct))
        {
          Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
          int octavation =  ly_scm2int (oct);
@@ -102,19 +102,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_))
+      && 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 +137,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 ();
 }