X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=79605c3b6d93094c227617e54a302fd35c17e82e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=05330364b8b25d79430fb4857c2dcfafe69dc543;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 05330364b8..79605c3b6d 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,18 +3,24 @@
 
   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"
 
@@ -34,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_;
@@ -58,10 +65,9 @@ Ambitus_engraver::create_ambitus ()
       accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL);
       accidentals_[d]->set_parent (heads_[d], Y_AXIS);
       heads_[d]->set_object ("accidental-grob",
-			       accidentals_[d]->self_scm ());
+			     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);
 
@@ -85,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
@@ -117,11 +118,15 @@ Ambitus_engraver::stop_translation_timestep ()
 void
 Ambitus_engraver::acknowledge_note_head (Grob_info info)
 {
-  Music *nr = info.music_cause ();
-  if (nr && nr->is_mus_type ("note-event"))
+  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);
+      Drul_array<bool> expands = pitch_interval_.add_point (pitch);
+      if (expands[UP])
+	causes_[UP] = nr;
+      if (expands[DOWN])
+	causes_[DOWN] = nr;
     }
 }
 
@@ -130,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 ()));
@@ -146,9 +156,9 @@ 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 ();
@@ -156,15 +166,17 @@ Ambitus_engraver::finalize ()
 	    }
 	  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 ()));
 	    }
+	  Separation_item::add_conditional_item (heads_[d], accidental_placement);
+	  Accidental_placement::add_accidental (accidental_placement, accidentals_[d]);
 	}
       while (flip (&d) != DOWN);
 
-      ambitus_->set_object ("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
     {
@@ -180,11 +192,21 @@ Ambitus_engraver::finalize ()
     }
 }
 
-
-ADD_ACKNOWLEDGER(Ambitus_engraver, note_head);
+ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
-		/* descr */ "",
-		/* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
-		/* accepts */ "",
-		/* reads */ "",
-		/* write */ "");
+		/* doc */
+		"",
+
+		/* create */
+		"AccidentalPlacement "
+		"Ambitus "
+		"AmbitusAccidental "
+		"AmbitusLine "
+		"AmbitusNoteHead ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);