Merge with master

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index a84f9d65ec35b4d7d2d7855ef693049a332c76ca..0e4e2d949b8006bfb899909b10837a1d9176e0f5 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,26 +3,32 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2007 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"
 
 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;
 
@@ -55,8 +61,8 @@ 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]);
@@ -89,9 +95,7 @@ Ambitus_engraver::process_music ()
    * be placed after the rest.
    */
   if (!ambitus_)
-    {
-      create_ambitus ();
-    }
+    create_ambitus ();
 }
 
 void
@@ -113,20 +117,13 @@ 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"));
+      pitch_interval_.add_point (pitch);
     }
 }
 
@@ -151,25 +148,24 @@ 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)
+           ? ly_scm2rational (scm_cdr (handle)) : 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
            {
-             SCM l = scm_list_1 (scm_from_int (p.get_alteration ()));
-             accidentals_[d]->set_property ("accidentals", l);
-                       
+             accidentals_[d]->set_property ("alteration", ly_rational2scm (p.get_alteration ()));
            }
        }
       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]);
     }
   else
     {
@@ -185,10 +181,13 @@ 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 */ "",
+               /* doc */ "",
+               /* create */
+               "Ambitus "
+               "AmbitusLine "
+               "AmbitusNoteHead "
+               "AmbitusAccidental",
+               /* read */ "",
                /* write */ "");