X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=2585bd8bc1c0fe00f9f55a85232e97ecb82cc7c1;hb=12f05ebf99e912dd94359f86d503ce8cbf1f9891;hp=8f617652bfdd55a161b4c2a62a9f9523817d4e43;hpb=03ce3667568361ee7433032988a4089c64de2ec7;p=lilypond.git

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 8f617652bf..2585bd8bc1 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2006 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 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"
@@ -17,7 +18,8 @@
 #include "pointer-group-interface.hh"
 #include "protected-scm.hh"
 #include "side-position-interface.hh"
-#include "staff-symbol-referencer.hh" 
+#include "separation-item.hh"
+#include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
 
 #include "translator.icc"
@@ -26,8 +28,10 @@ class Ambitus_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Ambitus_engraver);
+protected:
+  DECLARE_ACKNOWLEDGER (note_head);
+
   void process_music ();
-  void acknowledge_note_head (Grob_info);
   void stop_translation_timestep ();
   virtual void finalize ();
   virtual void derived_mark () const;
@@ -38,6 +42,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_;
@@ -65,7 +70,6 @@ Ambitus_engraver::create_ambitus ()
 			     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);
 
@@ -89,10 +93,7 @@ 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 ();
@@ -122,8 +123,19 @@ Ambitus_engraver::acknowledge_note_head (Grob_info info)
   Stream_event *nr = info.event_cause ();
   if (nr && nr->in_event_class ("note-event"))
     {
-      Pitch pitch = *unsmob_pitch (nr->get_property ("pitch"));
-      pitch_interval_.add_point (pitch);
+      SCM p = nr->get_property ("pitch");
+      /*
+	If the engraver is added to a percussion context,
+	filter out unpitched note heads.
+      */
+      if (!unsmob_pitch (p))
+	return;
+      Pitch pitch = *unsmob_pitch (p);
+      Drul_array<bool> expands = pitch_interval_.add_point (pitch);
+      if (expands[UP])
+	causes_[UP] = nr;
+      if (expands[DOWN])
+	causes_[DOWN] = nr;
     }
 }
 
@@ -132,10 +144,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 ()));
@@ -149,7 +166,7 @@ Ambitus_engraver::finalize ()
 				start_key_sig_);
 
 	  Rational sig_alter = (handle != SCM_BOOL_F)
-	    ? ly_scm2rational (scm_cdr (handle)) : Rational (0);
+	    ? robust_scm2rational (scm_cdr (handle), Rational (0)) : Rational (0);
 
 	  if (sig_alter == p.get_alteration ())
 	    {
@@ -158,15 +175,17 @@ Ambitus_engraver::finalize ()
 	    }
 	  else
 	    {
-	      SCM l = scm_list_1 (scm_from_int (int (Real (Rational (4) * p.get_alteration ()))));
-	      accidentals_[d]->set_property ("accidentals", l);
+	      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);
 
 
       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
     {
@@ -184,11 +203,19 @@ Ambitus_engraver::finalize ()
 
 ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
-		/* doc */ "",
+		/* doc */
+		"",
+
 		/* create */
+		"AccidentalPlacement "
 		"Ambitus "
+		"AmbitusAccidental "
 		"AmbitusLine "
-		"AmbitusNoteHead "
-		"AmbitusAccidental",
-		/* read */ "",
-		/* write */ "");
+		"AmbitusNoteHead ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);