Run `make grand-replace'.

[lilypond.git] / lily / span-arpeggio-engraver.cc

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 8495a2f5fecb594beb2942e07d3a26cd5d509dfd..07958a8a3e8da03bc8b7ad07c64160bb94a61db4 100644 (file)
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -3,16 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "arpeggio.hh"
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
+#include "item.hh"
 
 /**
    Make arpeggios that span multiple staves.  Catch arpeggios, and span a
@@ -22,15 +23,15 @@ class Span_arpeggio_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Span_arpeggio_engraver);
+  DECLARE_ACKNOWLEDGER (arpeggio);
 
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_acknowledged_grobs ();
-  virtual void stop_translation_timestep ();
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 
 private:
   Item *span_arpeggio_;
-  Link_array<Grob> arpeggios_;
+  vector<Grob*> arpeggios_;
 };
 
 Span_arpeggio_engraver::Span_arpeggio_engraver ()
@@ -39,17 +40,14 @@ Span_arpeggio_engraver::Span_arpeggio_engraver ()
 }
 
 void
-Span_arpeggio_engraver::acknowledge_grob (Grob_info info)
+Span_arpeggio_engraver::acknowledge_arpeggio (Grob_info info)
 {
-  if (Arpeggio::has_interface (info.grob ())
-      && info.origin_contexts (this).size ()) // huh? what's this test for? 
-    {
-      arpeggios_.push (info.grob ());
-    }
+  if (info.origin_contexts (this).size ()) // huh? what's this test for? 
+    arpeggios_.push_back (info.grob ());
 }
 
 void
-Span_arpeggio_engraver::process_acknowledged_grobs ()
+Span_arpeggio_engraver::process_acknowledged ()
 {
   /*
     connectArpeggios is slightly brusque; we should really read a grob
@@ -62,6 +60,7 @@ Span_arpeggio_engraver::process_acknowledged_grobs ()
       && to_boolean (get_property ("connectArpeggios")))
     {
       span_arpeggio_ = make_item ("Arpeggio", SCM_EOL);
+      span_arpeggio_->set_property ("cross-staff", SCM_BOOL_T);
     }
 }
 
@@ -74,31 +73,45 @@ Span_arpeggio_engraver::stop_translation_timestep ()
        we do this very late, to make sure we also catch `extra'
        side-pos support like accidentals.
       */
-      for (int i = 0; i < arpeggios_.size (); i++)
+      for (vsize j = 0; j < arpeggios_.size (); j++)
        {
-         for (SCM s = arpeggios_[i]->get_property ("stems");
-              scm_is_pair (s); s = scm_cdr (s))
-           Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("stems"), scm_car (s));
-         for (SCM s = arpeggios_[i]->get_property ("side-support-elements");
-              scm_is_pair (s); s = scm_cdr (s))
-           Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("side-support-elements"), scm_car (s));
+         extract_grob_set (arpeggios_[j], "stems", stems);
+         for (vsize i = 0; i < stems.size (); i++)
+           Pointer_group_interface::add_grob (span_arpeggio_, ly_symbol2scm ("stems"),
+                                              stems[i]);
+
+         extract_grob_set (arpeggios_[j], "side-support-elements", sses);
+         for (vsize i = 0; i < sses.size (); i++)
+           Pointer_group_interface::add_grob (span_arpeggio_, ly_symbol2scm ("side-support-elements"),
+                                              sses[i]);
 
          /*
            we can't kill the children, since we don't want to the
            previous note to bump into the span arpeggio; so we make
            it transparent.  */
-         arpeggios_[i]->set_property ("print-function", SCM_EOL);
+         arpeggios_[j]->set_property ("transparent", SCM_BOOL_T);
        }
 
+
+      span_arpeggio_->set_parent (arpeggios_[0]->get_parent (Y_AXIS), Y_AXIS);
       span_arpeggio_ = 0;
     }
   arpeggios_.clear ();
 }
 
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Span_arpeggio_engraver, arpeggio);
 ADD_TRANSLATOR (Span_arpeggio_engraver,
-               /* descr */ "",
-               /* creats*/ "Arpeggio",
-               /* accepts */ "",
-               /* acks  */ "arpeggio-interface",
-               /* reads */ "connectArpeggios",
-               /* write */ "");
+               /* doc */
+               "Make arpeggios that span multiple staves.",
+
+               /* create */
+               "Arpeggio ",
+
+               /* read */
+               "connectArpeggios ",
+
+               /* write */
+               ""
+               );