* 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 9523b7ea91e67f7a7fbcb5829017bdae8c3e12c9..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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -18,10 +18,9 @@ class Dot_column_engraver : public Engraver
 {
   Grob *dotcol_ ;
   Grob * stem_;
-  Link_array<Item> head_l_arr_;
+  Link_array<Item> heads_;
 public:
-  TRANSLATOR_DECLARATIONS(
-  Dot_column_engraver );
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver );
   
 protected:
   virtual void acknowledge_grob (Grob_info);
@@ -31,59 +30,54 @@ protected:
 
 Dot_column_engraver::Dot_column_engraver ()
 {
-  dotcol_ =0;
+  dotcol_ = 0;
   stem_ = 0;
 }
 
 void
 Dot_column_engraver::stop_translation_timestep ()
 {
-  if (dotcol_)
-    {
-
-      /*
-       Add the stem to the support so dots stay clear of flags.
+  /*
+    Add the stem to the support so dots stay clear of flags.
 
-       See [Ross, p 171]
-       */
-      if (stem_)
-       dotcol_->set_grob_property ("stem", stem_->self_scm ());
+    See [Ross, p 171]
+  */
+  if (stem_ && dotcol_)
+    dotcol_->set_property ("stem", stem_->self_scm ());
       
-      typeset_grob (dotcol_);
-      dotcol_ =0;
-    }
-  head_l_arr_.clear ();
+  dotcol_ =0;
+  heads_.clear ();
   stem_ =0;
 }
 
 void
 Dot_column_engraver::acknowledge_grob (Grob_info info)
 {
-  Grob *d = unsmob_grob (info.grob_l_->get_grob_property ("dot"));
+  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
   if (d)
     {
       if (!dotcol_)
        {
-         dotcol_ = new Item (get_property ("DotColumn"));
-         announce_grob (dotcol_, 0);
+         dotcol_ = make_item ("DotColumn", SCM_EOL);
+         
        }
 
-      Dot_column::add_head (dotcol_, info.grob_l_);
+      Dot_column::add_head (dotcol_, info.grob_);
     }
-  else if (Stem::has_interface (info.grob_l_))
+  else if (Stem::has_interface (info.grob_))
     {
-      stem_ = info.grob_l_;
+      stem_ = info.grob_;
     }
 }
 
 
 
 
-ENTER_DESCRIPTION(Dot_column_engraver,
-/* descr */       " Engraves dots on dotted notes shifted to the right of the note.
-If omitted, then dots appear on top of the notes.
-",
+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",
-/* acks  */       "dot-column-interface stem-interface",
+/* accepts */     "",
+/* acks  */      "rhythmic-head-interface dot-column-interface stem-interface",
 /* reads */       "",
 /* write */       "");