X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=38beed5d9dc6c84ad85690fcd6c9d802dda92d5f;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=d555327c8ef1318bb9132eb1797115271499265d;hpb=4301546faf4884b318a4d8c4e9b48f125e7fa72a;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index d555327c8e..38beed5d9d 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -1,54 +1,78 @@
-/*   
-  dot-column-engraver.cc -- implement Dot_column_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "dot-column-engraver.hh"
+/*
+  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 "translator.icc"
+#include "item.hh"
+
+class Dot_column_engraver : public Engraver
+{
+  Grob *dotcol_;
+public:
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver);
+
+protected:
+
+  DECLARE_ACKNOWLEDGER (rhythmic_head);
+
+  void stop_translation_timestep ();
+};
 
 Dot_column_engraver::Dot_column_engraver ()
 {
-  dotcol_p_ =0;
+  dotcol_ = 0;
 }
 
 void
-Dot_column_engraver::do_pre_move_processing ()
+Dot_column_engraver::stop_translation_timestep ()
 {
-  if (dotcol_p_)
-    {
-      typeset_element (dotcol_p_);
-      dotcol_p_ =0;
-    }
-  head_l_arr_.clear ();
+  dotcol_ = 0;
 }
 
 void
-Dot_column_engraver::acknowledge_element (Score_element_info info)
+Dot_column_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  Rhythmic_head * h = dynamic_cast<Rhythmic_head*>(info.elem_l_);
-  if (!h)
-      return;
-
-  if (!h->dots_l ())
-    return;
-
-  if (!dotcol_p_)
+  Grob *d = unsmob_grob (info.grob ()->get_object ("dot"));
+  if (d)
     {
-      dotcol_p_ = new Dot_column(get_property ("basicDotColumnProperties"));
-      Side_position_interface (dotcol_p_).set_axis (X_AXIS);
-      Side_position_interface (dotcol_p_).set_direction (RIGHT);      
-      announce_element (Score_element_info (dotcol_p_, 0));
-    }
+      if (!dotcol_)
+        dotcol_ = make_item ("DotColumn", SCM_EOL);
 
-  dotcol_p_->add_head (h);
+      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 */
+                ""
+               );