*** empty log message ***

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 85dbbd46b87f3b396dd01c5b350651ed946bd942..b3c8cc4c2cd5fbc081c5431d6a59243f3b3c2a40 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -64,62 +64,77 @@ class Ambitus_engraver : public Engraver
 {
 public:
 TRANSLATOR_DECLARATIONS(Ambitus_engraver);
+  virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
   virtual void finalize ();
 
 private:
   void create_ambitus ();
-  Item *ambitus_p_;
-  int isActive;
+  Item *ambitus_;
+  int/*bool*/ is_typeset;
   Pitch pitch_min, pitch_max;
 };
 
 Ambitus_engraver::Ambitus_engraver ()
 {
-  ambitus_p_ = 0; isActive = 0;
+  ambitus_ = 0;
+  is_typeset = 0;
 
-  // (pitch_min > pitch_max) means that pitches are not yet
-  // initialized
+  /*
+   * (pitch_min > pitch_max) means that pitches are not yet
+   * initialized
+   */
   pitch_min = Pitch (0, 0, +1);
   pitch_max = Pitch (0, 0, -1);
 }
 
 void
-Ambitus_engraver::stop_translation_timestep ()
+Ambitus_engraver::process_music ()
 {
-  if (!ambitus_p_) {
-    // Create ambitus not before stopping timestep.  centralCPosition
-    // will then be the same as that for the first timestep.
-    //
-    // TODO: is this really a good idea?  At least, creating the
-    // ambitus in start_translation_timestep is a *bad* idea, since we
-    // may then oversee a clef that is defined in a staff context if
-    // we are in a voice context; centralCPosition would then be
-    // assumed to be 0.
+  /*
+   * Ensure that ambitus is created in the very first timestep (on
+   * which lily does not call start_translation_timestep ()).
+   * Otherwise, if a voice begins with a rest, the ambitus grob will
+   * be placed after the rest.
+   */
+  if (!ambitus_) {
     create_ambitus ();
   }
-  if (ambitus_p_ && isActive)
+}
+
+void
+Ambitus_engraver::stop_translation_timestep ()
+{
+  if (ambitus_ && !is_typeset)
     {
+      /*
+       * Evaluate centralCPosition not until now, since otherwise we
+       * may then oversee a clef that is defined in a staff context if
+       * we are in a voice context; centralCPosition would then be
+       * assumed to be 0.
+       */
+      SCM c0 = get_property ("centralCPosition");
+      ambitus_->set_grob_property ("centralCPosition", c0);
+
+      /*
+       * Similar for keySignature.
+       */
       SCM key_signature = get_property ("keySignature");
-      ambitus_p_->set_grob_property ("keySignature", key_signature);
-      typeset_grob (ambitus_p_);
-      isActive = 0;
+      ambitus_->set_grob_property ("keySignature", key_signature);
+
+      typeset_grob (ambitus_);
+      is_typeset = 1;
     }
 }
 
 void
 Ambitus_engraver::acknowledge_grob (Grob_info info)
 {
-  if (!ambitus_p_) {
-    create_ambitus ();
-  }
-  if (!ambitus_p_)
-    return;
-  Item *item = dynamic_cast <Item *>(info.grob_l_);
+  Item *item = dynamic_cast <Item *>(info.grob_);
   if (item)
     {
-      if (Note_head::has_interface (info.grob_l_))
+      if (Note_head::has_interface (info.grob_))
        {
          Note_req *nr = dynamic_cast<Note_req*> (info.music_cause ());
          if (nr)
@@ -148,33 +163,33 @@ void
 Ambitus_engraver::create_ambitus ()
 {
   SCM basicProperties = get_property ("Ambitus");
-  SCM c0 = get_property ("centralCPosition");
-  ambitus_p_ = new Item (basicProperties); isActive = 1;
-  ambitus_p_->set_grob_property ("centralCPosition", c0);
-  announce_grob (ambitus_p_, SCM_EOL);
+  ambitus_ = new Item (basicProperties); is_typeset = 0;
+  announce_grob (ambitus_, SCM_EOL);
 }
 
 void
 Ambitus_engraver::finalize ()
 {
-  if (ambitus_p_)
+  if (ambitus_)
     {
       if (Pitch::compare (pitch_min, pitch_max) <= 0)
        {
-         ambitus_p_->set_grob_property ("pitch-min",
+         ambitus_->set_grob_property ("pitch-min",
                                         pitch_min.smobbed_copy ());
-         ambitus_p_->set_grob_property ("pitch-max",
+         ambitus_->set_grob_property ("pitch-max",
                                         pitch_max.smobbed_copy ());
        }
       else // have not seen any pitch, so forget about the ambitus
        {
-         // Do not print a warning on empty ambitus range, since this
-         // most probably arises from an empty voice, such as shared
-         // global timesig/clef definitions.
+         /*
+          * Do not print a warning on empty ambitus range, since this
+          * most probably arises from an empty voice, such as shared
+          * global timesig/clef definitions.
+          */
 #if 0
-         ambitus_p_->warning("empty ambitus range [ignored]");
+         ambitus_->warning("empty ambitus range [ignored]");
 #endif
-         ambitus_p_->suicide();
+         ambitus_->suicide();
        }
     }
 }