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

diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index ccca90f9a7..9543fcc92f 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -1,122 +1,168 @@
 /*
-  rhythmic-column-grav.cc -- implement Rhythmic_column_engraver
+  rhythmic-column-engraver.cc -- implement Rhythmic_column_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#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 "dot-column.hh"
-#include "musical-request.hh"
+#include "pointer-group-interface.hh"
 
-Rhythmic_column_engraver::Rhythmic_column_engraver()
+#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.
+*/
+
+class Rhythmic_column_engraver : public Engraver
+{
+  vector<Grob*> rheads_;
+  Grob *stem_;
+  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 (rhythmic_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
+};
+
+Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
-  stem_l_ =0;
-  ncol_p_=0;
-  dotcol_l_ =0;
+  spacing_ = 0;
+  last_spacing_ = 0;
+
+  stem_ = 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 (rhead_l_arr_.size ())
+  if (rheads_.size ())
     {
-      if (!ncol_p_)
+      if (!note_column_)
 	{
-	  ncol_p_ = new Note_column;
-	  announce_element (Score_element_info (ncol_p_, 0));
+	  note_column_ = make_item ("NoteColumn", rheads_[0]->self_scm ());
+
+	  spacing_ = make_item ("NoteSpacing", SCM_EOL);
+	  add_spacing_item (note_column_);
 	}
 
-      for (int i=0; i < rhead_l_arr_.size (); i++)
+      for (vsize i = 0; i < rheads_.size (); i++)
 	{
-	  ncol_p_->add_head (rhead_l_arr_[i]);
+	  if (!rheads_[i]->get_parent (X_AXIS))
+	    Note_column::add_head (note_column_, rheads_[i]);
 	}
-      rhead_l_arr_.set_size (0);
+      rheads_.resize (0);
     }
 
-  
-  if (ncol_p_)
+  if (note_column_)
     {
-      if (dotcol_l_)
-	{
-	  ncol_p_->set_dotcol (dotcol_l_);
-	}
+      if (dotcol_
+	  && !dotcol_->get_parent (X_AXIS))
+	Note_column::set_dotcol (note_column_, dotcol_);
 
-      if (stem_l_)
-	{
-	  ncol_p_->set_stem (stem_l_);
-	  stem_l_ = 0;
-	}
-      
-      for (int i=0; i < script_l_arr_.size(); i++) 
+      if (stem_
+	  && !stem_->get_parent (X_AXIS))
 	{
-	  if (ncol_p_)
-	    ncol_p_->add_script (script_l_arr_[i]);
+	  Note_column::set_stem (note_column_, stem_);
+	  stem_ = 0;
 	}
-  
-      script_l_arr_.clear();
     }
 }
 
 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_rhythmic_head (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;
-    }
+  rheads_.push_back (i.grob ());
 }
 
 void
-Rhythmic_column_engraver::do_post_move_processing()
+Rhythmic_column_engraver::acknowledge_dot_column (Grob_info i)
 {
-  script_l_arr_.clear();
-  dotcol_l_ =0;
-  stem_l_ =0;
+  dotcol_ = i.grob ();
 }
 
+void
+Rhythmic_column_engraver::stop_translation_timestep ()
+{
+  note_column_ = 0;
 
+  if (spacing_)
+    {
+      last_spacing_ = spacing_;
+      spacing_ = 0;
+    }
 
+  dotcol_ = 0;
+  stem_ = 0;
+}
 
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, dot_column);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, stem);
+ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
 
-ADD_THIS_TRANSLATOR(Rhythmic_column_engraver);
+ADD_TRANSLATOR (Rhythmic_column_engraver,
+		/* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
+		/* create */ "NoteColumn NoteSpacing",
+		/* read */ "",
+		/* write */ "");