* lily/simple-spacer.cc (add_columns): use binary search for

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

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 26dd7a64b31059d24b9dd055370e7225ed1b52ec..0483857e019ae506484eea214cf344deab4b2e38 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -9,11 +9,8 @@
 
 #include "bar-line.hh"
 #include "score-engraver.hh"
-#include "event.hh"
-#include "engraver-group-engraver.hh"
 #include "warn.hh"
 #include "item.hh"
-#include "engraver.hh"
 
 /*
   generate bars. Either user ("|:"), or default (new measure)
@@ -47,12 +44,10 @@ Bar_engraver::create_bar ()
 {
   if (!bar_)
     {
-      bar_ = make_item ("BarLine");
+      bar_ = make_item ("BarLine", SCM_EOL);
       SCM gl = get_property ("whichBar");
       if (scm_equal_p (gl, bar_->get_property ("glyph")) != SCM_BOOL_T)
          bar_->set_property ("glyph", gl);
-      
-      announce_grob (bar_, SCM_EOL);
     }
 }
 
@@ -77,20 +72,14 @@ Bar_engraver::finalize ()
 void
 Bar_engraver::process_acknowledged_grobs ()
 {
-  if (!bar_ && gh_string_p (get_property ("whichBar")))
-    {
-      create_bar ();
-    }
+  if (!bar_ && scm_is_string (get_property ("whichBar")))
+    create_bar ();
 }
 
 void
 Bar_engraver::typeset_bar ()
 {
-  if (bar_) 
-    {
-      typeset_grob (bar_);
-      bar_ =0;
-    }
+  bar_ = 0;
 }
 
 /*
@@ -100,9 +89,8 @@ void
 Bar_engraver::stop_translation_timestep ()
 {
   if (!bar_)
-    {
-      get_score_engraver ()->forbid_breaks (); // guh. Use properties!
-    }
+    /* guh. Use properties! */
+    get_score_engraver ()->forbid_breaks ();
   else
     typeset_bar ();
 }