* lily/moment.cc (robust_scm2moment): new function.

[lilypond.git] / lily / dot-column-engraver.cc

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 908851d168da4ae0934c741c08103aae377cfbbf..2d4b6ea4d0c2653b790cfd13e27b05aa7695fd99 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,57 +12,72 @@
 #include "dot-column.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
+#include "stem.hh"
 
 class Dot_column_engraver : public Engraver
 {
-  Score_element *dotcol_p_ ;
-  Link_array<Rhythmic_head> 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_element (Score_element_info);
-  virtual void do_pre_move_processing ();  
+  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)
 {
-  Score_element *d = unsmob_element (info.elem_l_->get_elt_pointer ("dot"));
+  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
   if (d)
     {
-      if (!dotcol_p_)
+      if (!dotcol_)
        {
-         dotcol_p_ = new Item(get_property ("basicDotColumnProperties"));
-
-         Dot_column::set_interface (dotcol_p_);
-         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));
+         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);
 
+
+ENTER_DESCRIPTION (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 */       "");