X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fspan-arpeggio-engraver.cc;h=c192d0a456408501f19eb5029e9f215999902948;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=5ae4d1295d5dad78283ab0b245cda19c98836d53;hpb=7249d131a7b58117ad502f17975af50ea4144a05;p=lilypond.git

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 5ae4d1295d..c192d0a456 100644
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -3,37 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "lily-guile.hh"
 #include "item.hh"
 #include "arpeggio.hh"
-#include "span-arpeggio.hh"
 #include "group-interface.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
 
 
 /** 
-  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_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_acknowledged_grobs ();
+  virtual void stop_translation_timestep ();
 
 private:
   Item *span_arpeggio_;
-  Link_array<Score_element> arpeggios_;
+  Link_array<Grob> arpeggios_;
 };
 
 
@@ -43,36 +43,35 @@ Span_arpeggio_engraver::Span_arpeggio_engraver ()
 }
 
 void
-Span_arpeggio_engraver::acknowledge_element (Score_element_info info)
+Span_arpeggio_engraver::acknowledge_grob (Grob_info info)
 {
-    if (info.origin_trans_l_arr (this).size ()
-        && Arpeggio::has_interface (info.elem_l_))
+    if (info.origin_transes (this).size ()
+        && Arpeggio::has_interface (info.grob_))
     {
-      arpeggios_.push (info.elem_l_);
+      arpeggios_.push (info.grob_);
     }
 }
 
 void
-Span_arpeggio_engraver::process_acknowledged ()
+Span_arpeggio_engraver::process_acknowledged_grobs ()
 {
   /*
-    connectArpeggios is slightly brusque; we should really read a elt
+    connectArpeggios is slightly brusque; we should really read a grob
     property of the caught non-span arpeggios. That way, we can have
 
     both non-connected and connected arps in one pianostaff.
-    
 
   */
   if (!span_arpeggio_ && arpeggios_.size () > 1
       && to_boolean (get_property ("connectArpeggios")))
     {
-      span_arpeggio_ = new Item (get_property ("Arpeggio"));
-      announce_element (span_arpeggio_, 0);      
+      span_arpeggio_ = make_item ("Arpeggio");
+      announce_grob(span_arpeggio_, SCM_EOL);      
     }
 }
 
 void
-Span_arpeggio_engraver::do_pre_move_processing ()
+Span_arpeggio_engraver::stop_translation_timestep ()
 {
   if (span_arpeggio_) 
     {
@@ -82,25 +81,32 @@ Span_arpeggio_engraver::do_pre_move_processing ()
        */
       for (int i=0; i < arpeggios_.size (); i ++)
 	{
-	  for (SCM s = arpeggios_[i]->get_elt_property ("stems");
-	       gh_pair_p (s); s = gh_cdr (s))
-	    Group_interface::add_thing (span_arpeggio_, "stems", gh_car (s));
-	  for (SCM s = arpeggios_[i]->get_elt_property ("side-support-elements");
-	       gh_pair_p (s); s = gh_cdr (s))
-	    Group_interface::add_thing (span_arpeggio_, "side-support-elements", gh_car (s));
+	  for (SCM s = arpeggios_[i]->get_grob_property ("stems");
+	       gh_pair_p (s); s = ly_cdr (s))
+	    Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("stems"), ly_car (s));
+	  for (SCM s = arpeggios_[i]->get_grob_property ("side-support-elements");
+	       gh_pair_p (s); s = ly_cdr (s))
+	    Group_interface::add_thing (span_arpeggio_, ly_symbol2scm ("side-support-elements"), ly_car (s));
 
 	  /*
 	    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_elt_property ("molecule-callback", SCM_BOOL_T);
+	  arpeggios_[i]->set_grob_property ("molecule-callback", SCM_EOL);
 	}
       
-      typeset_element (span_arpeggio_);
+      typeset_grob (span_arpeggio_);
       span_arpeggio_ = 0;
     }
   arpeggios_.clear ();
 }
 
-ADD_THIS_TRANSLATOR (Span_arpeggio_engraver);
 
+
+ENTER_DESCRIPTION(Span_arpeggio_engraver,
+/* descr */       "",
+/* creats*/       "Arpeggio",
+/* accepts */     "",
+/* acks  */      "arpeggio-interface",
+/* reads */       "connectArpeggios",
+/* write */       "");