release: 1.5.13

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

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 5608a0cb600ba5e7921125f016821917521c8c70..6d59bb277fc0bca1ccfbe70b4a495983a8bc909c 100644 (file)
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -16,15 +16,14 @@
 
 
 /** 
-  Make arpeggios that span multiple staffs.  Catch arpeggios, and span a
+  Make arpeggios that span multiple staves.  Catch arpeggios, and span a
   Span_arpeggio over them if we find more than two arpeggios.
   */
 class Span_arpeggio_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Span_arpeggio_engraver ();
-
+  TRANSLATOR_DECLARATIONS(Span_arpeggio_engraver);
+  
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void create_grobs ();
@@ -45,9 +44,9 @@ void
 Span_arpeggio_engraver::acknowledge_grob (Grob_info info)
 {
     if (info.origin_trans_l_arr (this).size ()
-        && Arpeggio::has_interface (info.elem_l_))
+        && Arpeggio::has_interface (info.grob_l_))
     {
-      arpeggios_.push (info.elem_l_);
+      arpeggios_.push (info.grob_l_);
     }
 }
 
@@ -82,11 +81,11 @@ Span_arpeggio_engraver::stop_translation_timestep ()
       for (int i=0; i < arpeggios_.size (); i ++)
        {
          for (SCM s = arpeggios_[i]->get_grob_property ("stems");
-              gh_pair_p (s); s = gh_cdr (s))
-           Group_interface::add_thing (span_arpeggio_, "stems", gh_car (s));
+              gh_pair_p (s); s = ly_cdr (s))
+           Group_interface::add_thing (span_arpeggio_, "stems", ly_car (s));
          for (SCM s = arpeggios_[i]->get_grob_property ("side-support-elements");
-              gh_pair_p (s); s = gh_cdr (s))
-           Group_interface::add_thing (span_arpeggio_, "side-support-elements", gh_car (s));
+              gh_pair_p (s); s = ly_cdr (s))
+           Group_interface::add_thing (span_arpeggio_, "side-support-elements", ly_car (s));
 
          /*
            we can't kill the children, since we don't want to the
@@ -101,5 +100,11 @@ Span_arpeggio_engraver::stop_translation_timestep ()
   arpeggios_.clear ();
 }
 
-ADD_THIS_TRANSLATOR (Span_arpeggio_engraver);
 
+
+ENTER_DESCRIPTION(Span_arpeggio_engraver,
+/* descr */       "",
+/* creats*/       "Arpeggio",
+/* acks  */       "arpeggio-interface",
+/* reads */       "connectArpeggios",
+/* write */       "");