Run `make grand-replace'.

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index f48668e75521dbd47f32558700e80a3f9755d6ad..79605c3b6d93094c227617e54a302fd35c17e82e 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,26 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2008 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 */
 
 #include "engraver.hh"
+
+#include "accidental-placement.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 "separation-item.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 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 ();
+  void process_music ();
+  void acknowledge_note_head (Grob_info);
+  void stop_translation_timestep ();
   virtual void finalize ();
   virtual void derived_mark () const;
 
@@ -32,6 +40,7 @@ private:
   Item *group_;
   Drul_array<Item *> heads_;
   Drul_array<Item *> accidentals_;
+  Drul_array<Stream_event *> causes_;
   Pitch_interval pitch_interval_;
   bool is_typeset_;
   int start_c0_;
@@ -55,10 +64,10 @@ Ambitus_engraver::create_ambitus ()
       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_object ("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);
 
@@ -82,15 +91,10 @@ void
 Ambitus_engraver::process_music ()
 {
   /*
-   * 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.
+   * Ensure that ambitus is created in the very first timestep
    */
   if (!ambitus_)
-    {
-      create_ambitus ();
-    }
+    create_ambitus ();
 }
 
 void
@@ -112,20 +116,17 @@ Ambitus_engraver::stop_translation_timestep ()
 }
 
 void
-Ambitus_engraver::acknowledge_grob (Grob_info info)
+Ambitus_engraver::acknowledge_note_head (Grob_info info)
 {
-  Item *item = dynamic_cast<Item *> (info.grob ());
-  if (item)
+  Stream_event *nr = info.event_cause ();
+  if (nr && nr->in_event_class ("note-event"))
     {
-      if (Note_head::has_interface (info.grob ()))
-       {
-         Music *nr = info.music_cause ();
-         if (nr && nr->is_mus_type ("note-event"))
-           {
-             Pitch pitch = *unsmob_pitch (nr->get_property ("pitch"));
-             pitch_interval_.add_point (pitch);
-           }
-       }
+      Pitch pitch = *unsmob_pitch (nr->get_property ("pitch"));
+      Drul_array<bool> expands = pitch_interval_.add_point (pitch);
+      if (expands[UP])
+       causes_[UP] = nr;
+      if (expands[DOWN])
+       causes_[DOWN] = nr;
     }
 }
 
@@ -134,10 +135,15 @@ Ambitus_engraver::finalize ()
 {
   if (ambitus_ && !pitch_interval_.is_empty ())
     {
+      Grob *accidental_placement =
+       make_item ("AccidentalPlacement",
+                  accidentals_[DOWN]->self_scm ());
+
       Direction d = DOWN;
       do
        {
          Pitch p = pitch_interval_[d];
+         heads_[d]->set_property ("cause", causes_[d]->self_scm());
          heads_[d]->set_property ("staff-position",
                                   scm_from_int (start_c0_
                                                 + p.steps ()));
@@ -150,22 +156,27 @@ Ambitus_engraver::finalize ()
            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;
+         Rational sig_alter = (handle != SCM_BOOL_F)
+           ? robust_scm2rational (scm_cdr (handle), Rational (0)) : Rational (0);
+
          if (sig_alter == p.get_alteration ())
            {
              accidentals_[d]->suicide ();
-             heads_[d]->set_property ("accidental-grob", SCM_EOL);
+             heads_[d]->set_object ("accidental-grob", SCM_EOL);
            }
          else
            {
-             accidentals_[d]->set_property ("accidentals",
-                                            scm_list_1 (scm_from_int (p.get_alteration ())));
+             accidentals_[d]->set_property ("alteration", ly_rational2scm (p.get_alteration ()));
            }
+         Separation_item::add_conditional_item (heads_[d], accidental_placement);
+         Accidental_placement::add_accidental (accidental_placement, accidentals_[d]);
        }
       while (flip (&d) != DOWN);
 
-      ambitus_->set_property ("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]);
+      Axis_group_interface::add_element (group_, accidental_placement);
     }
   else
     {
@@ -181,10 +192,21 @@ Ambitus_engraver::finalize ()
     }
 }
 
+ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
-               /* descr */ "",
-               /* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
-               /* accepts */ "",
-               /* acks  */ "note-head-interface",
-               /* reads */ "",
-               /* write */ "");
+               /* doc */
+               "",
+
+               /* create */
+               "AccidentalPlacement "
+               "Ambitus "
+               "AmbitusAccidental "
+               "AmbitusLine "
+               "AmbitusNoteHead ",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );