Release: bump Welcome versions.

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 0a76267c7edb3c58c36afb2f56a7b611e0ca0fd7..50cebbbf99a06a4d00c48b5ba12eff5df07e5674 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -40,7 +40,7 @@ class Ambitus_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Ambitus_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER (note_head);
+  void acknowledge_note_head (Grob_info);
 
   void process_music ();
   void stop_translation_timestep ();
@@ -88,7 +88,8 @@ Ambitus_engraver::create_ambitus ()
   is_typeset_ = false;
 }
 
-Ambitus_engraver::Ambitus_engraver ()
+Ambitus_engraver::Ambitus_engraver (Context *c)
+  : Engraver (c)
 {
   ambitus_ = 0;
   heads_.set (0, 0);
@@ -136,16 +137,17 @@ void
 Ambitus_engraver::acknowledge_note_head (Grob_info info)
 {
   Stream_event *nr = info.event_cause ();
-  if (nr && nr->in_event_class ("note-event"))
+  if (nr && nr->in_event_class ("note-event")
+      && !to_boolean (info.grob ()->get_property ("ignore-ambitus")))
     {
       SCM p = nr->get_property ("pitch");
       /*
         If the engraver is added to a percussion context,
         filter out unpitched note heads.
       */
-      if (!Pitch::is_smob (p))
+      if (!unsmob<Pitch> (p))
         return;
-      Pitch pitch = *Pitch::unsmob (p);
+      Pitch pitch = *unsmob<Pitch> (p);
       Drul_array<bool> expands = pitch_interval_.add_point (pitch);
       if (expands[UP])
         causes_[UP] = nr;
@@ -173,11 +175,11 @@ Ambitus_engraver::finalize ()
                                             scm_from_int (p.get_notename ())),
                                   start_key_sig_);
 
-          if (handle == SCM_BOOL_F)
+          if (scm_is_false (handle))
             handle = scm_assoc (scm_from_int (p.get_notename ()),
                                 start_key_sig_);
 
-          Rational sig_alter = (handle != SCM_BOOL_F)
+          Rational sig_alter = (scm_is_true (handle))
                                ? robust_scm2rational (scm_cdr (handle), Rational (0))
                                : Rational (0);
 
@@ -217,7 +219,12 @@ Ambitus_engraver::finalize ()
     }
 }
 
-ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
+void
+Ambitus_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
+}
+
 ADD_TRANSLATOR (Ambitus_engraver,
                 /* doc */
                 "Create an ambitus.",