X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdot-column-engraver.cc;h=53f1bdc62e68a135ebd1f7ce1abcc4e67902fb77;hb=150ff905539154877da98ae5d59fcf8938dcda97;hp=9fc7bbcd04a7d43d45b7144742bb40107f8424f5;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 9fc7bbcd04..53f1bdc62e 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,23 +3,23 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (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_p_ ;
-  Link_array<Item> head_l_arr_;
+  Grob *dotcol_ ;
+  Grob * stem_;
+  Link_array<Item> heads_;
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Dot_column_engraver();
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver );
   
 protected:
   virtual void acknowledge_grob (Grob_info);
@@ -29,40 +29,54 @@ protected:
 
 Dot_column_engraver::Dot_column_engraver ()
 {
-  dotcol_p_ =0;
+  dotcol_ = 0;
+  stem_ = 0;
 }
 
 void
 Dot_column_engraver::stop_translation_timestep ()
 {
-  if (dotcol_p_)
-    {
-      typeset_grob (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_grob (Grob_info info)
 {
-  Grob *d = unsmob_grob (info.elem_l_->get_grob_property ("dot"));
+  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
   if (d)
     {
-      if (!dotcol_p_)
+      if (!dotcol_)
 	{
-	  dotcol_p_ = new Item(get_property ("DotColumn"));
-
-	  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);
+	  dotcol_ = make_item ("DotColumn", SCM_EOL);
+	  
 	}
 
-      Dot_column::add_head (dotcol_p_, info.elem_l_);
+      Dot_column::add_head (dotcol_, info.grob_);
+    }
+  else if (Stem::has_interface (info.grob_))
+    {
+      stem_ = info.grob_;
     }
 }
 
 
-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 */       "");