* lily/new-chord-name-engraver.cc (process_music): give original

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

diff --git a/lily/new-chord-name-engraver.cc b/lily/new-chord-name-engraver.cc
index ca749fba5408064320676f4778b19d1bad776093..00a7215e55efc3b9dfc6b9270efba74fd381b28e 100644 (file)
--- a/lily/new-chord-name-engraver.cc
+++ b/lily/new-chord-name-engraver.cc
@@ -18,6 +18,7 @@
 #include "pitch.hh"
 #include "protected-scm.hh"
 #include "translator-group.hh"
+#include "warn.hh"
 
 class New_chord_name_engraver : public Engraver 
 {
@@ -60,18 +61,31 @@ New_chord_name_engraver::process_music ()
   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_mus_property ("pitch");;
       if (n->get_mus_property ("inversion") == SCM_BOOL_T)
-       inversion = p;
+       {
+         inversion_event = n;
+         inversion = p;
+       }
       else if (n->get_mus_property ("bass") == SCM_BOOL_T)
        bass = p;
       else
        pitches = gh_cons (p, pitches);
     }
 
+  if (inversion_event)
+    {
+      SCM op = inversion_event->get_mus_property ("original-pitch");
+      if (unsmob_pitch (op))
+       pitches= gh_cons (op, 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");