X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fspan-arpeggio-engraver.cc;h=79dbbd0dc218d37dd375af15470275fb5d484794;hb=38189e6a227753ee6dca31aac448d97071a8551d;hp=8fb13aeb93cdca8f98194f8d81899a0d8de01fa3;hpb=c36e72d6b4f840837d7923a61e537b24695b5388;p=lilypond.git

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 8fb13aeb93..79dbbd0dc2 100644
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -3,83 +3,102 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.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
-  Span_arpeggio over them if we find more than two arpeggios.
-  */
+/**
+   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_;
 };
 
-
 Span_arpeggio_engraver::Span_arpeggio_engraver ()
 {
   span_arpeggio_ = 0;
 }
 
 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 (Arpeggio::has_interface (info.grob_)
+      && info.origin_contexts (this).size ()) // huh? what's this test for? 
     {
-      arpeggios_.push (info.elem_l_);
+      arpeggios_.push (info.grob_);
     }
 }
 
 void
-Span_arpeggio_engraver::process_acknowledged ()
+Span_arpeggio_engraver::process_acknowledged_grobs ()
 {
-  if (arpeggios_.size () > 1 && !span_arpeggio_) 
+  /*
+    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 ("SpanArpeggio"));
-      Pointer_group_interface pgi (span_arpeggio_, "arpeggios");
-      for (int i = 0; i < arpeggios_.size () ; i++)
-	{
-	  pgi.add_element (arpeggios_[i]);
-	  span_arpeggio_->add_dependency (arpeggios_[i]);
-	}
-      
-      span_arpeggio_->set_parent (arpeggios_[0], Y_AXIS);
-      span_arpeggio_->set_parent (arpeggios_[0], X_AXIS);
-      
-      announce_element (span_arpeggio_, 0);
+      span_arpeggio_ = make_item ("Arpeggio", SCM_EOL);
     }
 }
 
 void
-Span_arpeggio_engraver::do_pre_move_processing ()
+Span_arpeggio_engraver::stop_translation_timestep ()
 {
-  if (span_arpeggio_) 
+  if (span_arpeggio_)
     {
-      typeset_element (span_arpeggio_);
+      /*
+	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 (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));
+
+	  /*
+	    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);
+	}
+
       span_arpeggio_ = 0;
     }
   arpeggios_.clear ();
 }
 
-ADD_THIS_TRANSLATOR (Span_arpeggio_engraver);
-
+ADD_TRANSLATOR (Span_arpeggio_engraver,
+		/* descr */ "",
+		/* creats*/ "Arpeggio",
+		/* accepts */ "",
+		/* acks  */ "arpeggio-interface",
+		/* reads */ "connectArpeggios",
+		/* write */ "");