X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=79f3a276863a1e96f6d51f8926752aa6af422935;hb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;hp=fdcc919bfd8813355ce90c7db5b3264a2402875f;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index fdcc919bfd..79f3a27686 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"
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
 #include "rhythmic-head.hh"
 #include "dot-column.hh"
 #include "side-position-interface.hh"
+#include "engraver.hh"
+#include "stem.hh"
+
+class Dot_column_engraver : public Engraver
+{
+  Grob *dotcol_;
+  Grob *stem_;
+  Link_array<Item> heads_;
+public:
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver);
+
+protected:
+  virtual void acknowledge_grob (Grob_info);
+  virtual void stop_translation_timestep ();
+};
 
 Dot_column_engraver::Dot_column_engraver ()
 {
-  dotcol_p_ =0;
+  dotcol_ = 0;
+  stem_ = 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 ();
+  /*
+    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;
 }
 
 void
-Dot_column_engraver::acknowledge_element (Score_element_info info)
+Dot_column_engraver::acknowledge_grob (Grob_info info)
 {
-  Rhythmic_head * h = dynamic_cast<Rhythmic_head*>(info.elem_l_);
-  if (!h)
-      return;
+  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
+  if (d)
+    {
+      if (!dotcol_)
+	{
+	  dotcol_ = make_item ("DotColumn", SCM_EOL);
 
-  if (!h->dots_l ())
-    return;
+	}
 
-  if (!dotcol_p_)
+      Dot_column::add_head (dotcol_, info.grob_);
+    }
+  else if (Stem::has_interface (info.grob_))
     {
-      dotcol_p_ = new Dot_column( SCM_EOL);
-      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));
+      stem_ = info.grob_;
     }
-
-  dotcol_p_->add_head (h);
 }
 
 
-ADD_THIS_TRANSLATOR(Dot_column_engraver);
-
+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 */ "",
+		/* acks  */ "rhythmic-head-interface dot-column-interface stem-interface",
+		/* reads */ "",
+		/* write */ "");