X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fambitus-engraver.cc;h=006bdb4c8792d075499a8e400e972fb4b9182abe;hb=ed430e2d3a44b70a0ee7b32f7dd2002bc6c6912b;hp=f48668e75521dbd47f32558700e80a3f9755d6ad;hpb=02c656d3b0cb895cc81b428d699d960746800e45;p=lilypond.git

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index f48668e755..006bdb4c87 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -1,28 +1,49 @@
 /*
-  ambitus-engraver.cc -- implement Ambitus_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2002--2010 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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"
 
 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 ();
+protected:
+  DECLARE_ACKNOWLEDGER (note_head);
+
+  void process_music ();
+  void stop_translation_timestep ();
   virtual void finalize ();
   virtual void derived_mark () const;
 
@@ -32,6 +53,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_;
@@ -55,10 +77,10 @@ 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]);
     }
   while (flip (&d) != DOWN);
 
@@ -71,8 +93,8 @@ Ambitus_engraver::create_ambitus ()
 Ambitus_engraver::Ambitus_engraver ()
 {
   ambitus_ = 0;
-  heads_[LEFT] = heads_[RIGHT] = 0;
-  accidentals_[LEFT] = accidentals_[RIGHT] = 0;
+  heads_.set (0, 0);
+  accidentals_.set (0, 0);
   group_ = 0;
   is_typeset_ = false;
   start_key_sig_ = SCM_EOL;
@@ -82,15 +104,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
@@ -112,20 +129,24 @@ 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);
-	    }
-	}
+      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;
     }
 }
 
@@ -134,13 +155,16 @@ 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 ()));
+				   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 ())),
@@ -150,22 +174,30 @@ 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 ();
-	      heads_[d]->set_property ("accidental-grob", SCM_EOL);
+	      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 ()));
+	  Separation_item::add_conditional_item (heads_[d],
+						 accidental_placement);
+	  Accidental_placement::add_accidental (accidental_placement,
+						accidentals_[d]);
+	  Pointer_group_interface::add_grob (ambitus_,
+					     ly_symbol2scm ("note-heads"),
+					     heads_[d]);
 	}
       while (flip (&d) != DOWN);
 
-      ambitus_->set_property ("note-heads", scm_list_2 (heads_[DOWN]->self_scm (),
-							heads_[UP]->self_scm ()));
+      Axis_group_interface::add_element (group_, accidental_placement);
     }
   else
     {
@@ -174,17 +206,29 @@ Ambitus_engraver::finalize ()
 	{
 	  accidentals_[d]->suicide ();
 	  heads_[d]->suicide ();
- 	}
+	}
       while (flip (&d) != DOWN);
 
       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 an ambitus.",
+
+		/* create */
+		"AccidentalPlacement "
+		"Ambitus "
+		"AmbitusAccidental "
+		"AmbitusLine "
+		"AmbitusNoteHead ",
+
+		/* read */
+		"keySignature "
+		"middleCPosition ",
+
+		/* write */
+		""
+		);