add & test ly:expand-environment.

[lilypond.git] / lily / ambitus-engraver.cc

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 1321c5bf6e1858d14a9391d7ed1aa937aa62a2f2..8606e4c9c11a82adce857c2af1851bead944d442 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -11,6 +11,7 @@
 #include "engraver.hh"
 
 #include "axis-group-interface.hh"
+#include "item.hh"
 #include "note-head.hh"
 #include "pitch-interval.hh"
 #include "pointer-group-interface.hh"
@@ -147,8 +148,8 @@ Ambitus_engraver::finalize ()
            handle = scm_assoc (scm_from_int (p.get_notename ()),
                                start_key_sig_);
 
-         int sig_alter = (handle != SCM_BOOL_F)
-           ? scm_to_int (scm_cdr (handle)) : 0;
+         Rational sig_alter = (handle != SCM_BOOL_F)
+           ? ly_scm2rational (scm_cdr (handle)) : Rational (0);
 
          if (sig_alter == p.get_alteration ())
            {
@@ -157,8 +158,7 @@ Ambitus_engraver::finalize ()
            }
          else
            {
-             SCM l = scm_list_1 (scm_from_int (p.get_alteration ()));
-             accidentals_[d]->set_property ("accidentals", l);
+             accidentals_[d]->set_property ("alteration", ly_rational2scm (p.get_alteration ()));
            }
        }
       while (flip (&d) != DOWN);
@@ -184,7 +184,10 @@ Ambitus_engraver::finalize ()
 ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
                /* doc */ "",
-               /* create */ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
-               /* accept */ "",
+               /* create */
+               "Ambitus "
+               "AmbitusLine "
+               "AmbitusNoteHead "
+               "AmbitusAccidental",
                /* read */ "",
                /* write */ "");