X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=874dad834b8abe2fb8e310af0a5c2d147920ad3e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=de2fcc46fa2a0abd86dcb0aee29aabe1d64d203e;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index de2fcc46fa..874dad834b 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -3,16 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #include "rhythmic-head.hh"
 #include "stem.hh"
 #include "note-column.hh"
+#include "item.hh"
 #include "dot-column.hh"
 #include "pointer-group-interface.hh"
 
+#include "translator.icc"
+
 /*
   this engraver  glues together stems, rests and note heads into a NoteColumn
   grob.
@@ -39,118 +42,101 @@
 
 class Rhythmic_column_engraver : public Engraver
 {
-  Link_array<Grob> rheads_;
+  vector<Grob*> rheads_;
   Grob *stem_;
   Grob *note_column_;
   Grob *dotcol_;
-
-  Grob *last_spacing_;
-  Grob *spacing_;
+  Grob *arpeggio_;
 
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  DECLARE_ACKNOWLEDGER (arpeggio);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 };
 
 Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
-  spacing_ = 0;
-  last_spacing_ = 0;
 
   stem_ = 0;
   note_column_ = 0;
-  dotcol_ = 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 ());
 
-	  spacing_ = make_item ("NoteSpacing", SCM_EOL);
-	  spacing_->set_object ("left-items", scm_cons (note_column_->self_scm (), SCM_EOL));
+      for (vsize i = 0; i < rheads_.size (); i++)
+	if (!rheads_[i]->get_parent (X_AXIS))
+	  Note_column::add_head (note_column_, rheads_[i]);
 
-	  if (last_spacing_)
-	    {
-	      Pointer_group_interface::add_grob (last_spacing_,
-						 ly_symbol2scm ("right-items"),
-						 note_column_);
-	    }
-	}
-
-      for (int i = 0; i < rheads_.size (); i++)
-	{
-	  if (!rheads_[i]->get_parent (X_AXIS))
-	    Note_column::add_head (note_column_, rheads_[i]);
-	}
-      rheads_.set_size (0);
+      rheads_.resize (0);
     }
 
   if (note_column_)
     {
-      if (dotcol_
-	  && !dotcol_->get_parent (X_AXIS))
-	{
-	  Note_column::set_dotcol (note_column_, dotcol_);
-	}
-
       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 ());
     }
 }
 
 void
-Rhythmic_column_engraver::acknowledge_grob (Grob_info i)
+Rhythmic_column_engraver::acknowledge_stem (Grob_info i)
 {
-  Item *item = dynamic_cast<Item *> (i.grob ());
-  if (!item || item->get_parent (X_AXIS))
-    return;
-  if (Stem::has_interface (item))
-    {
-      stem_ = item;
-    }
-  else if (Rhythmic_head::has_interface (item))
-    {
-      rheads_.push (item);
-    }
-  else if (Dot_column::has_interface (item))
-    {
-      dotcol_ = item;
-    }
+  stem_ = i.grob ();
 }
 
 void
-Rhythmic_column_engraver::stop_translation_timestep ()
+Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
 {
-  note_column_ = 0;
+  rheads_.push_back (i.grob ());
+}
 
-  if (spacing_)
-    {
-      last_spacing_ = spacing_;
-      spacing_ = 0;
-    }
+void
+Rhythmic_column_engraver::acknowledge_arpeggio (Grob_info i)
+{
+  arpeggio_ = i.grob ();
+}
 
-  dotcol_ = 0;
+void
+Rhythmic_column_engraver::stop_translation_timestep ()
+{
+  note_column_ = 0;
   stem_ = 0;
+  arpeggio_ = 0;
 }
 
-#include "translator.icc"
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, arpeggio);
 
 ADD_TRANSLATOR (Rhythmic_column_engraver,
-		/* descr */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
-		/* creats*/ "NoteColumn NoteSpacing",
-		/* accepts */ "",
-		/* acks  */ "stem-interface rhythmic-head-interface dot-column-interface",
-		/* reads */ "",
-		/* write */ "");
+		/* doc */
+		"Generate @code{NoteColumn}, an object that groups stems,"
+		" note heads, and rests.",
+
+		/* create */
+		"NoteColumn ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);