Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index d81f5cd7e7dc9a4b1d5a62fc97046474b1560b9e..f71c33b49c9c62537fd67ba4187eb6125359a4a8 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,27 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
-  
+  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
+
   Han-Wen Nienhuys <hanwen@xs4all.nl
-  
 */
 
 #include "engraver.hh"
+
+#include "axis-group-interface.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 "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 ();
+  TRANSLATOR_DECLARATIONS (Ambitus_engraver);
+  void process_music ();
+  void acknowledge_note_head (Grob_info);
+  void stop_translation_timestep ();
   virtual void finalize ();
   virtual void derived_mark () const;
 
@@ -48,26 +51,27 @@ Ambitus_engraver::derived_mark () const
 void
 Ambitus_engraver::create_ambitus ()
 {
-  ambitus_ = make_item ("AmbitusLine",SCM_EOL);
-  group_ = make_item ("Ambitus",SCM_EOL);
+  ambitus_ = make_item ("AmbitusLine", SCM_EOL);
+  group_ = make_item ("Ambitus", SCM_EOL);
   Direction d = DOWN;
   do
     {
       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);
+
   ambitus_->set_parent (heads_[DOWN], X_AXIS);
   Axis_group_interface::add_element (group_, ambitus_);
-  
-  is_typeset_ = false;         
-}
 
+  is_typeset_ = false;
+}
 
 Ambitus_engraver::Ambitus_engraver ()
 {
@@ -89,9 +93,7 @@ Ambitus_engraver::process_music ()
    * be placed after the rest.
    */
   if (!ambitus_)
-    {
-      create_ambitus ();
-    }
+    create_ambitus ();
 }
 
 void
@@ -108,26 +110,18 @@ Ambitus_engraver::stop_translation_timestep ()
       start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0);
       start_key_sig_ = get_property ("keySignature");
 
-
       is_typeset_ = true;
     }
 }
 
 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)
+  Music *nr = info.music_cause ();
+  if (nr && nr->is_mus_type ("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);
     }
 }
 
@@ -141,8 +135,8 @@ Ambitus_engraver::finalize ()
        {
          Pitch p = pitch_interval_[d];
          heads_[d]->set_property ("staff-position",
-                                  scm_from_int (start_c0_ +
-                                                p.steps ()));
+                                  scm_from_int (start_c0_
+                                                + p.steps ()));
 
          SCM handle = scm_assoc (scm_cons (scm_from_int (p.get_octave ()),
                                            scm_from_int (p.get_notename ())),
@@ -151,41 +145,45 @@ Ambitus_engraver::finalize ()
          if (handle == SCM_BOOL_F)
            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;
+
+         int sig_alter = (handle != SCM_BOOL_F)
+           ? scm_to_int (scm_cdr (handle)) : 0;
+
          if (sig_alter == p.get_alteration ())
            {
-             accidentals_[d]->suicide();
-             heads_[d]->set_property ("accidental-grob", SCM_EOL);
+             accidentals_[d]->suicide ();
+             heads_[d]->set_object ("accidental-grob", SCM_EOL);
            }
          else
            {
-             accidentals_[d]->set_property ("accidentals",
-                                            scm_list_1 (scm_from_int (p.get_alteration ())));
+             SCM l = scm_list_1 (scm_from_int (p.get_alteration ()));
+             accidentals_[d]->set_property ("accidentals", l);
            }
        }
       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
     {
       Direction d = DOWN;
       do
        {
-         accidentals_[d]->suicide();
-         heads_[d]->suicide();
-       }
+         accidentals_[d]->suicide ();
+         heads_[d]->suicide ();
+       }
       while (flip (&d) != DOWN);
-      ambitus_->suicide();
+
+      ambitus_->suicide ();
     }
 }
 
+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 */ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
+               /* accept */ "",
+               /* read */ "",
+               /* write */ "");