release: 1.3.38

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index e5e31c38f5ddaad8138b21a91a6f5226e13d9087..32419e420c42693e55b80804f263cb42d6369222 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "chord-name-engraver.hh"
@@ -15,7 +15,7 @@
 #include "main.hh"
 #include "dimensions.hh"
 #include "text-item.hh"
-#include "lily-guile.icc"
+
 
 ADD_THIS_TRANSLATOR (Chord_name_engraver);
 
@@ -61,7 +61,7 @@ Chord_name_engraver::do_try_music (Music* m)
 }
 
 void
-Chord_name_engraver::do_process_requests ()
+Chord_name_engraver::do_process_music ()
 {
   if (chord_name_p_)
     return;
@@ -69,7 +69,7 @@ Chord_name_engraver::do_process_requests ()
     return;
 
   bool find_inversion_b = false;
-  SCM chord_inversion = get_property ("chordInversion", 0);
+  SCM chord_inversion = get_property ("chordInversion");
   if (gh_boolean_p (chord_inversion))
     find_inversion_b = gh_scm2bool (chord_inversion);
 
@@ -81,12 +81,16 @@ Chord_name_engraver::do_process_requests ()
     Hmm, why not represent complete chord as list?
     ((tonic third fifth) (inversion bass))
   */
-  chord_name_p_->set_elt_property ("pitches", array_to_scm (chord.pitch_arr_));
+  SCM plist = SCM_EOL;
+  for (int i= chord.pitch_arr_.size (); i--; )
+    plist = gh_cons (chord.pitch_arr_[i].to_scm (), plist);
+  
+  chord_name_p_->set_elt_property ("pitches", plist);
   if (chord.inversion_b_)
     chord_name_p_->set_elt_property ("inversion",
-                                    to_scm (chord.inversion_pitch_));
+                                    chord.inversion_pitch_.to_scm ());
   if (chord.bass_b_)
-    chord_name_p_->set_elt_property ("bass", to_scm (chord.bass_pitch_));
+    chord_name_p_->set_elt_property ("bass", chord.bass_pitch_.to_scm ());
 
   announce_element (Score_element_info (chord_name_p_, 0));
 }