X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=44c1333d7a383a333261c813594a87ed03e12b8c;hb=076884bc0f9ee5e10fa4e8d29e09aeed85b0c0c6;hp=8860c235c49ea48dfae26466166fc320a3ad7db5;hpb=3d6e98eb215754ec531b467590197b5d5f48b8a3;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 8860c235c4..44c1333d7a 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,63 +3,127 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 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 "main.hh"
+#include "output-def.hh"
 #include "dimensions.hh"
 #include "item.hh"
-#include "pitch.hh"
 #include "protected-scm.hh"
+#include "context.hh"
+#include "warn.hh"
 
 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 ();
   virtual bool try_music (Music *);
-
+  virtual void finalize ();
+  virtual void derived_mark () const;
 private:
   void add_note (Music *);
   
   Item* chord_name_;
-
-  Protected_scm chord_;
-  Protected_scm last_chord_;
+  Link_array<Music> notes_;
+  
+  SCM last_chord_;
 };
 
 
 
+void
+Chord_name_engraver::finalize ()
+{
+}
+
+void
+Chord_name_engraver::derived_mark() const
+{
+  scm_gc_mark (last_chord_);
+}
+
 Chord_name_engraver::Chord_name_engraver ()
 {
   chord_name_ = 0;
-  chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
-  last_chord_ = chord_;
+  last_chord_ = SCM_EOL;
 }
 
 void
 Chord_name_engraver::add_note (Music * n)
 {
-  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);
+  notes_.push (n);
+}
+
+void
+Chord_name_engraver::process_music ()
+{
+  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 *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;
+	  inversion = p;
+	}
+      else if (n->get_property ("bass") == SCM_BOOL_T)
+	bass = p;
+      else
+	pitches = scm_cons (p, pitches);
+    }
+
+  if (inversion_event)
+    {
+      SCM oct = inversion_event->get_property ("octavation");
+      if (scm_is_number (oct))
+	{
+	  Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
+	  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.");
+    }
+
+  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,
+			   context ()->self_scm ());
+
+  /*
+    Ugh. 
+   */
+  SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
   
-  if (n->get_mus_property ("inversion") == SCM_BOOL_T)
-    inversion = n->get_mus_property ("pitch");
-  else if (n->get_mus_property ("bass") == SCM_BOOL_T)
-    bass = n->get_mus_property ("pitch");
-  else
-    pitches = scm_sort_list (gh_cons (n->get_mus_property ("pitch"), pitches),
-			     Pitch::less_p_proc);
-  chord_ = gh_cons (pitches, gh_cons (inversion, bass));
+  chord_name_ = make_item ("ChordName",notes_[0]->self_scm ());
+  chord_name_->set_property ("text", markup);
+
+  SCM s = get_property ("chordChanges");
+  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;
 }
 
 bool
@@ -76,40 +140,23 @@ Chord_name_engraver::try_music (Music* m)
   return false;
 }
 
-void
-Chord_name_engraver::process_music ()
-{
-  if (ly_car (chord_) != SCM_EOL)
-    {
-      chord_name_ = new Item (get_property ("ChordName"));
-      chord_name_->set_grob_property ("chord", chord_);
-      announce_grob(chord_name_, SCM_EOL);
-      SCM s = get_property ("chordChanges");
-      if (to_boolean (s) && ly_car (last_chord_) != SCM_EOL
-	  	  && gh_equal_p (chord_, last_chord_))
-	chord_name_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
-    }
-}
-
 void
 Chord_name_engraver::stop_translation_timestep ()
 {
-  if (chord_name_)
-    {
-      typeset_grob (chord_name_);
-    }
   chord_name_ = 0;
-
-  if (ly_car (chord_) != SCM_EOL)
-    last_chord_ = chord_;
-  chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
+  notes_.clear ();
 }
 
-ENTER_DESCRIPTION(Chord_name_engraver,
-/* descr */       "Catch note-events, Tonic_reqs, Inversion_reqs, Bass_req "
+/*
+  The READs description is not strictly accurate:
+  which properties are read depend on the chord naming function active.
+*/
+ADD_TRANSLATOR (Chord_name_engraver,
+/* descr */       "Catch note-events "
 "and generate the appropriate chordname.",
 /* creats*/       "ChordName",
-/* accepts */     "note-event busy-playing-event",
+/* accepts */     "note-event",
 /* acks  */      "",
-/* reads */       "chordChanges",
+/* reads */       "chordChanges chordNameExceptions chordNameFunction "
+"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
 /* write */       "");