X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=619b51a639323d312a6362d2629fd748e5cd19ae;hb=917a5ab05640a6f1b387d0c7260be875f12f9d9e;hp=005f7ff30f33450140e8fcab6129b9913279de49;hpb=fb2cb5e32d671334270e101a7a286ee80d5ade00;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 005f7ff30f..619b51a639 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
 #include "chord-name.hh"
-#include "chord.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"
 #include "paper-def.hh"
@@ -18,6 +17,8 @@
 #include "item.hh"
 #include "pitch.hh"
 #include "protected-scm.hh"
+#include "translator-group.hh"
+#include "warn.hh"
 
 class Chord_name_engraver : public Engraver 
 {
@@ -28,85 +29,127 @@ protected:
   virtual bool try_music (Music *);
 
 private:
-  void add_note (Note_req *);
+  void add_note (Music *);
+  
+  Item* chord_name_;
+  Link_array<Music> notes_;
   
-  Item* chord_name_p_;
-
-  Protected_scm chord_;
   Protected_scm last_chord_;
 };
 
-
-
 Chord_name_engraver::Chord_name_engraver ()
 {
-  chord_name_p_ = 0;
-  chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
-  last_chord_ = chord_;
+  chord_name_ = 0;
+  last_chord_ = SCM_EOL;
 }
 
 void
-Chord_name_engraver::add_note (Note_req* n)
+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);
-  
-  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));
+  notes_.push (n);
 }
 
-bool
-Chord_name_engraver::try_music (Music* m)
+void
+Chord_name_engraver::process_music ()
 {
-  if (Note_req* n = dynamic_cast<Note_req*> (m))
+  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++)
     {
-      add_note (n);
-      return true;
+      Music *n = notes_[i];
+      SCM p = n->get_mus_property ("pitch");
+      if (!unsmob_pitch (p))
+	continue;
+      
+      if (n->get_mus_property ("inversion") == SCM_BOOL_T)
+	{
+	  inversion_event = n;
+	  inversion = p;
+	}
+      else if (n->get_mus_property ("bass") == SCM_BOOL_T)
+	bass = p;
+      else
+	pitches = gh_cons (p, pitches);
     }
-  return false;
+
+  if (inversion_event)
+    {
+      SCM oct = inversion_event->get_mus_property ("octavation");
+      if (gh_number_p (oct))
+	{
+	  Pitch *p = unsmob_pitch (inversion_event->get_mus_property ("pitch"));
+	  int octavation =  gh_scm2int (oct);
+	  Pitch orig = p->transposed (Pitch (-octavation, 0,0));
+	  
+	  pitches= gh_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,
+			   daddy_trans_->self_scm());
+
+  /*
+    Ugh. 
+   */
+  SCM chord_as_scm = gh_cons (pitches, gh_cons (bass, inversion));
+  
+  chord_name_ = new Item (get_property ("ChordName"));
+  chord_name_->set_grob_property("text", markup);
+  announce_grob(chord_name_, notes_[0]->self_scm ());
+  SCM s = get_property ("chordChanges");
+  if (to_boolean (s) && gh_pair_p (last_chord_) 
+      && gh_equal_p (chord_as_scm, last_chord_))
+    chord_name_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
+
+  last_chord_ = chord_as_scm;
 }
 
-void
-Chord_name_engraver::process_music ()
+bool
+Chord_name_engraver::try_music (Music* m)
 {
-  if (ly_car (chord_) != SCM_EOL)
+  /*
+    hmm. Should check? 
+   */
+  if (m->is_mus_type ("note-event"))
     {
-      chord_name_p_ = new Item (get_property ("ChordName"));
-      chord_name_p_->set_grob_property ("chord", chord_);
-      announce_grob(chord_name_p_, 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_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T);
+      add_note (m);
+      return true;
     }
+  return false;
 }
 
 void
 Chord_name_engraver::stop_translation_timestep ()
 {
-  if (chord_name_p_)
+  if (chord_name_)
     {
-      typeset_grob (chord_name_p_);
+      typeset_grob (chord_name_);
     }
-  chord_name_p_ = 0;
-
-  if (ly_car (chord_) != SCM_EOL)
-    last_chord_ = chord_;
-  chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL));
+  chord_name_ = 0;
+  notes_.clear ();
 }
 
+/*
+  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_req's, Tonic_reqs, Inversion_reqs, Bass_req
-and generate the appropriate chordname.",
+/* descr */       "Catch note-events "
+"and generate the appropriate chordname.",
 /* creats*/       "ChordName",
-/* acks  */       "",
-/* reads */       "chordChanges",
+/* accepts */     "note-event",
+/* acks  */      "",
+/* reads */       "chordChanges chordNameExceptions chordNameFunction "
+"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
 /* write */       "");