Fix shared size test: add missing comma, do

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

diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 9985bf97c9c1f37ce05c95ef721739d80144265f..12402a3100fbfba53f815d361b4e2d4c1328d274 100644 (file)
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -3,55 +3,79 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
-  
+  (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
+
   Han-Wen Nienhuys <hanwen@xs4all.nl
-  
 */
 
 #include "engraver.hh"
-#include "item.hh"
 #include "note-head.hh"
-#include "staff-symbol-referencer.hh"
-#include "event.hh"
-#include "pitch.hh"
 #include "pitch-interval.hh"
 #include "protected-scm.hh"
+#include "staff-symbol-referencer.hh"
+#include "axis-group-interface.hh"
 #include "side-position-interface.hh"
 
-
 class Ambitus_engraver : public Engraver
 {
 public:
-TRANSLATOR_DECLARATIONS (Ambitus_engraver);
+  TRANSLATOR_DECLARATIONS (Ambitus_engraver);
   virtual void process_music ();
   virtual void acknowledge_grob (Grob_info);
   virtual 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::create_ambitus ()
+Ambitus_engraver::derived_mark () const
 {
-  ambitus_ = make_item ("Ambitus",SCM_EOL);
-  is_typeset_ = false;         
+  scm_gc_mark (start_key_sig_);
 }
 
+void
+Ambitus_engraver::create_ambitus ()
+{
+  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);
+      accidentals_[d]->set_parent (heads_[d], Y_AXIS);
+      heads_[d]->set_property ("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);
+  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
@@ -83,16 +107,6 @@ Ambitus_engraver::stop_translation_timestep ()
       start_c0_ = robust_scm2int (get_property ("middleCPosition"), 0);
       start_key_sig_ = get_property ("keySignature");
 
-      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 ());
-         Side_position_interface::add_support (accidentals_[d], heads_[d]);
-       }
-      while (flip (&d) != DOWN);
-      ambitus_->set_parent (heads_[DOWN], X_AXIS);
       is_typeset_ = true;
     }
 }
@@ -100,7 +114,7 @@ Ambitus_engraver::stop_translation_timestep ()
 void
 Ambitus_engraver::acknowledge_grob (Grob_info info)
 {
-  Item *item = dynamic_cast <Item *>(info.grob_);
+  Item *item = dynamic_cast<Item *> (info.grob_);
   if (item)
     {
       if (Note_head::has_interface (info.grob_))
@@ -125,17 +139,21 @@ 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_);
+
+         int sig_alter = (handle != SCM_BOOL_F) ? scm_to_int (scm_cdr (handle)) : 0;
          if (sig_alter == p.get_alteration ())
            {
-             accidentals_[d]->suicide();
+             accidentals_[d]->suicide ();
              heads_[d]->set_property ("accidental-grob", SCM_EOL);
            }
          else
@@ -154,18 +172,19 @@ Ambitus_engraver::finalize ()
       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_TRANSLATOR (Ambitus_engraver,
+               /* descr */ "",
+               /* creats*/ "Ambitus AmbitusLine AmbitusNoteHead AmbitusAccidental",
+               /* accepts */ "",
+               /* acks  */ "note-head-interface",
+               /* reads */ "",
+               /* write */ "");