* ChangeLog: Recode utf-8.

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index bf95336d8a2e2f7f2ae2097ddc771e941dfe0283..a84f9d65ec35b4d7d2d7855ef693049a332c76ca 100644 (file)
--- 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,26 +47,27 @@ 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
     {
       heads_[d] = make_item ("AmbitusNoteHead", SCM_EOL);
       accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL);
       accidentals_[d]->set_parent (heads_[d], Y_AXIS);
-      heads_[d]->set_property ("accidental-grob", accidentals_[d]->self_scm ());
+      heads_[d]->set_property ("accidental-grob",
+                              accidentals_[d]->self_scm ());
       Axis_group_interface::add_element (group_, heads_[d]);
       Axis_group_interface::add_element (group_, accidentals_[d]);
       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 +108,6 @@ Ambitus_engraver::stop_translation_timestep ()
       start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0);
       start_key_sig_ = get_property ("keySignature");
 
-
       is_typeset_ = true;
     }
 }
@@ -119,10 +115,10 @@ 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_))
+      if (Note_head::has_interface (info.grob ()))
        {
          Music *nr = info.music_cause ();
          if (nr && nr->is_mus_type ("note-event"))
@@ -144,8 +140,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,17 +150,20 @@ 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 (scm_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
            {
-             accidentals_[d]->set_property ("accidentals",
-                                            scm_list_1 (scm_from_int (p.get_alteration ())));
+             SCM l = scm_list_1 (scm_from_int (p.get_alteration ()));
+             accidentals_[d]->set_property ("accidentals", l);
+                       
            }
        }
       while (flip (&d) != DOWN);
@@ -177,18 +176,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 */ "");