X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=c5c80015249791f858e82ba1499e820122be975a;hb=17378a326b64ebeaeb6f9454cde414923785a470;hp=65a16a094e125637575ebbb344b22bb86d6bfc76;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 65a16a094e..c5c8001524 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,30 +1,38 @@
 /*
-  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--2006 Han-Wen Nienhuys <hanwen@xs4all.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_;
-  vector<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 ();
 };
@@ -32,50 +40,44 @@ protected:
 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
 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,
-		/* doc */ "Engraves dots on dotted notes shifted to the right of the note.\n"
-		"If omitted, then dots appear on top of the notes.",
-		/* create */ "DotColumn",
-		/* accept */ "",
-		/* read */ "",
-		/* 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 */
+                ""
+               );