X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=cd5402b2a0ac50768f80209484a92dc9d435c3c6;hb=c4cfedc7e988cc56d6390881288ae8c1a7e333c3;hp=71f00f7aa8d14aa4e156c8ed4f56aee476d3292d;hpb=3c9561d788078f7ee4a6e1d973cf549d8f258935;p=lilypond.git

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 71f00f7aa8..cd5402b2a0 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,80 +3,96 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 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 "staff-symbol-referencer.hh"
-#include "event.hh"
-#include "pitch.hh"
 #include "pitch-interval.hh"
+#include "pointer-group-interface.hh"
 #include "protected-scm.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 ();
+  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;
 
 private:
   void create_ambitus ();
   Item *ambitus_;
+  Item *group_;
   Drul_array<Item *> heads_;
   Drul_array<Item *> accidentals_;
   Pitch_interval pitch_interval_;
   bool is_typeset_;
   int start_c0_;
-  Protected_scm start_key_sig_;
+  SCM start_key_sig_;
 };
 
+void
+Ambitus_engraver::derived_mark () const
+{
+  scm_gc_mark (start_key_sig_);
+}
+
 void
 Ambitus_engraver::create_ambitus ()
 {
-  ambitus_ = make_item ("AmbitusLine",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);
-      heads_[d]->set_property ("accidental-grob", accidentals_[d]->self_scm ());
+      accidentals_[d]->set_parent (heads_[d], Y_AXIS);
+      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);
-  is_typeset_ = false;		
-}
+  Axis_group_interface::add_element (group_, ambitus_);
 
+  is_typeset_ = false;
+}
 
 Ambitus_engraver::Ambitus_engraver ()
 {
   ambitus_ = 0;
+  heads_[LEFT] = heads_[RIGHT] = 0;
+  accidentals_[LEFT] = accidentals_[RIGHT] = 0;
+  group_ = 0;
   is_typeset_ = false;
+  start_key_sig_ = SCM_EOL;
 }
 
 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
@@ -93,26 +109,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)
+  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);
     }
 }
 
@@ -126,47 +134,57 @@ 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 ())),
 				  start_key_sig_);
 
-	  int sig_alter = (handle != SCM_BOOL_F) ? ly_scm2int (ly_car (handle)) : 0;
+	  if (handle == SCM_BOOL_F)
+	    handle = scm_assoc (scm_from_int (p.get_notename ()),
+				start_key_sig_);
+
+	  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);
+	      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 ())));
+	      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
     {
       Direction d = DOWN;
       do
 	{
-	  accidentals_[d]->suicide();
-	  heads_[d]->suicide();
-   	}
+	  accidentals_[d]->suicide ();
+	  heads_[d]->suicide ();
+ 	}
       while (flip (&d) != DOWN);
-      ambitus_->suicide();
+
+      ambitus_->suicide ();
     }
 }
 
-ENTER_DESCRIPTION (Ambitus_engraver,
-/* descr */       "",
-/* creats*/       "Ambitus",
-/* accepts */ "",
-/* acks  */     "note-head-interface",
-/* reads */       "",
-/* write */       "");
+ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
+ADD_TRANSLATOR (Ambitus_engraver,
+		/* doc */ "",
+		/* create */
+		"Ambitus "
+		"AmbitusLine "
+		"AmbitusNoteHead "
+		"AmbitusAccidental",
+		/* read */ "",
+		/* write */ "");