Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 56573a5fddb2e3bd34928b4732346e362d3e009b..202e691d21d6515060cad0b0325fecc7af781200 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 */
@@ -28,8 +28,10 @@ class Ambitus_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Ambitus_engraver);
+protected:
+  DECLARE_ACKNOWLEDGER (note_head);
+
   void process_music ();
-  void acknowledge_note_head (Grob_info);
   void stop_translation_timestep ();
   virtual void finalize ();
   virtual void derived_mark () const;
@@ -119,9 +121,16 @@ void
 Ambitus_engraver::acknowledge_note_head (Grob_info info)
 {
   Stream_event *nr = info.event_cause ();
+  SCM p = nr->get_property ("pitch");
+  /*
+    If the engraver is added to a percussion context,
+    filter out unpitched note heads.
+  */
+  if (!unsmob_pitch (p))
+    return;
   if (nr && nr->in_event_class ("note-event"))
     {
-      Pitch pitch = *unsmob_pitch (nr->get_property ("pitch"));
+      Pitch pitch = *unsmob_pitch (p);
       Drul_array<bool> expands = pitch_interval_.add_point (pitch);
       if (expands[UP])
        causes_[UP] = nr;
@@ -135,7 +144,7 @@ Ambitus_engraver::finalize ()
 {
   if (ambitus_ && !pitch_interval_.is_empty ())
     {
-      Grob * accidental_placement =
+      Grob *accidental_placement =
        make_item ("AccidentalPlacement",
                   accidentals_[DOWN]->self_scm ());
 
@@ -198,10 +207,11 @@ ADD_TRANSLATOR (Ambitus_engraver,
                "",
 
                /* create */
+               "AccidentalPlacement "
                "Ambitus "
+               "AmbitusAccidental "
                "AmbitusLine "
-               "AmbitusNoteHead "
-               "AmbitusAccidental ",
+               "AmbitusNoteHead ",
 
                /* read */
                "",