X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=2e905fe405f4377c92c5e2bfbf2d3ab0cbea3690;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=f66f5a13b332428c9c60730dda29e1b31dea931e;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index f66f5a13b3..2e905fe405 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,84 +1,84 @@
 /*
-  dot-column-engraver.cc -- implement Dot_column_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2005 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-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);
-  
+  void acknowledge_rhythmic_head (Grob_info);
+
   void stop_translation_timestep ();
 };
 
-Dot_column_engraver::Dot_column_engraver ()
+Dot_column_engraver::Dot_column_engraver (Context *c)
+  : Engraver (c)
 {
   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
 Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  Grob *d = unsmob_grob (info.grob ()->get_object ("dot"));
+  Grob *d = unsmob<Grob> (info.grob ()->get_object ("dot"));
   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)
+Dot_column_engraver::boot ()
 {
-  stem_ = info.grob ();
+  ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
 }
 
-ADD_ACKNOWLEDGER(Dot_column_engraver, stem);
-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"
-		"If omitted, then dots appear on top of the notes.",
-		/* creats*/ "DotColumn",
-		/* accepts */ "",
-		/* reads */ "",
-		/* write */ "");
+                /* doc */
+                "Engrave dots on dotted notes shifted to the right of the"
+                " note.  If omitted, then dots appear on top of the notes.",
+
+                /* create */
+                "DotColumn ",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );