''

[lilypond.git] / lily / bar-engraver.cc

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index a070e4f411ac161a2fb7b99c8b4bb9541217fb86..864caaa82762ee9def1a835085f83ecc5db986e4 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "bar.hh"
+#include "bar-line.hh"
 #include "score-engraver.hh"
 #include "musical-request.hh"
 #include "engraver-group-engraver.hh"
@@ -53,7 +53,7 @@ Bar_engraver::create_bar ()
       if (scm_equal_p (gl, bar_p_->get_grob_property ("glyph")) != SCM_BOOL_T)
          bar_p_->set_grob_property ("glyph", gl);
       
-      announce_grob (bar_p_, 0);
+      announce_grob(bar_p_, SCM_EOL);
     }
 }
 
@@ -94,17 +94,7 @@ Bar_engraver::stop_translation_timestep ()
 {
   if (!bar_p_)
     {
-      Score_engraver * e = 0;
-      Translator * t  =  daddy_grav_l ();
-      for (; !e && t;  t = t->daddy_trans_l_)
-       {
-         e = dynamic_cast<Score_engraver*> (t);
-       }
-
-      if (!e)
-       programming_error ("No score engraver!");
-      else
-       e->forbid_breaks ();    // guh. Use properties!
+      top_engraver ()->forbid_breaks ();       // guh. Use properties!
     }
   else
     typeset_bar ();
@@ -116,5 +106,5 @@ ENTER_DESCRIPTION(Bar_engraver,
 @code{whichBar} property. If it has no bar line to create, it will forbid a linebreak at this point",
 /* creats*/       "BarLine",
 /* acks  */       "",
-/* reads */       "whichBar stavesFound",
+/* reads */       "whichBar",
 /* write */       "");