X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=9768cafcabaf9b97c2d7f20023f50732de0adaa4;hb=05514c83a49dd3dfabd1fa7774c69c3038ecde6b;hp=3c250c92b27a052a40f5f54ad06353af63d41456;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 3c250c92b2..9768cafcab 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -1,15 +1,27 @@
 /*
-  rhythmic-column-engraver.cc -- implement Rhythmic_column_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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 "rhythmic-head.hh"
 #include "stem.hh"
 #include "note-column.hh"
+#include "item.hh"
 #include "dot-column.hh"
 #include "pointer-group-interface.hh"
 
@@ -45,82 +57,53 @@ class Rhythmic_column_engraver : public Engraver
   Grob *stem_;
   Grob *note_column_;
   Grob *dotcol_;
-
-  Grob *last_spacing_;
-  Grob *spacing_;
-
-  void add_spacing_item (Grob *);
+  Grob *arpeggio_;
 
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
-  DECLARE_ACKNOWLEDGER (dot_column);
   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::add_spacing_item (Grob *g)
-{
-  if (spacing_)
-    {
-      Pointer_group_interface::add_grob (spacing_,
-					 ly_symbol2scm ("left-items"),
-					 g);
 
-      if (last_spacing_)
-	{
-	  Pointer_group_interface::add_grob (last_spacing_,
-					     ly_symbol2scm ("right-items"),
-					     g);
-	}
-    }
-}
 void
 Rhythmic_column_engraver::process_acknowledged ()
 {
   if (rheads_.size ())
     {
       if (!note_column_)
-	{
-	  note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
-
-	  spacing_ = make_item ("NoteSpacing", SCM_EOL);
-	  add_spacing_item (note_column_);
-	}
+	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);
     }
 
   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 ());
     }
 }
 
@@ -137,33 +120,34 @@ Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
 }
 
 void
-Rhythmic_column_engraver::acknowledge_dot_column (Grob_info i)
+Rhythmic_column_engraver::acknowledge_arpeggio (Grob_info i)
 {
-  dotcol_ = i.grob ();
+  arpeggio_ = i.grob ();
 }
 
 void
 Rhythmic_column_engraver::stop_translation_timestep ()
 {
   note_column_ = 0;
-
-  if (spacing_)
-    {
-      last_spacing_ = spacing_;
-      spacing_ = 0;
-    }
-
-  dotcol_ = 0;
   stem_ = 0;
+  arpeggio_ = 0;
 }
 
-ADD_ACKNOWLEDGER (Rhythmic_column_engraver, dot_column);
 ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem);
 ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, arpeggio);
 
 ADD_TRANSLATOR (Rhythmic_column_engraver,
-		/* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
-		/* create */ "NoteColumn NoteSpacing",
-		/* accept */ "",
-		/* read */ "",
-		/* write */ "");
+		/* doc */
+		"Generate @code{NoteColumn}, an object that groups stems,"
+		" note heads, and rests.",
+
+		/* create */
+		"NoteColumn ",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);