Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / dot-column-engraver.cc

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 235729c98a8b764b8329825c845905296e9b9190..3f2982df746607dfc7d0a10aad4a4fecf0d5f676 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,52 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rhythmic-head.hh"
 #include "dot-column.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
-#include "stem.hh"
 #include "translator.icc"
+#include "item.hh" 
 
 class Dot_column_engraver : public Engraver
 {
   Grob *dotcol_;
-  Grob *stem_;
-  Link_array<Item> heads_;
 public:
   TRANSLATOR_DECLARATIONS (Dot_column_engraver);
 
 protected:
 
-  DECLARE_ACKNOWLEDGER(stem);
-  DECLARE_ACKNOWLEDGER(rhythmic_head);
-  
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void stop_translation_timestep ();
 };
 
 Dot_column_engraver::Dot_column_engraver ()
 {
   dotcol_ = 0;
-  stem_ = 0;
 }
 
 void
 Dot_column_engraver::stop_translation_timestep ()
 {
-  /*
-    Add the stem to the support so dots stay clear of flags.
-
-    See [Ross, p 171]
-  */
-  if (stem_ && dotcol_)
-    dotcol_->set_object ("stem", stem_->self_scm ());
-
   dotcol_ = 0;
-  heads_.clear ();
-  stem_ = 0;
 }
 
 void
@@ -58,27 +44,17 @@ Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
   if (d)
     {
       if (!dotcol_)
-       {
-         dotcol_ = make_item ("DotColumn", SCM_EOL);
-       }
+       dotcol_ = make_item ("DotColumn", SCM_EOL);
 
       Dot_column::add_head (dotcol_, info.grob ());
     }
 }
 
 
-void
-Dot_column_engraver::acknowledge_stem (Grob_info info)
-{
-  stem_ = info.grob ();
-}
-
-ADD_ACKNOWLEDGER(Dot_column_engraver, stem);
-ADD_ACKNOWLEDGER(Dot_column_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
 ADD_TRANSLATOR (Dot_column_engraver,
-               /* descr */ "Engraves dots on dotted notes shifted to the right of the note.\n"
+               /* doc */ "Engraves dots on dotted notes shifted to the right of the note.\n"
                "If omitted, then dots appear on top of the notes.",
-               /* creats*/ "DotColumn",
-               /* accepts */ "",
-               /* reads */ "",
+               /* create */ "DotColumn",
+               /* read */ "",
                /* write */ "");