X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=6e2c731dacfd4a90098d8ddd5272dc7be24103a9;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=2d4b6ea4d0c2653b790cfd13e27b05aa7695fd99;hpb=335ac4c1568d57b71d37d31c0014169899a09a53;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 2d4b6ea4d0..6e2c731dac 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,83 +1,78 @@
-/*   
-  dot-column-engraver.cc -- implement Dot_column_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1998--2014 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_;
-  Link_array<Item> heads_;
+  Grob *dotcol_;
 public:
-  TRANSLATOR_DECLARATIONS (Dot_column_engraver );
-  
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver);
+
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  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_property ("stem", stem_->self_scm ());
-      
-  dotcol_ =0;
-  heads_.clear ();
-  stem_ =0;
+  dotcol_ = 0;
 }
 
 void
-Dot_column_engraver::acknowledge_grob (Grob_info info)
+Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
+  Grob *d = Grob::unsmob (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_);
-    }
-  else if (Stem::has_interface (info.grob_))
-    {
-      stem_ = info.grob_;
+      Dot_column::add_head (dotcol_, info.grob ());
     }
 }
 
+ADD_ACKNOWLEDGER (Dot_column_engraver, rhythmic_head);
+ADD_TRANSLATOR (Dot_column_engraver,
+                /* 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 */
+                "",
 
-ENTER_DESCRIPTION (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 */     "",
-/* acks  */      "rhythmic-head-interface dot-column-interface stem-interface",
-/* reads */       "",
-/* write */       "");
+                /* write */
+                ""
+               );