* lily/include/debug.hh: deprecate.

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index b18bdf251da3805ac41fea4247fcc1a835a020fb..71d918dfb2696491f0b3c232133fdcfa393537ce 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"
@@ -28,7 +28,7 @@ public:
 protected:
   virtual void finalize ();
   virtual void stop_translation_timestep ();
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
 
 private:
   void typeset_bar ();
@@ -48,12 +48,11 @@ Bar_engraver::create_bar ()
   if (!bar_p_)
     {
       bar_p_ = new Item (get_property ("BarLine"));
-
       SCM gl = get_property ("whichBar");
       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);
     }
 }
 
@@ -66,9 +65,17 @@ Bar_engraver::finalize ()
 /*
   Bar_engraver should come *after* any engravers that  
   modify whichBar
+
+  This is a little hairy : whichBar may be set by
+  Repeat_acknowledge_engraver::process_music, which is at score
+  context. This means that grobs could should be created after
+  process_music. We do stuff process_acknowledged_grobs(), just to be
+  on the safe side.
+     
 */
+
 void
-Bar_engraver::create_grobs ()
+Bar_engraver::process_acknowledged_grobs ()
 {
   if (!bar_p_ && gh_string_p (get_property ("whichBar")))
     {
@@ -106,5 +113,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 */       "");