X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=e307b512de092653ce91d6f54000161c175b07f4;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=d8e5751265537b76cd471bf6b0717bc1d12a7124;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index d8e5751265..e307b512de 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -53,42 +53,41 @@
 
 class Rhythmic_column_engraver : public Engraver
 {
-  vector<Grob*> rheads_;
+  vector<Grob *> rheads_;
   Grob *stem_;
+  Grob *flag_;
   Grob *note_column_;
-  Grob *dotcol_;
-  Grob *arpeggio_;
 
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
-  DECLARE_ACKNOWLEDGER (stem);
-  DECLARE_ACKNOWLEDGER (rhythmic_head);
-  DECLARE_ACKNOWLEDGER (arpeggio);
+  void acknowledge_stem (Grob_info);
+  void acknowledge_flag (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
   void process_acknowledged ();
   void stop_translation_timestep ();
 };
 
-Rhythmic_column_engraver::Rhythmic_column_engraver ()
+Rhythmic_column_engraver::Rhythmic_column_engraver (Context *c)
+  : Engraver (c)
 {
 
   stem_ = 0;
+  flag_ = 0;
   note_column_ = 0;
-  arpeggio_ = 0;
 }
 
-
 void
 Rhythmic_column_engraver::process_acknowledged ()
 {
   if (rheads_.size ())
     {
       if (!note_column_)
-	note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
+        note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
 
       for (vsize i = 0; i < rheads_.size (); i++)
-	if (!rheads_[i]->get_parent (X_AXIS))
-	  Note_column::add_head (note_column_, rheads_[i]);
+        if (!rheads_[i]->get_parent (X_AXIS))
+          Note_column::add_head (note_column_, rheads_[i]);
 
       rheads_.resize (0);
     }
@@ -96,14 +95,17 @@ Rhythmic_column_engraver::process_acknowledged ()
   if (note_column_)
     {
       if (stem_
-	  && !stem_->get_parent (X_AXIS))
-	{
-	  Note_column::set_stem (note_column_, stem_);
-	  stem_ = 0;
-	}
-
-      if (arpeggio_)
-	note_column_->set_object ("arpeggio", arpeggio_->self_scm ());
+          && !stem_->get_parent (X_AXIS))
+        {
+          Note_column::set_stem (note_column_, stem_);
+          stem_ = 0;
+        }
+
+      if (flag_)
+        {
+          Pointer_group_interface::add_grob (note_column_, ly_symbol2scm ("elements"), flag_);
+          flag_ = 0;
+        }
     }
 }
 
@@ -114,15 +116,15 @@ Rhythmic_column_engraver::acknowledge_stem (Grob_info i)
 }
 
 void
-Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
+Rhythmic_column_engraver::acknowledge_flag (Grob_info i)
 {
-  rheads_.push_back (i.grob ());
+  flag_ = i.grob ();
 }
 
 void
-Rhythmic_column_engraver::acknowledge_arpeggio (Grob_info i)
+Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
 {
-  arpeggio_ = i.grob ();
+  rheads_.push_back (i.grob ());
 }
 
 void
@@ -130,24 +132,29 @@ Rhythmic_column_engraver::stop_translation_timestep ()
 {
   note_column_ = 0;
   stem_ = 0;
-  arpeggio_ = 0;
+  flag_ = 0;
 }
 
-ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem);
-ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
-ADD_ACKNOWLEDGER (Rhythmic_column_engraver, arpeggio);
+
+void
+Rhythmic_column_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem);
+  ADD_ACKNOWLEDGER (Rhythmic_column_engraver, flag);
+  ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
+}
 
 ADD_TRANSLATOR (Rhythmic_column_engraver,
-		/* doc */
-		"Generate @code{NoteColumn}, an object that groups stems,"
-		" note heads, and rests.",
+                /* doc */
+                "Generate @code{NoteColumn}, an object that groups stems,"
+                " note heads, and rests.",
 
-		/* create */
-		"NoteColumn ",
+                /* create */
+                "NoteColumn ",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );