X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=12402a3100fbfba53f815d361b4e2d4c1328d274;hb=977326d20eaa9f7c5641b9f7af6bf607becb2ff7;hp=59464954134e23b0829d1c4181c07405cf30e8d6;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 5946495413..12402a3100 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,17 +3,13 @@
 
   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"
@@ -23,7 +19,7 @@
 class Ambitus_engraver : public Engraver
 {
 public:
-TRANSLATOR_DECLARATIONS (Ambitus_engraver);
+  TRANSLATOR_DECLARATIONS (Ambitus_engraver);
   virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
@@ -51,8 +47,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
     {
@@ -65,12 +61,12 @@ Ambitus_engraver::create_ambitus ()
       Side_position_interface::add_support (accidentals_[d], heads_[d]);
     }
   while (flip (&d) != DOWN);
+
   ambitus_->set_parent (heads_[DOWN], X_AXIS);
   Axis_group_interface::add_element (group_, ambitus_);
-  
-  is_typeset_ = false;		
-}
 
+  is_typeset_ = false;
+}
 
 Ambitus_engraver::Ambitus_engraver ()
 {
@@ -111,7 +107,6 @@ Ambitus_engraver::stop_translation_timestep ()
       start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0);
       start_key_sig_ = get_property ("keySignature");
 
-
       is_typeset_ = true;
     }
 }
@@ -119,7 +114,7 @@ Ambitus_engraver::stop_translation_timestep ()
 void
 Ambitus_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *item = dynamic_cast <Item *>(info.grob_);
+  Item *item = dynamic_cast<Item *> (info.grob_);
   if (item)
     {
       if (Note_head::has_interface (info.grob_))
@@ -144,8 +139,8 @@ Ambitus_engraver::finalize ()
 	{
 	  Pitch p = pitch_interval_[d];
 	  heads_[d]->set_property ("staff-position",
-				   scm_from_int (start_c0_ +
-						 p.steps ()));
+				   scm_from_int (start_c0_
+						 + p.steps ()));
 
 	  SCM handle = scm_assoc (scm_cons (scm_from_int (p.get_octave ()),
 					    scm_from_int (p.get_notename ())),
@@ -154,11 +149,11 @@ Ambitus_engraver::finalize ()
 	  if (handle == SCM_BOOL_F)
 	    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();
+	      accidentals_[d]->suicide ();
 	      heads_[d]->set_property ("accidental-grob", SCM_EOL);
 	    }
 	  else
@@ -177,18 +172,19 @@ Ambitus_engraver::finalize ()
       Direction d = DOWN;
       do
 	{
-	  accidentals_[d]->suicide();
-	  heads_[d]->suicide();
-   	}
+	  accidentals_[d]->suicide ();
+	  heads_[d]->suicide ();
+ 	}
       while (flip (&d) != DOWN);
-      ambitus_->suicide();
+
+      ambitus_->suicide ();
     }
 }
 
-ENTER_DESCRIPTION (Ambitus_engraver,
-/* descr */       "",
-/* creats*/       "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
-/* accepts */ "",
-/* acks  */     "note-head-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Ambitus_engraver,
+		/* descr */ "",
+		/* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
+		/* accepts */ "",
+		/* acks  */ "note-head-interface",
+		/* reads */ "",
+		/* write */ "");