X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=34691ff20e91ec4df82eab0236b57b6129c026f9;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=ec8b754873ce9af8bb0550ff07adb90eee5472cb;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index ec8b754873..34691ff20e 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  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--2014 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"
@@ -42,21 +53,16 @@
 
 class Rhythmic_column_engraver : public Engraver
 {
-  vector<Grob*> rheads_;
+  vector<Grob *> rheads_;
   Grob *stem_;
+  Grob *flag_;
   Grob *note_column_;
-  Grob *dotcol_;
-
-  Grob *last_spacing_;
-  Grob *spacing_;
-
-  void add_spacing_item (Grob *);
 
   TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
-  DECLARE_ACKNOWLEDGER (dot_column);
   DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (flag);
   DECLARE_ACKNOWLEDGER (rhythmic_head);
   void process_acknowledged ();
   void stop_translation_timestep ();
@@ -64,64 +70,41 @@ protected:
 
 Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
-  spacing_ = 0;
-  last_spacing_ = 0;
 
   stem_ = 0;
+  flag_ = 0;
   note_column_ = 0;
-  dotcol_ = 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;
-	}
+          && !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;
+        }
     }
 }
 
@@ -132,38 +115,40 @@ 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_dot_column (Grob_info i)
+Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
 {
-  dotcol_ = i.grob ();
+  rheads_.push_back (i.grob ());
 }
 
 void
 Rhythmic_column_engraver::stop_translation_timestep ()
 {
   note_column_ = 0;
-
-  if (spacing_)
-    {
-      last_spacing_ = spacing_;
-      spacing_ = 0;
-    }
-
-  dotcol_ = 0;
   stem_ = 0;
+  flag_ = 0;
 }
 
-ADD_ACKNOWLEDGER (Rhythmic_column_engraver, dot_column);
 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 */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
-		/* create */ "NoteColumn NoteSpacing",
-		/* read */ "",
-		/* write */ "");
+                /* doc */
+                "Generate @code{NoteColumn}, an object that groups stems,"
+                " note heads, and rests.",
+
+                /* create */
+                "NoteColumn ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );