Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index c316716a8b01c90cd4bc647e1655ad15b8fd3c03..b1e89885aee9f5bae4bf7a6a21b91f606e99114a 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2007 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2002--2009 Juergen Reuter <reuter@ipd.uka.de>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl
 */
@@ -19,7 +19,7 @@
 #include "protected-scm.hh"
 #include "side-position-interface.hh"
 #include "separation-item.hh"
-#include "staff-symbol-referencer.hh" 
+#include "staff-symbol-referencer.hh"
 #include "stream-event.hh"
 
 #include "translator.icc"
@@ -28,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;
@@ -80,8 +82,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;
@@ -121,7 +123,14 @@ 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"));
+      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;
@@ -135,9 +144,8 @@ Ambitus_engraver::finalize ()
 {
   if (ambitus_ && !pitch_interval_.is_empty ())
     {
-      Grob * accidental_placement =
-       make_item ("AccidentalPlacement",
-                  accidentals_[DOWN]->self_scm ());
+      Grob *accidental_placement =
+       make_item ("AccidentalPlacement", accidentals_[DOWN]->self_scm ());
 
       Direction d = DOWN;
       do
@@ -145,8 +153,7 @@ Ambitus_engraver::finalize ()
          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 ())),
@@ -157,7 +164,8 @@ Ambitus_engraver::finalize ()
                                start_key_sig_);
 
          Rational sig_alter = (handle != SCM_BOOL_F)
-           ? robust_scm2rational (scm_cdr (handle), Rational (0)) : Rational (0);
+           ? robust_scm2rational (scm_cdr (handle), Rational (0))
+           : Rational (0);
 
          if (sig_alter == p.get_alteration ())
            {
@@ -165,17 +173,19 @@ Ambitus_engraver::finalize ()
              heads_[d]->set_object ("accidental-grob", SCM_EOL);
            }
          else
-           {
-             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]);
+           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);
 
-
-      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
@@ -185,7 +195,7 @@ Ambitus_engraver::finalize ()
        {
          accidentals_[d]->suicide ();
          heads_[d]->suicide ();
-       }
+       }
       while (flip (&d) != DOWN);
 
       ambitus_->suicide ();
@@ -195,16 +205,18 @@ Ambitus_engraver::finalize ()
 ADD_ACKNOWLEDGER (Ambitus_engraver, note_head);
 ADD_TRANSLATOR (Ambitus_engraver,
                /* doc */
-               "",
+               "Create an ambitus.",
 
                /* create */
+               "AccidentalPlacement "
                "Ambitus "
+               "AmbitusAccidental "
                "AmbitusLine "
-               "AmbitusNoteHead "
-               "AmbitusAccidental ",
+               "AmbitusNoteHead ",
 
                /* read */
-               "",
+               "keySignature "
+               "middleCPosition ",
 
                /* write */
                ""