* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 59464954134e23b0829d1c4181c07405cf30e8d6..20193234a62b5f4f48acb6190f6f04d3793a5bb7 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,17 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
   
   Han-Wen Nienhuys <hanwen@xs4all.nl
   
 */
 
 #include "engraver.hh"
-#include "item.hh"
 #include "note-head.hh"
-#include "event.hh"
-#include "pitch.hh"
 #include "pitch-interval.hh"
 #include "protected-scm.hh"
 #include "staff-symbol-referencer.hh"
@@ -51,8 +48,8 @@ Ambitus_engraver::derived_mark () const
 void
 Ambitus_engraver::create_ambitus ()
 {
-  ambitus_ = make_item ("AmbitusLine",SCM_EOL);
-  group_ = make_item ("Ambitus",SCM_EOL);
+  ambitus_ = make_item ("AmbitusLine", SCM_EOL);
+  group_ = make_item ("Ambitus", SCM_EOL);
   Direction d = DOWN;
   do
     {
@@ -155,7 +152,7 @@ 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 (ly_cdr (handle)) : 0;
+         int sig_alter = (handle != SCM_BOOL_F) ? scm_to_int (scm_cdr (handle)) : 0;
          if (sig_alter == p.get_alteration ())
            {
              accidentals_[d]->suicide();
@@ -185,7 +182,7 @@ Ambitus_engraver::finalize ()
     }
 }
 
-ENTER_DESCRIPTION (Ambitus_engraver,
+ADD_TRANSLATOR (Ambitus_engraver,
 /* descr */       "",
 /* creats*/       "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
 /* accepts */ "",