* flower/file-path.cc (find): try to open directly as well, so we

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

diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index 2cdc4a0f7f68b84b5d3331691fcebced1ff5b243..6cabafe451f8e5c69cad94c0eac7b4db08d2a3e6 100644 (file)
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -3,11 +3,10 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-
 #include "rhythmic-head.hh"
 #include "dot-column.hh"
 #include "side-position-interface.hh"
@@ -20,8 +19,7 @@ class Dot_column_engraver : public Engraver
   Grob * stem_;
   Link_array<Item> heads_;
 public:
-  TRANSLATOR_DECLARATIONS(
-  Dot_column_engraver );
+  TRANSLATOR_DECLARATIONS (Dot_column_engraver );
   
 protected:
   virtual void acknowledge_grob (Grob_info);
@@ -31,41 +29,36 @@ 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;
-    }
+  dotcol_ = 0;
   heads_.clear ();
-  stem_ =0;
+  stem_ = 0;
 }
 
 void
 Dot_column_engraver::acknowledge_grob (Grob_info info)
 {
-  Grob *d = unsmob_grob (info.grob_->get_grob_property ("dot"));
+  Grob *d = unsmob_grob (info.grob_->get_property ("dot"));
   if (d)
     {
       if (!dotcol_)
        {
-         dotcol_ = make_item ("DotColumn");
-         announce_grob(dotcol_, SCM_EOL);
+         dotcol_ = make_item ("DotColumn", SCM_EOL);
+         
        }
 
       Dot_column::add_head (dotcol_, info.grob_);
@@ -79,8 +72,8 @@ Dot_column_engraver::acknowledge_grob (Grob_info info)
 
 
 
-ENTER_DESCRIPTION(Dot_column_engraver,
-/* descr */       " Engraves dots on dotted notes shifted to the right of the note.\n"
+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 */     "",