X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fdot-column-engraver.cc;h=7064eafba3dc2ecaffe4c2c807c027f42bb476ef;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=9fc7bbcd04a7d43d45b7144742bb40107f8424f5;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 9fc7bbcd04..7064eafba3 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,68 +1,78 @@
-/*   
-  dot-column-engraver.cc -- implement Dot_column_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1998--2015 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 "translator.icc"
+#include "item.hh"
 
 class Dot_column_engraver : public Engraver
 {
-  Grob *dotcol_p_ ;
-  Link_array<Item> head_l_arr_;
+  Grob *dotcol_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  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_p_ =0;
+  dotcol_ = 0;
 }
 
 void
 Dot_column_engraver::stop_translation_timestep ()
 {
-  if (dotcol_p_)
-    {
-      typeset_grob (dotcol_p_);
-      dotcol_p_ =0;
-    }
-  head_l_arr_.clear ();
+  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.elem_l_->get_grob_property ("dot"));
+  Grob *d = Grob::unsmob (info.grob ()->get_object ("dot"));
   if (d)
     {
-      if (!dotcol_p_)
-	{
-	  dotcol_p_ = new Item(get_property ("DotColumn"));
+      if (!dotcol_)
+        dotcol_ = make_item ("DotColumn", SCM_EOL);
 
-	  Dot_column::set_interface (dotcol_p_);
-	  Side_position::set_axis (dotcol_p_, X_AXIS);
-	  Side_position::set_direction (dotcol_p_, RIGHT);      
-	  announce_grob (dotcol_p_, 0);
-	}
-
-      Dot_column::add_head (dotcol_p_, info.elem_l_);
+      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 ",
 
-ADD_THIS_TRANSLATOR(Dot_column_engraver);
+                /* read */
+                "",
 
+                /* write */
+                ""
+               );