X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=363ba3e22e9a215f10aa6a13dbfeffdd987d30af;hb=91821bd59959b1289f2d711509017a4dacebecd2;hp=6f3c3e33d7f88e0cb5cf447b112575bf2760f6b8;hpb=a501f5946426488804ca2b03ab986f9c2b94ab99;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 6f3c3e33d7..363ba3e22e 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,43 +3,48 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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"
+#include "pitch.hh"
 
-class Chord_name_engraver : public Engraver 
+class Chord_name_engraver : public Engraver
 {
-  TRANSLATOR_DECLARATIONS ( Chord_name_engraver);
+  TRANSLATOR_DECLARATIONS (Chord_name_engraver);
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
   virtual bool try_music (Music *);
   virtual void finalize ();
+  virtual void derived_mark () const;
 private:
   void add_note (Music *);
-  
-  Item* chord_name_;
+
+  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 ()
@@ -49,7 +54,7 @@ Chord_name_engraver::Chord_name_engraver ()
 }
 
 void
-Chord_name_engraver::add_note (Music * n)
+Chord_name_engraver::add_note (Music *n)
 {
   notes_.push (n);
 }
@@ -57,21 +62,21 @@ Chord_name_engraver::add_note (Music * n)
 void
 Chord_name_engraver::process_music ()
 {
-  if (!notes_.size () )
+  if (!notes_.size ())
     return;
-  
+
   SCM bass = SCM_EOL;
   SCM inversion = SCM_EOL;
   SCM pitches = SCM_EOL;
 
-  Music* inversion_event = 0;
-  for (int i =0 ; i < notes_.size (); i++)
+  Music *inversion_event = 0;
+  for (int i = 0; i < notes_.size (); i++)
     {
       Music *n = notes_[i];
       SCM p = n->get_property ("pitch");
       if (!unsmob_pitch (p))
 	continue;
-      
+
       if (n->get_property ("inversion") == SCM_BOOL_T)
 	{
 	  inversion_event = n;
@@ -86,46 +91,46 @@ 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);
-	  Pitch orig = p->transposed (Pitch (-octavation, 0,0));
-	  
-	  pitches= scm_cons (orig.smobbed_copy (), pitches);
+	  int octavation = scm_to_int (oct);
+	  Pitch orig = p->transposed (Pitch (-octavation, 0, 0));
+
+	  pitches = scm_cons (orig.smobbed_copy (), pitches);
 	}
       else
-	programming_error ("Inversion does not have original pitch.");
+	programming_error ("inversion does not have original pitch");
     }
 
   pitches = scm_sort_list (pitches, Pitch::less_p_proc);
 
   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. 
-   */
+    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) && is_pair (last_chord_) 
-      && is_equal (chord_as_scm, last_chord_))
+  if (to_boolean (s) && scm_is_pair (last_chord_)
+      && ly_is_equal (chord_as_scm, last_chord_))
     chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
 
   last_chord_ = chord_as_scm;
 }
 
 bool
-Chord_name_engraver::try_music (Music* m)
+Chord_name_engraver::try_music (Music *m)
 {
   /*
-    hmm. Should check? 
-   */
+    hmm. Should check?
+  */
   if (m->is_mus_type ("note-event"))
     {
       add_note (m);
@@ -137,10 +142,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,12 +150,13 @@ 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,
-/* descr */       "Catch note-events "
-"and generate the appropriate chordname.",
-/* creats*/       "ChordName",
-/* accepts */     "note-event",
-/* acks  */      "",
-/* reads */       "chordChanges chordNameExceptions chordNameFunction "
-"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
-/* write */       "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Chord_name_engraver,
+		/* doc */ "Catch note-events "
+		"and generate the appropriate chordname.",
+		/* create */ "ChordName",
+		/* accept */ "note-event",
+		/* read */ "chordChanges chordNameExceptions chordNameFunction "
+		"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
+		/* write */ "");