Add penalty to interface.

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

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 9d886084069ba54ba1c5a19aaf7a93202fb04845..3db792dbe174c3223c7c51a3114bf765d0b822fd 100644 (file)
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -21,7 +21,7 @@
 
 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 ();
@@ -57,7 +57,7 @@ Chord_name_engraver::add_note (Music * n)
 void
 Chord_name_engraver::process_music ()
 {
-  if (!notes_.size() )
+  if (!notes_.size () )
     return;
   
   SCM bass = SCM_EOL;
@@ -68,31 +68,31 @@ Chord_name_engraver::process_music ()
   for (int i =0 ; i < notes_.size (); i++)
     {
       Music *n = notes_[i];
-      SCM p = n->get_mus_property ("pitch");
+      SCM p = n->get_property ("pitch");
       if (!unsmob_pitch (p))
        continue;
       
-      if (n->get_mus_property ("inversion") == SCM_BOOL_T)
+      if (n->get_property ("inversion") == SCM_BOOL_T)
        {
          inversion_event = n;
          inversion = p;
        }
-      else if (n->get_mus_property ("bass") == SCM_BOOL_T)
+      else if (n->get_property ("bass") == SCM_BOOL_T)
        bass = p;
       else
-       pitches = gh_cons (p, pitches);
+       pitches = scm_cons (p, pitches);
     }
 
   if (inversion_event)
     {
-      SCM oct = inversion_event->get_mus_property ("octavation");
-      if (gh_number_p (oct))
+      SCM oct = inversion_event->get_property ("octavation");
+      if (is_number (oct))
        {
-         Pitch *p = unsmob_pitch (inversion_event->get_mus_property ("pitch"));
-         int octavation =  gh_scm2int (oct);
+         Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
+         int octavation =  ly_scm2int (oct);
          Pitch orig = p->transposed (Pitch (-octavation, 0,0));
          
-         pitches= gh_cons (orig.smobbed_copy (), pitches);
+         pitches= scm_cons (orig.smobbed_copy (), pitches);
        }
       else
        programming_error ("Inversion does not have original pitch.");
@@ -107,15 +107,15 @@ Chord_name_engraver::process_music ()
   /*
     Ugh. 
    */
-  SCM chord_as_scm = gh_cons (pitches, gh_cons (bass, inversion));
+  SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
   
   chord_name_ = make_item ("ChordName");
-  chord_name_->set_grob_property("text", markup);
-  announce_grob(chord_name_, 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) && 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);
+  if (to_boolean (s) && is_pair (last_chord_) 
+      && is_equal (chord_as_scm, last_chord_))
+    chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
 
   last_chord_ = chord_as_scm;
 }
@@ -149,7 +149,7 @@ 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,
+ENTER_DESCRIPTION (Chord_name_engraver,
 /* descr */       "Catch note-events "
 "and generate the appropriate chordname.",
 /* creats*/       "ChordName",