X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=6cabafe451f8e5c69cad94c0eac7b4db08d2a3e6;hb=9ca26f1645ce2e09fcf66a45f0aa2f54ca4be497;hp=ccf70320b4df75720b767ea4d1ee7fb42e3011de;hpb=01d84d552854fb399bd0e819502c6c2db2a1b214;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index ccf70320b4..6cabafe451 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,49 +3,80 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "dot-column-engraver.hh"
 #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;
-
-  if (!h->dots_l ())
-    return;
+  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
+  if (d)
+    {
+      if (!dotcol_)
+	{
+	  dotcol_ = make_item ("DotColumn", SCM_EOL);
+	  
+	}
 
-  if (!dotcol_p_)
+      Dot_column::add_head (dotcol_, info.grob_);
+    }
+  else if (Stem::has_interface (info.grob_))
     {
-      dotcol_p_ = new Dot_column;
-      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 */       "");