X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frhythmic-column-engraver.cc;h=04281231d52825410a3606900a52f36147b31d5b;hb=ee6212f6538384b0730ba0754bd8a31c2b2ebda3;hp=ccca90f9a722c119a84131eb7a040ef5e8816df0;hpb=622b379cd71af8dde94f68135a489b2536309e6f;p=lilypond.git

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index ccca90f9a7..04281231d5 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -1,122 +1,159 @@
 /*
-  rhythmic-column-grav.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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.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 "rhythmic-column-engraver.hh"
-#include "note-head.hh"
+#include "engraver.hh"
+#include "rhythmic-head.hh"
 #include "stem.hh"
 #include "note-column.hh"
-#include "script.hh"
+#include "item.hh"
 #include "dot-column.hh"
-#include "musical-request.hh"
+#include "pointer-group-interface.hh"
+
+#include "translator.icc"
+
+/*
+  this engraver  glues together stems, rests and note heads into a NoteColumn
+  grob.
+
+  It also generates spacing objects.  Originally, we have tried to
+  have the spacing functionality at different levels.
+
+  - by simply using the sequence of Separation-item as
+  spacing-sequences (at staff level). Unfortunately, this fucks up if
+  there are different kinds of tuplets in different voices (8th and
+  8ths triplets combined made the program believe there were 1/12 th
+  notes.).
+
+  Doing it in a separate engraver using timing info is generally
+  complicated (start/end time management), and fucks up if a voice
+  changes staff.
+
+  Now we do it from here again. This has the problem that voices can
+  appear and disappear at will, leaving lots of loose ends (the note
+  spacing engraver don't know where to connect the last note of the
+  voice on the right with), but we don't complain about those, and let
+  the default spacing do its work.
+*/
 
-Rhythmic_column_engraver::Rhythmic_column_engraver()
+class Rhythmic_column_engraver : public Engraver
+{
+  vector<Grob *> rheads_;
+  Grob *stem_;
+  Grob *flag_;
+  Grob *note_column_;
+
+  TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
+protected:
+
+  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 ()
 {
-  stem_l_ =0;
-  ncol_p_=0;
-  dotcol_l_ =0;
-}
 
+  stem_ = 0;
+  flag_ = 0;
+  note_column_ = 0;
+}
 
 void
 Rhythmic_column_engraver::process_acknowledged ()
 {
-  if (rhead_l_arr_.size ())
+  if (rheads_.size ())
     {
-      if (!ncol_p_)
-	{
-	  ncol_p_ = new Note_column;
-	  announce_element (Score_element_info (ncol_p_, 0));
-	}
-
-      for (int i=0; i < rhead_l_arr_.size (); i++)
-	{
-	  ncol_p_->add_head (rhead_l_arr_[i]);
-	}
-      rhead_l_arr_.set_size (0);
+      if (!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]);
+
+      rheads_.resize (0);
     }
 
-  
-  if (ncol_p_)
+  if (note_column_)
     {
-      if (dotcol_l_)
-	{
-	  ncol_p_->set_dotcol (dotcol_l_);
-	}
-
-      if (stem_l_)
-	{
-	  ncol_p_->set_stem (stem_l_);
-	  stem_l_ = 0;
-	}
-      
-      for (int i=0; i < script_l_arr_.size(); i++) 
-	{
-	  if (ncol_p_)
-	    ncol_p_->add_script (script_l_arr_[i]);
-	}
-  
-      script_l_arr_.clear();
+      if (stem_
+          && !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;
+        }
     }
 }
 
 void
-Rhythmic_column_engraver::acknowledge_element (Score_element_info i)
+Rhythmic_column_engraver::acknowledge_stem (Grob_info i)
 {
-  Item * item =  dynamic_cast <Item *> (i.elem_l_);
-  if (!item)
-    return;
-  if (Script *s=dynamic_cast<Script *> (item))
-    {
-      if (i.req_l_ && dynamic_cast <Musical_req *> (i.req_l_)) 
-	{
-	  script_l_arr_.push (s);
-	}
-    }
-  else if (Stem*s=dynamic_cast<Stem *> (item))
-    {
-      stem_l_ = s;
-    }
-      else if (Rhythmic_head*r=dynamic_cast<Rhythmic_head *> (item))
-    {
-      rhead_l_arr_.push (r);
-    }
-      else if (Dot_column*d =dynamic_cast<Dot_column *> (item))
-    {
-      dotcol_l_ = d;
-    }
+  stem_ = i.grob ();
 }
 
 void
-Rhythmic_column_engraver::do_pre_move_processing()
+Rhythmic_column_engraver::acknowledge_flag (Grob_info i)
 {
-  if (ncol_p_) 
-    {
-      if (! ncol_p_->h_shift_b_)
-	// egcs
-	ncol_p_->h_shift_b_  = get_property ("hshift", 0).operator bool ();
-      if (! ncol_p_->dir_)
-	ncol_p_->dir_ =(Direction) int(get_property ("ydirection", 0));
-
-      typeset_element (ncol_p_);
-      ncol_p_ =0;
-    }
+  flag_ = i.grob ();
+}
+
+void
+Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
+{
+  rheads_.push_back (i.grob ());
 }
 
 void
-Rhythmic_column_engraver::do_post_move_processing()
+Rhythmic_column_engraver::stop_translation_timestep ()
 {
-  script_l_arr_.clear();
-  dotcol_l_ =0;
-  stem_l_ =0;
+  note_column_ = 0;
+  stem_ = 0;
+  flag_ = 0;
 }
 
 
+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.",
 
+                /* create */
+                "NoteColumn ",
 
+                /* read */
+                "",
 
-ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
+                /* write */
+                ""
+               );