Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 9ab212e7108876b0b68e8dd8a48e10cf4b14b883..5946b91c6d7c7c1f42226f0726272f0c8db8ac1b 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,18 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 */
 
 #include "engraver.hh"
+
+#include "axis-group-interface.hh"
+#include "item.hh"
 #include "note-head.hh"
 #include "pitch-interval.hh"
+#include "pointer-group-interface.hh"
 #include "protected-scm.hh"
-#include "staff-symbol-referencer.hh"
-#include "axis-group-interface.hh"
 #include "side-position-interface.hh"
+#include "staff-symbol-referencer.hh" 
+#include "stream-event.hh"
 
 #include "translator.icc"
 
@@ -58,7 +62,7 @@ Ambitus_engraver::create_ambitus ()
       accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL);
       accidentals_[d]->set_parent (heads_[d], Y_AXIS);
       heads_[d]->set_object ("accidental-grob",
-                              accidentals_[d]->self_scm ());
+                            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]);
@@ -91,9 +95,7 @@ Ambitus_engraver::process_music ()
    * be placed after the rest.
    */
   if (!ambitus_)
-    {
-      create_ambitus ();
-    }
+    create_ambitus ();
 }
 
 void
@@ -117,8 +119,8 @@ Ambitus_engraver::stop_translation_timestep ()
 void
 Ambitus_engraver::acknowledge_note_head (Grob_info info)
 {
-  Music *nr = info.music_cause ();
-  if (nr && nr->is_mus_type ("note-event"))
+  Stream_event *nr = info.event_cause ();
+  if (nr && nr->in_event_class ("note-event"))
     {
       Pitch pitch = *unsmob_pitch (nr->get_property ("pitch"));
       pitch_interval_.add_point (pitch);
@@ -148,7 +150,7 @@ Ambitus_engraver::finalize ()
 
          int sig_alter = (handle != SCM_BOOL_F)
            ? scm_to_int (scm_cdr (handle)) : 0;
-         
+
          if (sig_alter == p.get_alteration ())
            {
              accidentals_[d]->suicide ();
@@ -158,13 +160,13 @@ Ambitus_engraver::finalize ()
            {
              SCM l = scm_list_1 (scm_from_int (p.get_alteration ()));
              accidentals_[d]->set_property ("accidentals", l);
-                       
            }
        }
       while (flip (&d) != DOWN);
 
-      ambitus_->set_object ("note-heads", scm_list_2 (heads_[DOWN]->self_scm (),
-                                                       heads_[UP]->self_scm ()));
+
+      Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[DOWN]);
+      Pointer_group_interface::add_grob (ambitus_, ly_symbol2scm ("note-heads"), heads_[UP]);
     }
   else
     {
@@ -180,11 +182,13 @@ 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 */ "");