]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/rhythmic-column-engraver.cc
* lily/system-start-delimiter.cc (print): allow style = text too.
[lilypond.git] / lily / rhythmic-column-engraver.cc
index 905af2118641988622e7ccbb39d7e4ea447539cc..2ca4cdca7c837ef53a0e47c1db26cbec3a7e3b3f 100644 (file)
@@ -1,23 +1,19 @@
 /*
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
-#include "slur.hh"
 #include "engraver.hh"
 #include "rhythmic-head.hh"
 #include "stem.hh"
 #include "note-column.hh"
 #include "dot-column.hh"
-#include "musical-request.hh"
-#include "item.hh"
-#include "group-interface.hh"
-
+#include "pointer-group-interface.hh"
 
+#include "translator.icc"
 
 /*
   this engraver  glues together stems, rests and note heads into a NoteColumn
@@ -25,7 +21,7 @@
 
   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
   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
+{
+  Link_array__Grob_ rheads_;
+  Grob *stem_;
+  Grob *note_column_;
+  Grob *dotcol_;
 
+  Grob *last_spacing_;
+  Grob *spacing_;
 
-class Rhythmic_column_engraver :public Engraver
-{
-  Link_array<Grob> rhead_l_arr_;
-  Grob * stem_l_;
-  Grob * note_column_;
-  Grob * dotcol_l_;
-
-  Grob * last_spacing_;
-  Grob * spacing_;
-  
-  TRANSLATOR_DECLARATIONS(Rhythmic_column_engraver);
+  void add_spacing_item (Grob *);
+
+  TRANSLATOR_DECLARATIONS (Rhythmic_column_engraver);
 protected:
 
-  virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (dot_column);
+  DECLARE_ACKNOWLEDGER (stem);
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
 };
 
-
-
 Rhythmic_column_engraver::Rhythmic_column_engraver ()
 {
-  spacing_ =;
+  spacing_ = 0;
   last_spacing_ = 0;
-  
-  stem_l_ =0;
-  note_column_=0;
-  dotcol_l_ =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::create_grobs ()
+Rhythmic_column_engraver::process_acknowledged ()
 {
-  if (rhead_l_arr_.size ())
+  if (rheads_.size ())
     {
       if (!note_column_)
        {
-         note_column_ = new Item (get_property ("NoteColumn"));
-         Note_column::set_interface (note_column_);
-         announce_grob (note_column_, 0);
-
-
-         spacing_ = new Item (get_property ("NoteSpacing"));
-         spacing_->set_grob_property ("left-items", gh_cons (note_column_->self_scm (), SCM_EOL));
-         announce_grob (spacing_, 0);
-
-         if (last_spacing_)
-           {
-            Pointer_group_interface::add_grob (last_spacing_,
-                                               ly_symbol2scm ("right-items" ),
-                                               note_column_);
-           }
+         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++)
        {
-         if (!rhead_l_arr_[i]->get_parent (X_AXIS))
-           Note_column::add_head (note_column_, 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 (note_column_)
     {
-      if (dotcol_l_
-         && !dotcol_l_->get_parent (X_AXIS))
-       {
-         Note_column::set_dotcol (note_column_, dotcol_l_);
-       }
+      if (dotcol_
+         && !dotcol_->get_parent (X_AXIS))
+       Note_column::set_dotcol (note_column_, dotcol_);
 
-      if (stem_l_
-         && !stem_l_->get_parent (X_AXIS))
+      if (stem_
+         && !stem_->get_parent (X_AXIS))
        {
-         Note_column::set_stem (note_column_, stem_l_);
-         stem_l_ = 0;
+         Note_column::set_stem (note_column_, stem_);
+         stem_ = 0;
        }
-
     }
 }
 
 void
-Rhythmic_column_engraver::acknowledge_grob (Grob_info i)
+Rhythmic_column_engraver::acknowledge_stem (Grob_info i)
 {
-  Item * item =  dynamic_cast <Item *> (i.grob_l_);
-  if (item && Stem::has_interface (item))
-    {
-      stem_l_ = item;
-    }
-  else if (item && Rhythmic_head::has_interface (item))
-    {
-      rhead_l_arr_.push (item);
-    }
-  else if (item && Dot_column::has_interface (item))
-    {
-      dotcol_l_ = item;
-    }
+  stem_ = i.grob ();
+}
+
+void
+Rhythmic_column_engraver::acknowledge_rhythmic_head (Grob_info i)
+{
+  rheads_.push_back (i.grob ());
+}
+
+void
+Rhythmic_column_engraver::acknowledge_dot_column (Grob_info i)
+{
+  dotcol_ = i.grob ();
 }
 
 void
 Rhythmic_column_engraver::stop_translation_timestep ()
 {
-  if (note_column_) 
-    {
-      typeset_grob (note_column_);
-      note_column_ =0;
-    }
+  note_column_ = 0;
 
   if (spacing_)
     {
-      typeset_grob (spacing_);
       last_spacing_ = spacing_;
-      spacing_ =0;
+      spacing_ = 0;
     }
-}
 
-void
-Rhythmic_column_engraver::start_translation_timestep ()
-{
-  dotcol_l_ =0;
-  stem_l_ =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);
 
-
-ENTER_DESCRIPTION(Rhythmic_column_engraver,
-/* descr */       "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
-/* creats*/       "NoteColumn NoteSpacing",
-/* acks  */       "stem-interface rhythmic-head-interface dot-column-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Rhythmic_column_engraver,
+               /* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
+               /* create */ "NoteColumn NoteSpacing",
+               /* accept */ "",
+               /* read */ "",
+               /* write */ "");