Run grand-replace (issue 3765)

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

diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index 998d2693a27367066aa49d6d2a2ace357ff0d288..d4dd0f04feb05a6c4fc096bc7b1200502024162c 100644 (file)
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -1,16 +1,29 @@
 /*
-  span-arpeggio-engraver.cc -- implement Span_arpeggio_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
   Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "engraver.hh"
 #include "arpeggio.hh"
+#include "item.hh"
 #include "pointer-group-interface.hh"
+#include "separation-item.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
 
@@ -23,6 +36,7 @@ class Span_arpeggio_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Span_arpeggio_engraver);
   DECLARE_ACKNOWLEDGER (arpeggio);
+  DECLARE_ACKNOWLEDGER (note_column);
 
 protected:
   void process_acknowledged ();
@@ -30,7 +44,8 @@ protected:
 
 private:
   Item *span_arpeggio_;
-  Link_array<Grob> arpeggios_;
+  vector<Grob *> arpeggios_;
+  vector<Grob *> note_columns_;
 };
 
 Span_arpeggio_engraver::Span_arpeggio_engraver ()
@@ -41,10 +56,16 @@ Span_arpeggio_engraver::Span_arpeggio_engraver ()
 void
 Span_arpeggio_engraver::acknowledge_arpeggio (Grob_info info)
 {
-  if (info.origin_contexts (this).size ()) // huh? what's this test for? 
+  if (info.origin_contexts (this).size ()) // huh? what's this test for?
     arpeggios_.push_back (info.grob ());
 }
 
+void
+Span_arpeggio_engraver::acknowledge_note_column (Grob_info info)
+{
+  note_columns_.push_back (info.grob ());
+}
+
 void
 Span_arpeggio_engraver::process_acknowledged ()
 {
@@ -58,6 +79,13 @@ Span_arpeggio_engraver::process_acknowledged ()
   if (!span_arpeggio_ && arpeggios_.size () > 1
       && to_boolean (get_property ("connectArpeggios")))
     span_arpeggio_ = make_item ("Arpeggio", SCM_EOL);
+
+  if (span_arpeggio_)
+    {
+      for (vsize i = 0; i < note_columns_.size (); i++)
+        Separation_item::add_conditional_item (note_columns_[i], span_arpeggio_);
+      note_columns_.clear ();
+    }
 }
 
 void
@@ -66,39 +94,49 @@ Span_arpeggio_engraver::stop_translation_timestep ()
   if (span_arpeggio_)
     {
       /*
-       we do this very late, to make sure we also catch `extra'
-       side-pos support like accidentals.
+        we do this very late, to make sure we also catch `extra'
+        side-pos support like accidentals.
       */
       for (vsize j = 0; j < arpeggios_.size (); j++)
-       {
-         extract_grob_set (arpeggios_[j], "stems", stems);
-         for (vsize 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 = 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_[j]->set_property ("transparent", SCM_BOOL_T);
-       }
-
+        {
+          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_[j]->set_property ("transparent", SCM_BOOL_T);
+        }
+
+      span_arpeggio_->set_parent (arpeggios_[0]->get_parent (Y_AXIS), Y_AXIS);
       span_arpeggio_ = 0;
     }
   arpeggios_.clear ();
+  note_columns_.clear ();
 }
 
 #include "translator.icc"
 
 ADD_ACKNOWLEDGER (Span_arpeggio_engraver, arpeggio);
+ADD_ACKNOWLEDGER (Span_arpeggio_engraver, note_column);
 ADD_TRANSLATOR (Span_arpeggio_engraver,
-               /* doc */ "",
-               /* create */ "Arpeggio",
-               /* accept */ "",
-               /* read */ "connectArpeggios",
-               /* write */ "");
+                /* doc */
+                "Make arpeggios that span multiple staves.",
+
+                /* create */
+                "Arpeggio ",
+
+                /* read */
+                "connectArpeggios ",
+
+                /* write */
+                ""
+               );