X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=e191470161d99070b8f03597168b82e2b3eadcb2;hb=fd5bccb38f3219fe9bb8f4c2240d84e5c827615b;hp=58dd2c6fcd866e26fb9026596cd2061ddf55a247;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 58dd2c6fcd..e191470161 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,14 +19,15 @@
 
 #include "engraver.hh"
 
-#include "pointer-group-interface.hh"
 #include "arpeggio.hh"
-#include "stem.hh"
+#include "item.hh"
+#include "note-column.hh"
+#include "pointer-group-interface.hh"
 #include "rhythmic-head.hh"
+#include "separation-item.hh"
 #include "side-position-interface.hh"
+#include "stem.hh"
 #include "stream-event.hh"
-#include "note-column.hh"
-#include "item.hh"
 
 #include "translator.icc"
 
@@ -37,6 +38,8 @@ public:
 
   void acknowledge_stem (Grob_info);
   void acknowledge_rhythmic_head (Grob_info);
+  void acknowledge_note_column (Grob_info);
+
 protected:
   void process_music ();
   void stop_translation_timestep ();
@@ -64,11 +67,11 @@ Arpeggio_engraver::acknowledge_stem (Grob_info info)
   if (arpeggio_)
     {
       if (!arpeggio_->get_parent (Y_AXIS))
-	arpeggio_->set_parent (info.grob (), Y_AXIS);
+        arpeggio_->set_parent (info.grob (), Y_AXIS);
 
       Pointer_group_interface::add_grob (arpeggio_,
-					 ly_symbol2scm ("stems"),
-					 info.grob ());
+                                         ly_symbol2scm ("stems"),
+                                         info.grob ());
     }
 }
 void
@@ -83,6 +86,13 @@ Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
     Side_position_interface::add_support (arpeggio_, info.grob ());
 }
 
+void
+Arpeggio_engraver::acknowledge_note_column (Grob_info info)
+{
+  if (arpeggio_)
+    Separation_item::add_conditional_item (info.grob (), arpeggio_);
+}
+
 void
 Arpeggio_engraver::process_music ()
 {
@@ -101,17 +111,18 @@ Arpeggio_engraver::stop_translation_timestep ()
 
 ADD_ACKNOWLEDGER (Arpeggio_engraver, stem);
 ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column);
 
 ADD_TRANSLATOR (Arpeggio_engraver,
-		/* doc */
-		"Generate an Arpeggio symbol.",
+                /* doc */
+                "Generate an Arpeggio symbol.",
 
-		/* create */
-		"Arpeggio",
+                /* create */
+                "Arpeggio",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );